#include "gtklabel.h"
#include "gtkaccellabel.h"
#include "gtkdnd.h"
-#include "gtkmain.h"
+#include "gtkmainprivate.h"
#include "gtkmarshalers.h"
+#include "gtkpango.h"
#include "gtkwindow.h"
-#include "gdk/gdkkeysyms.h"
#include "gtkclipboard.h"
#include "gtkimagemenuitem.h"
#include "gtkintl.h"
#include "gtkseparatormenuitem.h"
#include "gtktextutil.h"
#include "gtkmenuitem.h"
+#include "gtkmenushellprivate.h"
#include "gtknotebook.h"
#include "gtkstock.h"
#include "gtkbindings.h"
#include "gtkimage.h"
#include "gtkshow.h"
#include "gtktooltip.h"
-#include "gtkextendedlayout.h"
#include "gtkprivate.h"
-#include "gtkalias.h"
+#include "gtktypebuiltins.h"
-#define GTK_LABEL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_LABEL, GtkLabelPrivate))
+/*rint() is only available in GCC and/or C99*/
+#if (__STDC_VERSION__ < 199901L && !defined __GNUC__)
+double rint(double x)
+{
+ if (ceil(x+0.5) == floor(x+0.5))
+ {
+ int a = (int)ceil(x);
+ if (a%2 == 0)
+ return ceil(x);
+ else
+ return floor(x);
+ }
+ else
+ return floor(x+0.5);
+}
+#endif
-typedef struct
+
+
+struct _GtkLabelPrivate
{
- gint wrap_width;
- gint width_chars;
- gint max_width_chars;
- gboolean full_size;
+ GtkLabelSelectionInfo *select_info;
+ GtkWidget *mnemonic_widget;
+ GtkWindow *mnemonic_window;
+
+ PangoAttrList *attrs;
+ PangoAttrList *effective_attrs;
+ PangoLayout *layout;
+
gboolean mnemonics_visible;
-} GtkLabelPrivate;
+
+ gchar *label;
+ gchar *text;
+
+ guint jtype : 2;
+ guint wrap : 1;
+ guint use_underline : 1;
+ guint use_markup : 1;
+ guint ellipsize : 3;
+ guint single_line_mode : 1;
+ guint have_transform : 1;
+ guint in_click : 1;
+ guint wrap_mode : 3;
+ guint pattern_set : 1;
+ guint track_links : 1;
+
+ guint mnemonic_keyval;
+
+ gint wrap_width;
+ gint width_chars;
+ gint max_width_chars;
+
+ gdouble angle;
+};
/* Notes about the handling of links:
*
PROP_SINGLE_LINE_MODE,
PROP_ANGLE,
PROP_MAX_WIDTH_CHARS,
- PROP_TRACK_VISITED_LINKS,
- PROP_FULL_SIZE
+ PROP_TRACK_VISITED_LINKS
};
+/* When rotating ellipsizable text we want the natural size to request
+ * more to ensure the label wont ever ellipsize in an allocation of full natural size.
+ * */
+#define ROTATION_ELLIPSIZE_PADDING 2
+
static guint signals[LAST_SIGNAL] = { 0 };
static const GdkColor default_link_color = { 0, 0, 0, 0xeeee };
guint prop_id,
GValue *value,
GParamSpec *pspec);
-static void gtk_label_destroy (GtkObject *object);
static void gtk_label_finalize (GObject *object);
+static void gtk_label_destroy (GtkWidget *widget);
static void gtk_label_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
static void gtk_label_state_changed (GtkWidget *widget,
GtkStateType state);
-static void gtk_label_style_set (GtkWidget *widget,
- GtkStyle *previous_style);
+static void gtk_label_style_updated (GtkWidget *widget);
static void gtk_label_direction_changed (GtkWidget *widget,
GtkTextDirection previous_dir);
-static gint gtk_label_expose (GtkWidget *widget,
- GdkEventExpose *event);
+static gint gtk_label_draw (GtkWidget *widget,
+ cairo_t *cr);
static gboolean gtk_label_focus (GtkWidget *widget,
GtkDirectionType direction);
static void gtk_label_clear_select_info (GtkLabel *label);
static void gtk_label_update_cursor (GtkLabel *label);
static void gtk_label_clear_layout (GtkLabel *label);
-static void gtk_label_ensure_layout (GtkLabel *label);
+static void gtk_label_ensure_layout (GtkLabel *label, gboolean guess_wrap_width);
static void gtk_label_invalidate_wrap_width (GtkLabel *label);
static void gtk_label_select_region_index (GtkLabel *label,
gint anchor_index,
static void emit_activate_link (GtkLabel *label,
GtkLabelLink *link);
-static void gtk_label_layout_interface_init (GtkExtendedLayoutIface *iface);
-
-static void gtk_label_get_desired_size (GtkExtendedLayout *layout,
- GtkRequisition *minimum_size,
- GtkRequisition *natural_size);
-static void gtk_label_get_width_for_height (GtkExtendedLayout *layout,
- gint height,
- gint *minimum_width,
- gint *natural_width);
-static void gtk_label_get_height_for_width (GtkExtendedLayout *layout,
- gint width,
- gint *minimum_height,
- gint *natural_height);
-
-static GQuark quark_angle = 0;
+static GtkSizeRequestMode gtk_label_get_request_mode (GtkWidget *widget);
+static void gtk_label_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_label_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_label_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width);
+static void gtk_label_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height);
static GtkBuildableIface *buildable_parent_iface = NULL;
G_DEFINE_TYPE_WITH_CODE (GtkLabel, gtk_label, GTK_TYPE_MISC,
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
- gtk_label_buildable_interface_init)
- G_IMPLEMENT_INTERFACE (GTK_TYPE_EXTENDED_LAYOUT,
- gtk_label_layout_interface_init));
+ gtk_label_buildable_interface_init))
static void
add_move_binding (GtkBindingSet *binding_set,
G_TYPE_BOOLEAN, TRUE);
}
-static void
-gtk_label_layout_interface_init (GtkExtendedLayoutIface *iface)
-{
- iface->get_desired_size = gtk_label_get_desired_size;
- iface->get_width_for_height = gtk_label_get_width_for_height;
- iface->get_height_for_width = gtk_label_get_height_for_width;
-}
-
static void
gtk_label_class_init (GtkLabelClass *class)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (class);
- GtkObjectClass *object_class = GTK_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
GtkBindingSet *binding_set;
- quark_angle = g_quark_from_static_string ("angle");
-
gobject_class->set_property = gtk_label_set_property;
gobject_class->get_property = gtk_label_get_property;
gobject_class->finalize = gtk_label_finalize;
- object_class->destroy = gtk_label_destroy;
-
+ widget_class->destroy = gtk_label_destroy;
widget_class->size_allocate = gtk_label_size_allocate;
widget_class->state_changed = gtk_label_state_changed;
- widget_class->style_set = gtk_label_style_set;
+ widget_class->style_updated = gtk_label_style_updated;
widget_class->query_tooltip = gtk_label_query_tooltip;
widget_class->direction_changed = gtk_label_direction_changed;
- widget_class->expose_event = gtk_label_expose;
+ widget_class->draw = gtk_label_draw;
widget_class->realize = gtk_label_realize;
widget_class->unrealize = gtk_label_unrealize;
widget_class->map = gtk_label_map;
widget_class->grab_focus = gtk_label_grab_focus;
widget_class->popup_menu = gtk_label_popup_menu;
widget_class->focus = gtk_label_focus;
+ widget_class->get_request_mode = gtk_label_get_request_mode;
+ widget_class->get_preferred_width = gtk_label_get_preferred_width;
+ widget_class->get_preferred_height = gtk_label_get_preferred_height;
+ widget_class->get_preferred_width_for_height = gtk_label_get_preferred_width_for_height;
+ widget_class->get_preferred_height_for_width = gtk_label_get_preferred_height_for_width;
class->move_cursor = gtk_label_move_cursor;
class->copy_clipboard = gtk_label_copy_clipboard;
*/
signals[ACTIVATE_CURRENT_LINK] =
g_signal_new_class_handler ("activate-current-link",
- G_TYPE_FROM_CLASS (object_class),
+ G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_CALLBACK (gtk_label_activate_current_link),
NULL, NULL,
*/
signals[ACTIVATE_LINK] =
g_signal_new ("activate-link",
- G_TYPE_FROM_CLASS (object_class),
+ G_TYPE_FROM_CLASS (gobject_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkLabelClass, activate_link),
_gtk_boolean_handled_accumulator, NULL,
P_("The mnemonic accelerator key for this label"),
0,
G_MAXUINT,
- GDK_VoidSymbol,
+ GDK_KEY_VoidSymbol,
GTK_PARAM_READABLE));
g_object_class_install_property (gobject_class,
PROP_MNEMONIC_WIDGET,
/**
* GtkLabel:width-chars:
- *
+ *
* The desired width of the label, in characters. If this property is set to
- * -1, the width will be calculated automatically, otherwise the label will
- * request either 3 characters or the property value, whichever is greater.
- * If the "width-chars" property is set to a positive value, then the
- * #GtkLabel:max-width-chars property is ignored.
+ * -1, the width will be calculated automatically.
+ *
+ * See the section on <link linkend="label-text-layout">text layout</link>
+ * for details of how #GtkLabel:width-chars and #GtkLabel:max-width-chars
+ * determine the width of ellipsized and wrapped labels.
*
* Since: 2.6
**/
* GtkLabel:max-width-chars:
*
* The desired maximum width of the label, in characters. If this property
- * is set to -1, the width will be calculated automatically, otherwise the
- * label will request space for no more than the requested number of
- * characters. If the #GtkLabel:width-chars property is set to a positive
- * value, then the "max-width-chars" property is ignored.
- *
+ * is set to -1, the width will be calculated automatically.
+ *
+ * See the section on <link linkend="label-text-layout">text layout</link>
+ * for details of how #GtkLabel:width-chars and #GtkLabel:max-width-chars
+ * determine the width of ellipsized and wrapped labels.
+ *
* Since: 2.6
**/
g_object_class_install_property (gobject_class,
P_("Whether visited links should be tracked"),
TRUE,
GTK_PARAM_READWRITE));
-
- /**
- * GtkLabel:full-size:
- *
- * Use the entire space the widget got assigned for text wrapping. Overrides
- * any #GtkLabel:width-chars, #GtkLabel:max-width-chars and screen size based
- * constraints. Requires #GtkLabel:angle to be 0°, 90°, 180° or 270°.
- *
- * Since: 2.18
- **/
- g_object_class_install_property (gobject_class,
- PROP_FULL_SIZE,
- g_param_spec_boolean ("full-size",
- P_("Full size"),
- P_("Use the entire size of the widget to wrap text"),
- FALSE,
- GTK_PARAM_READWRITE));
-
/*
* Key bindings
*/
binding_set = gtk_binding_set_by_class (class);
/* Moving the insertion point */
- add_move_binding (binding_set, GDK_Right, 0,
+ add_move_binding (binding_set, GDK_KEY_Right, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, 1);
- add_move_binding (binding_set, GDK_Left, 0,
+ add_move_binding (binding_set, GDK_KEY_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
- add_move_binding (binding_set, GDK_KP_Right, 0,
+ add_move_binding (binding_set, GDK_KEY_KP_Right, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, 1);
- add_move_binding (binding_set, GDK_KP_Left, 0,
+ add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
GTK_MOVEMENT_VISUAL_POSITIONS, -1);
- add_move_binding (binding_set, GDK_f, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_f, GDK_CONTROL_MASK,
GTK_MOVEMENT_LOGICAL_POSITIONS, 1);
- add_move_binding (binding_set, GDK_b, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_b, GDK_CONTROL_MASK,
GTK_MOVEMENT_LOGICAL_POSITIONS, -1);
- add_move_binding (binding_set, GDK_Right, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Right, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, 1);
- add_move_binding (binding_set, GDK_Left, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Left, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, -1);
- add_move_binding (binding_set, GDK_KP_Right, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Right, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, 1);
- add_move_binding (binding_set, GDK_KP_Left, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Left, GDK_CONTROL_MASK,
GTK_MOVEMENT_WORDS, -1);
/* select all */
- gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
- gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, -1,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_slash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_slash, GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 1,
G_TYPE_BOOLEAN, TRUE);
/* unselect all */
- gtk_binding_entry_add_signal (binding_set, GDK_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_SHIFT_MASK | GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 0,
G_TYPE_BOOLEAN, FALSE);
- gtk_binding_entry_add_signal (binding_set, GDK_backslash, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_backslash, GDK_CONTROL_MASK,
"move-cursor", 3,
G_TYPE_ENUM, GTK_MOVEMENT_PARAGRAPH_ENDS,
G_TYPE_INT, 0,
G_TYPE_BOOLEAN, FALSE);
- add_move_binding (binding_set, GDK_f, GDK_MOD1_MASK,
+ add_move_binding (binding_set, GDK_KEY_f, GDK_MOD1_MASK,
GTK_MOVEMENT_WORDS, 1);
- add_move_binding (binding_set, GDK_b, GDK_MOD1_MASK,
+ add_move_binding (binding_set, GDK_KEY_b, GDK_MOD1_MASK,
GTK_MOVEMENT_WORDS, -1);
- add_move_binding (binding_set, GDK_Home, 0,
+ add_move_binding (binding_set, GDK_KEY_Home, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
- add_move_binding (binding_set, GDK_End, 0,
+ add_move_binding (binding_set, GDK_KEY_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
- add_move_binding (binding_set, GDK_KP_Home, 0,
+ add_move_binding (binding_set, GDK_KEY_KP_Home, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, -1);
- add_move_binding (binding_set, GDK_KP_End, 0,
+ add_move_binding (binding_set, GDK_KEY_KP_End, 0,
GTK_MOVEMENT_DISPLAY_LINE_ENDS, 1);
- add_move_binding (binding_set, GDK_Home, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_Home, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
- add_move_binding (binding_set, GDK_End, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_End, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
- add_move_binding (binding_set, GDK_KP_Home, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_Home, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, -1);
- add_move_binding (binding_set, GDK_KP_End, GDK_CONTROL_MASK,
+ add_move_binding (binding_set, GDK_KEY_KP_End, GDK_CONTROL_MASK,
GTK_MOVEMENT_BUFFER_ENDS, 1);
/* copy */
- gtk_binding_entry_add_signal (binding_set, GDK_c, GDK_CONTROL_MASK,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_c, GDK_CONTROL_MASK,
"copy-clipboard", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_Return, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_Return, 0,
"activate-current-link", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_ISO_Enter, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_ISO_Enter, 0,
"activate-current-link", 0);
- gtk_binding_entry_add_signal (binding_set, GDK_KP_Enter, 0,
+ gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0,
"activate-current-link", 0);
- gtk_settings_install_property (g_param_spec_boolean ("gtk-label-select-on-focus",
- P_("Select on focus"),
- P_("Whether to select the contents of a selectable label when it is focused"),
- TRUE,
- GTK_PARAM_READWRITE));
-
-
g_type_class_add_private (class, sizeof (GtkLabelPrivate));
}
const GValue *value,
GParamSpec *pspec)
{
- GtkLabel *label;
+ GtkLabel *label = GTK_LABEL (object);
- label = GTK_LABEL (object);
-
switch (prop_id)
{
case PROP_LABEL:
case PROP_TRACK_VISITED_LINKS:
gtk_label_set_track_visited_links (label, g_value_get_boolean (value));
break;
- case PROP_FULL_SIZE:
- gtk_label_set_full_size (label, g_value_get_boolean (value));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
GValue *value,
GParamSpec *pspec)
{
- GtkLabel *label;
-
- label = GTK_LABEL (object);
-
+ GtkLabel *label = GTK_LABEL (object);
+ GtkLabelPrivate *priv = label->priv;
+
switch (prop_id)
{
case PROP_LABEL:
- g_value_set_string (value, label->label);
+ g_value_set_string (value, priv->label);
break;
case PROP_ATTRIBUTES:
- g_value_set_boxed (value, label->attrs);
+ g_value_set_boxed (value, priv->attrs);
break;
case PROP_USE_MARKUP:
- g_value_set_boolean (value, label->use_markup);
+ g_value_set_boolean (value, priv->use_markup);
break;
case PROP_USE_UNDERLINE:
- g_value_set_boolean (value, label->use_underline);
+ g_value_set_boolean (value, priv->use_underline);
break;
case PROP_JUSTIFY:
- g_value_set_enum (value, label->jtype);
+ g_value_set_enum (value, priv->jtype);
break;
case PROP_WRAP:
- g_value_set_boolean (value, label->wrap);
+ g_value_set_boolean (value, priv->wrap);
break;
case PROP_WRAP_MODE:
- g_value_set_enum (value, label->wrap_mode);
+ g_value_set_enum (value, priv->wrap_mode);
break;
case PROP_SELECTABLE:
g_value_set_boolean (value, gtk_label_get_selectable (label));
break;
case PROP_MNEMONIC_KEYVAL:
- g_value_set_uint (value, label->mnemonic_keyval);
+ g_value_set_uint (value, priv->mnemonic_keyval);
break;
case PROP_MNEMONIC_WIDGET:
- g_value_set_object (value, (GObject*) label->mnemonic_widget);
+ g_value_set_object (value, (GObject*) priv->mnemonic_widget);
break;
case PROP_CURSOR_POSITION:
- if (label->select_info && label->select_info->selectable)
+ if (priv->select_info && priv->select_info->selectable)
{
- gint offset = g_utf8_pointer_to_offset (label->text,
- label->text + label->select_info->selection_end);
+ gint offset = g_utf8_pointer_to_offset (priv->text,
+ priv->text + priv->select_info->selection_end);
g_value_set_int (value, offset);
}
else
g_value_set_int (value, 0);
break;
case PROP_SELECTION_BOUND:
- if (label->select_info && label->select_info->selectable)
+ if (priv->select_info && priv->select_info->selectable)
{
- gint offset = g_utf8_pointer_to_offset (label->text,
- label->text + label->select_info->selection_anchor);
+ gint offset = g_utf8_pointer_to_offset (priv->text,
+ priv->text + priv->select_info->selection_anchor);
g_value_set_int (value, offset);
}
else
g_value_set_int (value, 0);
break;
case PROP_ELLIPSIZE:
- g_value_set_enum (value, label->ellipsize);
+ g_value_set_enum (value, priv->ellipsize);
break;
case PROP_WIDTH_CHARS:
g_value_set_int (value, gtk_label_get_width_chars (label));
case PROP_TRACK_VISITED_LINKS:
g_value_set_boolean (value, gtk_label_get_track_visited_links (label));
break;
- case PROP_FULL_SIZE:
- g_value_set_int (value, gtk_label_get_full_size (label));
- break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
{
GtkLabelPrivate *priv;
+ label->priv = G_TYPE_INSTANCE_GET_PRIVATE (label,
+ GTK_TYPE_LABEL,
+ GtkLabelPrivate);
+ priv = label->priv;
+
gtk_widget_set_has_window (GTK_WIDGET (label), FALSE);
- priv = GTK_LABEL_GET_PRIVATE (label);
priv->width_chars = -1;
priv->max_width_chars = -1;
priv->wrap_width = -1;
- label->label = NULL;
+ priv->label = NULL;
- label->jtype = GTK_JUSTIFY_LEFT;
- label->wrap = FALSE;
- label->wrap_mode = PANGO_WRAP_WORD;
- label->ellipsize = PANGO_ELLIPSIZE_NONE;
+ priv->jtype = GTK_JUSTIFY_LEFT;
+ priv->wrap = FALSE;
+ priv->wrap_mode = PANGO_WRAP_WORD;
+ priv->ellipsize = PANGO_ELLIPSIZE_NONE;
- label->use_underline = FALSE;
- label->use_markup = FALSE;
- label->pattern_set = FALSE;
- label->track_links = TRUE;
+ priv->use_underline = FALSE;
+ priv->use_markup = FALSE;
+ priv->pattern_set = FALSE;
+ priv->track_links = TRUE;
- label->mnemonic_keyval = GDK_VoidSymbol;
- label->layout = NULL;
- label->text = NULL;
- label->attrs = NULL;
+ priv->mnemonic_keyval = GDK_KEY_VoidSymbol;
+ priv->layout = NULL;
+ priv->text = NULL;
+ priv->attrs = NULL;
- label->mnemonic_widget = NULL;
- label->mnemonic_window = NULL;
+ priv->mnemonic_widget = NULL;
+ priv->mnemonic_window = NULL;
priv->mnemonics_visible = TRUE;
gtk_label_mnemonic_activate (GtkWidget *widget,
gboolean group_cycling)
{
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
GtkWidget *parent;
- if (GTK_LABEL (widget)->mnemonic_widget)
- return gtk_widget_mnemonic_activate (GTK_LABEL (widget)->mnemonic_widget, group_cycling);
+ if (priv->mnemonic_widget)
+ return gtk_widget_mnemonic_activate (priv->mnemonic_widget, group_cycling);
/* Try to find the widget to activate by traversing the
* widget's ancestry.
*/
- parent = widget->parent;
+ parent = gtk_widget_get_parent (widget);
if (GTK_IS_NOTEBOOK (parent))
return FALSE;
{
if (gtk_widget_get_can_focus (parent) ||
(!group_cycling && GTK_WIDGET_GET_CLASS (parent)->activate_signal) ||
- GTK_IS_NOTEBOOK (parent->parent) ||
+ GTK_IS_NOTEBOOK (gtk_widget_get_parent (parent)) ||
GTK_IS_MENU_ITEM (parent))
return gtk_widget_mnemonic_activate (parent, group_cycling);
- parent = parent->parent;
+ parent = gtk_widget_get_parent (parent);
}
/* barf if there was nothing to activate */
gtk_label_setup_mnemonic (GtkLabel *label,
guint last_key)
{
+ GtkLabelPrivate *priv = label->priv;
GtkWidget *widget = GTK_WIDGET (label);
GtkWidget *toplevel;
GtkWidget *mnemonic_menu;
mnemonic_menu = g_object_get_data (G_OBJECT (label), "gtk-mnemonic-menu");
- if (last_key != GDK_VoidSymbol)
+ if (last_key != GDK_KEY_VoidSymbol)
{
- if (label->mnemonic_window)
+ if (priv->mnemonic_window)
{
- gtk_window_remove_mnemonic (label->mnemonic_window,
+ gtk_window_remove_mnemonic (priv->mnemonic_window,
last_key,
widget);
- label->mnemonic_window = NULL;
+ priv->mnemonic_window = NULL;
}
if (mnemonic_menu)
{
}
}
- if (label->mnemonic_keyval == GDK_VoidSymbol)
+ if (priv->mnemonic_keyval == GDK_KEY_VoidSymbol)
goto done;
connect_mnemonics_visible_notify (GTK_LABEL (widget));
if (menu_shell)
{
_gtk_menu_shell_add_mnemonic (GTK_MENU_SHELL (menu_shell),
- label->mnemonic_keyval,
+ priv->mnemonic_keyval,
widget);
mnemonic_menu = menu_shell;
}
if (!GTK_IS_MENU (menu_shell))
{
gtk_window_add_mnemonic (GTK_WINDOW (toplevel),
- label->mnemonic_keyval,
+ priv->mnemonic_keyval,
widget);
- label->mnemonic_window = GTK_WINDOW (toplevel);
+ priv->mnemonic_window = GTK_WINDOW (toplevel);
}
}
GtkWidget *old_toplevel)
{
GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
- gtk_label_setup_mnemonic (label, label->mnemonic_keyval);
+ gtk_label_setup_mnemonic (label, priv->mnemonic_keyval);
}
static void
mnemonics_visible_apply (GtkWidget *widget,
gboolean mnemonics_visible)
{
- GtkLabel *label;
- GtkLabelPrivate *priv;
-
- label = GTK_LABEL (widget);
-
- priv = GTK_LABEL_GET_PRIVATE (label);
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
mnemonics_visible = mnemonics_visible != FALSE;
GObject *where_the_object_was)
{
GtkLabel *label = data;
+ GtkLabelPrivate *priv = label->priv;
- label->mnemonic_widget = NULL;
+ priv->mnemonic_widget = NULL;
g_object_notify (G_OBJECT (label), "mnemonic-widget");
}
gtk_label_set_mnemonic_widget (GtkLabel *label,
GtkWidget *widget)
{
+ GtkLabelPrivate *priv;
+
g_return_if_fail (GTK_IS_LABEL (label));
+
+ priv = label->priv;
+
if (widget)
g_return_if_fail (GTK_IS_WIDGET (widget));
- if (label->mnemonic_widget)
+ if (priv->mnemonic_widget)
{
- gtk_widget_remove_mnemonic_label (label->mnemonic_widget, GTK_WIDGET (label));
- g_object_weak_unref (G_OBJECT (label->mnemonic_widget),
+ gtk_widget_remove_mnemonic_label (priv->mnemonic_widget, GTK_WIDGET (label));
+ g_object_weak_unref (G_OBJECT (priv->mnemonic_widget),
label_mnemonic_widget_weak_notify,
label);
}
- label->mnemonic_widget = widget;
- if (label->mnemonic_widget)
+ priv->mnemonic_widget = widget;
+ if (priv->mnemonic_widget)
{
- g_object_weak_ref (G_OBJECT (label->mnemonic_widget),
+ g_object_weak_ref (G_OBJECT (priv->mnemonic_widget),
label_mnemonic_widget_weak_notify,
label);
- gtk_widget_add_mnemonic_label (label->mnemonic_widget, GTK_WIDGET (label));
+ gtk_widget_add_mnemonic_label (priv->mnemonic_widget, GTK_WIDGET (label));
}
g_object_notify (G_OBJECT (label), "mnemonic-widget");
* Retrieves the target of the mnemonic (keyboard shortcut) of this
* label. See gtk_label_set_mnemonic_widget().
*
- * Return value: the target of the label's mnemonic, or %NULL if none
- * has been set and the default algorithm will be used.
+ * Return value: (transfer none): the target of the label's mnemonic,
+ * or %NULL if none has been set and the default algorithm will be used.
**/
GtkWidget *
gtk_label_get_mnemonic_widget (GtkLabel *label)
{
g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
- return label->mnemonic_widget;
+ return label->priv->mnemonic_widget;
}
/**
guint
gtk_label_get_mnemonic_keyval (GtkLabel *label)
{
- g_return_val_if_fail (GTK_IS_LABEL (label), GDK_VoidSymbol);
+ g_return_val_if_fail (GTK_IS_LABEL (label), GDK_KEY_VoidSymbol);
- return label->mnemonic_keyval;
+ return label->priv->mnemonic_keyval;
}
static void
gtk_label_set_text_internal (GtkLabel *label,
gchar *str)
{
- g_free (label->text);
-
- label->text = str;
+ GtkLabelPrivate *priv = label->priv;
+
+ g_free (priv->text);
+
+ priv->text = str;
gtk_label_select_region_index (label, 0, 0);
}
gtk_label_set_label_internal (GtkLabel *label,
gchar *str)
{
- g_free (label->label);
-
- label->label = str;
+ GtkLabelPrivate *priv = label->priv;
+
+ g_free (priv->label);
+
+ priv->label = str;
g_object_notify (G_OBJECT (label), "label");
}
gtk_label_set_use_markup_internal (GtkLabel *label,
gboolean val)
{
+ GtkLabelPrivate *priv = label->priv;
+
val = val != FALSE;
- if (label->use_markup != val)
+ if (priv->use_markup != val)
{
- label->use_markup = val;
+ priv->use_markup = val;
g_object_notify (G_OBJECT (label), "use-markup");
}
gtk_label_set_use_underline_internal (GtkLabel *label,
gboolean val)
{
+ GtkLabelPrivate *priv = label->priv;
+
val = val != FALSE;
- if (label->use_underline != val)
+ if (priv->use_underline != val)
{
- label->use_underline = val;
+ priv->use_underline = val;
g_object_notify (G_OBJECT (label), "use-underline");
}
static void
gtk_label_compose_effective_attrs (GtkLabel *label)
{
+ GtkLabelPrivate *priv = label->priv;
PangoAttrIterator *iter;
PangoAttribute *attr;
GSList *iter_attrs, *l;
- if (label->attrs)
+ if (priv->attrs)
{
- if (label->effective_attrs)
+ if (priv->effective_attrs)
{
- if ((iter = pango_attr_list_get_iterator (label->attrs)))
+ if ((iter = pango_attr_list_get_iterator (priv->attrs)))
{
do
{
for (l = iter_attrs; l; l = l->next)
{
attr = l->data;
- pango_attr_list_insert (label->effective_attrs, attr);
+ pango_attr_list_insert (priv->effective_attrs, attr);
}
g_slist_free (iter_attrs);
}
}
}
else
- label->effective_attrs =
- pango_attr_list_ref (label->attrs);
+ priv->effective_attrs =
+ pango_attr_list_ref (priv->attrs);
}
}
gtk_label_set_attributes_internal (GtkLabel *label,
PangoAttrList *attrs)
{
+ GtkLabelPrivate *priv = label->priv;
+
if (attrs)
pango_attr_list_ref (attrs);
-
- if (label->attrs)
- pango_attr_list_unref (label->attrs);
- label->attrs = attrs;
+
+ if (priv->attrs)
+ pango_attr_list_unref (priv->attrs);
+ priv->attrs = attrs;
g_object_notify (G_OBJECT (label), "attributes");
}
static void
gtk_label_recalculate (GtkLabel *label)
{
- guint keyval = label->mnemonic_keyval;
+ GtkLabelPrivate *priv = label->priv;
+ guint keyval = priv->mnemonic_keyval;
- if (label->use_markup)
- gtk_label_set_markup_internal (label, label->label, label->use_underline);
+ if (priv->use_markup)
+ gtk_label_set_markup_internal (label, priv->label, priv->use_underline);
else
{
- if (label->use_underline)
- gtk_label_set_uline_text_internal (label, label->label);
+ if (priv->use_underline)
+ gtk_label_set_uline_text_internal (label, priv->label);
else
{
- if (label->effective_attrs)
- pango_attr_list_unref (label->effective_attrs);
- label->effective_attrs = NULL;
- gtk_label_set_text_internal (label, g_strdup (label->label));
+ if (priv->effective_attrs)
+ pango_attr_list_unref (priv->effective_attrs);
+ priv->effective_attrs = NULL;
+ gtk_label_set_text_internal (label, g_strdup (priv->label));
}
}
gtk_label_compose_effective_attrs (label);
- if (!label->use_underline)
- label->mnemonic_keyval = GDK_VoidSymbol;
+ if (!priv->use_underline)
+ priv->mnemonic_keyval = GDK_KEY_VoidSymbol;
- if (keyval != label->mnemonic_keyval)
+ if (keyval != priv->mnemonic_keyval)
{
gtk_label_setup_mnemonic (label, keyval);
g_object_notify (G_OBJECT (label), "mnemonic-keyval");
* effective attributes for the label, use
* pango_layout_get_attribute (gtk_label_get_layout (label)).
*
- * Return value: the attribute list, or %NULL if none was set.
+ * Return value: (transfer none): the attribute list, or %NULL
+ * if none was set.
**/
PangoAttrList *
gtk_label_get_attributes (GtkLabel *label)
{
g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
- return label->attrs;
+ return label->priv->attrs;
}
/**
{
g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
- return label->label;
+ return label->priv->label;
}
typedef struct
gpointer user_data,
GError **error)
{
+ GtkLabelPrivate *priv;
UriParserData *pdata = user_data;
if (strcmp (element_name, "a") == 0)
}
visited = FALSE;
- if (pdata->label->track_links && pdata->label->select_info)
+ priv = pdata->label->priv;
+ if (priv->track_links && priv->select_info)
{
GList *l;
- for (l = pdata->label->select_info->links; l; l = l->next)
+ for (l = priv->select_info->links; l; l = l->next)
{
link = l->data;
if (strcmp (uri, link->uri) == 0)
GdkColor **link_color,
GdkColor **visited_link_color)
{
- gtk_widget_ensure_style (widget);
- gtk_widget_style_get (widget,
- "link-color", link_color,
- "visited-link-color", visited_link_color,
- NULL);
+ GtkStyleContext *context;
+
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_get_style (context,
+ "link-color", link_color,
+ "visited-link-color", visited_link_color,
+ NULL);
if (!*link_color)
*link_color = gdk_color_copy (&default_link_color);
if (!*visited_link_color)
static void
gtk_label_ensure_has_tooltip (GtkLabel *label)
{
+ GtkLabelPrivate *priv = label->priv;
GList *l;
gboolean has_tooltip = FALSE;
- for (l = label->select_info->links; l; l = l->next)
+ for (l = priv->select_info->links; l; l = l->next)
{
GtkLabelLink *link = l->data;
if (link->title)
const gchar *str,
gboolean with_uline)
{
- GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (label);
+ GtkLabelPrivate *priv = label->priv;
gchar *text = NULL;
GError *error = NULL;
PangoAttrList *attrs = NULL;
if (links)
{
gtk_label_ensure_select_info (label);
- label->select_info->links = links;
+ priv->select_info->links = links;
gtk_label_ensure_has_tooltip (label);
}
if (!(enable_mnemonics && priv->mnemonics_visible &&
(!auto_mnemonics ||
(gtk_widget_is_sensitive (GTK_WIDGET (label)) &&
- (!label->mnemonic_widget ||
- gtk_widget_is_sensitive (label->mnemonic_widget))))))
+ (!priv->mnemonic_widget ||
+ gtk_widget_is_sensitive (priv->mnemonic_widget))))))
{
gchar *tmp;
gchar *pattern;
if (attrs)
{
- if (label->effective_attrs)
- pango_attr_list_unref (label->effective_attrs);
- label->effective_attrs = attrs;
+ if (priv->effective_attrs)
+ pango_attr_list_unref (priv->effective_attrs);
+ priv->effective_attrs = attrs;
}
if (accel_char != 0)
- label->mnemonic_keyval = gdk_keyval_to_lower (gdk_unicode_to_keyval (accel_char));
+ priv->mnemonic_keyval = gdk_keyval_to_lower (gdk_unicode_to_keyval (accel_char));
else
- label->mnemonic_keyval = GDK_VoidSymbol;
+ priv->mnemonic_keyval = GDK_KEY_VoidSymbol;
}
/**
* g_markup_printf_escaped()<!-- -->:
* |[
* char *markup;
- *
+ *
* markup = g_markup_printf_escaped ("<span style=\"italic\">%s</span>", str);
* gtk_label_set_markup (GTK_LABEL (label), markup);
* g_free (markup);
void
gtk_label_set_markup (GtkLabel *label,
const gchar *str)
-{
+{
g_return_if_fail (GTK_IS_LABEL (label));
g_object_freeze_notify (G_OBJECT (label));
gtk_label_set_label_internal (label, g_strdup (str ? str : ""));
gtk_label_set_use_markup_internal (label, TRUE);
gtk_label_set_use_underline_internal (label, FALSE);
-
+
gtk_label_recalculate (label);
g_object_thaw_notify (G_OBJECT (label));
/**
* gtk_label_set_markup_with_mnemonic:
* @label: a #GtkLabel
- * @str: a markup string (see <link linkend="PangoMarkupFormat">Pango markup format</link>)
- *
- * Parses @str which is marked up with the <link linkend="PangoMarkupFormat">Pango text markup language</link>,
+ * @str: a markup string (see
+ * <link linkend="PangoMarkupFormat">Pango markup format</link>)
+ *
+ * Parses @str which is marked up with the
+ * <link linkend="PangoMarkupFormat">Pango text markup language</link>,
* setting the label's text and attribute list based on the parse results.
* If characters in @str are preceded by an underscore, they are underlined
* indicating that they represent a keyboard accelerator called a mnemonic.
*
- * The mnemonic key can be used to activate another widget, chosen
+ * The mnemonic key can be used to activate another widget, chosen
* automatically, or explicitly using gtk_label_set_mnemonic_widget().
- **/
+ */
void
gtk_label_set_markup_with_mnemonic (GtkLabel *label,
- const gchar *str)
+ const gchar *str)
{
g_return_if_fail (GTK_IS_LABEL (label));
gtk_label_set_label_internal (label, g_strdup (str ? str : ""));
gtk_label_set_use_markup_internal (label, TRUE);
gtk_label_set_use_underline_internal (label, TRUE);
-
+
gtk_label_recalculate (label);
g_object_thaw_notify (G_OBJECT (label));
{
g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
- return label->text;
+ return label->priv->text;
}
static PangoAttrList *
gtk_label_pattern_to_attrs (GtkLabel *label,
const gchar *pattern)
{
+ GtkLabelPrivate *priv = label->priv;
const char *start;
- const char *p = label->text;
+ const char *p = priv->text;
const char *q = pattern;
PangoAttrList *attrs;
if (p > start)
{
PangoAttribute *attr = pango_attr_underline_new (PANGO_UNDERLINE_LOW);
- attr->start_index = start - label->text;
- attr->end_index = p - label->text;
+ attr->start_index = start - priv->text;
+ attr->end_index = p - priv->text;
pango_attr_list_insert (attrs, attr);
}
const gchar *pattern,
gboolean is_mnemonic)
{
- GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (label);
+ GtkLabelPrivate *priv = label->priv;
PangoAttrList *attrs;
gboolean enable_mnemonics;
gboolean auto_mnemonics;
- g_return_if_fail (GTK_IS_LABEL (label));
-
- if (label->pattern_set)
+ if (priv->pattern_set)
return;
if (is_mnemonic)
if (enable_mnemonics && priv->mnemonics_visible && pattern &&
(!auto_mnemonics ||
(gtk_widget_is_sensitive (GTK_WIDGET (label)) &&
- (!label->mnemonic_widget ||
- gtk_widget_is_sensitive (label->mnemonic_widget)))))
+ (!priv->mnemonic_widget ||
+ gtk_widget_is_sensitive (priv->mnemonic_widget)))))
attrs = gtk_label_pattern_to_attrs (label, pattern);
else
attrs = NULL;
else
attrs = gtk_label_pattern_to_attrs (label, pattern);
- if (label->effective_attrs)
- pango_attr_list_unref (label->effective_attrs);
- label->effective_attrs = attrs;
+ if (priv->effective_attrs)
+ pango_attr_list_unref (priv->effective_attrs);
+ priv->effective_attrs = attrs;
}
void
gtk_label_set_pattern (GtkLabel *label,
const gchar *pattern)
{
+ GtkLabelPrivate *priv = label->priv;
+
g_return_if_fail (GTK_IS_LABEL (label));
-
- label->pattern_set = FALSE;
+
+ priv = label->priv;
+
+ priv->pattern_set = FALSE;
if (pattern)
{
gtk_label_set_pattern_internal (label, pattern, FALSE);
- label->pattern_set = TRUE;
+ priv->pattern_set = TRUE;
}
else
gtk_label_recalculate (label);
gtk_label_set_justify (GtkLabel *label,
GtkJustification jtype)
{
+ GtkLabelPrivate *priv;
+
g_return_if_fail (GTK_IS_LABEL (label));
g_return_if_fail (jtype >= GTK_JUSTIFY_LEFT && jtype <= GTK_JUSTIFY_FILL);
-
- if ((GtkJustification) label->jtype != jtype)
+
+ priv = label->priv;
+
+ if ((GtkJustification) priv->jtype != jtype)
{
- label->jtype = jtype;
+ priv->jtype = jtype;
/* No real need to be this drastic, but easier than duplicating the code */
gtk_label_clear_layout (label);
{
g_return_val_if_fail (GTK_IS_LABEL (label), 0);
- return label->jtype;
+ return label->priv->jtype;
}
/**
gtk_label_set_ellipsize (GtkLabel *label,
PangoEllipsizeMode mode)
{
+ GtkLabelPrivate *priv;
+
g_return_if_fail (GTK_IS_LABEL (label));
g_return_if_fail (mode >= PANGO_ELLIPSIZE_NONE && mode <= PANGO_ELLIPSIZE_END);
-
- if ((PangoEllipsizeMode) label->ellipsize != mode)
+
+ priv = label->priv;
+
+ if ((PangoEllipsizeMode) priv->ellipsize != mode)
{
- label->ellipsize = mode;
+ priv->ellipsize = mode;
/* No real need to be this drastic, but easier than duplicating the code */
gtk_label_clear_layout (label);
{
g_return_val_if_fail (GTK_IS_LABEL (label), PANGO_ELLIPSIZE_NONE);
- return label->ellipsize;
+ return label->priv->ellipsize;
}
/**
g_return_if_fail (GTK_IS_LABEL (label));
- priv = GTK_LABEL_GET_PRIVATE (label);
+ priv = label->priv;
if (priv->width_chars != n_chars)
{
{
g_return_val_if_fail (GTK_IS_LABEL (label), -1);
- return GTK_LABEL_GET_PRIVATE (label)->width_chars;
+ return label->priv->width_chars;
}
/**
g_return_if_fail (GTK_IS_LABEL (label));
- priv = GTK_LABEL_GET_PRIVATE (label);
+ priv = label->priv;
if (priv->max_width_chars != n_chars)
{
{
g_return_val_if_fail (GTK_IS_LABEL (label), -1);
- return GTK_LABEL_GET_PRIVATE (label)->max_width_chars;
+ return label->priv->max_width_chars;
}
/**
gtk_label_set_line_wrap (GtkLabel *label,
gboolean wrap)
{
+ GtkLabelPrivate *priv;
+
g_return_if_fail (GTK_IS_LABEL (label));
-
+
+ priv = label->priv;
+
wrap = wrap != FALSE;
-
- if (label->wrap != wrap)
+
+ if (priv->wrap != wrap)
{
- label->wrap = wrap;
+ priv->wrap = wrap;
gtk_label_clear_layout (label);
gtk_widget_queue_resize (GTK_WIDGET (label));
{
g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
- return label->wrap;
+ return label->priv->wrap;
}
/**
gtk_label_set_line_wrap_mode (GtkLabel *label,
PangoWrapMode wrap_mode)
{
+ GtkLabelPrivate *priv;
+
g_return_if_fail (GTK_IS_LABEL (label));
-
- if (label->wrap_mode != wrap_mode)
+
+ priv = label->priv;
+
+ if (priv->wrap_mode != wrap_mode)
{
- label->wrap_mode = wrap_mode;
+ priv->wrap_mode = wrap_mode;
g_object_notify (G_OBJECT (label), "wrap-mode");
gtk_widget_queue_resize (GTK_WIDGET (label));
{
g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
- return label->wrap_mode;
-}
-
-
-void
-gtk_label_get (GtkLabel *label,
- gchar **str)
-{
- g_return_if_fail (GTK_IS_LABEL (label));
- g_return_if_fail (str != NULL);
-
- *str = label->text;
+ return label->priv->wrap_mode;
}
static void
-gtk_label_destroy (GtkObject *object)
+gtk_label_destroy (GtkWidget *widget)
{
- GtkLabel *label = GTK_LABEL (object);
+ GtkLabel *label = GTK_LABEL (widget);
gtk_label_set_mnemonic_widget (label, NULL);
- GTK_OBJECT_CLASS (gtk_label_parent_class)->destroy (object);
+ GTK_WIDGET_CLASS (gtk_label_parent_class)->destroy (widget);
}
static void
gtk_label_finalize (GObject *object)
{
GtkLabel *label = GTK_LABEL (object);
+ GtkLabelPrivate *priv = label->priv;
- g_free (label->label);
- g_free (label->text);
+ g_free (priv->label);
+ g_free (priv->text);
- if (label->layout)
- g_object_unref (label->layout);
+ if (priv->layout)
+ g_object_unref (priv->layout);
- if (label->attrs)
- pango_attr_list_unref (label->attrs);
+ if (priv->attrs)
+ pango_attr_list_unref (priv->attrs);
- if (label->effective_attrs)
- pango_attr_list_unref (label->effective_attrs);
+ if (priv->effective_attrs)
+ pango_attr_list_unref (priv->effective_attrs);
gtk_label_clear_links (label);
- g_free (label->select_info);
+ g_free (priv->select_info);
G_OBJECT_CLASS (gtk_label_parent_class)->finalize (object);
}
static void
gtk_label_clear_layout (GtkLabel *label)
{
- if (label->layout)
+ GtkLabelPrivate *priv = label->priv;
+
+ if (priv->layout)
{
- g_object_unref (label->layout);
- label->layout = NULL;
+ g_object_unref (priv->layout);
+ priv->layout = NULL;
//gtk_label_clear_links (label);
}
}
-static gint
-get_label_char_width (GtkLabel *label)
+static PangoFontMetrics *
+get_font_metrics (PangoContext *context, GtkWidget *widget)
{
- GtkLabelPrivate *priv;
- PangoContext *context;
+ GtkStyleContext *style_context;
+ PangoFontDescription *font;
+ PangoFontMetrics *retval;
+
+ style_context = gtk_widget_get_style_context (widget);
+ gtk_style_context_get (style_context, 0, "font", &font, NULL);
+
+ retval = pango_context_get_metrics (context,
+ font,
+ pango_context_get_language (context));
+
+ if (font != NULL)
+ pango_font_description_free (font);
+
+ return retval;
+}
+
+static void
+get_label_width (GtkLabel *label,
+ gint *minimum,
+ gint *natural)
+{
+ GtkLabelPrivate *priv;
+ PangoLayout *layout;
+ PangoContext *context;
PangoFontMetrics *metrics;
- gint char_width, digit_width, char_pixels, w;
-
- priv = GTK_LABEL_GET_PRIVATE (label);
-
- context = pango_layout_get_context (label->layout);
- metrics = pango_context_get_metrics (context, GTK_WIDGET (label)->style->font_desc,
- pango_context_get_language (context));
-
+ PangoRectangle rect;
+ gint char_width, digit_width, char_pixels, text_width, ellipsize_chars, guess_width;
+
+ priv = label->priv;
+
+ layout = pango_layout_copy (priv->layout);
+ context = pango_layout_get_context (layout);
+ metrics = get_font_metrics (context, GTK_WIDGET (label));
char_width = pango_font_metrics_get_approximate_char_width (metrics);
digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
char_pixels = MAX (char_width, digit_width);
pango_font_metrics_unref (metrics);
-
- if (priv->width_chars < 0)
- {
- PangoRectangle rect;
-
- pango_layout_set_width (label->layout, -1);
- pango_layout_get_extents (label->layout, NULL, &rect);
- w = char_pixels * MAX (priv->max_width_chars, 3);
- w = MIN (rect.width, w);
+ /* Fetch the length of the complete unwrapped text */
+ pango_layout_set_width (layout, -1);
+ pango_layout_get_extents (layout, NULL, &rect);
+ text_width = rect.width;
+
+ /* Fetch the width that was guessed by gtk_label_ensure_layout() */
+ pango_layout_get_extents (priv->layout, NULL, &rect);
+ guess_width = rect.width;
+
+ /* enforce minimum width for ellipsized labels at ~3 chars */
+ if (priv->ellipsize)
+ ellipsize_chars = 3;
+ else
+ ellipsize_chars = 0;
+
+ /* "width-chars" Hard-coded minimum width:
+ * - minimum size should be MAX (width-chars, strlen ("..."));
+ * - natural size should be MAX (width-chars, strlen (priv->text));
+ *
+ * "max-width-chars" User specified maximum size requisition
+ * - minimum size should be MAX (width-chars, 0)
+ * - natural size should be MIN (max-width-chars, strlen (priv->text))
+ *
+ * For ellipsizing labels; if max-width-chars is specified: either it is used as
+ * a minimum size or the label text as a minimum size (natural size still overflows).
+ *
+ * For wrapping labels; A reasonable minimum size is useful to naturally layout
+ * interfaces automatically. In this case if no "width-chars" is specified, the minimum
+ * width will default to the wrap guess that gtk_label_ensure_layout() does.
+ *
+ * In *any* case the minimum width is completely overridden if an explicit width
+ * request was provided.
+ */
+
+ if (priv->ellipsize || priv->wrap)
+ {
+ *minimum = char_pixels * MAX (priv->width_chars, ellipsize_chars);
+
+ /* Default to the minimum width regularly guessed by GTK+ if no minimum
+ * width was specified, only allow unwrapping of these labels.
+ *
+ * Note that when specifying a small width_chars for a long text;
+ * an accordingly large size will be required for the label height.
+ */
+ if (priv->wrap && priv->width_chars <= 0)
+ *minimum = guess_width;
+
+ if (priv->max_width_chars < 0)
+ {
+ *natural = MAX (*minimum, text_width);
+ }
+ else
+ {
+ gint max_char_width = char_pixels * priv->max_width_chars;
+ gint max_width = MIN (text_width, max_char_width);
+
+ /* With max-char-width specified, we let the minimum widths of
+ * ellipsized text crawl up to the max-char-width
+ * (note that we dont want to limit the minimum width for wrapping text).
+ */
+ if (priv->ellipsize)
+ *minimum = MIN (text_width, max_width);
+
+ *natural = MAX (*minimum, max_width);
+ }
}
else
{
- /* enforce minimum width for ellipsized labels at ~3 chars */
- w = char_pixels * MAX (priv->width_chars, 3);
+ *minimum = text_width;
+ *natural = *minimum;
}
-
- return w;
+
+ /* if a width-request is set, use that as the requested label width */
+ if (priv->wrap || priv->ellipsize || priv->width_chars > 0 || priv->max_width_chars > 0)
+ {
+ GtkWidgetAuxInfo *aux_info;
+
+ aux_info = _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE);
+ if (aux_info && aux_info->width > 0)
+ {
+ *minimum = aux_info->width * PANGO_SCALE;
+ *natural = MAX (*natural, *minimum);
+ }
+ }
+
+ g_object_unref (layout);
}
static void
gtk_label_invalidate_wrap_width (GtkLabel *label)
{
- GtkLabelPrivate *priv;
-
- priv = GTK_LABEL_GET_PRIVATE (label);
+ GtkLabelPrivate *priv = label->priv;
priv->wrap_width = -1;
}
static gint
get_label_wrap_width (GtkLabel *label)
{
- GtkLabelPrivate *priv;
+ GtkLabelPrivate *priv = label->priv;
- priv = GTK_LABEL_GET_PRIVATE (label);
-
if (priv->wrap_width < 0)
{
- if (priv->width_chars > 0 || priv->max_width_chars > 0)
- priv->wrap_width = get_label_char_width (label);
+ if (priv->width_chars > 0)
+ {
+ PangoLayout *layout;
+ PangoContext *context;
+ PangoFontMetrics *metrics;
+ PangoRectangle rect;
+ gint char_width, digit_width, char_pixels, text_width;
+
+ layout = pango_layout_copy (priv->layout);
+ context = pango_layout_get_context (layout);
+ metrics = get_font_metrics (context, GTK_WIDGET (label));
+ char_width = pango_font_metrics_get_approximate_char_width (metrics);
+ digit_width = pango_font_metrics_get_approximate_digit_width (metrics);
+ char_pixels = MAX (char_width, digit_width);
+ pango_font_metrics_unref (metrics);
+
+ pango_layout_set_width (layout, -1);
+ pango_layout_get_extents (layout, NULL, &rect);
+ g_object_unref (layout);
+
+ text_width = rect.width;
+
+ priv->wrap_width = PANGO_PIXELS (MAX (text_width, char_pixels * priv->width_chars));
+ }
else
{
PangoLayout *layout;
layout = gtk_widget_create_pango_layout (GTK_WIDGET (label),
- "This long string gives a good enough length for any line to have.");
+ "This string is just about long enough.");
pango_layout_get_size (layout, &priv->wrap_width, NULL);
g_object_unref (layout);
}
}
static void
-gtk_label_ensure_layout (GtkLabel *label)
+gtk_label_ensure_layout (GtkLabel *label, gboolean guess_wrap_width)
{
+ GtkLabelPrivate *priv = label->priv;
GtkWidget *widget;
PangoRectangle logical_rect;
gboolean rtl;
rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
- if (!label->layout)
+ if (!priv->layout)
{
+ GtkAllocation allocation;
PangoAlignment align = PANGO_ALIGN_LEFT; /* Quiet gcc */
gdouble angle = gtk_label_get_angle (label);
- if (angle != 0.0 && !label->select_info)
+ if (angle != 0.0 && !priv->select_info)
{
PangoMatrix matrix = PANGO_MATRIX_INIT;
pango_matrix_rotate (&matrix, angle);
pango_context_set_matrix (gtk_widget_get_pango_context (widget), &matrix);
-
- label->have_transform = TRUE;
+
+ priv->have_transform = TRUE;
}
- else
+ else
{
- if (label->have_transform)
+ if (priv->have_transform)
pango_context_set_matrix (gtk_widget_get_pango_context (widget), NULL);
- label->have_transform = FALSE;
+ priv->have_transform = FALSE;
}
- label->layout = gtk_widget_create_pango_layout (widget, label->text);
+ priv->layout = gtk_widget_create_pango_layout (widget, priv->text);
- if (label->effective_attrs)
- pango_layout_set_attributes (label->layout, label->effective_attrs);
+ if (priv->effective_attrs)
+ pango_layout_set_attributes (priv->layout, priv->effective_attrs);
gtk_label_rescan_links (label);
- switch (label->jtype)
+ switch (priv->jtype)
{
case GTK_JUSTIFY_LEFT:
align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT;
break;
case GTK_JUSTIFY_FILL:
align = rtl ? PANGO_ALIGN_RIGHT : PANGO_ALIGN_LEFT;
- pango_layout_set_justify (label->layout, TRUE);
+ pango_layout_set_justify (priv->layout, TRUE);
break;
default:
g_assert_not_reached();
}
- pango_layout_set_alignment (label->layout, align);
- pango_layout_set_ellipsize (label->layout, label->ellipsize);
- pango_layout_set_single_paragraph_mode (label->layout, label->single_line_mode);
+ pango_layout_set_alignment (priv->layout, align);
+ pango_layout_set_ellipsize (priv->layout, priv->ellipsize);
+ pango_layout_set_single_paragraph_mode (priv->layout, priv->single_line_mode);
- if (label->ellipsize)
- pango_layout_set_width (label->layout,
- widget->allocation.width * PANGO_SCALE);
- else if (label->wrap)
+ gtk_widget_get_allocation (widget, &allocation);
+
+ if (priv->ellipsize)
+ pango_layout_set_width (priv->layout, allocation.width * PANGO_SCALE);
+ else if (priv->wrap)
{
- GtkWidgetAuxInfo *aux_info;
+ GtkWidgetAuxInfo *aux_info = _gtk_widget_get_aux_info (widget, FALSE);
gint longest_paragraph;
gint width, height;
-
- pango_layout_set_wrap (label->layout, label->wrap_mode);
-
- aux_info = _gtk_widget_get_aux_info (widget, FALSE);
- if (aux_info && aux_info->width > 0)
- pango_layout_set_width (label->layout, aux_info->width * PANGO_SCALE);
+ gint aux_width = 0;
+
+ if ((angle == 90 || angle == 270) && aux_info && aux_info->height > 0)
+ aux_width = aux_info->height;
+ else if (aux_info && aux_info->width > 0)
+ aux_width = aux_info->width;
+
+ if (aux_width > 0)
+ pango_layout_set_width (priv->layout, aux_width * PANGO_SCALE);
+ else if (guess_wrap_width == FALSE && allocation.width > 1 && allocation.height > 1)
+ {
+ PangoRectangle rect;
+ gint xpad, ypad, natural_width;
+ gtk_misc_get_padding (GTK_MISC (label), &xpad, &ypad);
+
+ if (angle == 90 || angle == 270)
+ width = allocation.height - ypad * 2;
+ else
+ width = allocation.width - xpad * 2;
+
+ /* dont set a wrap width wider than the label's natural width
+ * incase we're allocated more space than needed */
+ pango_layout_get_extents (priv->layout, NULL, &rect);
+ natural_width = PANGO_PIXELS (rect.width);
+ width = MIN (natural_width, width);
+
+ pango_layout_set_wrap (priv->layout, priv->wrap_mode);
+ pango_layout_set_width (priv->layout, MAX (width, 1) * PANGO_SCALE);
+ }
else
{
GdkScreen *screen = gtk_widget_get_screen (GTK_WIDGET (label));
gint wrap_width;
-
- pango_layout_set_width (label->layout, -1);
- pango_layout_get_extents (label->layout, NULL, &logical_rect);
+
+ pango_layout_set_width (priv->layout, -1);
+ pango_layout_get_extents (priv->layout, NULL, &logical_rect);
width = logical_rect.width;
-
/* Try to guess a reasonable maximum width */
longest_paragraph = width;
width = MIN (width,
PANGO_SCALE * (gdk_screen_get_width (screen) + 1) / 2);
- pango_layout_set_width (label->layout, width);
- pango_layout_get_extents (label->layout, NULL, &logical_rect);
+ pango_layout_set_width (priv->layout, width);
+ pango_layout_get_extents (priv->layout, NULL, &logical_rect);
width = logical_rect.width;
height = logical_rect.height;
if (longest_paragraph > 0)
{
gint nlines, perfect_width;
-
- nlines = pango_layout_get_line_count (label->layout);
+
+ nlines = pango_layout_get_line_count (priv->layout);
perfect_width = (longest_paragraph + nlines - 1) / nlines;
if (perfect_width < width)
{
- pango_layout_set_width (label->layout, perfect_width);
- pango_layout_get_extents (label->layout, NULL, &logical_rect);
-
+ pango_layout_set_width (priv->layout, perfect_width);
+ pango_layout_get_extents (priv->layout, NULL, &logical_rect);
+
if (logical_rect.height <= height)
width = logical_rect.width;
else
if (mid_width > perfect_width)
{
- pango_layout_set_width (label->layout, mid_width);
- pango_layout_get_extents (label->layout, NULL, &logical_rect);
-
+ pango_layout_set_width (priv->layout, mid_width);
+ pango_layout_get_extents (priv->layout, NULL, &logical_rect);
+
if (logical_rect.height <= height)
width = logical_rect.width;
}
}
}
}
- pango_layout_set_width (label->layout, width);
+ pango_layout_set_width (priv->layout, width);
}
}
- else /* !label->wrap */
- pango_layout_set_width (label->layout, -1);
+ else /* !priv->wrap */
+ pango_layout_set_width (priv->layout, -1);
}
}
gint ascent, descent;
context = pango_layout_get_context (layout);
- metrics = pango_context_get_metrics (context, widget->style->font_desc,
- pango_context_get_language (context));
-
+ metrics = get_font_metrics (context, widget);
ascent = pango_font_metrics_get_ascent (metrics);
descent = pango_font_metrics_get_descent (metrics);
pango_font_metrics_unref (metrics);
- return PANGO_PIXELS (ascent + descent);
+ return ascent + descent;
+}
+
+static GtkSizeRequestMode
+gtk_label_get_request_mode (GtkWidget *widget)
+{
+ GtkLabel *label = GTK_LABEL (widget);
+ gdouble angle = gtk_label_get_angle (label);
+
+ if (angle == 90 || angle == 270)
+ return GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT;
+
+ return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
+}
+
+static void
+get_size_for_allocation (GtkLabel *label,
+ GtkOrientation orientation,
+ gint allocation,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ GtkLabelPrivate *priv = label->priv;
+ PangoLayout *layout;
+ GtkWidgetAuxInfo *aux_info =
+ _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE);
+ gint aux_size;
+ gint text_height;
+
+ gtk_label_ensure_layout (label, FALSE);
+ layout = pango_layout_copy (priv->layout);
+
+ if (aux_info)
+ {
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
+ aux_size = aux_info->width;
+ else
+ aux_size = aux_info->height;
+ }
+ else
+ aux_size = 0;
+
+ if (aux_size > 0)
+ pango_layout_set_width (layout, aux_size * PANGO_SCALE);
+ else
+ pango_layout_set_width (layout, allocation * PANGO_SCALE);
+
+ pango_layout_get_pixel_size (layout, NULL, &text_height);
+
+ if (minimum_size)
+ *minimum_size = text_height;
+
+ if (natural_size)
+ *natural_size = text_height;
+
+ g_object_unref (layout);
}
static void
-gtk_label_get_desired_size (GtkExtendedLayout *layout,
- GtkRequisition *minimum_size,
- GtkRequisition *natural_size)
+gtk_label_get_preferred_size (GtkWidget *widget,
+ GtkOrientation orientation,
+ gint *minimum_size,
+ gint *natural_size)
{
- GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (layout);
- GtkLabel *label = GTK_LABEL (layout);
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
PangoRectangle required_rect;
+ PangoRectangle natural_rect;
+ gint xpad, ypad;
- /*
- * If word wrapping is on, then the height requisition can depend
- * on:
+ /* "width-chars" Hard-coded minimum width:
+ * - minimum size should be MAX (width-chars, strlen ("..."));
+ * - natural size should be MAX (width-chars, strlen (priv->text));
*
- * - Any width set on the widget via gtk_widget_set_size_request().
- * - The padding of the widget (xpad, set by gtk_misc_set_padding)
+ * "max-width-chars" User specified maximum size requisition
+ * - minimum size should be MAX (width-chars, 0)
+ * - natural size should be MIN (max-width-chars, strlen (priv->text))
*
- * Instead of trying to detect changes to these quantities, if we
- * are wrapping, we just rewrap for each size request. Since
- * size requisitions are cached by the GTK+ core, this is not
- * expensive.
*/
- if (label->wrap)
+ /* When calculating ->wrap sometimes we need to invent a size; Ideally we should be doing
+ * that stuff here instead of inside gtk_label_ensure_layout() */
+ if (priv->wrap)
gtk_label_clear_layout (label);
+ gtk_label_ensure_layout (label, TRUE);
- gtk_label_ensure_layout (label);
+ /* Start off with the pixel extents of the rendered layout */
+ pango_layout_get_extents (priv->layout, NULL, &required_rect);
+ required_rect.x = required_rect.y = 0;
- if (minimum_size)
- {
- GtkWidgetAuxInfo *aux_info = _gtk_widget_get_aux_info (GTK_WIDGET (label), FALSE);
+ if (priv->single_line_mode || priv->wrap)
+ required_rect.height = get_single_line_height (GTK_WIDGET (label), priv->layout);
- pango_layout_get_extents (label->layout, NULL, &required_rect);
- required_rect.x = required_rect.y = 0;
+ natural_rect = required_rect;
- if (label->ellipsize || priv->width_chars > 0 || priv->max_width_chars > 0)
- {
- /* backup the Pango layout, as get_label_char_width() scrambles it */
+ /* Calculate text width itself based on GtkLabel property rules */
+ get_label_width (label, &required_rect.width, &natural_rect.width);
- PangoLayout *backup = label->layout;
- label->layout = pango_layout_copy (label->layout);
+ /* Now that we have minimum and natural sizes in pango extents, apply a possible transform */
+ if (priv->have_transform)
+ {
+ PangoLayout *layout = pango_layout_copy (priv->layout);
+ PangoContext *context = pango_layout_get_context (priv->layout);
+ const PangoMatrix *matrix = pango_context_get_matrix (context);
- required_rect.width = get_label_char_width (label);
+ pango_layout_set_width (layout, -1);
+ pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_NONE);
- g_object_unref (label->layout);
- label->layout = backup;
- }
+ pango_layout_get_extents (layout, NULL, &natural_rect);
+ g_object_unref (layout);
- if (label->single_line_mode)
- required_rect.height = get_single_line_height (GTK_WIDGET (label), label->layout);
+ pango_matrix_transform_rectangle (matrix, &required_rect);
+ pango_matrix_transform_rectangle (matrix, &natural_rect);
- if (label->have_transform)
+ /* Bump the natural size in case of ellipsize to ensure pango has
+ * enough space in the angles (note, we could alternatively set the
+ * layout to not ellipsize when we know we have been allocated our
+ * full natural size, or it may be that pango needs a fix here).
+ */
+ if (priv->ellipsize && priv->angle != 0 && priv->angle != 90 &&
+ priv->angle != 180 && priv->angle != 270 && priv->angle != 360)
{
- PangoContext *context = pango_layout_get_context (label->layout);
- const PangoMatrix *matrix = pango_context_get_matrix (context);
- pango_matrix_transform_rectangle (matrix, &required_rect);
+ /* For some reason we only need this at about 110 degrees, and only
+ * when gaining in height
+ */
+ natural_rect.height += ROTATION_ELLIPSIZE_PADDING * 2 * PANGO_SCALE;
+ natural_rect.width += ROTATION_ELLIPSIZE_PADDING * 2 * PANGO_SCALE;
}
+ }
- required_rect.width = PANGO_PIXELS_CEIL (required_rect.width);
- required_rect.height = PANGO_PIXELS_CEIL (required_rect.height);
+ required_rect.width = PANGO_PIXELS_CEIL (required_rect.width);
+ required_rect.height = PANGO_PIXELS_CEIL (required_rect.height);
- if ((label->wrap || label->ellipsize ||
- priv->width_chars > 0 || priv->max_width_chars > 0) &&
- aux_info && aux_info->width > 0)
- required_rect.width = aux_info->width;
+ natural_rect.width = PANGO_PIXELS_CEIL (natural_rect.width);
+ natural_rect.height = PANGO_PIXELS_CEIL (natural_rect.height);
- minimum_size->width = required_rect.width + label->misc.xpad * 2;
- minimum_size->height = required_rect.height + label->misc.ypad * 2;
- }
+ gtk_misc_get_padding (GTK_MISC (label), &xpad, &ypad);
- if (natural_size)
+ if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
- PangoLayout *natural_layout = pango_layout_copy (label->layout);
-
- pango_layout_set_width (natural_layout, -1);
- pango_layout_set_ellipsize (natural_layout, PANGO_ELLIPSIZE_NONE);
-
- pango_layout_get_extents (natural_layout, NULL, &required_rect);
- required_rect.x = required_rect.y = 0;
+ /* Note, we cant use get_size_for_allocation() when rotating
+ * ellipsized labels.
+ */
+ if (!(priv->ellipsize && priv->have_transform) &&
+ (priv->angle == 90 || priv->angle == 270))
+ {
+ /* Doing a h4w request on a rotated label here, return the
+ * required width for the minimum height.
+ */
+ get_size_for_allocation (label,
+ GTK_ORIENTATION_VERTICAL,
+ required_rect.height,
+ minimum_size, natural_size);
- if (label->single_line_mode)
- required_rect.height = get_single_line_height (GTK_WIDGET (label), label->layout);
+ }
+ else
+ {
+ /* Normal desired width */
+ *minimum_size = required_rect.width;
+ *natural_size = natural_rect.width;
+ }
- if (label->have_transform)
+ *minimum_size += xpad * 2;
+ *natural_size += xpad * 2;
+ }
+ else /* GTK_ORIENTATION_VERTICAL */
+ {
+ /* Note, we cant use get_size_for_allocation() when rotating
+ * ellipsized labels.
+ */
+ if (!(priv->ellipsize && priv->have_transform) &&
+ (priv->angle == 0 || priv->angle == 180 || priv->angle == 360))
+ {
+ /* Doing a w4h request on a label here, return the required
+ * height for the minimum width.
+ */
+ get_size_for_allocation (label,
+ GTK_ORIENTATION_HORIZONTAL,
+ required_rect.width,
+ minimum_size, natural_size);
+ }
+ else
{
- PangoContext *context = pango_layout_get_context (natural_layout);
- const PangoMatrix *matrix = pango_context_get_matrix (context);
- pango_matrix_transform_rectangle (matrix, &required_rect);
+ /* A vertically rotated label does w4h, so return the base
+ * desired height (text length)
+ */
+ *minimum_size = required_rect.height;
+ *natural_size = natural_rect.height;
}
- required_rect.width = PANGO_PIXELS_CEIL (required_rect.width);
- required_rect.height = PANGO_PIXELS_CEIL (required_rect.height);
+ *minimum_size += ypad * 2;
+ *natural_size += ypad * 2;
+ }
- natural_size->width = required_rect.width + label->misc.xpad * 2;
- natural_size->height = required_rect.height + label->misc.ypad * 2;
+ /* Restore real allocated size of layout; sometimes size-requests
+ * are randomly called without a following allocation; for this case
+ * we need to make sure we dont have a mucked up layout because we
+ * went and guessed the wrap-size.
+ */
+ if (priv->wrap)
+ gtk_label_clear_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
- g_object_unref (natural_layout);
- }
}
+
static void
-get_size_for_allocation (GtkLabel *label,
- gint allocation,
- gint *minimum_size,
- gint *natural_size)
+gtk_label_get_preferred_width (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
- PangoLayout *layout;
-
- gtk_label_ensure_layout (label);
- layout = pango_layout_copy (label->layout);
- pango_layout_set_width (layout, PANGO_SCALE * allocation);
-
- if (minimum_size)
- pango_layout_get_pixel_size (layout, NULL, minimum_size);
-
- if (natural_size)
- {
-// pango_layout_set_ellipsize (layout, PANGO_ELLIPSIZE_NONE);
- pango_layout_get_pixel_size (layout, NULL, natural_size);
- }
+ gtk_label_get_preferred_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
+}
- g_object_unref (layout);
+static void
+gtk_label_get_preferred_height (GtkWidget *widget,
+ gint *minimum_size,
+ gint *natural_size)
+{
+ gtk_label_get_preferred_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
}
static void
-gtk_label_get_width_for_height (GtkExtendedLayout *layout,
- gint height,
- gint *minimum_width,
- gint *natural_width)
+gtk_label_get_preferred_width_for_height (GtkWidget *widget,
+ gint height,
+ gint *minimum_width,
+ gint *natural_width)
{
- GtkLabel *label = GTK_LABEL (layout);
- gdouble angle = gtk_label_get_angle (label);
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
- if (90 == angle || 270 == angle)
- get_size_for_allocation (label, height, minimum_width, natural_width);
- else
+ if (priv->wrap && (priv->angle == 90 || priv->angle == 270))
{
- GtkRequisition minimum_size, natural_size;
+ gint xpad, ypad;
+
+ gtk_misc_get_padding (GTK_MISC (label), &xpad, &ypad);
- gtk_widget_get_desired_size (layout,
- minimum_width ? &minimum_size : NULL,
- natural_width ? &natural_size : NULL);
+ if (priv->wrap)
+ gtk_label_clear_layout (label);
+
+ get_size_for_allocation (label, GTK_ORIENTATION_VERTICAL,
+ MAX (1, height - (ypad * 2)),
+ minimum_width, natural_width);
if (minimum_width)
- *minimum_width = minimum_size.width;
+ *minimum_width += xpad * 2;
+
if (natural_width)
- *natural_width = natural_size.width;
+ *natural_width += xpad * 2;
}
+ else
+ GTK_WIDGET_GET_CLASS (widget)->get_preferred_width (widget, minimum_width, natural_width);
}
static void
-gtk_label_get_height_for_width (GtkExtendedLayout *layout,
- gint width,
- gint *minimum_height,
- gint *natural_height)
+gtk_label_get_preferred_height_for_width (GtkWidget *widget,
+ gint width,
+ gint *minimum_height,
+ gint *natural_height)
{
- GtkLabel *label = GTK_LABEL (layout);
- gdouble angle = gtk_label_get_angle (label);
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
- if (0 == angle || 180 == angle)
- get_size_for_allocation (label, width, minimum_height, natural_height);
- else
+ if (priv->wrap && (priv->angle == 0 || priv->angle == 180 || priv->angle == 360))
{
- GtkRequisition minimum_size, natural_size;
+ gint xpad, ypad;
+
+ gtk_misc_get_padding (GTK_MISC (label), &xpad, &ypad);
- gtk_widget_get_desired_size (layout,
- minimum_height ? &minimum_size : NULL,
- natural_height ? &natural_size : NULL);
+ if (priv->wrap)
+ gtk_label_clear_layout (label);
+
+ get_size_for_allocation (label, GTK_ORIENTATION_HORIZONTAL,
+ MAX (1, width - xpad * 2),
+ minimum_height, natural_height);
if (minimum_height)
- *minimum_height = minimum_size.height;
+ *minimum_height += ypad * 2;
+
if (natural_height)
- *natural_height = natural_size.height;
+ *natural_height += ypad * 2;
}
+ else
+ GTK_WIDGET_GET_CLASS (widget)->get_preferred_height (widget, minimum_height, natural_height);
}
static void
gtk_label_size_allocate (GtkWidget *widget,
GtkAllocation *allocation)
{
- GtkLabel *label;
-
- label = GTK_LABEL (widget);
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
GTK_WIDGET_CLASS (gtk_label_parent_class)->size_allocate (widget, allocation);
- if (label->ellipsize)
+ /* The layout may have been recently cleared in get_size_for_orientation(),
+ * but the width at that point may not be the same as the allocated width
+ */
+ if (priv->wrap)
+ gtk_label_clear_layout (label);
+
+ gtk_label_ensure_layout (label, FALSE);
+
+ if (priv->ellipsize)
{
- if (label->layout)
- {
- gint width;
- PangoRectangle logical;
+ if (priv->layout)
+ {
+ PangoRectangle logical;
+ PangoRectangle bounds;
+ gint xpad, ypad;
- width = (allocation->width - label->misc.xpad * 2) * PANGO_SCALE;
+ gtk_misc_get_padding (GTK_MISC (label), &xpad, &ypad);
- pango_layout_set_width (label->layout, -1);
- pango_layout_get_extents (label->layout, NULL, &logical);
+ bounds.x = bounds.y = 0;
+ bounds.width = allocation->width - xpad * 2;
+ bounds.height = allocation->height - ypad * 2;
- if (logical.width > width)
- pango_layout_set_width (label->layout, width);
- }
+ pango_layout_set_width (priv->layout, -1);
+ pango_layout_get_pixel_extents (priv->layout, NULL, &logical);
+
+ if (priv->have_transform)
+ {
+ PangoContext *context = gtk_widget_get_pango_context (widget);
+ const PangoMatrix *matrix = pango_context_get_matrix (context);
+
+ const gdouble dx = matrix->xx; /* cos (M_PI * angle / 180) */
+ const gdouble dy = matrix->xy; /* sin (M_PI * angle / 180) */
+ if (fabs (dy) < 0.01)
+ {
+ if (logical.width > bounds.width)
+ pango_layout_set_width (priv->layout, bounds.width * PANGO_SCALE);
+ }
+ else if (fabs (dx) < 0.01)
+ {
+ if (logical.width > bounds.height)
+ pango_layout_set_width (priv->layout, bounds.height * PANGO_SCALE);
+ }
+ else
+ {
+ gdouble x0, y0, x1, y1, length;
+ gboolean vertical;
+ gint cy;
+
+ x0 = bounds.width / 2;
+ y0 = dx ? x0 * dy / dx : G_MAXDOUBLE;
+ vertical = fabs (y0) > bounds.height / 2;
+
+ if (vertical)
+ {
+ y0 = bounds.height/2;
+ x0 = dy ? y0 * dx / dy : G_MAXDOUBLE;
+ }
+
+ length = 2 * sqrt (x0 * x0 + y0 * y0);
+ pango_layout_set_width (priv->layout, rint (length * PANGO_SCALE));
+ pango_layout_get_pixel_size (priv->layout, NULL, &cy);
+
+ x1 = +dy * cy/2;
+ y1 = -dx * cy/2;
+
+ if (vertical)
+ {
+ y0 = bounds.height/2 + y1 - y0;
+ x0 = -y0 * dx/dy;
+ }
+ else
+ {
+ x0 = bounds.width/2 + x1 - x0;
+ y0 = -x0 * dy/dx;
+ }
+
+ length = length - sqrt (x0 * x0 + y0 * y0) * 2;
+ pango_layout_set_width (priv->layout, rint (length * PANGO_SCALE));
+ }
+ }
+ else if (logical.width > bounds.width)
+ pango_layout_set_width (priv->layout, bounds.width * PANGO_SCALE);
+ }
}
- if (label->select_info && label->select_info->window)
+ if (priv->select_info && priv->select_info->window)
{
- gdk_window_move_resize (label->select_info->window,
+ gdk_window_move_resize (priv->select_info->window,
allocation->x,
allocation->y,
allocation->width,
static void
gtk_label_update_cursor (GtkLabel *label)
{
+ GtkLabelPrivate *priv = label->priv;
GtkWidget *widget;
- if (!label->select_info)
+ if (!priv->select_info)
return;
widget = GTK_WIDGET (label);
{
display = gtk_widget_get_display (widget);
- if (label->select_info->active_link)
+ if (priv->select_info->active_link)
cursor = gdk_cursor_new_for_display (display, GDK_HAND2);
- else if (label->select_info->selectable)
+ else if (priv->select_info->selectable)
cursor = gdk_cursor_new_for_display (display, GDK_XTERM);
else
cursor = NULL;
else
cursor = NULL;
- gdk_window_set_cursor (label->select_info->window, cursor);
+ gdk_window_set_cursor (priv->select_info->window, cursor);
if (cursor)
- gdk_cursor_unref (cursor);
+ g_object_unref (cursor);
}
}
GtkStateType prev_state)
{
GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
- if (label->select_info)
+ if (priv->select_info)
{
gtk_label_select_region (label, 0, 0);
gtk_label_update_cursor (label);
}
static void
-gtk_label_style_set (GtkWidget *widget,
- GtkStyle *previous_style)
+gtk_label_style_updated (GtkWidget *widget)
{
GtkLabel *label = GTK_LABEL (widget);
+ GTK_WIDGET_CLASS (gtk_label_parent_class)->style_updated (widget);
+
/* We have to clear the layout, fonts etc. may have changed */
gtk_label_clear_layout (label);
gtk_label_invalidate_wrap_width (label);
GtkTextDirection previous_dir)
{
GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
- if (label->layout)
- pango_layout_context_changed (label->layout);
+ if (priv->layout)
+ pango_layout_context_changed (priv->layout);
GTK_WIDGET_CLASS (gtk_label_parent_class)->direction_changed (widget, previous_dir);
}
gint *xp,
gint *yp)
{
+ GtkAllocation allocation;
GtkMisc *misc;
- GtkWidget *widget;
+ GtkWidget *widget;
GtkLabelPrivate *priv;
- gfloat xalign;
gint req_width, x, y;
+ gint req_height;
+ gint xpad, ypad;
+ gfloat xalign, yalign;
PangoRectangle logical;
-
- misc = GTK_MISC (label);
+
+ misc = GTK_MISC (label);
widget = GTK_WIDGET (label);
- priv = GTK_LABEL_GET_PRIVATE (label);
+ priv = label->priv;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
- xalign = misc->xalign;
- else
- xalign = 1.0 - misc->xalign;
+ gtk_misc_get_alignment (misc, &xalign, &yalign);
+ gtk_misc_get_padding (misc, &xpad, &ypad);
+
+ if (gtk_widget_get_direction (widget) != GTK_TEXT_DIR_LTR)
+ xalign = 1.0 - xalign;
- pango_layout_get_pixel_extents (label->layout, NULL, &logical);
+ pango_layout_get_extents (priv->layout, NULL, &logical);
- if (label->ellipsize || priv->width_chars > 0)
+ if (priv->have_transform)
{
- int width;
+ PangoContext *context = gtk_widget_get_pango_context (widget);
+ const PangoMatrix *matrix = pango_context_get_matrix (context);
+ pango_matrix_transform_rectangle (matrix, &logical);
+ }
- width = pango_layout_get_width (label->layout);
+ pango_extents_to_pixels (&logical, NULL);
- req_width = logical.width;
- if (width != -1)
- req_width = MIN(PANGO_PIXELS (width), req_width);
- req_width += 2 * misc->xpad;
- }
- else
- req_width = widget->requisition.width;
+ req_width = logical.width;
+ req_height = logical.height;
+
+ req_width += 2 * xpad;
+ req_height += 2 * ypad;
- x = floor (widget->allocation.x + (gint)misc->xpad +
- xalign * (widget->allocation.width - req_width));
+ gtk_widget_get_allocation (widget, &allocation);
+
+ x = floor (allocation.x + xpad + xalign * (allocation.width - req_width));
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
- x = MAX (x, widget->allocation.x + misc->xpad);
+ x = MAX (x, allocation.x + xpad);
else
- x = MIN (x, widget->allocation.x + widget->allocation.width - misc->xpad);
- x -= logical.x;
+ x = MIN (x, allocation.x + allocation.width - xpad);
+
/* bgo#315462 - For single-line labels, *do* align the requisition with
* respect to the allocation, even if we are under-allocated. For multi-line
* - Multi-line labels should not be clipped to showing "something in the
* middle". You want to read the first line, at least, to get some context.
*/
- if (pango_layout_get_line_count (label->layout) == 1)
- y = floor (widget->allocation.y + (gint)misc->ypad
- + (widget->allocation.height - widget->requisition.height) * misc->yalign);
+ if (pango_layout_get_line_count (priv->layout) == 1)
+ y = floor (allocation.y + ypad + (allocation.height - req_height) * yalign);
else
- y = floor (widget->allocation.y + (gint)misc->ypad
- + MAX (((widget->allocation.height - widget->requisition.height) * misc->yalign),
- 0));
+ y = floor (allocation.y + ypad + MAX ((allocation.height - req_height) * yalign, 0));
if (xp)
*xp = x;
static void
draw_insertion_cursor (GtkLabel *label,
+ cairo_t *cr,
GdkRectangle *cursor_location,
gboolean is_primary,
PangoDirection direction,
else
text_dir = GTK_TEXT_DIR_RTL;
- gtk_draw_insertion_cursor (widget, widget->window, &(widget->allocation),
- cursor_location,
+ gtk_draw_insertion_cursor (widget, cr, cursor_location,
is_primary, text_dir, draw_arrow);
}
static PangoDirection
get_cursor_direction (GtkLabel *label)
{
+ GtkLabelPrivate *priv = label->priv;
GSList *l;
- g_assert (label->select_info);
+ g_assert (priv->select_info);
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
- for (l = pango_layout_get_lines_readonly (label->layout); l; l = l->next)
+ for (l = pango_layout_get_lines_readonly (priv->layout); l; l = l->next)
{
PangoLayoutLine *line = l->data;
- /* If label->select_info->selection_end is at the very end of
+ /* If priv->select_info->selection_end is at the very end of
* the line, we don't know if the cursor is on this line or
* the next without looking ahead at the next line. (End
* of paragraph is different from line break.) But it's
* definitely in this paragraph, which is good enough
* to figure out the resolved direction.
*/
- if (line->start_index + line->length >= label->select_info->selection_end)
+ if (line->start_index + line->length >= priv->select_info->selection_end)
return line->resolved_dir;
}
}
static void
-gtk_label_draw_cursor (GtkLabel *label, gint xoffset, gint yoffset)
+gtk_label_draw_cursor (GtkLabel *label, cairo_t *cr, gint xoffset, gint yoffset)
{
+ GtkLabelPrivate *priv = label->priv;
GtkWidget *widget;
- if (label->select_info == NULL)
+ if (priv->select_info == NULL)
return;
widget = GTK_WIDGET (label);
keymap_direction = gdk_keymap_get_direction (gdk_keymap_get_for_display (gtk_widget_get_display (widget)));
cursor_direction = get_cursor_direction (label);
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
- pango_layout_get_cursor_pos (label->layout, label->select_info->selection_end,
+ pango_layout_get_cursor_pos (priv->layout, priv->select_info->selection_end,
&strong_pos, &weak_pos);
g_object_get (gtk_widget_get_settings (widget),
cursor_location.width = 0;
cursor_location.height = PANGO_PIXELS (cursor1->height);
- draw_insertion_cursor (label,
+ draw_insertion_cursor (label, cr,
&cursor_location, TRUE, dir1,
dir2 != PANGO_DIRECTION_NEUTRAL);
cursor_location.width = 0;
cursor_location.height = PANGO_PIXELS (cursor2->height);
- draw_insertion_cursor (label,
+ draw_insertion_cursor (label, cr,
&cursor_location, FALSE, dir2,
TRUE);
}
static GtkLabelLink *
gtk_label_get_focus_link (GtkLabel *label)
{
- GtkLabelSelectionInfo *info = label->select_info;
+ GtkLabelPrivate *priv = label->priv;
+ GtkLabelSelectionInfo *info = priv->select_info;
GList *l;
if (!info)
}
static gint
-gtk_label_expose (GtkWidget *widget,
- GdkEventExpose *event)
+gtk_label_draw (GtkWidget *widget,
+ cairo_t *cr)
{
GtkLabel *label = GTK_LABEL (widget);
- GtkLabelSelectionInfo *info = label->select_info;
+ GtkLabelPrivate *priv = label->priv;
+ GtkLabelSelectionInfo *info = priv->select_info;
+ GtkAllocation allocation;
+ GtkStyleContext *context;
+ GtkStateFlags state;
gint x, y;
- gtk_label_ensure_layout (label);
-
- if (gtk_widget_get_visible (widget) && gtk_widget_get_mapped (widget) &&
- label->text && (*label->text != '\0'))
+ gtk_label_ensure_layout (label, FALSE);
+
+ if (priv->text && (*priv->text != '\0'))
{
+ GdkRGBA *bg_color, *fg_color;
+
get_layout_location (label, &x, &y);
- gtk_paint_layout (widget->style,
- widget->window,
- gtk_widget_get_state (widget),
- FALSE,
- &event->area,
- widget,
- "label",
- x, y,
- label->layout);
+ context = gtk_widget_get_style_context (widget);
+ gtk_widget_get_allocation (widget, &allocation);
+
+ cairo_translate (cr, -allocation.x, -allocation.y);
+
+ state = gtk_widget_get_state_flags (widget);
+ gtk_style_context_set_state (context, state);
+
+ gtk_render_layout (context, cr,
+ x, y,
+ priv->layout);
if (info &&
(info->selection_anchor != info->selection_end))
{
gint range[2];
- GdkRegion *clip;
- GtkStateType state;
+ cairo_region_t *clip;
range[0] = info->selection_anchor;
range[1] = info->selection_end;
range[1] = tmp;
}
- clip = gdk_pango_layout_get_clip_region (label->layout,
+ clip = gdk_pango_layout_get_clip_region (priv->layout,
x, y,
range,
1);
- gdk_region_intersect (clip, event->region);
- /* FIXME should use gtk_paint, but it can't use a clip
- * region
- */
+ /* FIXME should use gtk_paint, but it can't use a clip region */
+ cairo_save (cr);
+
+ gdk_cairo_region (cr, clip);
+ cairo_clip (cr);
+
+ state = GTK_STATE_FLAG_SELECTED;
+
+ if (gtk_widget_has_focus (widget))
+ state |= GTK_STATE_FLAG_FOCUSED;
- gdk_gc_set_clip_region (widget->style->black_gc, clip);
+ gtk_style_context_get (context, state,
+ "background-color", &bg_color,
+ "color", &fg_color,
+ NULL);
+ gdk_cairo_set_source_rgba (cr, bg_color);
+ cairo_paint (cr);
- state = GTK_STATE_SELECTED;
- if (!gtk_widget_has_focus (widget))
- state = GTK_STATE_ACTIVE;
+ gdk_cairo_set_source_rgba (cr, fg_color);
+ cairo_move_to (cr, x, y);
+ _gtk_pango_fill_layout (cr, priv->layout);
- gdk_draw_layout_with_colors (widget->window,
- widget->style->black_gc,
- x, y,
- label->layout,
- &widget->style->text[state],
- &widget->style->base[state]);
+ cairo_restore (cr);
+ cairo_region_destroy (clip);
- gdk_gc_set_clip_region (widget->style->black_gc, NULL);
- gdk_region_destroy (clip);
+ gdk_rgba_free (bg_color);
+ gdk_rgba_free (fg_color);
}
else if (info)
{
GtkLabelLink *focus_link;
GtkLabelLink *active_link;
gint range[2];
- GdkRegion *clip;
+ cairo_region_t *clip;
GdkRectangle rect;
GdkColor *text_color;
- GdkColor *base_color;
GdkColor *link_color;
GdkColor *visited_link_color;
if (info->selectable && gtk_widget_has_focus (widget))
- gtk_label_draw_cursor (label, x, y);
+ gtk_label_draw_cursor (label, cr, x, y);
focus_link = gtk_label_get_focus_link (label);
active_link = info->active_link;
+
if (active_link)
{
+ GdkRGBA *bg_color;
+
range[0] = active_link->start;
range[1] = active_link->end;
- clip = gdk_pango_layout_get_clip_region (label->layout,
+ cairo_save (cr);
+
+ clip = gdk_pango_layout_get_clip_region (priv->layout,
x, y,
range,
1);
- gdk_gc_set_clip_region (widget->style->black_gc, clip);
+ gdk_cairo_region (cr, clip);
+ cairo_clip (cr);
+ cairo_region_destroy (clip);
gtk_label_get_link_colors (widget, &link_color, &visited_link_color);
if (active_link->visited)
text_color = visited_link_color;
else
text_color = link_color;
+
if (info->link_clicked)
- base_color = &widget->style->base[GTK_STATE_ACTIVE];
+ state = GTK_STATE_FLAG_ACTIVE;
else
- base_color = &widget->style->base[GTK_STATE_PRELIGHT];
- gdk_draw_layout_with_colors (widget->window,
- widget->style->black_gc,
- x, y,
- label->layout,
- text_color,
- base_color);
+ state = GTK_STATE_FLAG_PRELIGHT;
+
+ gtk_style_context_get (context, state,
+ "background-color", &bg_color,
+ NULL);
+
+ gdk_cairo_set_source_rgba (cr, bg_color);
+ cairo_paint (cr);
+
+ gdk_cairo_set_source_color (cr, text_color);
+ cairo_move_to (cr, x, y);
+ _gtk_pango_fill_layout (cr, priv->layout);
+
gdk_color_free (link_color);
gdk_color_free (visited_link_color);
+ gdk_rgba_free (bg_color);
- gdk_gc_set_clip_region (widget->style->black_gc, NULL);
- gdk_region_destroy (clip);
+ cairo_restore (cr);
}
if (focus_link && gtk_widget_has_focus (widget))
range[0] = focus_link->start;
range[1] = focus_link->end;
- clip = gdk_pango_layout_get_clip_region (label->layout,
+ clip = gdk_pango_layout_get_clip_region (priv->layout,
x, y,
range,
1);
- gdk_region_get_clipbox (clip, &rect);
+ cairo_region_get_extents (clip, &rect);
- gtk_paint_focus (widget->style, widget->window, gtk_widget_get_state (widget),
- &event->area, widget, "label",
- rect.x, rect.y, rect.width, rect.height);
+ state = gtk_widget_get_state_flags (widget);
+ gtk_style_context_set_state (context, state);
- gdk_region_destroy (clip);
+ gtk_render_focus (context, cr,
+ rect.x, rect.y,
+ rect.width, rect.height);
+
+ cairo_region_destroy (clip);
}
}
}
gchar *dest;
gchar *pattern_dest;
- *accel_key = GDK_VoidSymbol;
+ *accel_key = GDK_KEY_VoidSymbol;
*new_str = g_new (gchar, strlen (str) + 1);
*pattern = g_new (gchar, g_utf8_strlen (str, -1) + 1);
else
{
*pattern_dest++ = '_';
- if (*accel_key == GDK_VoidSymbol)
+ if (*accel_key == GDK_KEY_VoidSymbol)
*accel_key = gdk_keyval_to_lower (gdk_unicode_to_keyval (c));
}
gtk_label_set_uline_text_internal (GtkLabel *label,
const gchar *str)
{
- guint accel_key = GDK_VoidSymbol;
+ GtkLabelPrivate *priv = label->priv;
+ guint accel_key = GDK_KEY_VoidSymbol;
gchar *new_str;
gchar *pattern;
gtk_label_set_text_internal (label, new_str);
gtk_label_set_pattern_internal (label, pattern, TRUE);
- label->mnemonic_keyval = accel_key;
+ priv->mnemonic_keyval = accel_key;
g_free (pattern);
}
-guint
-gtk_label_parse_uline (GtkLabel *label,
- const gchar *str)
-{
- guint keyval;
-
- g_return_val_if_fail (GTK_IS_LABEL (label), GDK_VoidSymbol);
- g_return_val_if_fail (str != NULL, GDK_VoidSymbol);
-
- g_object_freeze_notify (G_OBJECT (label));
-
- gtk_label_set_label_internal (label, g_strdup (str ? str : ""));
- gtk_label_set_use_markup_internal (label, FALSE);
- gtk_label_set_use_underline_internal (label, TRUE);
-
- gtk_label_recalculate (label);
-
- keyval = label->mnemonic_keyval;
- if (keyval != GDK_VoidSymbol)
- {
- label->mnemonic_keyval = GDK_VoidSymbol;
- gtk_label_setup_mnemonic (label, keyval);
- g_object_notify (G_OBJECT (label), "mnemonic-keyval");
- }
-
- g_object_thaw_notify (G_OBJECT (label));
-
- return keyval;
-}
-
/**
* gtk_label_set_text_with_mnemonic:
* @label: a #GtkLabel
static void
gtk_label_realize (GtkWidget *widget)
{
- GtkLabel *label;
-
- label = GTK_LABEL (widget);
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
GTK_WIDGET_CLASS (gtk_label_parent_class)->realize (widget);
- if (label->select_info)
+ if (priv->select_info)
gtk_label_create_window (label);
}
static void
gtk_label_unrealize (GtkWidget *widget)
{
- GtkLabel *label;
-
- label = GTK_LABEL (widget);
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
- if (label->select_info)
+ if (priv->select_info)
gtk_label_destroy_window (label);
GTK_WIDGET_CLASS (gtk_label_parent_class)->unrealize (widget);
static void
gtk_label_map (GtkWidget *widget)
{
- GtkLabel *label;
-
- label = GTK_LABEL (widget);
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
GTK_WIDGET_CLASS (gtk_label_parent_class)->map (widget);
- if (label->select_info)
- gdk_window_show (label->select_info->window);
+ if (priv->select_info)
+ gdk_window_show (priv->select_info->window);
}
static void
gtk_label_unmap (GtkWidget *widget)
{
- GtkLabel *label;
-
- label = GTK_LABEL (widget);
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
- if (label->select_info)
- gdk_window_hide (label->select_info->window);
+ if (priv->select_info)
+ gdk_window_hide (priv->select_info->window);
GTK_WIDGET_CLASS (gtk_label_parent_class)->unmap (widget);
}
gint *x,
gint *y)
{
+ GtkAllocation allocation;
gint lx, ly;
GtkWidget *widget;
/* get layout location in widget->window coords */
get_layout_location (label, &lx, &ly);
-
+
+ gtk_widget_get_allocation (widget, &allocation);
+
if (x)
{
- *x += widget->allocation.x; /* go to widget->window */
+ *x += allocation.x; /* go to widget->window */
*x -= lx; /* go to layout */
}
if (y)
{
- *y += widget->allocation.y; /* go to widget->window */
+ *y += allocation.y; /* go to widget->window */
*y -= ly; /* go to layout */
}
}
gint y,
gint *index)
{
+ GtkLabelPrivate *priv = label->priv;
gint trailing = 0;
const gchar *cluster;
const gchar *cluster_end;
*index = 0;
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
window_to_layout_coords (label, &x, &y);
x *= PANGO_SCALE;
y *= PANGO_SCALE;
- inside = pango_layout_xy_to_index (label->layout,
+ inside = pango_layout_xy_to_index (priv->layout,
x, y,
index, &trailing);
- cluster = label->text + *index;
+ cluster = priv->text + *index;
cluster_end = cluster;
while (trailing)
{
static void
gtk_label_select_word (GtkLabel *label)
{
+ GtkLabelPrivate *priv = label->priv;
gint min, max;
-
- gint start_index = gtk_label_move_backward_word (label, label->select_info->selection_end);
- gint end_index = gtk_label_move_forward_word (label, label->select_info->selection_end);
- min = MIN (label->select_info->selection_anchor,
- label->select_info->selection_end);
- max = MAX (label->select_info->selection_anchor,
- label->select_info->selection_end);
+ gint start_index = gtk_label_move_backward_word (label, priv->select_info->selection_end);
+ gint end_index = gtk_label_move_forward_word (label, priv->select_info->selection_end);
+
+ min = MIN (priv->select_info->selection_anchor,
+ priv->select_info->selection_end);
+ max = MAX (priv->select_info->selection_anchor,
+ priv->select_info->selection_end);
min = MIN (min, start_index);
max = MAX (max, end_index);
static void
gtk_label_grab_focus (GtkWidget *widget)
{
- GtkLabel *label;
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
gboolean select_on_focus;
GtkLabelLink *link;
- label = GTK_LABEL (widget);
-
- if (label->select_info == NULL)
+ if (priv->select_info == NULL)
return;
GTK_WIDGET_CLASS (gtk_label_parent_class)->grab_focus (widget);
- if (label->select_info->selectable)
+ if (priv->select_info->selectable)
{
g_object_get (gtk_widget_get_settings (widget),
"gtk-label-select-on-focus",
&select_on_focus,
NULL);
- if (select_on_focus && !label->in_click)
+ if (select_on_focus && !priv->in_click)
gtk_label_select_region (label, 0, -1);
}
else
{
- if (label->select_info->links && !label->in_click)
+ if (priv->select_info->links && !priv->in_click)
{
- link = label->select_info->links->data;
- label->select_info->selection_anchor = link->start;
- label->select_info->selection_end = link->start;
+ link = priv->select_info->links->data;
+ priv->select_info->selection_anchor = link->start;
+ priv->select_info->selection_end = link->start;
}
}
}
GtkDirectionType direction)
{
GtkLabel *label = GTK_LABEL (widget);
- GtkLabelSelectionInfo *info = label->select_info;
+ GtkLabelPrivate *priv = label->priv;
+ GtkLabelSelectionInfo *info = priv->select_info;
GtkLabelLink *focus_link;
GList *l;
GdkEventButton *event)
{
GtkLabel *label = GTK_LABEL (widget);
- GtkLabelSelectionInfo *info = label->select_info;
+ GtkLabelPrivate *priv = label->priv;
+ GtkLabelSelectionInfo *info = priv->select_info;
gint index = 0;
gint min, max;
{
if (!gtk_widget_has_focus (widget))
{
- label->in_click = TRUE;
+ priv->in_click = TRUE;
gtk_widget_grab_focus (widget);
- label->in_click = FALSE;
+ priv->in_click = FALSE;
}
if (event->type == GDK_3BUTTON_PRESS)
{
- gtk_label_select_region_index (label, 0, strlen (label->text));
+ gtk_label_select_region_index (label, 0, strlen (priv->text));
return TRUE;
}
else
{
if (event->type == GDK_3BUTTON_PRESS)
- gtk_label_select_region_index (label, 0, strlen (label->text));
+ gtk_label_select_region_index (label, 0, strlen (priv->text));
else if (event->type == GDK_2BUTTON_PRESS)
gtk_label_select_word (label);
else if (min < max && min <= index && index <= max)
{
GtkLabel *label = GTK_LABEL (widget);
- GtkLabelSelectionInfo *info = label->select_info;
+ GtkLabelPrivate *priv = label->priv;
+ GtkLabelSelectionInfo *info = priv->select_info;
gint index;
if (info == NULL)
static void
connect_mnemonics_visible_notify (GtkLabel *label)
{
- GtkLabelPrivate *priv = GTK_LABEL_GET_PRIVATE (label);
+ GtkLabelPrivate *priv = label->priv;
GtkWidget *toplevel;
gboolean connected;
GdkDragContext *context,
gpointer data)
{
- GtkLabel *label;
- GdkPixmap *pixmap = NULL;
+ GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
+ cairo_surface_t *surface = NULL;
g_signal_handlers_disconnect_by_func (widget, drag_begin_cb, NULL);
- label = GTK_LABEL (widget);
-
- if ((label->select_info->selection_anchor !=
- label->select_info->selection_end) &&
- label->text)
+ if ((priv->select_info->selection_anchor !=
+ priv->select_info->selection_end) &&
+ priv->text)
{
gint start, end;
gint len;
- start = MIN (label->select_info->selection_anchor,
- label->select_info->selection_end);
- end = MAX (label->select_info->selection_anchor,
- label->select_info->selection_end);
-
- len = strlen (label->text);
-
+ start = MIN (priv->select_info->selection_anchor,
+ priv->select_info->selection_end);
+ end = MAX (priv->select_info->selection_anchor,
+ priv->select_info->selection_end);
+
+ len = strlen (priv->text);
+
if (end > len)
end = len;
-
+
if (start > len)
start = len;
-
- pixmap = _gtk_text_util_create_drag_icon (widget,
- label->text + start,
- end - start);
+
+ surface = _gtk_text_util_create_drag_icon (widget,
+ priv->text + start,
+ end - start);
}
- if (pixmap)
- gtk_drag_set_icon_pixmap (context,
- gdk_drawable_get_colormap (pixmap),
- pixmap,
- NULL,
- -2, -2);
+ if (surface)
+ {
+ gtk_drag_set_icon_surface (context, surface);
+ cairo_surface_destroy (surface);
+ }
else
- gtk_drag_set_icon_default (context);
-
- if (pixmap)
- g_object_unref (pixmap);
+ {
+ gtk_drag_set_icon_default (context);
+ }
}
static gboolean
GdkEventMotion *event)
{
GtkLabel *label = GTK_LABEL (widget);
- GtkLabelSelectionInfo *info = label->select_info;
+ GtkLabelPrivate *priv = label->priv;
+ GtkLabelSelectionInfo *info = priv->select_info;
gint index;
- gint x, y;
if (info == NULL)
return FALSE;
if (info->selection_anchor == info->selection_end)
{
- gdk_window_get_pointer (event->window, &x, &y, NULL);
- if (get_layout_index (label, x, y, &index))
+ if (get_layout_index (label, event->x, event->y, &index))
{
for (l = info->links; l != NULL; l = l->next)
{
if ((event->state & GDK_BUTTON1_MASK) == 0)
return FALSE;
- gdk_window_get_pointer (info->window, &x, &y, NULL);
-
if (info->in_drag)
{
if (gtk_drag_check_threshold (widget,
}
else
{
+ gint x, y;
+
+ gdk_window_get_device_position (info->window, event->device, &x, &y, NULL);
get_layout_index (label, x, y, &index);
if (info->select_words)
GdkEventCrossing *event)
{
GtkLabel *label = GTK_LABEL (widget);
+ GtkLabelPrivate *priv = label->priv;
- if (label->select_info)
+ if (priv->select_info)
{
- label->select_info->active_link = NULL;
+ priv->select_info->active_link = NULL;
gtk_label_update_cursor (label);
gtk_widget_queue_draw (widget);
}
static void
gtk_label_create_window (GtkLabel *label)
{
+ GtkLabelPrivate *priv = label->priv;
+ GtkAllocation allocation;
GtkWidget *widget;
GdkWindowAttr attributes;
gint attributes_mask;
-
- g_assert (label->select_info);
+
+ g_assert (priv->select_info);
widget = GTK_WIDGET (label);
g_assert (gtk_widget_get_realized (widget));
-
- if (label->select_info->window)
+
+ if (priv->select_info->window)
return;
- attributes.x = widget->allocation.x;
- attributes.y = widget->allocation.y;
- attributes.width = widget->allocation.width;
- attributes.height = widget->allocation.height;
+ gtk_widget_get_allocation (widget, &allocation);
+
+ attributes.x = allocation.x;
+ attributes.y = allocation.y;
+ attributes.width = allocation.width;
+ attributes.height = allocation.height;
attributes.window_type = GDK_WINDOW_CHILD;
attributes.wclass = GDK_INPUT_ONLY;
attributes.override_redirect = TRUE;
}
- label->select_info->window = gdk_window_new (widget->window,
+ priv->select_info->window = gdk_window_new (gtk_widget_get_window (widget),
&attributes, attributes_mask);
- gdk_window_set_user_data (label->select_info->window, widget);
+ gdk_window_set_user_data (priv->select_info->window, widget);
if (attributes_mask & GDK_WA_CURSOR)
- gdk_cursor_unref (attributes.cursor);
+ g_object_unref (attributes.cursor);
}
static void
gtk_label_destroy_window (GtkLabel *label)
{
- g_assert (label->select_info);
+ GtkLabelPrivate *priv = label->priv;
- if (label->select_info->window == NULL)
+ g_assert (priv->select_info);
+
+ if (priv->select_info->window == NULL)
return;
- gdk_window_set_user_data (label->select_info->window, NULL);
- gdk_window_destroy (label->select_info->window);
- label->select_info->window = NULL;
+ gdk_window_set_user_data (priv->select_info->window, NULL);
+ gdk_window_destroy (priv->select_info->window);
+ priv->select_info->window = NULL;
}
static void
gtk_label_ensure_select_info (GtkLabel *label)
{
- if (label->select_info == NULL)
+ GtkLabelPrivate *priv = label->priv;
+
+ if (priv->select_info == NULL)
{
- label->select_info = g_new0 (GtkLabelSelectionInfo, 1);
+ priv->select_info = g_new0 (GtkLabelSelectionInfo, 1);
gtk_widget_set_can_focus (GTK_WIDGET (label), TRUE);
gtk_label_create_window (label);
if (gtk_widget_get_mapped (GTK_WIDGET (label)))
- gdk_window_show (label->select_info->window);
+ gdk_window_show (priv->select_info->window);
}
}
static void
gtk_label_clear_select_info (GtkLabel *label)
{
- if (label->select_info == NULL)
+ GtkLabelPrivate *priv = label->priv;
+
+ if (priv->select_info == NULL)
return;
- if (!label->select_info->selectable && !label->select_info->links)
+ if (!priv->select_info->selectable && !priv->select_info->links)
{
gtk_label_destroy_window (label);
- g_free (label->select_info);
- label->select_info = NULL;
+ g_free (priv->select_info);
+ priv->select_info = NULL;
gtk_widget_set_can_focus (GTK_WIDGET (label), FALSE);
}
gtk_label_set_selectable (GtkLabel *label,
gboolean setting)
{
+ GtkLabelPrivate *priv;
gboolean old_setting;
g_return_if_fail (GTK_IS_LABEL (label));
+ priv = label->priv;
+
setting = setting != FALSE;
- old_setting = label->select_info && label->select_info->selectable;
+ old_setting = priv->select_info && priv->select_info->selectable;
if (setting)
{
gtk_label_ensure_select_info (label);
- label->select_info->selectable = TRUE;
+ priv->select_info->selectable = TRUE;
gtk_label_update_cursor (label);
}
else
/* unselect, to give up the selection */
gtk_label_select_region (label, 0, 0);
- label->select_info->selectable = FALSE;
+ priv->select_info->selectable = FALSE;
gtk_label_clear_select_info (label);
gtk_label_update_cursor (label);
}
gboolean
gtk_label_get_selectable (GtkLabel *label)
{
+ GtkLabelPrivate *priv;
+
g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
- return label->select_info && label->select_info->selectable;
-}
+ priv = label->priv;
-static void
-free_angle (gpointer angle)
-{
- g_slice_free (gdouble, angle);
+ return priv->select_info && priv->select_info->selectable;
}
/**
gtk_label_set_angle (GtkLabel *label,
gdouble angle)
{
- gdouble *label_angle;
+ GtkLabelPrivate *priv;
g_return_if_fail (GTK_IS_LABEL (label));
- label_angle = (gdouble *)g_object_get_qdata (G_OBJECT (label), quark_angle);
+ priv = label->priv;
- if (!label_angle)
- {
- label_angle = g_slice_new (gdouble);
- *label_angle = 0.0;
- g_object_set_qdata_full (G_OBJECT (label), quark_angle,
- label_angle, free_angle);
- }
-
/* Canonicalize to [0,360]. We don't canonicalize 360 to 0, because
* double property ranges are inclusive, and changing 360 to 0 would
* make a property editor behave strangely.
if (angle < 0 || angle > 360.0)
angle = angle - 360. * floor (angle / 360.);
- if (*label_angle != angle)
+ if (priv->angle != angle)
{
- *label_angle = angle;
+ priv->angle = angle;
gtk_label_clear_layout (label);
gtk_widget_queue_resize (GTK_WIDGET (label));
gdouble
gtk_label_get_angle (GtkLabel *label)
{
- gdouble *angle;
-
g_return_val_if_fail (GTK_IS_LABEL (label), 0.0);
- angle = (gdouble *)g_object_get_qdata (G_OBJECT (label), quark_angle);
-
- if (angle)
- return *angle;
- else
- return 0.0;
+ return label->priv->angle;
}
static void
gtk_label_set_selection_text (GtkLabel *label,
GtkSelectionData *selection_data)
{
- if ((label->select_info->selection_anchor !=
- label->select_info->selection_end) &&
- label->text)
+ GtkLabelPrivate *priv = label->priv;
+
+ if ((priv->select_info->selection_anchor !=
+ priv->select_info->selection_end) &&
+ priv->text)
{
gint start, end;
gint len;
-
- start = MIN (label->select_info->selection_anchor,
- label->select_info->selection_end);
- end = MAX (label->select_info->selection_anchor,
- label->select_info->selection_end);
-
- len = strlen (label->text);
-
+
+ start = MIN (priv->select_info->selection_anchor,
+ priv->select_info->selection_end);
+ end = MAX (priv->select_info->selection_anchor,
+ priv->select_info->selection_end);
+
+ len = strlen (priv->text);
+
if (end > len)
end = len;
-
+
if (start > len)
start = len;
-
+
gtk_selection_data_set_text (selection_data,
- label->text + start,
+ priv->text + start,
end - start);
}
}
gpointer user_data_or_owner)
{
GtkLabel *label;
+ GtkLabelPrivate *priv;
label = GTK_LABEL (user_data_or_owner);
+ priv = label->priv;
- if (label->select_info)
+ if (priv->select_info)
{
- label->select_info->selection_anchor = label->select_info->selection_end;
-
+ priv->select_info->selection_anchor = priv->select_info->selection_end;
+
gtk_widget_queue_draw (GTK_WIDGET (label));
}
}
gint anchor_index,
gint end_index)
{
+ GtkLabelPrivate *priv;
+
g_return_if_fail (GTK_IS_LABEL (label));
-
- if (label->select_info && label->select_info->selectable)
+
+ priv = label->priv;
+
+ if (priv->select_info && priv->select_info->selectable)
{
GtkClipboard *clipboard;
- if (label->select_info->selection_anchor == anchor_index &&
- label->select_info->selection_end == end_index)
+ if (priv->select_info->selection_anchor == anchor_index &&
+ priv->select_info->selection_end == end_index)
return;
- label->select_info->selection_anchor = anchor_index;
- label->select_info->selection_end = end_index;
+ priv->select_info->selection_anchor = anchor_index;
+ priv->select_info->selection_end = end_index;
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label),
GDK_SELECTION_PRIMARY);
gint start_offset,
gint end_offset)
{
+ GtkLabelPrivate *priv;
+
g_return_if_fail (GTK_IS_LABEL (label));
-
- if (label->text && label->select_info)
+
+ priv = label->priv;
+
+ if (priv->text && priv->select_info)
{
if (start_offset < 0)
- start_offset = g_utf8_strlen (label->text, -1);
+ start_offset = g_utf8_strlen (priv->text, -1);
if (end_offset < 0)
- end_offset = g_utf8_strlen (label->text, -1);
+ end_offset = g_utf8_strlen (priv->text, -1);
gtk_label_select_region_index (label,
- g_utf8_offset_to_pointer (label->text, start_offset) - label->text,
- g_utf8_offset_to_pointer (label->text, end_offset) - label->text);
+ g_utf8_offset_to_pointer (priv->text, start_offset) - priv->text,
+ g_utf8_offset_to_pointer (priv->text, end_offset) - priv->text);
}
}
/**
* gtk_label_get_selection_bounds:
* @label: a #GtkLabel
- * @start: return location for start of selection, as a character offset
- * @end: return location for end of selection, as a character offset
+ * @start: (out): return location for start of selection, as a character offset
+ * @end: (out): return location for end of selection, as a character offset
*
* Gets the selected range of characters in the label, returning %TRUE
* if there's a selection.
gint *start,
gint *end)
{
+ GtkLabelPrivate *priv;
+
g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
- if (label->select_info == NULL)
+ priv = label->priv;
+
+ if (priv->select_info == NULL)
{
/* not a selectable label */
if (start)
gint start_offset, end_offset;
gint len;
- start_index = MIN (label->select_info->selection_anchor,
- label->select_info->selection_end);
- end_index = MAX (label->select_info->selection_anchor,
- label->select_info->selection_end);
+ start_index = MIN (priv->select_info->selection_anchor,
+ priv->select_info->selection_end);
+ end_index = MAX (priv->select_info->selection_anchor,
+ priv->select_info->selection_end);
- len = strlen (label->text);
+ len = strlen (priv->text);
if (end_index > len)
end_index = len;
if (start_index > len)
start_index = len;
- start_offset = g_utf8_strlen (label->text, start_index);
- end_offset = g_utf8_strlen (label->text, end_index);
+ start_offset = g_utf8_strlen (priv->text, start_index);
+ end_offset = g_utf8_strlen (priv->text, end_index);
if (start_offset > end_offset)
{
* Gets the #PangoLayout used to display the label.
* The layout is useful to e.g. convert text positions to
* pixel positions, in combination with gtk_label_get_layout_offsets().
- * The returned layout is owned by the label so need not be
- * freed by the caller.
+ * The returned layout is owned by the @label so need not be
+ * freed by the caller. The @label is free to recreate its layout at
+ * any time, so it should be considered read-only.
*
* Return value: (transfer none): the #PangoLayout for this label
**/
PangoLayout*
gtk_label_get_layout (GtkLabel *label)
{
+ GtkLabelPrivate *priv;
+
g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
- gtk_label_ensure_layout (label);
+ priv = label->priv;
- return label->layout;
+ gtk_label_ensure_layout (label, FALSE);
+
+ return priv->layout;
}
/**
* gtk_label_get_layout_offsets:
* @label: a #GtkLabel
- * @x: (allow-none): location to store X offset of layout, or %NULL
- * @y: (allow-none): location to store Y offset of layout, or %NULL
+ * @x: (out) (allow-none): location to store X offset of layout, or %NULL
+ * @y: (out) (allow-none): location to store Y offset of layout, or %NULL
*
* Obtains the coordinates where the label will draw the #PangoLayout
* representing the text in the label; useful to convert mouse events
{
g_return_if_fail (GTK_IS_LABEL (label));
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
get_layout_location (label, x, y);
}
gtk_label_get_use_markup (GtkLabel *label)
{
g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
-
- return label->use_markup;
+
+ return label->priv->use_markup;
}
/**
gtk_label_recalculate (label);
}
-gboolean
-gtk_label_get_full_size (GtkLabel *label)
-{
- g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
- return GTK_LABEL_GET_PRIVATE (label)->full_size;
-}
-
-void
-gtk_label_set_full_size (GtkLabel *label,
- gboolean setting)
-{
- GtkLabelPrivate *priv;
-
- g_return_if_fail (GTK_IS_LABEL (label));
- priv = GTK_LABEL_GET_PRIVATE (label);
-
- if (priv->full_size != setting)
- {
- priv->full_size = setting;
-
- g_object_notify (G_OBJECT (label), "full-size");
- gtk_label_invalidate_wrap_width (label);
- gtk_widget_queue_resize (GTK_WIDGET (label));
- }
-}
-
/**
* gtk_label_get_use_underline:
* @label: a #GtkLabel
gtk_label_get_use_underline (GtkLabel *label)
{
g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
-
- return label->use_underline;
+
+ return label->priv->use_underline;
}
/**
gtk_label_set_single_line_mode (GtkLabel *label,
gboolean single_line_mode)
{
+ GtkLabelPrivate *priv;
+
g_return_if_fail (GTK_IS_LABEL (label));
+ priv = label->priv;
+
single_line_mode = single_line_mode != FALSE;
- if (label->single_line_mode != single_line_mode)
+ if (priv->single_line_mode != single_line_mode)
{
- label->single_line_mode = single_line_mode;
+ priv->single_line_mode = single_line_mode;
gtk_label_clear_layout (label);
gtk_widget_queue_resize (GTK_WIDGET (label));
{
g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
- return label->single_line_mode;
+ return label->priv->single_line_mode;
}
/* Compute the X position for an offset that corresponds to the "more important
gint *x,
gint *y)
{
+ GtkLabelPrivate *priv = label->priv;
GdkKeymap *keymap = gdk_keymap_get_for_display (gtk_widget_get_display (GTK_WIDGET (label)));
PangoDirection keymap_direction = gdk_keymap_get_direction (keymap);
PangoDirection cursor_direction = get_cursor_direction (label);
"gtk-split-cursor", &split_cursor,
NULL);
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
- pango_layout_get_cursor_pos (label->layout, index,
+ pango_layout_get_cursor_pos (priv->layout, index,
&strong_pos, &weak_pos);
if (split_cursor)
gint start,
gint count)
{
- gint offset = g_utf8_pointer_to_offset (label->text,
- label->text + start);
+ GtkLabelPrivate *priv = label->priv;
+ gint offset = g_utf8_pointer_to_offset (priv->text,
+ priv->text + start);
- if (label->text)
+ if (priv->text)
{
PangoLogAttr *log_attrs;
gint n_attrs;
gint length;
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
- length = g_utf8_strlen (label->text, -1);
+ length = g_utf8_strlen (priv->text, -1);
- pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
+ pango_layout_get_log_attrs (priv->layout, &log_attrs, &n_attrs);
while (count > 0 && offset < length)
{
g_free (log_attrs);
}
- return g_utf8_offset_to_pointer (label->text, offset) - label->text;
+ return g_utf8_offset_to_pointer (priv->text, offset) - priv->text;
}
static gint
gint start,
gint count)
{
+ GtkLabelPrivate *priv = label->priv;
gint index;
index = start;
gboolean split_cursor;
gboolean strong;
- gtk_label_ensure_layout (label);
+ gtk_label_ensure_layout (label, FALSE);
g_object_get (gtk_widget_get_settings (GTK_WIDGET (label)),
"gtk-split-cursor", &split_cursor,
if (count > 0)
{
- pango_layout_move_cursor_visually (label->layout, strong, index, 0, 1, &new_index, &new_trailing);
+ pango_layout_move_cursor_visually (priv->layout, strong, index, 0, 1, &new_index, &new_trailing);
count--;
}
else
{
- pango_layout_move_cursor_visually (label->layout, strong, index, 0, -1, &new_index, &new_trailing);
+ pango_layout_move_cursor_visually (priv->layout, strong, index, 0, -1, &new_index, &new_trailing);
count++;
}
index = new_index;
while (new_trailing--)
- index = g_utf8_next_char (label->text + new_index) - label->text;
+ index = g_utf8_next_char (priv->text + new_index) - priv->text;
}
return index;
gtk_label_move_forward_word (GtkLabel *label,
gint start)
{
- gint new_pos = g_utf8_pointer_to_offset (label->text,
- label->text + start);
+ GtkLabelPrivate *priv = label->priv;
+ gint new_pos = g_utf8_pointer_to_offset (priv->text,
+ priv->text + start);
gint length;
- length = g_utf8_strlen (label->text, -1);
+ length = g_utf8_strlen (priv->text, -1);
if (new_pos < length)
{
PangoLogAttr *log_attrs;
gint n_attrs;
- gtk_label_ensure_layout (label);
-
- pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
-
+ gtk_label_ensure_layout (label, FALSE);
+
+ pango_layout_get_log_attrs (priv->layout, &log_attrs, &n_attrs);
+
/* Find the next word end */
new_pos++;
while (new_pos < n_attrs && !log_attrs[new_pos].is_word_end)
g_free (log_attrs);
}
- return g_utf8_offset_to_pointer (label->text, new_pos) - label->text;
+ return g_utf8_offset_to_pointer (priv->text, new_pos) - priv->text;
}
gtk_label_move_backward_word (GtkLabel *label,
gint start)
{
- gint new_pos = g_utf8_pointer_to_offset (label->text,
- label->text + start);
+ GtkLabelPrivate *priv = label->priv;
+ gint new_pos = g_utf8_pointer_to_offset (priv->text,
+ priv->text + start);
if (new_pos > 0)
{
PangoLogAttr *log_attrs;
gint n_attrs;
- gtk_label_ensure_layout (label);
-
- pango_layout_get_log_attrs (label->layout, &log_attrs, &n_attrs);
-
+ gtk_label_ensure_layout (label, FALSE);
+
+ pango_layout_get_log_attrs (priv->layout, &log_attrs, &n_attrs);
+
new_pos -= 1;
/* Find the previous word beginning */
g_free (log_attrs);
}
- return g_utf8_offset_to_pointer (label->text, new_pos) - label->text;
+ return g_utf8_offset_to_pointer (priv->text, new_pos) - priv->text;
}
static void
gint count,
gboolean extend_selection)
{
+ GtkLabelPrivate *priv = label->priv;
gint old_pos;
gint new_pos;
-
- if (label->select_info == NULL)
+
+ if (priv->select_info == NULL)
return;
- old_pos = new_pos = label->select_info->selection_end;
+ old_pos = new_pos = priv->select_info->selection_end;
- if (label->select_info->selection_end != label->select_info->selection_anchor &&
+ if (priv->select_info->selection_end != priv->select_info->selection_anchor &&
!extend_selection)
{
/* If we have a current selection and aren't extending it, move to the
gint end_x, end_y;
gint anchor_x, anchor_y;
gboolean end_is_left;
-
- get_better_cursor (label, label->select_info->selection_end, &end_x, &end_y);
- get_better_cursor (label, label->select_info->selection_anchor, &anchor_x, &anchor_y);
+
+ get_better_cursor (label, priv->select_info->selection_end, &end_x, &end_y);
+ get_better_cursor (label, priv->select_info->selection_anchor, &anchor_x, &anchor_y);
end_is_left = (end_y < anchor_y) || (end_y == anchor_y && end_x < anchor_x);
if (count < 0)
- new_pos = end_is_left ? label->select_info->selection_end : label->select_info->selection_anchor;
+ new_pos = end_is_left ? priv->select_info->selection_end : priv->select_info->selection_anchor;
else
- new_pos = !end_is_left ? label->select_info->selection_end : label->select_info->selection_anchor;
+ new_pos = !end_is_left ? priv->select_info->selection_end : priv->select_info->selection_anchor;
break;
}
case GTK_MOVEMENT_LOGICAL_POSITIONS:
case GTK_MOVEMENT_WORDS:
if (count < 0)
- new_pos = MIN (label->select_info->selection_end, label->select_info->selection_anchor);
+ new_pos = MIN (priv->select_info->selection_end, priv->select_info->selection_anchor);
else
- new_pos = MAX (label->select_info->selection_end, label->select_info->selection_anchor);
+ new_pos = MAX (priv->select_info->selection_end, priv->select_info->selection_anchor);
break;
case GTK_MOVEMENT_DISPLAY_LINE_ENDS:
case GTK_MOVEMENT_PARAGRAPH_ENDS:
case GTK_MOVEMENT_BUFFER_ENDS:
/* FIXME: Can do better here */
- new_pos = count < 0 ? 0 : strlen (label->text);
+ new_pos = count < 0 ? 0 : strlen (priv->text);
break;
case GTK_MOVEMENT_DISPLAY_LINES:
case GTK_MOVEMENT_PARAGRAPHS:
case GTK_MOVEMENT_PARAGRAPH_ENDS:
case GTK_MOVEMENT_BUFFER_ENDS:
/* FIXME: Can do better here */
- new_pos = count < 0 ? 0 : strlen (label->text);
+ new_pos = count < 0 ? 0 : strlen (priv->text);
if (new_pos == old_pos)
gtk_widget_error_bell (GTK_WIDGET (label));
break;
if (extend_selection)
gtk_label_select_region_index (label,
- label->select_info->selection_anchor,
+ priv->select_info->selection_anchor,
new_pos);
else
gtk_label_select_region_index (label, new_pos, new_pos);
static void
gtk_label_copy_clipboard (GtkLabel *label)
{
- if (label->text && label->select_info)
+ GtkLabelPrivate *priv = label->priv;
+
+ if (priv->text && priv->select_info)
{
gint start, end;
gint len;
GtkClipboard *clipboard;
- start = MIN (label->select_info->selection_anchor,
- label->select_info->selection_end);
- end = MAX (label->select_info->selection_anchor,
- label->select_info->selection_end);
+ start = MIN (priv->select_info->selection_anchor,
+ priv->select_info->selection_end);
+ end = MAX (priv->select_info->selection_anchor,
+ priv->select_info->selection_end);
- len = strlen (label->text);
+ len = strlen (priv->text);
if (end > len)
end = len;
clipboard = gtk_widget_get_clipboard (GTK_WIDGET (label), GDK_SELECTION_CLIPBOARD);
if (start != end)
- gtk_clipboard_set_text (clipboard, label->text + start, end - start);
+ gtk_clipboard_set_text (clipboard, priv->text + start, end - start);
else
{
GtkLabelLink *link;
static void
gtk_label_select_all (GtkLabel *label)
{
- gtk_label_select_region_index (label, 0, strlen (label->text));
+ GtkLabelPrivate *priv = label->priv;
+
+ gtk_label_select_region_index (label, 0, strlen (priv->text));
}
/* Quick hack of a popup menu
GtkMenu *menu)
{
GtkLabel *label = GTK_LABEL (attach_widget);
+ GtkLabelPrivate *priv = label->priv;
- if (label->select_info)
- label->select_info->popup_menu = NULL;
+ if (priv->select_info)
+ priv->select_info->popup_menu = NULL;
}
static void
{
GtkLabel *label;
GtkWidget *widget;
+ GtkAllocation allocation;
GtkRequisition req;
GdkScreen *screen;
g_return_if_fail (gtk_widget_get_realized (widget));
screen = gtk_widget_get_screen (widget);
- gdk_window_get_origin (widget->window, x, y);
+ gdk_window_get_origin (gtk_widget_get_window (widget), x, y);
- *x += widget->allocation.x;
- *y += widget->allocation.y;
+ gtk_widget_get_allocation (widget, &allocation);
- gtk_widget_size_request (GTK_WIDGET (menu), &req);
+ *x += allocation.x;
+ *y += allocation.y;
- *x += widget->allocation.width / 2;
- *y += widget->allocation.height;
+ gtk_widget_get_preferred_size (GTK_WIDGET (menu),
+ &req, NULL);
+
+ gtk_widget_get_allocation (widget, &allocation);
+
+ *x += allocation.width / 2;
+ *y += allocation.height;
*x = CLAMP (*x, 0, MAX (0, gdk_screen_get_width (screen) - req.width));
*y = CLAMP (*y, 0, MAX (0, gdk_screen_get_height (screen) - req.height));
gtk_label_do_popup (GtkLabel *label,
GdkEventButton *event)
{
+ GtkLabelPrivate *priv = label->priv;
GtkWidget *menuitem;
GtkWidget *menu;
GtkWidget *image;
gboolean have_selection;
GtkLabelLink *link;
- if (!label->select_info)
+ if (!priv->select_info)
return;
- if (label->select_info->popup_menu)
- gtk_widget_destroy (label->select_info->popup_menu);
+ if (priv->select_info->popup_menu)
+ gtk_widget_destroy (priv->select_info->popup_menu);
- label->select_info->popup_menu = menu = gtk_menu_new ();
+ priv->select_info->popup_menu = menu = gtk_menu_new ();
gtk_menu_attach_to_widget (GTK_MENU (menu), GTK_WIDGET (label), popup_menu_detach);
have_selection =
- label->select_info->selection_anchor != label->select_info->selection_end;
+ priv->select_info->selection_anchor != priv->select_info->selection_end;
if (event)
{
- if (label->select_info->link_clicked)
- link = label->select_info->active_link;
+ if (priv->select_info->link_clicked)
+ link = priv->select_info->active_link;
else
link = NULL;
}
static void
gtk_label_clear_links (GtkLabel *label)
{
- if (!label->select_info)
+ GtkLabelPrivate *priv = label->priv;
+
+ if (!priv->select_info)
return;
- g_list_foreach (label->select_info->links, (GFunc)link_free, NULL);
- g_list_free (label->select_info->links);
- label->select_info->links = NULL;
- label->select_info->active_link = NULL;
+ g_list_foreach (priv->select_info->links, (GFunc)link_free, NULL);
+ g_list_free (priv->select_info->links);
+ priv->select_info->links = NULL;
+ priv->select_info->active_link = NULL;
}
static void
gtk_label_rescan_links (GtkLabel *label)
{
- PangoLayout *layout = label->layout;
+ GtkLabelPrivate *priv = label->priv;
+ PangoLayout *layout = priv->layout;
PangoAttrList *attlist;
PangoAttrIterator *iter;
GList *links;
- if (!label->select_info || !label->select_info->links)
+ if (!priv->select_info || !priv->select_info->links)
return;
attlist = pango_layout_get_attributes (layout);
iter = pango_attr_list_get_iterator (attlist);
- links = label->select_info->links;
+ links = priv->select_info->links;
do
{
emit_activate_link (GtkLabel *label,
GtkLabelLink *link)
{
+ GtkLabelPrivate *priv = label->priv;
gboolean handled;
g_signal_emit (label, signals[ACTIVATE_LINK], 0, link->uri, &handled);
- if (handled && label->track_links && !link->visited)
+ if (handled && priv->track_links && !link->visited)
{
link->visited = TRUE;
/* FIXME: shouldn't have to redo everything here */
{
GtkWidget *toplevel;
GtkWindow *window;
+ GtkWidget *default_widget, *focus_widget;
toplevel = gtk_widget_get_toplevel (widget);
if (GTK_IS_WINDOW (toplevel))
{
window = GTK_WINDOW (toplevel);
- if (window &&
- window->default_widget != widget &&
- !(widget == window->focus_widget &&
- (!window->default_widget || !gtk_widget_is_sensitive (window->default_widget))))
- gtk_window_activate_default (window);
+ if (window)
+ {
+ default_widget = gtk_window_get_default_widget (window);
+ focus_widget = gtk_window_get_focus (window);
+
+ if (default_widget != widget &&
+ !(widget == focus_widget && (!default_widget || !gtk_widget_is_sensitive (default_widget))))
+ gtk_window_activate_default (window);
+ }
}
}
}
static GtkLabelLink *
gtk_label_get_current_link (GtkLabel *label)
{
+ GtkLabelPrivate *priv = label->priv;
GtkLabelLink *link;
- if (!label->select_info)
+ if (!priv->select_info)
return NULL;
- if (label->select_info->link_clicked)
- link = label->select_info->active_link;
+ if (priv->select_info->link_clicked)
+ link = priv->select_info->active_link;
else
link = gtk_label_get_focus_link (label);
gtk_label_get_current_uri (GtkLabel *label)
{
GtkLabelLink *link;
+
g_return_val_if_fail (GTK_IS_LABEL (label), NULL);
link = gtk_label_get_current_link (label);
gtk_label_set_track_visited_links (GtkLabel *label,
gboolean track_links)
{
+ GtkLabelPrivate *priv;
+
g_return_if_fail (GTK_IS_LABEL (label));
+ priv = label->priv;
+
track_links = track_links != FALSE;
- if (label->track_links != track_links)
+ if (priv->track_links != track_links)
{
- label->track_links = track_links;
+ priv->track_links = track_links;
/* FIXME: shouldn't have to redo everything here */
gtk_label_recalculate (label);
{
g_return_val_if_fail (GTK_IS_LABEL (label), FALSE);
- return label->track_links;
+ return label->priv->track_links;
}
static gboolean
GtkTooltip *tooltip)
{
GtkLabel *label = GTK_LABEL (widget);
- GtkLabelSelectionInfo *info = label->select_info;
+ GtkLabelPrivate *priv = label->priv;
+ GtkLabelSelectionInfo *info = priv->select_info;
gint index = -1;
GList *l;
keyboard_tip,
tooltip);
}
-
-
-#define __GTK_LABEL_C__
-#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff