X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkstatusbar.c;h=47350376ad2cbe885e0c107f983abb09f326339e;hb=feb64f40b0f50735104da0a7fdafbe480763c180;hp=023072d368318ec127edf006e2a159a52747be75;hpb=ab4d6935ef4abeacde3506640d0d86f0e3787a30;p=~andy%2Fgtk
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index 023072d36..47350376a 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -13,27 +13,82 @@
* 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.
+ * License along with this library. If not, see .
*/
/*
* 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 "config.h"
+
+#include "gtkstatusbar.h"
+
+#include "gtkboxprivate.h"
#include "gtkframe.h"
#include "gtklabel.h"
#include "gtkmarshalers.h"
-#include "gtkstatusbar.h"
#include "gtkwindow.h"
+#include "gtkprivate.h"
#include "gtkintl.h"
-
+#include "gtkbuildable.h"
+#include "gtkorientable.h"
+#include "gtktypebuiltins.h"
+#include "a11y/gtkstatusbaraccessible.h"
+
+/**
+ * SECTION:gtkstatusbar
+ * @title: GtkStatusbar
+ * @short_description: Report messages of minor importance to the user
+ *
+ * A #GtkStatusbar is usually placed along the bottom of an application's
+ * main #GtkWindow. It may provide a regular commentary of the application's
+ * status (as is usually the case in a web browser, for example), or may be
+ * used to simply output a message when the status changes, (when an upload
+ * is complete in an FTP client, for example).
+ *
+ * Status bars in GTK+ maintain a stack of messages. The message at
+ * the top of the each bar's stack is the one that will currently be displayed.
+ *
+ * Any messages added to a statusbar's stack must specify a
+ * context id that is used to uniquely identify
+ * the source of a message. This context id can be generated by
+ * gtk_statusbar_get_context_id(), given a message and the statusbar that
+ * it will be added to. Note that messages are stored in a stack, and when
+ * choosing which message to display, the stack structure is adhered to,
+ * regardless of the context identifier of a message.
+ *
+ * One could say that a statusbar maintains one stack of messages for
+ * display purposes, but allows multiple message producers to maintain
+ * sub-stacks of the messages they produced (via context ids).
+ *
+ * Status bars are created using gtk_statusbar_new().
+ *
+ * Messages are added to the bar's stack with gtk_statusbar_push().
+ *
+ * The message at the top of the stack can be removed using
+ * gtk_statusbar_pop(). A message can be removed from anywhere in the
+ * stack if its message id was recorded at the time it was added. This
+ * is done using gtk_statusbar_remove().
+ */
typedef struct _GtkStatusbarMsg GtkStatusbarMsg;
+struct _GtkStatusbarPrivate
+{
+ GtkWidget *frame;
+ GtkWidget *label;
+
+ GSList *messages;
+ GSList *keys;
+
+ guint seq_context_id;
+ guint seq_message_id;
+};
+
+
struct _GtkStatusbarMsg
{
gchar *text;
@@ -48,95 +103,52 @@ enum
SIGNAL_LAST
};
-static void gtk_statusbar_class_init (GtkStatusbarClass *class);
-static void gtk_statusbar_init (GtkStatusbar *statusbar);
-static void gtk_statusbar_destroy (GtkObject *object);
-static void gtk_statusbar_update (GtkStatusbar *statusbar,
- guint context_id,
- const gchar *text);
-static void gtk_statusbar_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gtk_statusbar_realize (GtkWidget *widget);
-static void gtk_statusbar_unrealize (GtkWidget *widget);
-static void gtk_statusbar_map (GtkWidget *widget);
-static void gtk_statusbar_unmap (GtkWidget *widget);
-static gboolean gtk_statusbar_button_press (GtkWidget *widget,
- GdkEventButton *event);
-static gboolean gtk_statusbar_expose_event (GtkWidget *widget,
- GdkEventExpose *event);
-static void gtk_statusbar_size_request (GtkWidget *widget,
- GtkRequisition *requisition);
-static void gtk_statusbar_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation);
-static void gtk_statusbar_create_window (GtkStatusbar *statusbar);
-static void gtk_statusbar_destroy_window (GtkStatusbar *statusbar);
-
-static GtkContainerClass *parent_class;
-static guint statusbar_signals[SIGNAL_LAST] = { 0 };
+static void gtk_statusbar_buildable_interface_init (GtkBuildableIface *iface);
+static GObject *gtk_statusbar_buildable_get_internal_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *childname);
+static void gtk_statusbar_update (GtkStatusbar *statusbar,
+ guint context_id,
+ const gchar *text);
+static void gtk_statusbar_realize (GtkWidget *widget);
+static void gtk_statusbar_destroy (GtkWidget *widget);
+static void gtk_statusbar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation);
+static void gtk_statusbar_hierarchy_changed (GtkWidget *widget,
+ GtkWidget *previous_toplevel);
-GType
-gtk_statusbar_get_type (void)
-{
- static GType statusbar_type = 0;
- if (!statusbar_type)
- {
- static const GTypeInfo statusbar_info =
- {
- sizeof (GtkStatusbarClass),
- NULL, /* base_init */
- NULL, /* base_finalize */
- (GClassInitFunc) gtk_statusbar_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkStatusbar),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_statusbar_init,
- };
-
- statusbar_type = g_type_register_static (GTK_TYPE_HBOX, "GtkStatusbar",
- &statusbar_info, 0);
- }
+static guint statusbar_signals[SIGNAL_LAST] = { 0 };
- return statusbar_type;
-}
+G_DEFINE_TYPE_WITH_CODE (GtkStatusbar, gtk_statusbar, GTK_TYPE_BOX,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+ gtk_statusbar_buildable_interface_init));
static void
gtk_statusbar_class_init (GtkStatusbarClass *class)
{
- GtkObjectClass *object_class;
GtkWidgetClass *widget_class;
- GtkContainerClass *container_class;
- object_class = (GtkObjectClass *) class;
widget_class = (GtkWidgetClass *) class;
- container_class = (GtkContainerClass *) class;
-
- parent_class = g_type_class_peek_parent (class);
-
- object_class->destroy = gtk_statusbar_destroy;
widget_class->realize = gtk_statusbar_realize;
- widget_class->unrealize = gtk_statusbar_unrealize;
- widget_class->map = gtk_statusbar_map;
- widget_class->unmap = gtk_statusbar_unmap;
-
- widget_class->button_press_event = gtk_statusbar_button_press;
- widget_class->expose_event = gtk_statusbar_expose_event;
-
- widget_class->size_request = gtk_statusbar_size_request;
+ widget_class->destroy = gtk_statusbar_destroy;
widget_class->size_allocate = gtk_statusbar_size_allocate;
-
- class->messages_mem_chunk = g_mem_chunk_new ("GtkStatusbar messages mem chunk",
- sizeof (GtkStatusbarMsg),
- sizeof (GtkStatusbarMsg) * 64,
- G_ALLOC_AND_FREE);
+ widget_class->hierarchy_changed = gtk_statusbar_hierarchy_changed;
class->text_pushed = gtk_statusbar_update;
class->text_popped = gtk_statusbar_update;
-
+
+ /**
+ * GtkStatusbar::text-pushed:
+ * @statusbar: the object which received the signal
+ * @context_id: the context id of the relevant message/statusbar
+ * @text: the message that was pushed
+ *
+ * Is emitted whenever a new message gets pushed onto a statusbar's stack.
+ */
statusbar_signals[SIGNAL_TEXT_PUSHED] =
- g_signal_new ("text_pushed",
+ g_signal_new (I_("text-pushed"),
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkStatusbarClass, text_pushed),
@@ -145,8 +157,17 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
G_TYPE_NONE, 2,
G_TYPE_UINT,
G_TYPE_STRING);
+
+ /**
+ * GtkStatusbar::text-popped:
+ * @statusbar: the object which received the signal
+ * @context_id: the context id of the relevant message/statusbar
+ * @text: the message that was just popped
+ *
+ * Is emitted whenever a new message is popped off a statusbar's stack.
+ */
statusbar_signals[SIGNAL_TEXT_POPPED] =
- g_signal_new ("text_popped",
+ g_signal_new (I_("text-popped"),
G_OBJECT_CLASS_TYPE (class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkStatusbarClass, text_popped),
@@ -157,49 +178,93 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
G_TYPE_STRING);
gtk_widget_class_install_style_property (widget_class,
- g_param_spec_enum ("shadow_type",
- _("Shadow type"),
- _("Style of bevel around the statusbar text"),
+ g_param_spec_enum ("shadow-type",
+ P_("Shadow type"),
+ P_("Style of bevel around the statusbar text"),
GTK_TYPE_SHADOW_TYPE,
GTK_SHADOW_IN,
- G_PARAM_READABLE));
+ GTK_PARAM_READABLE));
+
+ g_type_class_add_private (class, sizeof (GtkStatusbarPrivate));
+
+ gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_STATUSBAR_ACCESSIBLE);
}
static void
gtk_statusbar_init (GtkStatusbar *statusbar)
{
- GtkBox *box;
+ GtkStatusbarPrivate *priv;
+ GtkBox *box = GTK_BOX (statusbar);
+ GtkWidget *message_area;
GtkShadowType shadow_type;
-
- box = GTK_BOX (statusbar);
- box->spacing = 2;
- box->homogeneous = FALSE;
+ statusbar->priv = G_TYPE_INSTANCE_GET_PRIVATE (statusbar,
+ GTK_TYPE_STATUSBAR,
+ GtkStatusbarPrivate);
+ priv = statusbar->priv;
- statusbar->has_resize_grip = TRUE;
+ gtk_widget_set_redraw_on_allocate (GTK_WIDGET (box), TRUE);
- gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow_type", &shadow_type, NULL);
-
- statusbar->frame = gtk_frame_new (NULL);
- gtk_frame_set_shadow_type (GTK_FRAME (statusbar->frame), shadow_type);
- gtk_box_pack_start (box, statusbar->frame, TRUE, TRUE, 0);
- gtk_widget_show (statusbar->frame);
-
- statusbar->label = gtk_label_new ("");
- gtk_misc_set_alignment (GTK_MISC (statusbar->label), 0.0, 0.0);
- /* don't expand the size request for the label; if we
- * do that then toplevels weirdly resize
- */
- gtk_widget_set_size_request (statusbar->label, 1, -1);
- gtk_container_add (GTK_CONTAINER (statusbar->frame), statusbar->label);
- gtk_widget_show (statusbar->label);
-
- statusbar->seq_context_id = 1;
- statusbar->seq_message_id = 1;
- statusbar->messages = NULL;
- statusbar->keys = NULL;
+ gtk_box_set_spacing (box, 2);
+ gtk_box_set_homogeneous (box, FALSE);
+
+ gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow-type", &shadow_type, NULL);
+
+ priv->frame = gtk_frame_new (NULL);
+ gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), shadow_type);
+ gtk_box_pack_start (box, priv->frame, TRUE, TRUE, 0);
+ gtk_widget_show (priv->frame);
+
+ message_area = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+ gtk_container_add (GTK_CONTAINER (priv->frame), message_area);
+ gtk_widget_show (message_area);
+
+ priv->label = gtk_label_new ("");
+ gtk_label_set_single_line_mode (GTK_LABEL (priv->label), TRUE);
+ gtk_widget_set_halign (priv->label, GTK_ALIGN_START);
+ gtk_widget_set_valign (priv->label, GTK_ALIGN_CENTER);
+ gtk_label_set_ellipsize (GTK_LABEL (priv->label), PANGO_ELLIPSIZE_END);
+ gtk_container_add (GTK_CONTAINER (message_area), priv->label);
+ gtk_widget_show (priv->label);
+
+ priv->seq_context_id = 1;
+ priv->seq_message_id = 1;
+ priv->messages = NULL;
+ priv->keys = NULL;
+}
+
+static GtkBuildableIface *parent_buildable_iface;
+
+static void
+gtk_statusbar_buildable_interface_init (GtkBuildableIface *iface)
+{
+ parent_buildable_iface = g_type_interface_peek_parent (iface);
+ iface->get_internal_child = gtk_statusbar_buildable_get_internal_child;
}
+static GObject *
+gtk_statusbar_buildable_get_internal_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ const gchar *childname)
+{
+ GtkStatusbar *statusbar = GTK_STATUSBAR (buildable);
+ GtkStatusbarPrivate *priv = statusbar->priv;
+
+ if (strcmp (childname, "message_area") == 0)
+ return G_OBJECT (gtk_bin_get_child (GTK_BIN (priv->frame)));
+
+ return parent_buildable_iface->get_internal_child (buildable,
+ builder,
+ childname);
+}
+
+/**
+ * gtk_statusbar_new:
+ *
+ * Creates a new #GtkStatusbar ready for messages.
+ *
+ * Returns: the new #GtkStatusbar
+ */
GtkWidget*
gtk_statusbar_new (void)
{
@@ -211,59 +276,108 @@ gtk_statusbar_update (GtkStatusbar *statusbar,
guint context_id,
const gchar *text)
{
+ GtkStatusbarPrivate *priv;
+
g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
+ priv = statusbar->priv;
+
if (!text)
text = "";
- gtk_label_set_text (GTK_LABEL (statusbar->label), text);
+ gtk_label_set_text (GTK_LABEL (priv->label), text);
}
+/**
+ * gtk_statusbar_get_context_id:
+ * @statusbar: a #GtkStatusbar
+ * @context_description: textual description of what context
+ * the new message is being used in
+ *
+ * Returns a new context identifier, given a description
+ * of the actual context. Note that the description is
+ * not shown in the UI.
+ *
+ * Returns: an integer id
+ */
guint
gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
const gchar *context_description)
{
+ GtkStatusbarPrivate *priv;
gchar *string;
- guint *id;
+ guint id;
g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
g_return_val_if_fail (context_description != NULL, 0);
+ priv = statusbar->priv;
+
/* we need to preserve namespaces on object datas */
string = g_strconcat ("gtk-status-bar-context:", context_description, NULL);
- id = g_object_get_data (G_OBJECT (statusbar), string);
- if (!id)
+ id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (statusbar), string));
+ if (id == 0)
{
- id = g_new (guint, 1);
- *id = statusbar->seq_context_id++;
- g_object_set_data_full (G_OBJECT (statusbar), string, id, g_free);
- statusbar->keys = g_slist_prepend (statusbar->keys, string);
+ id = priv->seq_context_id++;
+ g_object_set_data_full (G_OBJECT (statusbar), string, GUINT_TO_POINTER (id), NULL);
+ priv->keys = g_slist_prepend (priv->keys, string);
}
else
g_free (string);
- return *id;
+ return id;
+}
+
+static GtkStatusbarMsg *
+gtk_statusbar_msg_create (GtkStatusbar *statusbar,
+ guint context_id,
+ const gchar *text)
+{
+ GtkStatusbarMsg *msg;
+
+ msg = g_slice_new (GtkStatusbarMsg);
+ msg->text = g_strdup (text);
+ msg->context_id = context_id;
+ msg->message_id = statusbar->priv->seq_message_id++;
+
+ return msg;
+}
+
+static void
+gtk_statusbar_msg_free (GtkStatusbarMsg *msg)
+{
+ g_free (msg->text);
+ g_slice_free (GtkStatusbarMsg, msg);
}
+/**
+ * gtk_statusbar_push:
+ * @statusbar: a #GtkStatusbar
+ * @context_id: the message's context id, as returned by
+ * gtk_statusbar_get_context_id()
+ * @text: the message to add to the statusbar
+ *
+ * Pushes a new message onto a statusbar's stack.
+ *
+ * Returns: a message id that can be used with
+ * gtk_statusbar_remove().
+ */
guint
gtk_statusbar_push (GtkStatusbar *statusbar,
guint context_id,
const gchar *text)
{
+ GtkStatusbarPrivate *priv;
GtkStatusbarMsg *msg;
- GtkStatusbarClass *class;
g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), 0);
g_return_val_if_fail (text != NULL, 0);
- class = GTK_STATUSBAR_GET_CLASS (statusbar);
- msg = g_chunk_new (GtkStatusbarMsg, class->messages_mem_chunk);
- msg->text = g_strdup (text);
- msg->context_id = context_id;
- msg->message_id = statusbar->seq_message_id++;
+ priv = statusbar->priv;
- statusbar->messages = g_slist_prepend (statusbar->messages, msg);
+ msg = gtk_statusbar_msg_create (statusbar, context_id, text);
+ priv->messages = g_slist_prepend (priv->messages, msg);
g_signal_emit (statusbar,
statusbar_signals[SIGNAL_TEXT_PUSHED],
@@ -274,39 +388,48 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
return msg->message_id;
}
+/**
+ * gtk_statusbar_pop:
+ * @statusbar: a #GtkStatusbar
+ * @context_id: a context identifier
+ *
+ * Removes the first message in the #GtkStatusbar's stack
+ * with the given context id.
+ *
+ * Note that this may not change the displayed message, if
+ * the message at the top of the stack has a different
+ * context id.
+ */
void
gtk_statusbar_pop (GtkStatusbar *statusbar,
guint context_id)
{
+ GtkStatusbarPrivate *priv;
GtkStatusbarMsg *msg;
g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
- if (statusbar->messages)
+ priv = statusbar->priv;
+
+ if (priv->messages)
{
GSList *list;
- for (list = statusbar->messages; list; list = list->next)
+ for (list = priv->messages; list; list = list->next)
{
msg = list->data;
if (msg->context_id == context_id)
{
- GtkStatusbarClass *class;
-
- class = GTK_STATUSBAR_GET_CLASS (statusbar);
-
- statusbar->messages = g_slist_remove_link (statusbar->messages,
- list);
- g_free (msg->text);
- g_mem_chunk_free (class->messages_mem_chunk, msg);
+ priv->messages = g_slist_remove_link (priv->messages, list);
+ gtk_statusbar_msg_free (msg);
g_slist_free_1 (list);
break;
}
}
}
- msg = statusbar->messages ? statusbar->messages->data : NULL;
+ msg = priv->messages ? priv->messages->data : NULL;
g_signal_emit (statusbar,
statusbar_signals[SIGNAL_TEXT_POPPED],
@@ -315,17 +438,29 @@ gtk_statusbar_pop (GtkStatusbar *statusbar,
msg ? msg->text : NULL);
}
+/**
+ * gtk_statusbar_remove:
+ * @statusbar: a #GtkStatusbar
+ * @context_id: a context identifier
+ * @message_id: a message identifier, as returned by gtk_statusbar_push()
+ *
+ * Forces the removal of a message from a statusbar's stack.
+ * The exact @context_id and @message_id must be specified.
+ */
void
gtk_statusbar_remove (GtkStatusbar *statusbar,
guint context_id,
guint message_id)
{
+ GtkStatusbarPrivate *priv;
GtkStatusbarMsg *msg;
g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
g_return_if_fail (message_id > 0);
- msg = statusbar->messages ? statusbar->messages->data : NULL;
+ priv = statusbar->priv;
+
+ msg = priv->messages ? priv->messages->data : NULL;
if (msg)
{
GSList *list;
@@ -338,19 +473,15 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
return;
}
- for (list = statusbar->messages; list; list = list->next)
+ for (list = priv->messages; list; list = list->next)
{
msg = list->data;
if (msg->context_id == context_id &&
msg->message_id == message_id)
{
- GtkStatusbarClass *class;
-
- class = GTK_STATUSBAR_GET_CLASS (statusbar);
- statusbar->messages = g_slist_remove_link (statusbar->messages, list);
- g_free (msg->text);
- g_mem_chunk_free (class->messages_mem_chunk, msg);
+ priv->messages = g_slist_remove_link (priv->messages, list);
+ gtk_statusbar_msg_free (msg);
g_slist_free_1 (list);
break;
@@ -359,312 +490,284 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
}
}
+/**
+ * gtk_statusbar_remove_all:
+ * @statusbar: a #GtkStatusbar
+ * @context_id: a context identifier
+ *
+ * Forces the removal of all messages from a statusbar's
+ * stack with the exact @context_id.
+ *
+ * Since: 2.22
+ */
void
-gtk_statusbar_set_has_resize_grip (GtkStatusbar *statusbar,
- gboolean setting)
+gtk_statusbar_remove_all (GtkStatusbar *statusbar,
+ guint context_id)
{
- g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
-
- setting = setting != FALSE;
-
- if (setting != statusbar->has_resize_grip)
- {
- statusbar->has_resize_grip = setting;
- gtk_widget_queue_draw (GTK_WIDGET (statusbar));
-
- if (GTK_WIDGET_REALIZED (statusbar))
- {
- if (statusbar->has_resize_grip && statusbar->grip_window == NULL)
- gtk_statusbar_create_window (statusbar);
- else if (!statusbar->has_resize_grip && statusbar->grip_window != NULL)
- gtk_statusbar_destroy_window (statusbar);
- }
- }
-}
+ GtkStatusbarPrivate *priv;
+ GtkStatusbarMsg *msg;
+ GSList *prev, *list;
-gboolean
-gtk_statusbar_get_has_resize_grip (GtkStatusbar *statusbar)
-{
- g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), FALSE);
+ g_return_if_fail (GTK_IS_STATUSBAR (statusbar));
- return statusbar->has_resize_grip;
-}
+ priv = statusbar->priv;
-static void
-gtk_statusbar_destroy (GtkObject *object)
-{
- GtkStatusbar *statusbar;
- GtkStatusbarClass *class;
- GSList *list;
+ if (priv->messages == NULL)
+ return;
- g_return_if_fail (GTK_IS_STATUSBAR (object));
+ msg = priv->messages->data;
- statusbar = GTK_STATUSBAR (object);
- class = GTK_STATUSBAR_GET_CLASS (statusbar);
-
- for (list = statusbar->messages; list; list = list->next)
+ /* care about signal emission if the topmost item is removed */
+ if (msg->context_id == context_id)
{
- GtkStatusbarMsg *msg;
+ gtk_statusbar_pop (statusbar, context_id);
- msg = list->data;
- g_free (msg->text);
- g_mem_chunk_free (class->messages_mem_chunk, msg);
+ prev = NULL;
+ list = priv->messages;
+ }
+ else
+ {
+ prev = priv->messages;
+ list = prev->next;
}
- g_slist_free (statusbar->messages);
- statusbar->messages = NULL;
-
- for (list = statusbar->keys; list; list = list->next)
- g_free (list->data);
- g_slist_free (statusbar->keys);
- statusbar->keys = NULL;
- GTK_OBJECT_CLASS (parent_class)->destroy (object);
-}
+ while (list != NULL)
+ {
+ msg = list->data;
-static void
-get_grip_rect (GtkStatusbar *statusbar,
- GdkRectangle *rect)
-{
- GtkWidget *widget;
- gint w, h;
-
- widget = GTK_WIDGET (statusbar);
+ if (msg->context_id == context_id)
+ {
+ if (prev == NULL)
+ priv->messages = list->next;
+ else
+ prev->next = list->next;
- /* These are in effect the max/default size of the grip. */
- w = 18;
- h = 18;
+ gtk_statusbar_msg_free (msg);
+ g_slist_free_1 (list);
- if (w > (widget->allocation.width))
- w = widget->allocation.width;
+ if (prev == NULL)
+ prev = priv->messages;
- if (h > (widget->allocation.height - widget->style->ythickness))
- h = widget->allocation.height - widget->style->ythickness;
-
- rect->x = widget->allocation.x + widget->allocation.width - w;
- rect->y = widget->allocation.y + widget->allocation.height - h;
- rect->width = w;
- rect->height = h;
+ if (prev)
+ list = prev->next;
+ else
+ list = NULL;
+ }
+ else
+ {
+ prev = list;
+ list = prev->next;
+ }
+ }
}
-static void
-gtk_statusbar_create_window (GtkStatusbar *statusbar)
+/**
+ * gtk_statusbar_get_message_area:
+ * @statusbar: a #GtkStatusbar
+ *
+ * Retrieves the box containing the label widget.
+ *
+ * Returns: (transfer none): a #GtkBox
+ *
+ * Since: 2.20
+ */
+GtkWidget*
+gtk_statusbar_get_message_area (GtkStatusbar *statusbar)
{
- GtkWidget *widget;
- GdkWindowAttr attributes;
- gint attributes_mask;
- GdkRectangle rect;
-
- g_return_if_fail (GTK_WIDGET_REALIZED (statusbar));
- g_return_if_fail (statusbar->has_resize_grip);
-
- widget = GTK_WIDGET (statusbar);
-
- get_grip_rect (statusbar, &rect);
+ GtkStatusbarPrivate *priv;
- attributes.x = rect.x;
- attributes.y = rect.y;
- attributes.width = rect.width;
- attributes.height = rect.height;
- attributes.window_type = GDK_WINDOW_CHILD;
- attributes.wclass = GDK_INPUT_ONLY;
- attributes.event_mask = gtk_widget_get_events (widget) |
- GDK_BUTTON_PRESS_MASK;
+ g_return_val_if_fail (GTK_IS_STATUSBAR (statusbar), NULL);
- attributes_mask = GDK_WA_X | GDK_WA_Y;
+ priv = statusbar->priv;
- statusbar->grip_window = gdk_window_new (widget->window,
- &attributes, attributes_mask);
- gdk_window_set_user_data (statusbar->grip_window, widget);
+ return gtk_bin_get_child (GTK_BIN (priv->frame));
}
static void
-gtk_statusbar_destroy_window (GtkStatusbar *statusbar)
+gtk_statusbar_destroy (GtkWidget *widget)
{
- gdk_window_set_user_data (statusbar->grip_window, NULL);
- gdk_window_destroy (statusbar->grip_window);
- statusbar->grip_window = NULL;
-}
+ GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
+ GtkStatusbarPrivate *priv = statusbar->priv;
-static void
-gtk_statusbar_realize (GtkWidget *widget)
-{
- GtkStatusbar *statusbar;
+ g_slist_free_full (priv->messages, (GDestroyNotify) gtk_statusbar_msg_free);
+ priv->messages = NULL;
- statusbar = GTK_STATUSBAR (widget);
-
- (* GTK_WIDGET_CLASS (parent_class)->realize) (widget);
+ g_slist_free_full (priv->keys, g_free);
+ priv->keys = NULL;
- if (statusbar->has_resize_grip)
- gtk_statusbar_create_window (statusbar);
+ GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->destroy (widget);
}
-static void
-gtk_statusbar_unrealize (GtkWidget *widget)
+/* look for extra children between the frame containing
+ * the label and where we want to draw the resize grip
+ */
+static gboolean
+has_extra_children (GtkStatusbar *statusbar)
{
- GtkStatusbar *statusbar;
+ GtkStatusbarPrivate *priv = statusbar->priv;
+ GtkPackType child_pack_type, frame_pack_type;
+ GtkWidget *child, *frame;
+ GList *l, *children;
+ gboolean retval = FALSE;
+
+ frame = NULL;
+ children = _gtk_box_get_children (GTK_BOX (statusbar));
+ for (l = children; l; l = l->next)
+ {
+ frame = l->data;
- statusbar = GTK_STATUSBAR (widget);
+ if (frame == priv->frame)
+ break;
+ }
- if (statusbar->grip_window)
- gtk_statusbar_destroy_window (statusbar);
-
- (* GTK_WIDGET_CLASS (parent_class)->unrealize) (widget);
-}
+ gtk_box_query_child_packing (GTK_BOX (statusbar), frame,
+ NULL, NULL, NULL, &frame_pack_type);
-static void
-gtk_statusbar_map (GtkWidget *widget)
-{
- GtkStatusbar *statusbar;
+ for (l = l->next; l; l = l->next)
+ {
+ child = l->data;
- statusbar = GTK_STATUSBAR (widget);
-
- (* GTK_WIDGET_CLASS (parent_class)->map) (widget);
-
- if (statusbar->grip_window)
- gdk_window_show (statusbar->grip_window);
-}
+ if (!gtk_widget_get_visible (child))
+ continue;
-static void
-gtk_statusbar_unmap (GtkWidget *widget)
-{
- GtkStatusbar *statusbar;
+ gtk_box_query_child_packing (GTK_BOX (statusbar), child,
+ NULL, NULL, NULL, &child_pack_type);
- statusbar = GTK_STATUSBAR (widget);
+ if (frame_pack_type == GTK_PACK_START || child_pack_type == GTK_PACK_END)
+ {
+ retval = TRUE;
+ break;
+ }
+ }
- if (statusbar->grip_window)
- gdk_window_hide (statusbar->grip_window);
-
- (* GTK_WIDGET_CLASS (parent_class)->unmap) (widget);
-}
+ g_list_free (children);
-static gboolean
-gtk_statusbar_button_press (GtkWidget *widget,
- GdkEventButton *event)
-{
- GtkStatusbar *statusbar;
- GtkWidget *ancestor;
-
- statusbar = GTK_STATUSBAR (widget);
-
- if (!statusbar->has_resize_grip ||
- event->type != GDK_BUTTON_PRESS)
- return FALSE;
-
- ancestor = gtk_widget_get_toplevel (widget);
-
- if (!GTK_IS_WINDOW (ancestor))
- return FALSE;
-
- if (event->button == 1)
- gtk_window_begin_resize_drag (GTK_WINDOW (ancestor),
- GDK_WINDOW_EDGE_SOUTH_EAST,
- event->button,
- event->x_root, event->y_root,
- event->time);
- else if (event->button == 2)
- gtk_window_begin_move_drag (GTK_WINDOW (ancestor),
- event->button,
- event->x_root, event->y_root,
- event->time);
- else
- return FALSE;
-
- return TRUE;
+ return retval;
}
-static gboolean
-gtk_statusbar_expose_event (GtkWidget *widget,
- GdkEventExpose *event)
+static void
+gtk_statusbar_size_allocate (GtkWidget *widget,
+ GtkAllocation *allocation)
{
- GtkStatusbar *statusbar;
+ GtkStatusbar *statusbar = GTK_STATUSBAR (widget);
+ GtkStatusbarPrivate *priv = statusbar->priv;
+ gboolean extra_children = FALSE;
+ gboolean has_resize_grip = FALSE;
GdkRectangle rect;
-
- statusbar = GTK_STATUSBAR (widget);
+ GtkWidget *window;
+ gint x, y;
+ GdkRectangle translated_rect;
- GTK_WIDGET_CLASS (parent_class)->expose_event (widget, event);
+ window = gtk_widget_get_toplevel (widget);
- if (statusbar->has_resize_grip)
+ if (GTK_IS_WINDOW (window) &&
+ gtk_window_resize_grip_is_visible (GTK_WINDOW (window)))
{
- get_grip_rect (statusbar, &rect);
-
- gtk_paint_resize_grip (widget->style,
- widget->window,
- GTK_WIDGET_STATE (widget),
- NULL,
- widget,
- "statusbar",
- GDK_WINDOW_EDGE_SOUTH_EAST,
- rect.x, rect.y,
- /* don't draw grip over the frame, though you
- * can click on the frame.
- */
- rect.width - widget->style->xthickness,
- rect.height - widget->style->ythickness);
+ gtk_window_get_resize_grip_area (GTK_WINDOW (window), &rect);
+ if (gtk_widget_translate_coordinates (widget, window, 0, 0, &x, &y))
+ {
+ translated_rect.x = x;
+ translated_rect.y = y;
+ translated_rect.width = allocation->width;
+ translated_rect.height = allocation->height;
+
+ if (gdk_rectangle_intersect (&rect, &translated_rect, NULL))
+ {
+ has_resize_grip = TRUE;
+ extra_children = has_extra_children (statusbar);
+
+ /* If there are extra children, we don't want them to occupy
+ * the space where we draw the resize grip, so we temporarily
+ * shrink the allocation.
+ * If there are no extra children, we want the frame to get
+ * the full allocation, and we fix up the allocation of the
+ * label afterwards to make room for the grip.
+ */
+ if (extra_children)
+ {
+ allocation->width -= rect.width;
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ allocation->x += rect.width;
+ }
+ }
+ }
}
- return FALSE;
+ /* chain up normally */
+ GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->size_allocate (widget, allocation);
+
+ if (has_resize_grip)
+ {
+ if (extra_children)
+ {
+ allocation->width += rect.width;
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ allocation->x -= rect.width;
+
+ gtk_widget_set_allocation (widget, allocation);
+ }
+ else
+ {
+ GtkAllocation child_allocation, frame_allocation;
+ GtkWidget *child;
+
+ /* Use the frame's child instead of statusbar->label directly, in case
+ * the label has been replaced by a container as the frame's child
+ * (and the label reparented into that container).
+ */
+ child = gtk_bin_get_child (GTK_BIN (priv->frame));
+
+ gtk_widget_get_allocation (child, &child_allocation);
+ gtk_widget_get_allocation (priv->frame, &frame_allocation);
+ if (child_allocation.width + rect.width > frame_allocation.width)
+ {
+ /* shrink the label to make room for the grip */
+ *allocation = child_allocation;
+ allocation->width = MAX (1, allocation->width - rect.width);
+ if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ allocation->x += child_allocation.width - allocation->width;
+
+ gtk_widget_size_allocate (child, allocation);
+ }
+ }
+ }
}
static void
-gtk_statusbar_size_request (GtkWidget *widget,
- GtkRequisition *requisition)
+resize_grip_visible_changed (GObject *object,
+ GParamSpec *pspec,
+ gpointer user_data)
{
- GtkStatusbar *statusbar;
- GtkShadowType shadow_type;
-
- statusbar = GTK_STATUSBAR (widget);
+ GtkStatusbar *statusbar = GTK_STATUSBAR (user_data);
+ GtkStatusbarPrivate *priv = statusbar->priv;
- gtk_widget_style_get (GTK_WIDGET (statusbar), "shadow_type", &shadow_type, NULL);
- gtk_frame_set_shadow_type (GTK_FRAME (statusbar->frame), shadow_type);
-
- GTK_WIDGET_CLASS (parent_class)->size_request (widget, requisition);
-
- if (statusbar->has_resize_grip)
- {
- GdkRectangle rect;
+ gtk_widget_queue_resize (priv->label);
+ gtk_widget_queue_resize (priv->frame);
+ gtk_widget_queue_resize (GTK_WIDGET (statusbar));
+}
- /* x, y in the grip rect depend on size allocation, but
- * w, h do not so this is OK
- */
- get_grip_rect (statusbar, &rect);
-
- requisition->width += rect.width;
- requisition->height = MAX (requisition->height, rect.height);
- }
+static void
+gtk_statusbar_hierarchy_changed (GtkWidget *widget,
+ GtkWidget *previous_toplevel)
+{
+ GtkWidget *window;
+
+ if (previous_toplevel)
+ g_signal_handlers_disconnect_by_func (previous_toplevel,
+ G_CALLBACK (resize_grip_visible_changed),
+ widget);
+ window = gtk_widget_get_toplevel (widget);
+ if (GTK_IS_WINDOW (window))
+ g_signal_connect (window, "notify::resize-grip-visible",
+ G_CALLBACK (resize_grip_visible_changed), widget);
+
+ resize_grip_visible_changed (NULL, NULL, widget);
}
static void
-gtk_statusbar_size_allocate (GtkWidget *widget,
- GtkAllocation *allocation)
+gtk_statusbar_realize (GtkWidget *widget)
{
- GtkStatusbar *statusbar;
-
- statusbar = GTK_STATUSBAR (widget);
+ GTK_WIDGET_CLASS (gtk_statusbar_parent_class)->realize (widget);
- if (statusbar->has_resize_grip)
- {
- GdkRectangle rect;
- GtkRequisition saved_req;
-
- widget->allocation = *allocation; /* get_grip_rect needs this info */
- get_grip_rect (statusbar, &rect);
-
- if (statusbar->grip_window)
- gdk_window_move_resize (statusbar->grip_window,
- rect.x, rect.y,
- rect.width, rect.height);
-
- /* enter the bad hack zone */
- saved_req = widget->requisition;
- widget->requisition.width -= rect.width; /* HBox::size_allocate needs this */
- if (widget->requisition.width < 0)
- widget->requisition.width = 0;
- GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
- widget->requisition = saved_req;
- }
- else
- {
- /* chain up normally */
- GTK_WIDGET_CLASS (parent_class)->size_allocate (widget, allocation);
- }
+ resize_grip_visible_changed (NULL, NULL, widget);
}