* GTK+ at ftp://ftp.gtk.org/pub/gtk/.
*/
+#include <config.h>
#include <math.h>
#include <stdlib.h>
#include <string.h>
#include "gtkgc.h"
+#include "gtkmarshalers.h"
#include "gtkrc.h"
#include "gtkspinbutton.h"
#include "gtkstyle.h"
#include "gtkthemes.h"
#include "gtkiconfactory.h"
#include "gtksettings.h" /* _gtk_settings_parse_convert() */
+#include "gtkintl.h"
+#include "gtkalias.h"
#define LIGHTNESS_MULT 1.3
#define DARKNESS_MULT 0.7
GValue value;
} PropertyValue;
+#define GTK_STYLE_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), GTK_TYPE_STYLE, GtkStylePrivate))
+
+typedef struct _GtkStylePrivate GtkStylePrivate;
+
+struct _GtkStylePrivate {
+ GSList *color_hashes;
+};
/* --- prototypes --- */
-static void gtk_style_init (GtkStyle *style);
-static void gtk_style_class_init (GtkStyleClass *klass);
static void gtk_style_finalize (GObject *object);
static void gtk_style_realize (GtkStyle *style,
GdkColormap *colormap);
gint width,
gint height);
-static void gtk_style_shade (GdkColor *a,
- GdkColor *b,
- gdouble k);
static void rgb_to_hls (gdouble *r,
gdouble *g,
gdouble *b);
gdouble *l,
gdouble *s);
+static void style_unrealize_cursor_gcs (GtkStyle *style);
-/*
- * Data for default check and radio buttons
- */
-
-static GtkRequisition default_option_indicator_size = { 7, 13 };
-static GtkBorder default_option_indicator_spacing = { 7, 5, 2, 2 };
-
-#define INDICATOR_PART_SIZE 13
-
-typedef enum {
- CHECK_AA,
- CHECK_BASE,
- CHECK_BLACK,
- CHECK_DARK,
- CHECK_LIGHT,
- CHECK_MID,
- CHECK_TEXT,
- CHECK_INCONSISTENT_AA,
- CHECK_INCONSISTENT_TEXT,
- RADIO_BASE,
- RADIO_BLACK,
- RADIO_DARK,
- RADIO_LIGHT,
- RADIO_MID,
- RADIO_TEXT,
- RADIO_INCONSISTENT_AA,
- RADIO_INCONSISTENT_TEXT
-} IndicatorPart;
+static GdkFont *gtk_style_get_font_internal (GtkStyle *style);
/*
- * Extracted from check-13.png, width=13, height=13
+ * Data for default check and radio buttons
*/
-static char check_black_bits[] = {
- 0x00,0x00,0xfe,0x0f,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,
- 0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x00,0x00,0x00,0x00};
-static char check_dark_bits[] = {
- 0xff,0x1f,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,
- 0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x01,0x00,0x00,0x00};
-static char check_mid_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,0x08,0x00,
- 0x08,0x00,0x08,0x00,0x08,0x00,0x08,0xfc,0x0f,0x00,0x00,0x00,0x00};
-static char check_light_bits[] = {
- 0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
- 0x10,0x00,0x10,0x00,0x10,0x00,0x10,0x00,0x10,0xfe,0x1f,0x00,0x00};
-static char check_text_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x03,0x80,0x01,0x80,0x00,0x58,
- 0x00,0x60,0x00,0x40,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char check_aa_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x04,0x00,0x00,0x00,0x00,0x58,0x00,0xa0,
- 0x00,0x10,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char check_base_bits[] = {
- 0x00,0x00,0x00,0x00,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
- 0x07,0xfc,0x07,0xfc,0x07,0xfc,0x07,0x00,0x00,0x00,0x00,0x00,0x00};
-/*
- * Extracted from check-13-inconsistent-ssp.png, width=13, height=13
- */
-static char check_inconsistent_text_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0xf8,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char check_inconsistent_aa_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
+static const GtkRequisition default_option_indicator_size = { 7, 13 };
+static const GtkBorder default_option_indicator_spacing = { 7, 5, 2, 2 };
-/*
- * Extracted from radio-13-ssp.png, width=13, height=13
- */
-static char radio_black_bits[] = {
- 0x00,0x00,0xf0,0x01,0x0c,0x02,0x04,0x00,0x02,0x00,0x02,0x00,0x02,0x00,0x02,
- 0x00,0x02,0x00,0x04,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char radio_dark_bits[] = {
- 0xf0,0x00,0x0c,0x02,0x02,0x04,0x02,0x04,0x01,0x08,0x01,0x08,0x01,0x08,0x01,
- 0x08,0x00,0x04,0x02,0x04,0x0c,0x03,0xf0,0x00,0x00,0x00,0x00,0x00};
-static char radio_mid_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char radio_light_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x10,0x00,0x10,0x00,0x10,0x00,
- 0x10,0x00,0x08,0x00,0x08,0x00,0x04,0x00,0x03,0xf0,0x00,0x00,0x00};
-static char radio_text_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xe0,0x00,0xf0,0x01,0xf0,0x01,0xf0,
- 0x01,0xe0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char radio_aa_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char radio_base_bits[] = {
- 0x00,0x00,0x00,0x00,0xf0,0x01,0xf8,0x03,0xfc,0x07,0xfc,0x07,0xfc,0x07,0xfc,
- 0x07,0xfc,0x03,0xf8,0x03,0xf0,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-/*
- * Extracted from radio-13-inconsistent-ssp.png, width=13, height=13
- */
-static char radio_inconsistent_text_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-static char radio_inconsistent_aa_bits[] = {
- 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0xf8,0x03,0x00,0x00,0xf8,
- 0x03,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00};
-
-static struct {
- char *bits;
- GdkBitmap *bmap;
-} indicator_parts[] = {
- { check_aa_bits, NULL },
- { check_base_bits, NULL },
- { check_black_bits, NULL },
- { check_dark_bits, NULL },
- { check_light_bits, NULL },
- { check_mid_bits, NULL },
- { check_text_bits, NULL },
- { check_inconsistent_aa_bits, NULL },
- { check_inconsistent_text_bits, NULL },
- { radio_base_bits, NULL },
- { radio_black_bits, NULL },
- { radio_dark_bits, NULL },
- { radio_light_bits, NULL },
- { radio_mid_bits, NULL },
- { radio_text_bits, NULL },
- { radio_inconsistent_aa_bits, NULL },
- { radio_inconsistent_text_bits, NULL },
-};
+#define GTK_GRAY 0xdcdc, 0xdada, 0xd5d5
+#define GTK_DARK_GRAY 0xc4c4, 0xc2c2, 0xbdbd
+#define GTK_LIGHT_GRAY 0xeeee, 0xebeb, 0xe7e7
+#define GTK_WHITE 0xffff, 0xffff, 0xffff
+#define GTK_BLUE 0x4b4b, 0x6969, 0x8383
+#define GTK_VERY_DARK_GRAY 0x9c9c, 0x9a9a, 0x9494
+#define GTK_BLACK 0x0000, 0x0000, 0x0000
+#define GTK_WEAK_GRAY 0x7530, 0x7530, 0x7530
/* --- variables --- */
-static GdkColor gtk_default_normal_fg = { 0, 0, 0, 0 };
-static GdkColor gtk_default_active_fg = { 0, 0, 0, 0 };
-static GdkColor gtk_default_prelight_fg = { 0, 0, 0, 0 };
-static GdkColor gtk_default_selected_fg = { 0, 0xffff, 0xffff, 0xffff };
-static GdkColor gtk_default_insensitive_fg = { 0, 0x7530, 0x7530, 0x7530 };
-
-static GdkColor gtk_default_normal_bg = { 0, 0xd6d6, 0xd6d6, 0xd6d6 };
-static GdkColor gtk_default_active_bg = { 0, 0xc350, 0xc350, 0xc350 };
-static GdkColor gtk_default_prelight_bg = { 0, 0xea60, 0xea60, 0xea60 };
-static GdkColor gtk_default_selected_bg = { 0, 0, 0, 0x9c40 };
-static GdkColor gtk_default_insensitive_bg = { 0, 0xd6d6, 0xd6d6, 0xd6d6 };
-static GdkColor gtk_default_selected_base = { 0, 0xa4a4, 0xdfdf, 0xffff };
-static GdkColor gtk_default_active_base = { 0, 0xbcbc, 0xd2d2, 0xeeee };
-
-static gpointer parent_class = NULL;
-
+static const GdkColor gtk_default_normal_fg = { 0, GTK_BLACK };
+static const GdkColor gtk_default_active_fg = { 0, GTK_BLACK };
+static const GdkColor gtk_default_prelight_fg = { 0, GTK_BLACK };
+static const GdkColor gtk_default_selected_fg = { 0, GTK_WHITE };
+static const GdkColor gtk_default_insensitive_fg = { 0, GTK_WEAK_GRAY };
+
+static const GdkColor gtk_default_normal_bg = { 0, GTK_GRAY };
+static const GdkColor gtk_default_active_bg = { 0, GTK_DARK_GRAY };
+static const GdkColor gtk_default_prelight_bg = { 0, GTK_LIGHT_GRAY };
+static const GdkColor gtk_default_selected_bg = { 0, GTK_BLUE };
+static const GdkColor gtk_default_insensitive_bg = { 0, GTK_GRAY };
+static const GdkColor gtk_default_selected_base = { 0, GTK_BLUE };
+static const GdkColor gtk_default_active_base = { 0, GTK_VERY_DARK_GRAY };
+
+/* --- signals --- */
+static guint realize_signal = 0;
+static guint unrealize_signal = 0;
+
+G_DEFINE_TYPE (GtkStyle, gtk_style, G_TYPE_OBJECT)
/* --- functions --- */
-GType
-gtk_style_get_type (void)
-{
- static GType style_type = 0;
-
- if (!style_type)
- {
- static const GTypeInfo style_info =
- {
- sizeof (GtkStyleClass),
- (GBaseInitFunc) NULL,
- (GBaseFinalizeFunc) NULL,
- (GClassInitFunc) gtk_style_class_init,
- NULL, /* class_finalize */
- NULL, /* class_data */
- sizeof (GtkStyle),
- 0, /* n_preallocs */
- (GInstanceInitFunc) gtk_style_init,
- };
-
- style_type = g_type_register_static (G_TYPE_OBJECT,
- "GtkStyle",
- &style_info, 0);
- }
-
- return style_type;
-}
-static void
-gtk_style_init (GtkStyle *style)
+/**
+ * _gtk_style_init_for_settings:
+ * @style: a #GtkStyle
+ * @settings: a #GtkSettings
+ *
+ * Initializes the font description in @style according to the default
+ * font name of @settings. This is called for gtk_style_new() with
+ * the settings for the default screen (if any); if we are creating
+ * a style for a particular screen, we then call it again in a
+ * location where we know the correct settings.
+ * The reason for this is that gtk_rc_style_create_style() doesn't
+ * take the screen for an argument.
+ **/
+void
+_gtk_style_init_for_settings (GtkStyle *style,
+ GtkSettings *settings)
{
- gint i;
- const gchar *font_name = _gtk_rc_context_get_default_font_name (gtk_settings_get_default ());
+ const gchar *font_name = _gtk_rc_context_get_default_font_name (settings);
+ if (style->font_desc)
+ pango_font_description_free (style->font_desc);
+
style->font_desc = pango_font_description_from_string (font_name);
-
+
if (!pango_font_description_get_family (style->font_desc))
{
g_warning ("Default font does not have a family set");
g_warning ("Default font does not have a positive size");
pango_font_description_set_size (style->font_desc, 10 * PANGO_SCALE);
}
+}
+
+static void
+gtk_style_init (GtkStyle *style)
+{
+ gint i;
+
+ GtkSettings *settings = gtk_settings_get_default ();
+
+ if (settings)
+ _gtk_style_init_for_settings (style, settings);
+ else
+ style->font_desc = pango_font_description_from_string ("Sans 10");
style->attach_count = 0;
style->colormap = NULL;
}
style->base[GTK_STATE_SELECTED] = gtk_default_selected_base;
- style->text[GTK_STATE_SELECTED] = style->black;
+ style->text[GTK_STATE_SELECTED] = style->white;
style->base[GTK_STATE_ACTIVE] = gtk_default_active_base;
- style->text[GTK_STATE_ACTIVE] = style->black;
+ style->text[GTK_STATE_ACTIVE] = style->white;
style->base[GTK_STATE_INSENSITIVE] = gtk_default_prelight_bg;
style->text[GTK_STATE_INSENSITIVE] = gtk_default_insensitive_fg;
{
GObjectClass *object_class = G_OBJECT_CLASS (klass);
- parent_class = g_type_class_peek_parent (klass);
-
object_class->finalize = gtk_style_finalize;
klass->clone = gtk_style_real_clone;
klass->draw_expander = gtk_default_draw_expander;
klass->draw_layout = gtk_default_draw_layout;
klass->draw_resize_grip = gtk_default_draw_resize_grip;
+
+ g_type_class_add_private (object_class, sizeof (GtkStylePrivate));
+
+ /**
+ * GtkStyle::realize:
+ * @style: the object which received the signal
+ *
+ * Emitted when the style has been initialized for a particular
+ * colormap and depth. Connecting to this signal is probably seldom
+ * useful since most of the time applications and widgets only
+ * deal with styles that have been already realized.
+ *
+ * Since: 2.4
+ */
+ realize_signal = g_signal_new (I_("realize"),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkStyleClass, realize),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
+ /**
+ * GtkStyle::unrealize:
+ * @style: the object which received the signal
+ *
+ * Emitted when the aspects of the style specific to a particular colormap
+ * and depth are being cleaned up. A connection to this signal can be useful
+ * if a widget wants to cache objects like a #GdkGC as object data on #GtkStyle.
+ * This signal provides a convenient place to free such cached objects.
+ *
+ * Since: 2.4
+ */
+ unrealize_signal = g_signal_new (I_("unrealize"),
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_FIRST,
+ G_STRUCT_OFFSET (GtkStyleClass, unrealize),
+ NULL, NULL,
+ _gtk_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
}
static void
gtk_style_finalize (GObject *object)
{
GtkStyle *style = GTK_STYLE (object);
+ GtkStylePrivate *priv = GTK_STYLE_GET_PRIVATE (style);
g_return_if_fail (style->attach_count == 0);
clear_property_cache (style);
+ /* All the styles in the list have the same
+ * style->styles pointer. If we delete the
+ * *first* style from the list, we need to update
+ * the style->styles pointers from all the styles.
+ * Otherwise we simply remove the node from
+ * the list.
+ */
if (style->styles)
{
if (style->styles->data != style)
}
}
+ g_slist_foreach (style->icon_factories, (GFunc) g_object_unref, NULL);
+ g_slist_free (style->icon_factories);
+
+ g_slist_foreach (priv->color_hashes, (GFunc) g_hash_table_unref, NULL);
+ g_slist_free (priv->color_hashes);
+
pango_font_description_free (style->font_desc);
if (style->private_font)
if (style->rc_style)
gtk_rc_style_unref (style->rc_style);
- G_OBJECT_CLASS (parent_class)->finalize (object);
+ G_OBJECT_CLASS (gtk_style_parent_class)->finalize (object);
}
new_style = gtk_style_copy (style);
+ /* All the styles in the list have the same
+ * style->styles pointer. When we insert a new
+ * style, we append it to the list to avoid having
+ * to update the existing ones.
+ */
style->styles = g_slist_append (style->styles, new_style);
new_style->styles = style->styles;
/**
* gtk_style_attach:
* @style: a #GtkStyle.
- * @window: a #GtkWindow.
+ * @window: a #GdkWindow.
* @returns: Either @style, or a newly-created #GtkStyle.
* If the style is newly created, the style parameter
* will be dereferenced, and the new style will have
* it to a particular visual and colormap. The process may
* involve the creation of a new style if the style has already
* been attached to a window with a different style and colormap.
+ *
+ * Since this function may return a new object, you have to use it
+ * in the following way:
+ * <literal>style = gtk_style_attach (style, window)</literal>
**/
- /*
- * FIXME: The sequence -
- * create a style => s1
- * attach s1 to v1, c1 => s1
- * attach s1 to v2, c2 => s2
- * detach s1 from v1, c1
- * attach s1 to v2, c2 => s3
- * results in two separate, unlinked styles s2 and s3 which
- * are identical and could be shared. To fix this, we would
- * want to never remove a style from the list of linked
- * styles as long as as it has a reference count. However, the
- * disadvantage of doing it this way means that we would need two
- * passes through the linked list when attaching (one to check for
- * matching styles, one to look for empty unattached styles - but
- * it will almost never be longer than 2 elements.
- */
GtkStyle*
gtk_style_attach (GtkStyle *style,
GdkWindow *window)
g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
g_return_val_if_fail (window != NULL, NULL);
- colormap = gdk_window_get_colormap (window);
+ colormap = gdk_drawable_get_colormap (window);
if (!style->styles)
style->styles = g_slist_append (NULL, style);
{
new_style = styles->data;
- if (new_style->attach_count == 0)
- {
- gtk_style_realize (new_style, colormap);
- break;
- }
- else if (new_style->colormap == colormap)
+ if (new_style->colormap == colormap)
break;
-
+
new_style = NULL;
styles = styles->next;
}
+
+ if (!new_style)
+ {
+ styles = style->styles;
+
+ while (styles)
+ {
+ new_style = styles->data;
+
+ if (new_style->attach_count == 0)
+ {
+ gtk_style_realize (new_style, colormap);
+ break;
+ }
+
+ new_style = NULL;
+ styles = styles->next;
+ }
+ }
if (!new_style)
{
new_style = gtk_style_duplicate (style);
+ if (gdk_colormap_get_screen (style->colormap) != gdk_colormap_get_screen (colormap) &&
+ new_style->private_font)
+ {
+ gdk_font_unref (new_style->private_font);
+ new_style->private_font = NULL;
+ }
gtk_style_realize (new_style, colormap);
}
return new_style;
}
+/**
+ * gtk_style_detach:
+ * @style: a #GtkStyle
+ *
+ * Detaches a style from a window. If the style is not attached
+ * to any windows anymore, it is unrealized. See gtk_style_attach().
+ *
+ */
void
gtk_style_detach (GtkStyle *style)
{
g_return_if_fail (GTK_IS_STYLE (style));
+ g_return_if_fail (style->attach_count > 0);
style->attach_count -= 1;
if (style->attach_count == 0)
{
- GTK_STYLE_GET_CLASS (style)->unrealize (style);
+ g_signal_emit (style, unrealize_signal, 0);
- gdk_colormap_unref (style->colormap);
+ g_object_unref (style->colormap);
style->colormap = NULL;
-
+
+ if (style->private_font_desc)
+ {
+ if (style->private_font)
+ {
+ gdk_font_unref (style->private_font);
+ style->private_font = NULL;
+ }
+
+ pango_font_description_free (style->private_font_desc);
+ style->private_font_desc = NULL;
+ }
+
g_object_unref (style);
}
}
GtkStyle*
gtk_style_ref (GtkStyle *style)
{
- return (GtkStyle *) g_object_ref (G_OBJECT (style));
+ return (GtkStyle *) g_object_ref (style);
}
/**
void
gtk_style_unref (GtkStyle *style)
{
- g_object_unref (G_OBJECT (style));
+ g_object_unref (style);
}
static void
gtk_style_realize (GtkStyle *style,
GdkColormap *colormap)
{
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (GDK_IS_COLORMAP (colormap));
-
- style->colormap = gdk_colormap_ref (colormap);
+ style->colormap = g_object_ref (colormap);
style->depth = gdk_colormap_get_visual (colormap)->depth;
- GTK_STYLE_GET_CLASS (style)->realize (style);
+ g_signal_emit (style, realize_signal, 0);
}
GtkIconSet*
return gtk_icon_factory_lookup_default (stock_id);
}
+/**
+ * gtk_style_lookup_color:
+ * @style: a #GtkStyle
+ * @color_name: the name of the logical color to look up
+ * @color: the #GdkColor to fill in
+ *
+ * Looks up @color_name in the style's logical color mappings,
+ * filling in @color and returning %TRUE if found, otherwise
+ * returning %FALSE. Do not cache the found mapping, because
+ * it depends on the #GtkStyle and might change when a theme
+ * switch occurs.
+ *
+ * Return value: %TRUE if the mapping was found.
+ *
+ * Since: 2.10
+ **/
+gboolean
+gtk_style_lookup_color (GtkStyle *style,
+ const char *color_name,
+ GdkColor *color)
+{
+ GtkStylePrivate *priv;
+ GSList *iter;
+
+ g_return_val_if_fail (GTK_IS_STYLE (style), FALSE);
+ g_return_val_if_fail (color_name != NULL, FALSE);
+ g_return_val_if_fail (color != NULL, FALSE);
+
+ priv = GTK_STYLE_GET_PRIVATE (style);
+
+ for (iter = priv->color_hashes; iter != NULL; iter = iter->next)
+ {
+ GHashTable *hash = iter->data;
+ GdkColor *mapping = g_hash_table_lookup (hash, color_name);
+
+ if (mapping)
+ {
+ color->red = mapping->red;
+ color->green = mapping->green;
+ color->blue = mapping->blue;
+ return TRUE;
+ }
+ }
+
+ return FALSE;
+}
+
/**
* gtk_draw_hline:
* @style: a #GtkStyle
* Draws a horizontal line from (@x1, @y) to (@x2, @y) in @window
* using the given style and state.
*
- * This function is deprecated, use gtk_paint_hline() instead.
+ * Deprecated: Use gtk_paint_hline() instead.
**/
void
gtk_draw_hline (GtkStyle *style,
* @style: a #GtkStyle
* @window: a #GdkWindow
* @state_type: a state
- * @y1: the starting y coordinate
- * @y2: the ending y coordinate
+ * @y1_: the starting y coordinate
+ * @y2_: the ending y coordinate
* @x: the x coordinate
*
- * Draws a vertical line from (@x, @y1) to (@x, @y2) in @window
+ * Draws a vertical line from (@x, @y1_) to (@x, @y2_) in @window
* using the given style and state.
*
- * This function is deprecated, use gtk_paint_vline() instead.
+ * Deprecated: Use gtk_paint_vline() instead.
**/
void
gtk_draw_vline (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
- gint y1,
- gint y2,
+ gint y1_,
+ gint y2_,
gint x)
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_vline != NULL);
- GTK_STYLE_GET_CLASS (style)->draw_vline (style, window, state_type, NULL, NULL, NULL, y1, y2, x);
+ GTK_STYLE_GET_CLASS (style)->draw_vline (style, window, state_type, NULL, NULL, NULL, y1_, y2_, x);
}
/**
* Draws a shadow around the given rectangle in @window
* using the given style and state and shadow type.
*
- * This function is deprecated, use gtk_paint_shadow() instead.
+ * Deprecated: Use gtk_paint_shadow() instead.
*/
void
gtk_draw_shadow (GtkStyle *style,
* @window: a #GdkWindow
* @state_type: a state
* @shadow_type: type of shadow to draw
- * @points: an array of #GdkPoint<!>s
+ * @points: an array of #GdkPoint<!-- -->s
* @npoints: length of @points
* @fill: %TRUE if the polygon should be filled
*
* Draws a polygon on @window with the given parameters.
*
- * This function is deprecated, use gtk_paint_polygon() instead.
+ * Deprecated: Use gtk_paint_polygon() instead.
*/
void
gtk_draw_polygon (GtkStyle *style,
* Draws an arrow in the given rectangle on @window using the given
* parameters. @arrow_type determines the direction of the arrow.
*
- * This function is deprecated, use gtk_paint_arrow() instead.
+ * Deprecated: Use gtk_paint_arrow() instead.
*/
void
gtk_draw_arrow (GtkStyle *style,
* @width: width of the rectangle to draw the diamond in
* @height: height of the rectangle to draw the diamond in
*
- * Draws a diamond in the given rectangle on @window using the given parameters.
+ * Draws a diamond in the given rectangle on @window using the given
+ * parameters.
*
- * This function is deprecated, use gtk_paint_diamond() instead.
+ * Deprecated: Use gtk_paint_diamond() instead.
*/
void
gtk_draw_diamond (GtkStyle *style,
*
* Draws a text string on @window with the given parameters.
*
- * This function is deprecated, use gtk_paint_layout() instead.
+ * Deprecated: Use gtk_paint_layout() instead.
*/
void
gtk_draw_string (GtkStyle *style,
*
* Draws a box on @window with the given parameters.
*
- * This function is deprecated, use gtk_paint_box() instead.
+ * Deprecated: Use gtk_paint_box() instead.
*/
void
gtk_draw_box (GtkStyle *style,
*
* Draws a flat box on @window with the given parameters.
*
- * This function is deprecated, use gtk_paint_flat_box() instead.
+ * Deprecated: Use gtk_paint_flat_box() instead.
*/
void
gtk_draw_flat_box (GtkStyle *style,
* Draws a check button indicator in the given rectangle on @window with
* the given parameters.
*
- * This function is deprecated, use gtk_paint_check() instead.
+ * Deprecated: Use gtk_paint_check() instead.
*/
void
gtk_draw_check (GtkStyle *style,
* Draws a radio button indicator in the given rectangle on @window with
* the given parameters.
*
- * This function is deprecated, use gtk_paint_option() instead.
+ * Deprecated: Use gtk_paint_option() instead.
*/
void
gtk_draw_option (GtkStyle *style,
* Draws an option menu tab (i.e. the up and down pointing arrows)
* in the given rectangle on @window using the given parameters.
*
- * This function is deprecated, use gtk_paint_tab() instead.
+ * Deprecated: Use gtk_paint_tab() instead.
*/
void
gtk_draw_tab (GtkStyle *style,
GTK_STYLE_GET_CLASS (style)->draw_tab (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height);
}
+/**
+ * gtk_draw_shadow_gap:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @x: x origin of the rectangle
+ * @y: y origin of the rectangle
+ * @width: width of the rectangle
+ * @height: width of the rectangle
+ * @gap_side: side in which to leave the gap
+ * @gap_x: starting position of the gap
+ * @gap_width: width of the gap
+ *
+ * Draws a shadow around the given rectangle in @window
+ * using the given style and state and shadow type, leaving a
+ * gap in one side.
+ *
+ * Deprecated: Use gtk_paint_shadow_gap() instead.
+*/
void
gtk_draw_shadow_gap (GtkStyle *style,
GdkWindow *window,
GTK_STYLE_GET_CLASS (style)->draw_shadow_gap (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, gap_side, gap_x, gap_width);
}
+/**
+ * gtk_draw_box_gap:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @x: x origin of the rectangle
+ * @y: y origin of the rectangle
+ * @width: width of the rectangle
+ * @height: width of the rectangle
+ * @gap_side: side in which to leave the gap
+ * @gap_x: starting position of the gap
+ * @gap_width: width of the gap
+ *
+ * Draws a box in @window using the given style and state and shadow type,
+ * leaving a gap in one side.
+ *
+ * Deprecated: Use gtk_paint_box_gap() instead.
+ */
void
gtk_draw_box_gap (GtkStyle *style,
GdkWindow *window,
GTK_STYLE_GET_CLASS (style)->draw_box_gap (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, gap_side, gap_x, gap_width);
}
+/**
+ * gtk_draw_extension:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @x: x origin of the extension
+ * @y: y origin of the extension
+ * @width: width of the extension
+ * @height: width of the extension
+ * @gap_side: the side on to which the extension is attached
+ *
+ * Draws an extension, i.e. a notebook tab.
+ *
+ * Deprecated: Use gtk_paint_extension() instead.
+ **/
void
gtk_draw_extension (GtkStyle *style,
GdkWindow *window,
* Draws a focus indicator around the given rectangle on @window using the
* given style.
*
- * This function is deprecated, use gtk_paint_focus() instead.
+ * Deprecated: Use gtk_paint_focus() instead.
*/
void
gtk_draw_focus (GtkStyle *style,
GTK_STYLE_GET_CLASS (style)->draw_slider (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, orientation);
}
+/**
+ * gtk_draw_handle:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @x: x origin of the handle
+ * @y: y origin of the handle
+ * @width: with of the handle
+ * @height: height of the handle
+ * @orientation: the orientation of the handle
+ *
+ * Draws a handle as used in #GtkHandleBox and #GtkPaned.
+ *
+ * Deprecated: Use gtk_paint_handle() instead.
+ **/
void
gtk_draw_handle (GtkStyle *style,
GdkWindow *window,
GTK_STYLE_GET_CLASS (style)->draw_handle (style, window, state_type, shadow_type, NULL, NULL, NULL, x, y, width, height, orientation);
}
+/**
+ * gtk_draw_expander:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @x: the x position to draw the expander at
+ * @y: the y position to draw the expander at
+ * @expander_style: the style to draw the expander in
+ *
+ * Draws an expander as used in #GtkTreeView.
+ *
+ * Deprecated: Use gtk_paint_expander() instead.
+ **/
void
gtk_draw_expander (GtkStyle *style,
GdkWindow *window,
* @style: a #GtkStyle
* @window: a #GdkWindow
* @state_type: a state
- * @edge: the edge in which to draw the resize grip, currently only
- * %GTK_WINDOW_EDGE_SOUTH_EAST is implemented
+ * @edge: the edge in which to draw the resize grip
* @x: the x origin of the rectangle in which to draw the resize grip
* @y: the y origin of the rectangle in which to draw the resize grip
* @width: the width of the rectangle in which to draw the resize grip
* Draws a resize grip in the given rectangle on @window using the given
* parameters.
*
- * This function is deprecated, use gtk_paint_resize_grip() instead.
+ * Deprecated: Use gtk_paint_resize_grip() instead.
*/
void
gtk_draw_resize_grip (GtkStyle *style,
static GtkStyle *
gtk_style_real_clone (GtkStyle *style)
{
- return GTK_STYLE (g_object_new (G_OBJECT_TYPE (style), NULL));
+ return g_object_new (G_OBJECT_TYPE (style), NULL);
}
static void
style->bg[i] = src->bg[i];
style->text[i] = src->text[i];
style->base[i] = src->base[i];
-
+
+ if (style->bg_pixmap[i])
+ g_object_unref (style->bg_pixmap[i]),
style->bg_pixmap[i] = src->bg_pixmap[i];
+ if (style->bg_pixmap[i])
+ g_object_ref (style->bg_pixmap[i]);
}
if (style->private_font)
style->ythickness = src->ythickness;
if (style->rc_style)
- gtk_rc_style_unref (style->rc_style);
+ g_object_unref (style->rc_style);
style->rc_style = src->rc_style;
if (src->rc_style)
- gtk_rc_style_ref (src->rc_style);
+ g_object_ref (src->rc_style);
/* don't copy, just clear cache */
clear_property_cache (style);
gtk_style_real_init_from_rc (GtkStyle *style,
GtkRcStyle *rc_style)
{
+ GtkStylePrivate *priv = GTK_STYLE_GET_PRIVATE (style);
gint i;
/* cache _should_ be still empty */
if (rc_style->ythickness >= 0)
style->ythickness = rc_style->ythickness;
- if (rc_style->icon_factories)
- {
- GSList *iter;
+ style->icon_factories = g_slist_copy (rc_style->icon_factories);
+ g_slist_foreach (style->icon_factories, (GFunc) g_object_ref, NULL);
- style->icon_factories = g_slist_copy (rc_style->icon_factories);
-
- iter = style->icon_factories;
- while (iter != NULL)
- {
- g_object_ref (G_OBJECT (iter->data));
-
- iter = g_slist_next (iter);
- }
- }
+ priv->color_hashes = g_slist_copy (_gtk_rc_style_get_color_hashes (rc_style));
+ g_slist_foreach (priv->color_hashes, (GFunc) g_hash_table_ref, NULL);
}
static gint
gchar *contents = g_strdup_value_contents (&rcprop->value);
g_message ("%s: failed to retrieve property `%s::%s' of type `%s' from rc file value \"%s\" of type `%s'",
- rcprop->origin,
+ rcprop->origin ? rcprop->origin : "(for origin information, set GTK_DEBUG)",
g_type_name (pspec->owner_type), pspec->name,
g_type_name (G_PARAM_SPEC_VALUE_TYPE (pspec)),
contents,
for (i = 0; i < 5; i++)
{
- gtk_style_shade (&style->bg[i], &style->light[i], LIGHTNESS_MULT);
- gtk_style_shade (&style->bg[i], &style->dark[i], DARKNESS_MULT);
-
+ _gtk_style_shade (&style->bg[i], &style->light[i], LIGHTNESS_MULT);
+ _gtk_style_shade (&style->bg[i], &style->dark[i], DARKNESS_MULT);
+
style->mid[i].red = (style->light[i].red + style->dark[i].red) / 2;
style->mid[i].green = (style->light[i].green + style->dark[i].green) / 2;
style->mid[i].blue = (style->light[i].blue + style->dark[i].blue) / 2;
style->text_aa[i].green = (style->text[i].green + style->base[i].green) / 2;
style->text_aa[i].blue = (style->text[i].blue + style->base[i].blue) / 2;
}
-
- gdk_color_black (style->colormap, &style->black);
- gdk_color_white (style->colormap, &style->white);
-
- gc_values_mask = GDK_GC_FOREGROUND;
+
+ style->black.red = 0x0000;
+ style->black.green = 0x0000;
+ style->black.blue = 0x0000;
+ gdk_colormap_alloc_color (style->colormap, &style->black, FALSE, TRUE);
+
+ style->white.red = 0xffff;
+ style->white.green = 0xffff;
+ style->white.blue = 0xffff;
+ gdk_colormap_alloc_color (style->colormap, &style->white, FALSE, TRUE);
+
+ gc_values_mask = GDK_GC_FOREGROUND | GDK_GC_BACKGROUND;
gc_values.foreground = style->black;
+ gc_values.background = style->white;
style->black_gc = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
gc_values.foreground = style->white;
+ gc_values.background = style->black;
style->white_gc = gtk_gc_get (style->depth, style->colormap, &gc_values, gc_values_mask);
+ gc_values_mask = GDK_GC_FOREGROUND;
+
for (i = 0; i < 5; i++)
{
if (style->rc_style && style->rc_style->bg_pixmap_name[i])
- style->bg_pixmap[i] = load_bg_image (style->colormap,
+ style->bg_pixmap[i] = load_bg_image (style->colormap,
&style->bg[i],
style->rc_style->bg_pixmap_name[i]);
- if (!gdk_color_alloc (style->colormap, &style->fg[i]))
+ if (!gdk_colormap_alloc_color (style->colormap, &style->fg[i], FALSE, TRUE))
g_warning ("unable to allocate color: ( %d %d %d )",
style->fg[i].red, style->fg[i].green, style->fg[i].blue);
- if (!gdk_color_alloc (style->colormap, &style->bg[i]))
+ if (!gdk_colormap_alloc_color (style->colormap, &style->bg[i], FALSE, TRUE))
g_warning ("unable to allocate color: ( %d %d %d )",
style->bg[i].red, style->bg[i].green, style->bg[i].blue);
- if (!gdk_color_alloc (style->colormap, &style->light[i]))
+ if (!gdk_colormap_alloc_color (style->colormap, &style->light[i], FALSE, TRUE))
g_warning ("unable to allocate color: ( %d %d %d )",
style->light[i].red, style->light[i].green, style->light[i].blue);
- if (!gdk_color_alloc (style->colormap, &style->dark[i]))
+ if (!gdk_colormap_alloc_color (style->colormap, &style->dark[i], FALSE, TRUE))
g_warning ("unable to allocate color: ( %d %d %d )",
style->dark[i].red, style->dark[i].green, style->dark[i].blue);
- if (!gdk_color_alloc (style->colormap, &style->mid[i]))
+ if (!gdk_colormap_alloc_color (style->colormap, &style->mid[i], FALSE, TRUE))
g_warning ("unable to allocate color: ( %d %d %d )",
style->mid[i].red, style->mid[i].green, style->mid[i].blue);
- if (!gdk_color_alloc (style->colormap, &style->text[i]))
+ if (!gdk_colormap_alloc_color (style->colormap, &style->text[i], FALSE, TRUE))
g_warning ("unable to allocate color: ( %d %d %d )",
style->text[i].red, style->text[i].green, style->text[i].blue);
- if (!gdk_color_alloc (style->colormap, &style->base[i]))
+ if (!gdk_colormap_alloc_color (style->colormap, &style->base[i], FALSE, TRUE))
g_warning ("unable to allocate color: ( %d %d %d )",
style->base[i].red, style->base[i].green, style->base[i].blue);
- if (!gdk_color_alloc (style->colormap, &style->text_aa[i]))
+ if (!gdk_colormap_alloc_color (style->colormap, &style->text_aa[i], FALSE, TRUE))
g_warning ("unable to allocate color: ( %d %d %d )",
style->text_aa[i].red, style->text_aa[i].green, style->text_aa[i].blue);
gtk_gc_release (style->text_aa_gc[i]);
if (style->bg_pixmap[i] && style->bg_pixmap[i] != (GdkPixmap*) GDK_PARENT_RELATIVE)
- gdk_pixmap_unref (style->bg_pixmap[i]);
+ {
+ g_object_unref (style->bg_pixmap[i]);
+ style->bg_pixmap[i] = NULL;
+ }
+
}
gdk_colormap_free_colors (style->colormap, style->fg, 5);
gdk_colormap_free_colors (style->colormap, style->text, 5);
gdk_colormap_free_colors (style->colormap, style->base, 5);
gdk_colormap_free_colors (style->colormap, style->text_aa, 5);
+
+ style_unrealize_cursor_gcs (style);
}
static void
if (width == gdk_pixbuf_get_width (src) &&
height == gdk_pixbuf_get_height (src))
{
- gdk_pixbuf_ref (src);
- return src;
+ return g_object_ref (src);
}
else
{
GdkPixbuf *scaled;
GdkPixbuf *stated;
GdkPixbuf *base_pixbuf;
+ GdkScreen *screen;
+ GtkSettings *settings;
/* Oddly, style can be NULL in this function, because
* GtkIconSet can be used without a style and if so
base_pixbuf = gtk_icon_source_get_pixbuf (source);
g_return_val_if_fail (base_pixbuf != NULL, NULL);
+
+ if (widget && gtk_widget_has_screen (widget))
+ {
+ screen = gtk_widget_get_screen (widget);
+ settings = gtk_settings_get_for_screen (screen);
+ }
+ else if (style && style->colormap)
+ {
+ screen = gdk_colormap_get_screen (style->colormap);
+ settings = gtk_settings_get_for_screen (screen);
+ }
+ else
+ {
+ settings = gtk_settings_get_default ();
+ GTK_NOTE (MULTIHEAD,
+ g_warning ("Using the default screen for gtk_default_render_icon()"));
+ }
+
- if (size != (GtkIconSize) -1 && !gtk_icon_size_lookup (size, &width, &height))
+ if (size != (GtkIconSize) -1 && !gtk_icon_size_lookup_for_settings (settings, size, &width, &height))
{
- g_warning (G_STRLOC ": invalid icon size `%d'", size);
+ g_warning (G_STRLOC ": invalid icon size '%d'", size);
return NULL;
}
if (size != (GtkIconSize)-1 && gtk_icon_source_get_size_wildcarded (source))
scaled = scale_or_ref (base_pixbuf, width, height);
else
- scaled = GDK_PIXBUF (g_object_ref (G_OBJECT (base_pixbuf)));
+ scaled = g_object_ref (base_pixbuf);
/* If the state was wildcarded, then generate a state. */
if (gtk_icon_source_get_state_wildcarded (source))
gdk_pixbuf_saturate_and_pixelate (scaled, stated,
0.8, TRUE);
- gdk_pixbuf_unref (scaled);
+ g_object_unref (scaled);
}
else if (state == GTK_STATE_PRELIGHT)
{
gdk_pixbuf_saturate_and_pixelate (scaled, stated,
1.2, FALSE);
- gdk_pixbuf_unref (scaled);
+ g_object_unref (scaled);
}
else
{
gint *height)
{
if ((*width == -1) && (*height == -1))
- gdk_window_get_size (window, width, height);
+ gdk_drawable_get_size (window, width, height);
else if (*width == -1)
- gdk_window_get_size (window, width, NULL);
+ gdk_drawable_get_size (window, width, NULL);
else if (*height == -1)
- gdk_window_get_size (window, NULL, height);
-}
-
-static void
-draw_part (GdkDrawable *drawable,
- GdkGC *gc,
- GdkRectangle *area,
- gint x,
- gint y,
- IndicatorPart part)
-{
- if (area)
- gdk_gc_set_clip_rectangle (gc, area);
-
- if (!indicator_parts[part].bmap)
- indicator_parts[part].bmap = gdk_bitmap_create_from_data (drawable,
- indicator_parts[part].bits,
- INDICATOR_PART_SIZE, INDICATOR_PART_SIZE);
-
- gdk_gc_set_ts_origin (gc, x, y);
- gdk_gc_set_stipple (gc, indicator_parts[part].bmap);
- gdk_gc_set_fill (gc, GDK_STIPPLED);
-
- gdk_draw_rectangle (drawable, gc, TRUE, x, y, INDICATOR_PART_SIZE, INDICATOR_PART_SIZE);
-
- gdk_gc_set_fill (gc, GDK_SOLID);
-
- if (area)
- gdk_gc_set_clip_rectangle (gc, NULL);
+ gdk_drawable_get_size (window, NULL, height);
}
static void
gint thickness_dark;
gint i;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
thickness_light = style->ythickness / 2;
thickness_dark = style->ythickness - thickness_light;
{
for (i = 0; i < thickness_dark; i++)
{
- gdk_draw_line (window, style->light_gc[state_type], x2 - i - 1, y + i, x2, y + i);
gdk_draw_line (window, style->dark_gc[state_type], x1, y + i, x2 - i - 1, y + i);
+ gdk_draw_line (window, style->light_gc[state_type], x2 - i, y + i, x2, y + i);
}
y += thickness_dark;
for (i = 0; i < thickness_light; i++)
{
gdk_draw_line (window, style->dark_gc[state_type], x1, y + i, x1 + thickness_light - i - 1, y + i);
- gdk_draw_line (window, style->light_gc[state_type], x1 + thickness_light - i - 1, y + i, x2, y + i);
+ gdk_draw_line (window, style->light_gc[state_type], x1 + thickness_light - i, y + i, x2, y + i);
}
}
gint thickness_dark;
gint i;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
thickness_light = style->xthickness / 2;
thickness_dark = style->xthickness - thickness_light;
gdk_gc_set_clip_rectangle (style->dark_gc[state_type], area);
}
for (i = 0; i < thickness_dark; i++)
- {
- gdk_draw_line (window, style->light_gc[state_type], x + i, y2 - i - 1, x + i, y2);
+ {
gdk_draw_line (window, style->dark_gc[state_type], x + i, y1, x + i, y2 - i - 1);
+ gdk_draw_line (window, style->light_gc[state_type], x + i, y2 - i, x + i, y2);
}
x += thickness_dark;
for (i = 0; i < thickness_light; i++)
{
- gdk_draw_line (window, style->dark_gc[state_type], x + i, y1, x + i, y1 + thickness_light - i);
+ gdk_draw_line (window, style->dark_gc[state_type], x + i, y1, x + i, y1 + thickness_light - i - 1);
gdk_draw_line (window, style->light_gc[state_type], x + i, y1 + thickness_light - i, x + i, y2);
}
if (area)
}
}
-
static void
draw_thin_shadow (GtkStyle *style,
GdkWindow *window,
x + width - 1, y, x + width - 1, y + height - 1);
gdk_draw_line (window, gc2,
- x, y, x + width - 1, y);
+ x, y, x + width - 2, y);
gdk_draw_line (window, gc2,
- x, y, x, y + height - 1);
+ x, y, x, y + height - 2);
if (area)
{
}
}
-static void
-draw_spin_entry_shadow (GtkStyle *style,
- GdkWindow *window,
- GtkStateType state,
- GdkRectangle *area,
- gint x,
- gint y,
- gint width,
- gint height)
-{
- gint window_width, window_height;
- gboolean focus_inset;
-
- gdk_window_get_size (window, &window_width, &window_height);
-
- if (width == -1)
- width = window_width;
- if (height == 1)
- height = window_height;
-
- focus_inset = (width < window_width && height < window_height);
-
- if (area)
- {
- gdk_gc_set_clip_rectangle (style->light_gc[state], area);
- gdk_gc_set_clip_rectangle (style->dark_gc[state], area);
- gdk_gc_set_clip_rectangle (style->black_gc, area);
- gdk_gc_set_clip_rectangle (style->bg_gc[state], area);
- gdk_gc_set_clip_rectangle (style->base_gc[state], area);
- }
-
- gdk_draw_line (window, style->light_gc[state],
- x, y + height - 1, x + width - 1, y + height - 1);
-
- gdk_draw_line (window,
- style->base_gc[state],
- x + width - 1, y + 1, x + width - 1, y + height - 3);
-
- if (!focus_inset)
- {
- gdk_draw_line (window, style->bg_gc[state],
- x + 1, y + height - 2, x + width - 1, y + height - 2);
- gdk_draw_line (window,
- style->base_gc[state],
- x + width - 2, y + 1, x + width - 2, y + height - 3);
-
- gdk_draw_line (window, style->black_gc,
- x + 1, y + 1, x + width - 1, y + 1);
- gdk_draw_line (window, style->black_gc,
- x + 1, y + 1, x + 1, y + height - 2);
- }
-
- gdk_draw_line (window, style->dark_gc[state],
- x, y, x + width - 1, y);
- gdk_draw_line (window, style->dark_gc[state],
- x, y, x, y + height - 1);
-
- if (area)
- {
- gdk_gc_set_clip_rectangle (style->light_gc[state], NULL);
- gdk_gc_set_clip_rectangle (style->dark_gc[state], NULL);
- gdk_gc_set_clip_rectangle (style->black_gc, NULL);
- gdk_gc_set_clip_rectangle (style->bg_gc[state], NULL);
- gdk_gc_set_clip_rectangle (style->base_gc[state], NULL);
- }
-}
-
static void
draw_spinbutton_shadow (GtkStyle *style,
GdkWindow *window,
}
static void
-gtk_default_draw_shadow (GtkStyle *style,
- GdkWindow *window,
- GtkStateType state_type,
+draw_menu_shadow (GtkStyle *style,
+ GdkWindow *window,
+ GtkStateType state,
+ GdkRectangle *area,
+ gint x,
+ gint y,
+ gint width,
+ gint height)
+{
+ if (style->ythickness > 0)
+ {
+ if (style->ythickness > 1)
+ {
+ gdk_draw_line (window, style->dark_gc[state],
+ x + 1, y + height - 2, x + width - 2, y + height - 2);
+ gdk_draw_line (window, style->black_gc,
+ x, y + height - 1, x + width - 1, y + height - 1);
+ }
+ else
+ {
+ gdk_draw_line (window, style->dark_gc[state],
+ x + 1, y + height - 1, x + width - 1, y + height - 1);
+ }
+ }
+
+ if (style->xthickness > 0)
+ {
+ if (style->xthickness > 1)
+ {
+ gdk_draw_line (window, style->dark_gc[state],
+ x + width - 2, y + 1, x + width - 2, y + height - 2);
+
+ gdk_draw_line (window, style->black_gc,
+ x + width - 1, y, x + width - 1, y + height - 1);
+ }
+ else
+ {
+ gdk_draw_line (window, style->dark_gc[state],
+ x + width - 1, y + 1, x + width - 1, y + height - 1);
+ }
+ }
+
+ /* Light around top and left */
+
+ if (style->ythickness > 0)
+ gdk_draw_line (window, style->black_gc,
+ x, y, x + width - 2, y);
+ if (style->xthickness > 0)
+ gdk_draw_line (window, style->black_gc,
+ x, y, x, y + height - 2);
+
+ if (style->ythickness > 1)
+ gdk_draw_line (window, style->light_gc[state],
+ x + 1, y + 1, x + width - 3, y + 1);
+ if (style->xthickness > 1)
+ gdk_draw_line (window, style->light_gc[state],
+ x + 1, y + 1, x + 1, y + height - 3);
+}
+
+static GtkTextDirection
+get_direction (GtkWidget *widget)
+{
+ GtkTextDirection dir;
+
+ if (widget)
+ dir = gtk_widget_get_direction (widget);
+ else
+ dir = GTK_TEXT_DIR_LTR;
+
+ return dir;
+}
+
+
+static void
+gtk_default_draw_shadow (GtkStyle *style,
+ GdkWindow *window,
+ GtkStateType state_type,
GtkShadowType shadow_type,
GdkRectangle *area,
GtkWidget *widget,
gint thickness_dark;
gint i;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
if (shadow_type == GTK_SHADOW_IN)
{
- if (detail && (strcmp (detail, "buttondefault") == 0))
+ if (detail && strcmp (detail, "buttondefault") == 0)
{
sanitize_size (window, &width, &height);
x, y, width, height);
return;
}
- if (widget && GTK_IS_SPIN_BUTTON (widget) &&
+ if (GTK_IS_SPIN_BUTTON (widget) &&
detail && strcmp (detail, "spinbutton") == 0)
{
- draw_spinbutton_shadow (style, window, state_type,
- gtk_widget_get_direction (widget), area, x, y, width, height);
+ draw_spinbutton_shadow (style, window, state_type,
+ get_direction (widget), area, x, y, width, height);
return;
}
}
+
+ if (shadow_type == GTK_SHADOW_OUT && detail && strcmp (detail, "menu") == 0)
+ {
+ draw_menu_shadow (style, window, state_type, area, x, y, width, height);
+ return;
+ }
sanitize_size (window, &width, &height);
if (style->ythickness > 0)
gdk_draw_line (window, gc2,
- x, y, x + width - 1, y);
+ x, y, x + width - 2, y);
if (style->xthickness > 0)
gdk_draw_line (window, gc2,
- x, y, x, y + height - 1);
+ x, y, x, y + height - 2);
if (style->ythickness > 1)
gdk_draw_line (window, style->bg_gc[state_type],
- x + 1, y + 1, x + width - 2, y + 1);
+ x + 1, y + 1, x + width - 3, y + 1);
if (style->xthickness > 1)
gdk_draw_line (window, style->bg_gc[state_type],
- x + 1, y + 1, x + 1, y + height - 2);
+ x + 1, y + 1, x + 1, y + height - 3);
break;
case GTK_SHADOW_ETCHED_IN:
gdk_draw_line (window, gc1,
x + thickness_dark + i,
y + thickness_dark + i,
- x + width - thickness_dark - i - 1,
+ x + width - thickness_dark - i - 2,
y + thickness_dark + i);
gdk_draw_line (window, gc2,
}
if (shadow_type == GTK_SHADOW_IN &&
- widget && GTK_IS_SPIN_BUTTON (widget) &&
+ GTK_IS_SPIN_BUTTON (widget) &&
detail && strcmp (detail, "entry") == 0)
{
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_LTR)
+ if (get_direction (widget) == GTK_TEXT_DIR_LTR)
{
gdk_draw_line (window,
style->base_gc[state_type],
gint yadjust;
gint i;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
- g_return_if_fail (points != NULL);
-
switch (shadow_type)
{
case GTK_SHADOW_IN:
static void
draw_arrow (GdkWindow *window,
- GdkGC *gc,
+ GdkColor *color,
GdkRectangle *area,
GtkArrowType arrow_type,
gint x,
gint width,
gint height)
{
- gint i, j;
-
+ cairo_t *cr = gdk_cairo_create (window);
+ gdk_cairo_set_source_color (cr, color);
+
if (area)
- gdk_gc_set_clip_rectangle (gc, area);
-
+ {
+ gdk_cairo_rectangle (cr, area);
+ cairo_clip (cr);
+ }
+
if (arrow_type == GTK_ARROW_DOWN)
{
- for (i = 0, j = 0; i < height; i++, j++)
- gdk_draw_line (window, gc, x + j, y + i, x + width - j - 1, y + i);
+ cairo_move_to (cr, x, y);
+ cairo_line_to (cr, x + width, y);
+ cairo_line_to (cr, x + width / 2., y + height);
}
else if (arrow_type == GTK_ARROW_UP)
{
- for (i = height - 1, j = 0; i >= 0; i--, j++)
- gdk_draw_line (window, gc, x + j, y + i, x + width - j - 1, y + i);
+ cairo_move_to (cr, x, y + height);
+ cairo_line_to (cr, x + width / 2., y);
+ cairo_line_to (cr, x + width, y + height);
}
else if (arrow_type == GTK_ARROW_LEFT)
{
- for (i = width - 1, j = 0; i >= 0; i--, j++)
- gdk_draw_line (window, gc, x + i, y + j, x + i, y + height - j - 1);
+ cairo_move_to (cr, x + width, y);
+ cairo_line_to (cr, x + width, y + height);
+ cairo_line_to (cr, x, y + height / 2.);
}
else if (arrow_type == GTK_ARROW_RIGHT)
{
- for (i = 0, j = 0; i < width; i++, j++)
- gdk_draw_line (window, gc, x + i, y + j, x + i, y + height - j - 1);
+ cairo_move_to (cr, x, y);
+ cairo_line_to (cr, x + width, y + height / 2.);
+ cairo_line_to (cr, x, y + height);
}
- if (area)
- gdk_gc_set_clip_rectangle (gc, NULL);
+ cairo_close_path (cr);
+ cairo_fill (cr);
+
+ cairo_destroy (cr);
}
static void
gint width,
gint height)
{
- gint original_width, original_x;
-
sanitize_size (window, &width, &height);
- original_width = width;
- original_x = x;
-
calculate_arrow_geometry (arrow_type, &x, &y, &width, &height);
-
- if (detail && strcmp (detail, "menuitem") == 0)
- x = original_x + original_width - width;
+
+ if (detail && strcmp (detail, "menu_scroll_arrow_up") == 0)
+ y++;
if (state == GTK_STATE_INSENSITIVE)
- draw_arrow (window, style->white_gc, area, arrow_type,
+ draw_arrow (window, &style->white, area, arrow_type,
x + 1, y + 1, width, height);
- draw_arrow (window, style->fg_gc[state], area, arrow_type,
+ draw_arrow (window, &style->fg[state], area, arrow_type,
x, y, width, height);
}
GdkGC *inner_sw = NULL;
GdkGC *inner_se = NULL;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
sanitize_size (window, &width, &height);
half_width = width / 2;
gint y,
const gchar *string)
{
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
if (area)
{
gdk_gc_set_clip_rectangle (style->white_gc, area);
}
if (state_type == GTK_STATE_INSENSITIVE)
- gdk_draw_string (window, gtk_style_get_font (style), style->white_gc, x + 1, y + 1, string);
+ gdk_draw_string (window,
+ gtk_style_get_font_internal (style),
+ style->white_gc, x + 1, y + 1, string);
- gdk_draw_string (window, gtk_style_get_font (style), style->fg_gc[state_type], x, y, string);
+ gdk_draw_string (window,
+ gtk_style_get_font_internal (style),
+ style->fg_gc[state_type], x, y, string);
if (area)
{
if (widget)
gtk_widget_style_get (widget,
- "indicator_size", &tmp_size,
- "indicator_spacing", &tmp_spacing,
+ "indicator-size", &tmp_size,
+ "indicator-spacing", &tmp_spacing,
NULL);
if (tmp_size)
{
gboolean is_spinbutton_box = FALSE;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
sanitize_size (window, &width, &height);
- if (widget && GTK_IS_SPIN_BUTTON (widget) && detail)
+ if (GTK_IS_SPIN_BUTTON (widget) && detail)
{
if (strcmp (detail, "spinbutton_up") == 0)
{
width -= 3;
height -= 2;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ if (get_direction (widget) == GTK_TEXT_DIR_RTL)
x += 2;
else
x += 1;
width -= 3;
height -= 2;
- if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
+ if (get_direction (widget) == GTK_TEXT_DIR_RTL)
x += 2;
else
x += 1;
if (!style->bg_pixmap[state_type] ||
GDK_IS_PIXMAP (window))
{
+ GdkGC *gc = style->bg_gc[state_type];
+
+ if (state_type == GTK_STATE_SELECTED && detail && strcmp (detail, "paned") == 0)
+ {
+ if (widget && !GTK_WIDGET_HAS_FOCUS (widget))
+ gc = style->base_gc[GTK_STATE_ACTIVE];
+ }
+
if (area)
- gdk_gc_set_clip_rectangle (style->bg_gc[state_type], area);
+ gdk_gc_set_clip_rectangle (gc, area);
- gdk_draw_rectangle (window, style->bg_gc[state_type], TRUE,
+ gdk_draw_rectangle (window, gc, TRUE,
x, y, width, height);
if (area)
- gdk_gc_set_clip_rectangle (style->bg_gc[state_type], NULL);
+ gdk_gc_set_clip_rectangle (gc, NULL);
}
else
gtk_style_apply_default_background (style, window,
{
GtkRequisition indicator_size;
GtkBorder indicator_spacing;
+ gint vline_x;
option_menu_get_props (widget, &indicator_size, &indicator_spacing);
sanitize_size (window, &width, &height);
-
+
+ if (get_direction (widget) == GTK_TEXT_DIR_RTL)
+ vline_x = x + indicator_size.width + indicator_spacing.left + indicator_spacing.right;
+ else
+ vline_x = x + width - (indicator_size.width + indicator_spacing.left + indicator_spacing.right) - style->xthickness;
+
gtk_paint_vline (style, window, state_type, area, widget,
detail,
y + style->ythickness + 1,
y + height - style->ythickness - 3,
- x + width - (indicator_size.width + indicator_spacing.left + indicator_spacing.right) - style->xthickness);
+ vline_x);
}
}
gint darken_count)
{
GdkColor src = *color;
- GdkColor shaded;
+ GdkColor shaded = *color;
GdkGC *gc;
gc = gdk_gc_new (window);
while (darken_count)
{
- gtk_style_shade (&src, &shaded, 0.93);
+ _gtk_style_shade (&src, &shaded, 0.93);
src = shaded;
--darken_count;
}
-
+
gdk_gc_set_rgb_fg_color (gc, &shaded);
return gc;
GdkGC *gc1;
GdkGC *freeme = NULL;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
sanitize_size (window, &width, &height);
if (detail)
{
if (!strcmp ("text", detail))
gc1 = style->bg_gc[GTK_STATE_SELECTED];
- else if (!strncmp ("cell_even", detail, strlen ("cell_even")) ||
- !strncmp ("cell_odd", detail, strlen ("cell_odd")))
+ else if (!strcmp ("cell_even", detail) ||
+ !strcmp ("cell_odd", detail) ||
+ !strcmp ("cell_even_ruled", detail) ||
+ !strcmp ("cell_even_ruled_sorted", detail))
{
/* This has to be really broken; alex made me do it. -jrb */
if (GTK_WIDGET_HAS_FOCUS (widget))
gc1 = style->base_gc[state_type];
- else
- gc1 = style->base_gc[GTK_STATE_ACTIVE];
+ else
+ gc1 = style->base_gc[GTK_STATE_ACTIVE];
}
+ else if (!strcmp ("cell_odd_ruled", detail) ||
+ !strcmp ("cell_odd_ruled_sorted", detail))
+ {
+ if (GTK_WIDGET_HAS_FOCUS (widget))
+ freeme = get_darkened_gc (window, &style->base[state_type], 1);
+ else
+ freeme = get_darkened_gc (window, &style->base[GTK_STATE_ACTIVE], 1);
+ gc1 = freeme;
+ }
else
{
gc1 = style->bg_gc[state_type];
* for that row.
*/
- /* FIXME when we have style properties, clean this up.
- */
-
else if (!strcmp ("cell_even", detail) ||
!strcmp ("cell_odd", detail) ||
!strcmp ("cell_even_ruled", detail))
{
- gc1 = style->base_gc[state_type];
+ GdkColor *color = NULL;
+
+ gtk_widget_style_get (widget,
+ "even-row-color", &color,
+ NULL);
+
+ if (color)
+ {
+ freeme = get_darkened_gc (window, color, 0);
+ gc1 = freeme;
+
+ gdk_color_free (color);
+ }
+ else
+ gc1 = style->base_gc[state_type];
}
+ else if (!strcmp ("cell_odd_ruled", detail))
+ {
+ GdkColor *color;
+
+ gtk_widget_style_get (widget,
+ "odd-row-color", &color,
+ NULL);
+
+ if (color)
+ {
+ freeme = get_darkened_gc (window, color, 0);
+ gc1 = freeme;
+
+ gdk_color_free (color);
+ }
+ else
+ {
+ gtk_widget_style_get (widget,
+ "even-row-color", &color,
+ NULL);
+
+ if (color)
+ {
+ freeme = get_darkened_gc (window, color, 1);
+ gdk_color_free (color);
+ }
+ else
+ freeme = get_darkened_gc (window, &style->base[state_type], 1);
+ gc1 = freeme;
+ }
+ }
else if (!strcmp ("cell_even_sorted", detail) ||
!strcmp ("cell_odd_sorted", detail) ||
- !strcmp ("cell_odd_ruled", detail) ||
!strcmp ("cell_even_ruled_sorted", detail))
{
- freeme = get_darkened_gc (window, &style->base[state_type], 1);
- gc1 = freeme;
+ GdkColor *color = NULL;
+
+ if (!strcmp ("cell_odd_sorted", detail))
+ gtk_widget_style_get (widget,
+ "odd-row-color", &color,
+ NULL);
+ else
+ gtk_widget_style_get (widget,
+ "even-row-color", &color,
+ NULL);
+
+ if (color)
+ {
+ freeme = get_darkened_gc (window, color, 1);
+ gc1 = freeme;
+
+ gdk_color_free (color);
+ }
+ else
+ {
+ freeme = get_darkened_gc (window, &style->base[state_type], 1);
+ gc1 = freeme;
+ }
}
else if (!strcmp ("cell_odd_ruled_sorted", detail))
{
- freeme = get_darkened_gc (window, &style->base[state_type], 2);
- gc1 = freeme;
+ GdkColor *color = NULL;
+
+ gtk_widget_style_get (widget,
+ "odd-row-color", &color,
+ NULL);
+
+ if (color)
+ {
+ freeme = get_darkened_gc (window, color, 1);
+ gc1 = freeme;
+
+ gdk_color_free (color);
+ }
+ else
+ {
+ gtk_widget_style_get (widget,
+ "even-row-color", &color,
+ NULL);
+
+ if (color)
+ {
+ freeme = get_darkened_gc (window, color, 2);
+ gdk_color_free (color);
+ }
+ else
+ freeme = get_darkened_gc (window, &style->base[state_type], 2);
+ gc1 = freeme;
+ }
}
else
gc1 = style->bg_gc[state_type];
if (freeme)
- g_object_unref (G_OBJECT (freeme));
+ g_object_unref (freeme);
}
static void
gint width,
gint height)
{
- if (detail && strcmp (detail, "cellcheck") == 0)
- {
- gdk_draw_rectangle (window,
- widget->style->base_gc[state_type],
- TRUE,
- x, y,
- width, height);
- gdk_draw_rectangle (window,
- widget->style->text_gc[state_type],
- FALSE,
- x, y,
- width, height);
-
- x -= (1 + INDICATOR_PART_SIZE - width) / 2;
- y -= (((1 + INDICATOR_PART_SIZE - height) / 2) - 1);
- if (shadow_type == GTK_SHADOW_IN)
- {
- draw_part (window, style->text_gc[state_type], area, x, y, CHECK_TEXT);
- draw_part (window, style->text_aa_gc[state_type], area, x, y, CHECK_AA);
- }
- }
- else
+ cairo_t *cr = gdk_cairo_create (window);
+ enum { BUTTON, MENU, CELL } type = BUTTON;
+ int exterior_size;
+ int interior_size;
+ int pad;
+
+ if (detail)
{
- x -= (1 + INDICATOR_PART_SIZE - width) / 2;
- y -= (1 + INDICATOR_PART_SIZE - height) / 2;
+ if (strcmp (detail, "cellcheck") == 0)
+ type = CELL;
+ else if (strcmp (detail, "check") == 0)
+ type = MENU;
+ }
- if (strcmp (detail, "check") == 0) /* Menu item */
- {
- if (shadow_type == GTK_SHADOW_IN)
- {
- draw_part (window, style->black_gc, area, x, y, CHECK_TEXT);
- draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_AA);
- }
- else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
- {
- draw_part (window, style->black_gc, area, x, y, CHECK_INCONSISTENT_TEXT);
- draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_INCONSISTENT_AA);
- }
- }
+ if (area)
+ {
+ gdk_cairo_rectangle (cr, area);
+ cairo_clip (cr);
+ }
+
+ exterior_size = MIN (width, height);
+ if (exterior_size % 2 == 0) /* Ensure odd */
+ exterior_size -= -1;
+
+ pad = style->xthickness + MAX (1, (exterior_size - 2 * style->xthickness) / 9);
+ interior_size = MAX (1, exterior_size - 2 * pad);
+
+ if (interior_size < 7)
+ {
+ interior_size = 7;
+ pad = MAX (0, (exterior_size - interior_size) / 2);
+ }
+
+ x -= (1 + exterior_size - width) / 2;
+ y -= (1 + exterior_size - height) / 2;
+
+ switch (type)
+ {
+ case BUTTON:
+ case CELL:
+ if (type == BUTTON)
+ gdk_cairo_set_source_color (cr, &style->fg[state_type]);
else
- {
- GdkGC *base_gc = style->base_gc[state_type];
+ gdk_cairo_set_source_color (cr, &style->text[state_type]);
+
+ cairo_set_line_width (cr, 1.0);
+ cairo_rectangle (cr, x + 0.5, y + 0.5, exterior_size - 1, exterior_size - 1);
+ cairo_stroke (cr);
+
+ gdk_cairo_set_source_color (cr, &style->base[state_type]);
+ cairo_rectangle (cr, x + 1, y + 1, exterior_size - 2, exterior_size - 2);
+ cairo_fill (cr);
+ break;
- if (state_type == GTK_STATE_ACTIVE)
- base_gc = style->bg_gc[GTK_STATE_ACTIVE];
-
- draw_part (window, base_gc, area, x, y, CHECK_BASE);
- draw_part (window, style->black_gc, area, x, y, CHECK_BLACK);
- draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_DARK);
- draw_part (window, style->mid_gc[state_type], area, x, y, CHECK_MID);
- draw_part (window, style->light_gc[state_type], area, x, y, CHECK_LIGHT);
-
- if (shadow_type == GTK_SHADOW_IN)
- {
- draw_part (window, style->text_gc[state_type], area, x, y, CHECK_TEXT);
- draw_part (window, style->text_aa_gc[state_type], area, x, y, CHECK_AA);
- }
- else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
- {
- draw_part (window, style->text_gc[state_type], area, x, y, CHECK_INCONSISTENT_TEXT);
- draw_part (window, style->text_aa_gc[state_type], area, x, y, CHECK_INCONSISTENT_AA);
- }
- }
+ case MENU:
+ break;
+ }
+
+ switch (type)
+ {
+ case BUTTON:
+ case CELL:
+ gdk_cairo_set_source_color (cr, &style->text[state_type]);
+ break;
+ case MENU:
+ gdk_cairo_set_source_color (cr, &style->fg[state_type]);
+ break;
}
+ if (shadow_type == GTK_SHADOW_IN)
+ {
+ cairo_translate (cr,
+ x + pad, y + pad);
+
+ cairo_scale (cr, interior_size / 7., interior_size / 7.);
+
+ cairo_move_to (cr, 7.0, 0.0);
+ cairo_line_to (cr, 7.5, 1.0);
+ cairo_curve_to (cr, 5.3, 2.0,
+ 4.3, 4.0,
+ 3.5, 7.0);
+ cairo_curve_to (cr, 3.0, 5.7,
+ 1.3, 4.7,
+ 0.0, 4.7);
+ cairo_line_to (cr, 0.2, 3.5);
+ cairo_curve_to (cr, 1.1, 3.5,
+ 2.3, 4.3,
+ 3.0, 5.0);
+ cairo_curve_to (cr, 1.0, 3.9,
+ 2.4, 4.1,
+ 3.2, 4.9);
+ cairo_curve_to (cr, 3.5, 3.1,
+ 5.2, 2.0,
+ 7.0, 0.0);
+
+ cairo_fill (cr);
+ }
+ else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
+ {
+ int line_thickness = MAX (1, (3 + interior_size * 2) / 7);
+
+ cairo_rectangle (cr,
+ x + pad,
+ y + pad + (1 + interior_size - line_thickness) / 2,
+ interior_size,
+ line_thickness);
+ cairo_fill (cr);
+ }
+
+ cairo_destroy (cr);
}
static void
gint width,
gint height)
{
- if (detail && strcmp (detail, "cellradio") == 0)
+ cairo_t *cr = gdk_cairo_create (window);
+ enum { BUTTON, MENU, CELL } type = BUTTON;
+ int exterior_size;
+
+ if (detail)
+ {
+ if (strcmp (detail, "radio") == 0)
+ type = CELL;
+ else if (strcmp (detail, "option") == 0)
+ type = MENU;
+ }
+
+ if (area)
+ {
+ gdk_cairo_rectangle (cr, area);
+ cairo_clip (cr);
+ }
+
+ exterior_size = MIN (width, height);
+ if (exterior_size % 2 == 0) /* Ensure odd */
+ exterior_size -= -1;
+
+ x -= (1 + exterior_size - width) / 2;
+ y -= (1 + exterior_size - height) / 2;
+
+ switch (type)
+ {
+ case BUTTON:
+ case CELL:
+ gdk_cairo_set_source_color (cr, &style->base[state_type]);
+
+ cairo_arc (cr,
+ x + exterior_size / 2.,
+ y + exterior_size / 2.,
+ (exterior_size - 1) / 2.,
+ 0, 2 * G_PI);
+
+ cairo_fill_preserve (cr);
+
+ if (type == BUTTON)
+ gdk_cairo_set_source_color (cr, &style->fg[state_type]);
+ else
+ gdk_cairo_set_source_color (cr, &style->text[state_type]);
+
+ cairo_set_line_width (cr, 1.);
+ cairo_stroke (cr);
+ break;
+
+ case MENU:
+ break;
+ }
+
+ switch (type)
+ {
+ case BUTTON:
+ gdk_cairo_set_source_color (cr, &style->text[state_type]);
+ break;
+ case CELL:
+ break;
+ case MENU:
+ gdk_cairo_set_source_color (cr, &style->fg[state_type]);
+ break;
+ }
+
+ if (shadow_type == GTK_SHADOW_IN)
{
- gdk_draw_arc (window,
- widget->style->fg_gc[state_type],
- FALSE,
- x, y,
- width,
- height,
- 0, 360*64);
+ int pad = style->xthickness + MAX (1, 2 * (exterior_size - 2 * style->xthickness) / 9);
+ int interior_size = MAX (1, exterior_size - 2 * pad);
- if (shadow_type == GTK_SHADOW_IN)
+ if (interior_size < 5)
{
- gdk_draw_arc (window,
- widget->style->fg_gc[state_type],
- TRUE,
- x + 2,
- y + 2,
- width - 4,
- height - 4,
- 0, 360*64);
+ interior_size = 7;
+ pad = MAX (0, (exterior_size - interior_size) / 2);
}
+
+ cairo_arc (cr,
+ x + pad + interior_size / 2.,
+ y + pad + interior_size / 2.,
+ interior_size / 2.,
+ 0, 2 * G_PI);
+ cairo_fill (cr);
}
- else
+ else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
{
- x -= (1 + INDICATOR_PART_SIZE - width) / 2;
- y -= (1 + INDICATOR_PART_SIZE - height) / 2;
-
- if (strcmp (detail, "option") == 0) /* Menu item */
+ int pad = style->xthickness + MAX (1, (exterior_size - 2 * style->xthickness) / 9);
+ int interior_size = MAX (1, exterior_size - 2 * pad);
+ int line_thickness;
+
+ if (interior_size < 7)
{
- if (shadow_type == GTK_SHADOW_IN)
- {
- draw_part (window, style->fg_gc[state_type], area, x, y, RADIO_TEXT);
- }
- else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
- {
- draw_part (window, style->black_gc, area, x, y, CHECK_INCONSISTENT_TEXT);
- draw_part (window, style->dark_gc[state_type], area, x, y, CHECK_INCONSISTENT_AA);
- }
+ interior_size = 7;
+ pad = MAX (0, (exterior_size - interior_size) / 2);
}
- else
- {
- GdkGC *base_gc = style->base_gc[state_type];
- if (state_type == GTK_STATE_ACTIVE)
- base_gc = style->bg_gc[GTK_STATE_ACTIVE];
+ line_thickness = MAX (1, (3 + interior_size * 2) / 7);
- draw_part (window, base_gc, area, x, y, RADIO_BASE);
- draw_part (window, style->black_gc, area, x, y, RADIO_BLACK);
- draw_part (window, style->dark_gc[state_type], area, x, y, RADIO_DARK);
- draw_part (window, style->mid_gc[state_type], area, x, y, RADIO_MID);
- draw_part (window, style->light_gc[state_type], area, x, y, RADIO_LIGHT);
-
- if (shadow_type == GTK_SHADOW_IN)
- {
- draw_part (window, style->text_gc[state_type], area, x, y, RADIO_TEXT);
- }
- else if (shadow_type == GTK_SHADOW_ETCHED_IN) /* inconsistent */
- {
- draw_part (window, style->text_aa_gc[state_type], area, x, y, RADIO_INCONSISTENT_AA);
- draw_part (window, style->text_gc[state_type], area, x, y, RADIO_INCONSISTENT_TEXT);
- }
- }
+ cairo_rectangle (cr,
+ x + pad,
+ y + pad + (interior_size - line_thickness) / 2.,
+ interior_size,
+ line_thickness);
+ cairo_fill (cr);
}
+
+ cairo_destroy (cr);
}
static void
if (state_type == GTK_STATE_INSENSITIVE)
{
- draw_arrow (window, style->white_gc, area,
+ draw_arrow (window, &style->white, area,
GTK_ARROW_UP, x + 1, y + 1,
indicator_size.width, arrow_height);
- draw_arrow (window, style->white_gc, area,
+ draw_arrow (window, &style->white, area,
GTK_ARROW_DOWN, x + 1, y + arrow_height + ARROW_SPACE + 1,
indicator_size.width, arrow_height);
}
- draw_arrow (window, style->fg_gc[state_type], area,
+ draw_arrow (window, &style->fg[state_type], area,
GTK_ARROW_UP, x, y,
indicator_size.width, arrow_height);
- draw_arrow (window, style->fg_gc[state_type], area,
+ draw_arrow (window, &style->fg[state_type], area,
GTK_ARROW_DOWN, x, y + arrow_height + ARROW_SPACE,
indicator_size.width, arrow_height);
}
GdkGC *gc3 = NULL;
GdkGC *gc4 = NULL;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
sanitize_size (window, &width, &height);
switch (shadow_type)
GdkGC *gc3 = NULL;
GdkGC *gc4 = NULL;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
gtk_style_apply_default_background (style, window,
widget && !GTK_WIDGET_NO_WINDOW (widget),
state_type, area, x, y, width, height);
gdk_draw_line (window, gc2,
x, y + gap_x, x, y + gap_x);
}
- if ((width - (gap_x + gap_width)) > 0)
+ if ((height - (gap_x + gap_width)) > 0)
{
gdk_draw_line (window, gc1,
x, y + gap_x + gap_width, x, y + height - 2);
gdk_draw_line (window, gc3,
x + width - 1, y + gap_x, x + width - 1, y + gap_x);
}
- if ((width - (gap_x + gap_width)) > 0)
+ if ((height - (gap_x + gap_width)) > 0)
{
gdk_draw_line (window, gc4,
x + width - 1, y + gap_x + gap_width, x + width - 1, y + height - 2);
GdkGC *gc3 = NULL;
GdkGC *gc4 = NULL;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
gtk_style_apply_default_background (style, window,
widget && !GTK_WIDGET_NO_WINDOW (widget),
GTK_STATE_NORMAL, area, x, y, width, height);
gint width,
gint height)
{
- GdkPoint points[5];
- GdkGC *gc;
+ cairo_t *cr;
gboolean free_dash_list = FALSE;
gint line_width = 1;
- gchar *dash_list = "\1\1";
- gint dash_len;
-
- gc = style->fg_gc[state_type];
+ gint8 *dash_list = "\1\1";
if (widget)
{
free_dash_list = TRUE;
}
- sanitize_size (window, &width, &height);
-
- if (area)
- gdk_gc_set_clip_rectangle (gc, area);
-
- gdk_gc_set_line_attributes (gc, line_width,
- dash_list[0] ? GDK_LINE_ON_OFF_DASH : GDK_LINE_SOLID,
- GDK_CAP_BUTT, GDK_JOIN_MITER);
-
-
if (detail && !strcmp (detail, "add-mode"))
{
if (free_dash_list)
free_dash_list = FALSE;
}
- points[0].x = x + line_width / 2;
- points[0].y = y + line_width / 2;
- points[1].x = x + width - line_width + line_width / 2;
- points[1].y = y + line_width / 2;
- points[2].x = x + width - line_width + line_width / 2;
- points[2].y = y + height - line_width + line_width / 2;
- points[3].x = x + line_width / 2;
- points[3].y = y + height - line_width + line_width / 2;
- points[4] = points[0];
+ sanitize_size (window, &width, &height);
- if (!dash_list[0])
- {
- gdk_draw_lines (window, gc, points, 5);
- }
+ cr = gdk_cairo_create (window);
+
+ if (detail && !strcmp (detail, "colorwheel_light"))
+ cairo_set_source_rgb (cr, 0., 0., 0.);
+ else if (detail && !strcmp (detail, "colorwheel_dark"))
+ cairo_set_source_rgb (cr, 1., 1., 1.);
else
+ gdk_cairo_set_source_color (cr, &style->fg[state_type]);
+
+ cairo_set_line_width (cr, line_width);
+
+ if (dash_list[0])
{
- /* We go through all the pain below because the X rasterization
- * rules don't really work right for dashed lines if you
- * want continuity in segments that go between top/right
- * and left/bottom. For instance, a top left corner
- * with a 1-1 dash is drawn as:
- *
- * X X X
- * X
- *
- * X
- *
- * This is because pixels on the top and left boundaries
- * of polygons are drawn, but not on the bottom and right.
- * So, if you have a line going up that turns the corner
- * and goes right, there is a one pixel shift in the pattern.
- *
- * So, to fix this, we drawn the top and right in one call,
- * then the left and bottom in another call, fixing up
- * the dash offset for the second call ourselves to get
- * continuity at the upper left.
- *
- * It's not perfect since we really should have a join at
- * the upper left and lower right instead of two intersecting
- * lines but that's only really apparent for no-dashes,
- * which (for this reason) are done as one polygon and
- * don't to through this code path.
- */
-
- dash_len = strlen (dash_list);
-
- if (dash_list[0])
- gdk_gc_set_dashes (gc, 0, dash_list, dash_len);
-
- gdk_draw_lines (window, gc, points, 3);
-
- /* We draw this line one farther over than it is "supposed" to
- * because of another rasterization problem ... if two 1 pixel
- * unjoined lines meet at the lower right, there will be a missing
- * pixel.
- */
- points[2].x += 1;
-
- if (dash_list[0])
+ gint n_dashes = strlen (dash_list);
+ gdouble *dashes = g_new (gdouble, n_dashes);
+ gdouble total_length = 0;
+ gdouble dash_offset;
+ gint i;
+
+ for (i = 0; i < n_dashes; i++)
{
- gint dash_pixels = 0;
- gint i;
-
- /* Adjust the dash offset for the bottom and left so we
- * match up at the upper left.
- */
- for (i = 0; i < dash_len; i++)
- dash_pixels += dash_list[i];
-
- if (dash_len % 2 == 1)
- dash_pixels *= 2;
-
- gdk_gc_set_dashes (gc, dash_pixels - (width + height - 2 * line_width) % dash_pixels, dash_list, dash_len);
+ dashes[i] = dash_list[i];
+ total_length += dash_list[i];
}
+
+ /* The dash offset here aligns the pattern to integer pixels
+ * by starting the dash at the right side of the left border
+ * Negative dash offsets in cairo don't work
+ * (https://bugs.freedesktop.org/show_bug.cgi?id=2729)
+ */
+ dash_offset = - line_width / 2.;
+ while (dash_offset < 0)
+ dash_offset += total_length;
- gdk_draw_lines (window, gc, points + 2, 3);
+ cairo_set_dash (cr, dashes, n_dashes, dash_offset);
+ g_free (dashes);
}
- gdk_gc_set_line_attributes (gc, 0, GDK_LINE_SOLID, GDK_CAP_BUTT, GDK_JOIN_MITER);
-
if (area)
- gdk_gc_set_clip_rectangle (gc, NULL);
+ {
+ gdk_cairo_rectangle (cr, area);
+ cairo_clip (cr);
+ }
+
+ cairo_rectangle (cr,
+ x + line_width / 2.,
+ y + line_width / 2.,
+ width - line_width,
+ height - line_width);
+ cairo_stroke (cr);
+ cairo_destroy (cr);
if (free_dash_list)
g_free (dash_list);
gint height,
GtkOrientation orientation)
{
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
sanitize_size (window, &width, &height);
gtk_paint_box (style, window, state_type, shadow_type,
gint y,
gushort size)
{
-
size = CLAMP (size, 2, 3);
if (size == 2)
gdk_draw_point (window, light_gc, x, y);
gdk_draw_point (window, light_gc, x+1, y+1);
}
- else if (size == 3);
+ else if (size == 3)
{
gdk_draw_point (window, light_gc, x, y);
gdk_draw_point (window, light_gc, x+1, y);
gint xx, yy;
gint xthick, ythick;
GdkGC *light_gc, *dark_gc;
+ GdkGC *free_me = NULL;
GdkRectangle rect;
GdkRectangle dest;
gint intersect;
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
sanitize_size (window, &width, &height);
gtk_paint_box (style, window, state_type, shadow_type, area, widget,
detail, x, y, width, height);
- if (!strcmp (detail, "paned"))
+ if (detail && !strcmp (detail, "paned"))
{
/* we want to ignore the shadow border in paned widgets */
xthick = 0;
ythick = 0;
- light_gc = style->light_gc[state_type];
+ if (state_type == GTK_STATE_SELECTED && widget && !GTK_WIDGET_HAS_FOCUS (widget))
+ {
+ GdkColor unfocused_light;
+
+ _gtk_style_shade (&style->base[GTK_STATE_ACTIVE], &unfocused_light,
+ LIGHTNESS_MULT);
+
+ light_gc = free_me = gdk_gc_new (window);
+ gdk_gc_set_rgb_fg_color (light_gc, &unfocused_light);
+ }
+ else
+ light_gc = style->light_gc[state_type];
+
dark_gc = style->black_gc;
}
else
rect.height = height - (ythick * 2);
if (area)
- intersect = gdk_rectangle_intersect (area, &rect, &dest);
+ intersect = gdk_rectangle_intersect (area, &rect, &dest);
else
{
intersect = TRUE;
}
if (!intersect)
- return;
+ goto out;
gdk_gc_set_clip_rectangle (light_gc, &dest);
gdk_gc_set_clip_rectangle (dark_gc, &dest);
- if (!strcmp (detail, "paned"))
+ if (detail && !strcmp (detail, "paned"))
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
for (xx = x + width/2 - 15; xx <= x + width/2 + 15; xx += 5)
gdk_gc_set_clip_rectangle (light_gc, NULL);
gdk_gc_set_clip_rectangle (dark_gc, NULL);
-}
-static void
-create_expander_affine (gdouble affine[6],
- gint degrees,
- gint expander_size,
- gint x,
- gint y)
-{
- gdouble s, c;
- gdouble width;
- gdouble height;
-
- width = expander_size / 4.0;
- height = expander_size / 2.0;
-
- s = sin (degrees * G_PI / 180.0);
- c = cos (degrees * G_PI / 180.0);
-
- affine[0] = c;
- affine[1] = s;
- affine[2] = -s;
- affine[3] = c;
- affine[4] = -width * c - height * -s + x;
- affine[5] = -width * s - height * c + y;
-}
-
-static void
-apply_affine_on_point (double affine[6], GdkPoint *point)
-{
- gdouble x, y;
-
- x = point->x * affine[0] + point->y * affine[2] + affine[4];
- y = point->x * affine[1] + point->y * affine[3] + affine[5];
-
- point->x = x;
- point->y = y;
-}
-
-static void
-gtk_style_draw_polygon_with_gc (GdkWindow *window, GdkGC *gc, gint line_width,
- gboolean do_fill, GdkPoint *points, gint n_points)
-{
- gdk_gc_set_line_attributes (gc, line_width,
- GDK_LINE_SOLID,
- GDK_CAP_BUTT, GDK_JOIN_MITER);
-
- gdk_draw_polygon (window, gc, do_fill, points, n_points);
- gdk_gc_set_line_attributes (gc, 0, GDK_LINE_SOLID, GDK_CAP_BUTT, GDK_JOIN_MITER);
+ out:
+ if (free_me)
+ g_object_unref (free_me);
}
static void
gint y,
GtkExpanderStyle expander_style)
{
+#define DEFAULT_EXPANDER_SIZE 12
+
gint expander_size;
- GdkPoint points[3];
- gint i;
gint line_width;
- gdouble affine[6];
+ double vertical_overshoot;
+ int diameter;
+ double radius;
+ double interp; /* interpolation factor for center position */
+ double x_double_horz, y_double_horz;
+ double x_double_vert, y_double_vert;
+ double x_double, y_double;
gint degrees = 0;
- gtk_widget_style_get (widget,
- "expander_size", &expander_size,
- NULL);
- line_width = MAX (1, expander_size/7);
-
+ cairo_t *cr = gdk_cairo_create (window);
+
if (area)
{
- gdk_gc_set_clip_rectangle (style->fg_gc[GTK_STATE_NORMAL], area);
- gdk_gc_set_clip_rectangle (style->base_gc[GTK_STATE_NORMAL], area);
+ gdk_cairo_rectangle (cr, area);
+ cairo_clip (cr);
}
- expander_size -= (line_width * 2 - 2);
- points[0].x = line_width / 2;
- points[0].y = line_width / 2;
- points[1].x = expander_size / 2 + line_width / 2;
- points[1].y = expander_size / 2 + line_width / 2;
- points[2].x = line_width / 2;
- points[2].y = expander_size + line_width / 2;
+ if (widget &&
+ gtk_widget_class_find_style_property (GTK_WIDGET_GET_CLASS (widget),
+ "expander-size"))
+ {
+ gtk_widget_style_get (widget,
+ "expander-size", &expander_size,
+ NULL);
+ }
+ else
+ expander_size = DEFAULT_EXPANDER_SIZE;
+
+ line_width = MAX (1, expander_size/9);
switch (expander_style)
{
case GTK_EXPANDER_COLLAPSED:
- degrees = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? 180 : 0;
+ degrees = (get_direction (widget) == GTK_TEXT_DIR_RTL) ? 180 : 0;
+ interp = 0.0;
break;
case GTK_EXPANDER_SEMI_COLLAPSED:
- degrees = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? 150 : 30;
+ degrees = (get_direction (widget) == GTK_TEXT_DIR_RTL) ? 150 : 30;
+ interp = 0.25;
break;
case GTK_EXPANDER_SEMI_EXPANDED:
- degrees = (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? 120 : 60;
+ degrees = (get_direction (widget) == GTK_TEXT_DIR_RTL) ? 120 : 60;
+ interp = 0.75;
break;
case GTK_EXPANDER_EXPANDED:
degrees = 90;
+ interp = 1.0;
break;
default:
g_assert_not_reached ();
}
- create_expander_affine (affine, degrees, expander_size, x, y);
+ /* Compute distance that the stroke extends beyonds the end
+ * of the triangle we draw.
+ */
+ vertical_overshoot = line_width / 2.0 * (1. / tan (G_PI / 8));
+
+ /* For odd line widths, we end the vertical line of the triangle
+ * at a half pixel, so we round differently.
+ */
+ if (line_width % 2 == 1)
+ vertical_overshoot = ceil (0.5 + vertical_overshoot) - 0.5;
+ else
+ vertical_overshoot = ceil (vertical_overshoot);
- for (i = 0; i < 3; i++)
- apply_affine_on_point (affine, &points[i]);
+ /* Adjust the size of the triangle we draw so that the entire stroke fits
+ */
+ diameter = MAX (3, expander_size - 2 * vertical_overshoot);
+
+ /* If the line width is odd, we want the diameter to be even,
+ * and vice versa, so force the sum to be odd. This relationship
+ * makes the point of the triangle look right.
+ */
+ diameter -= (1 - (diameter + line_width) % 2);
+
+ radius = diameter / 2.;
+
+ /* Adjust the center so that the stroke is properly aligned with
+ * the pixel grid. The center adjustment is different for the
+ * horizontal and vertical orientations. For intermediate positions
+ * we interpolate between the two.
+ */
+ x_double_vert = floor (x - (radius + line_width) / 2.) + (radius + line_width) / 2.;
+ y_double_vert = y - 0.5;
+
+ x_double_horz = x - 0.5;
+ y_double_horz = floor (y - (radius + line_width) / 2.) + (radius + line_width) / 2.;
+
+ x_double = x_double_vert * (1 - interp) + x_double_horz * interp;
+ y_double = y_double_vert * (1 - interp) + y_double_horz * interp;
+
+ cairo_translate (cr, x_double, y_double);
+ cairo_rotate (cr, degrees * G_PI / 180);
+
+ cairo_move_to (cr, - radius / 2., - radius);
+ cairo_line_to (cr, radius / 2., 0);
+ cairo_line_to (cr, - radius / 2., radius);
+ cairo_close_path (cr);
+
+ cairo_set_line_width (cr, line_width);
if (state_type == GTK_STATE_PRELIGHT)
- {
- gtk_style_draw_polygon_with_gc (window, style->fg_gc[GTK_STATE_NORMAL],
- 1, TRUE, points, 3);
- }
+ gdk_cairo_set_source_color (cr,
+ &style->fg[GTK_STATE_PRELIGHT]);
else if (state_type == GTK_STATE_ACTIVE)
- {
- gtk_style_draw_polygon_with_gc (window, style->light_gc[GTK_STATE_ACTIVE],
- 1, TRUE, points, 3);
- gtk_style_draw_polygon_with_gc (window, style->fg_gc[GTK_STATE_NORMAL],
- line_width, FALSE, points, 3);
- }
+ gdk_cairo_set_source_color (cr,
+ &style->light[GTK_STATE_ACTIVE]);
else
- {
- gtk_style_draw_polygon_with_gc (window, style->base_gc[GTK_STATE_NORMAL],
- 1, TRUE, points, 3);
- gtk_style_draw_polygon_with_gc (window, style->fg_gc[GTK_STATE_NORMAL],
- line_width, FALSE, points, 3);
- }
- if (area)
- {
- gdk_gc_set_clip_rectangle (style->fg_gc[GTK_STATE_NORMAL], NULL);
- gdk_gc_set_clip_rectangle (style->base_gc[GTK_STATE_NORMAL], NULL);
- }
+ gdk_cairo_set_source_color (cr,
+ &style->base[GTK_STATE_NORMAL]);
+
+ cairo_fill_preserve (cr);
+
+ gdk_cairo_set_source_color (cr, &style->fg[state_type]);
+ cairo_stroke (cr);
+
+ cairo_destroy (cr);
}
typedef struct _ByteRange ByteRange;
}
static PangoLayout*
-get_insensitive_layout (PangoLayout *layout)
+get_insensitive_layout (GdkDrawable *drawable,
+ PangoLayout *layout)
{
GSList *embossed_ranges = NULL;
GSList *stippled_ranges = NULL;
{
#define gray50_width 2
#define gray50_height 2
- static char gray50_bits[] = {
+ static const char gray50_bits[] = {
0x02, 0x01
};
- stipple = gdk_bitmap_create_from_data (NULL,
+ stipple = gdk_bitmap_create_from_data (drawable,
gray50_bits, gray50_width,
gray50_height);
}
g_slist_free (stippled_ranges);
if (stipple)
- g_object_unref (G_OBJECT (stipple));
+ g_object_unref (stipple);
return new_layout;
}
PangoLayout *layout)
{
GdkGC *gc;
-
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
gc = use_text ? style->text_gc[state_type] : style->fg_gc[state_type];
{
PangoLayout *ins;
- ins = get_insensitive_layout (layout);
+ ins = get_insensitive_layout (window, layout);
gdk_draw_layout (window, gc, x, y, ins);
- g_object_unref (G_OBJECT (ins));
+ g_object_unref (ins);
}
else
{
gint width,
gint height)
{
- g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (window != NULL);
-
+ GdkPoint points[4];
+ gint i, j, skip;
+
if (area)
{
gdk_gc_set_clip_rectangle (style->light_gc[state_type], area);
gdk_gc_set_clip_rectangle (style->dark_gc[state_type], area);
gdk_gc_set_clip_rectangle (style->bg_gc[state_type], area);
}
-
- /* make it square, aligning to bottom right */
- if (width < height)
+
+ skip = -1;
+ switch (edge)
{
- y += (height - width);
- height = width;
+ case GDK_WINDOW_EDGE_NORTH_WEST:
+ /* make it square */
+ if (width < height)
+ height = width;
+ else if (height < width)
+ width = height;
+ skip = 2;
+ break;
+ case GDK_WINDOW_EDGE_NORTH:
+ if (width < height)
+ height = width;
+ break;
+ case GDK_WINDOW_EDGE_NORTH_EAST:
+ /* make it square, aligning to top right */
+ if (width < height)
+ height = width;
+ else if (height < width)
+ {
+ x += (width - height);
+ width = height;
+ }
+ skip = 3;
+ break;
+ case GDK_WINDOW_EDGE_WEST:
+ if (height < width)
+ width = height;
+ break;
+ case GDK_WINDOW_EDGE_EAST:
+ /* aligning to right */
+ if (height < width)
+ {
+ x += (width - height);
+ width = height;
+ }
+ break;
+ case GDK_WINDOW_EDGE_SOUTH_WEST:
+ /* make it square, aligning to bottom left */
+ if (width < height)
+ {
+ y += (height - width);
+ height = width;
+ }
+ else if (height < width)
+ width = height;
+ skip = 1;
+ break;
+ case GDK_WINDOW_EDGE_SOUTH:
+ /* align to bottom */
+ if (width < height)
+ {
+ y += (height - width);
+ height = width;
+ }
+ break;
+ case GDK_WINDOW_EDGE_SOUTH_EAST:
+ /* make it square, aligning to bottom right */
+ if (width < height)
+ {
+ y += (height - width);
+ height = width;
+ }
+ else if (height < width)
+ {
+ x += (width - height);
+ width = height;
+ }
+ skip = 0;
+ break;
+ default:
+ g_assert_not_reached ();
}
- else if (height < width)
+ /* Clear background */
+ j = 0;
+ for (i = 0; i < 4; i++)
{
- x += (width - height);
- width = height;
+ if (skip != i)
+ {
+ points[j].x = (i == 0 || i == 3) ? x : x + width;
+ points[j].y = (i < 2) ? y : y + height;
+ j++;
+ }
}
-
- /* Clear background */
- gtk_style_apply_default_background (style, window, FALSE,
- state_type, area,
- x, y, width, height);
-
+
+ gdk_draw_polygon (window, style->bg_gc[state_type], TRUE,
+ points, skip < 0 ? 4 : 3);
+
switch (edge)
{
+ case GDK_WINDOW_EDGE_WEST:
+ case GDK_WINDOW_EDGE_EAST:
+ {
+ gint xi;
+
+ xi = x;
+
+ while (xi < x + width)
+ {
+ gdk_draw_line (window,
+ style->light_gc[state_type],
+ xi, y,
+ xi, y + height);
+
+ xi++;
+ gdk_draw_line (window,
+ style->dark_gc[state_type],
+ xi, y,
+ xi, y + height);
+
+ xi += 2;
+ }
+ }
+ break;
+ case GDK_WINDOW_EDGE_NORTH:
+ case GDK_WINDOW_EDGE_SOUTH:
+ {
+ gint yi;
+
+ yi = y;
+
+ while (yi < y + height)
+ {
+ gdk_draw_line (window,
+ style->light_gc[state_type],
+ x, yi,
+ x + width, yi);
+
+ yi++;
+ gdk_draw_line (window,
+ style->dark_gc[state_type],
+ x, yi,
+ x + width, yi);
+
+ yi+= 2;
+ }
+ }
+ break;
+ case GDK_WINDOW_EDGE_NORTH_WEST:
+ {
+ gint xi, yi;
+
+ xi = x + width;
+ yi = y + height;
+
+ while (xi > x + 3)
+ {
+ gdk_draw_line (window,
+ style->dark_gc[state_type],
+ xi, y,
+ x, yi);
+
+ --xi;
+ --yi;
+
+ gdk_draw_line (window,
+ style->dark_gc[state_type],
+ xi, y,
+ x, yi);
+
+ --xi;
+ --yi;
+
+ gdk_draw_line (window,
+ style->light_gc[state_type],
+ xi, y,
+ x, yi);
+
+ xi -= 3;
+ yi -= 3;
+
+ }
+ }
+ break;
+ case GDK_WINDOW_EDGE_NORTH_EAST:
+ {
+ gint xi, yi;
+
+ xi = x;
+ yi = y + height;
+
+ while (xi < (x + width - 3))
+ {
+ gdk_draw_line (window,
+ style->light_gc[state_type],
+ xi, y,
+ x + width, yi);
+
+ ++xi;
+ --yi;
+
+ gdk_draw_line (window,
+ style->dark_gc[state_type],
+ xi, y,
+ x + width, yi);
+
+ ++xi;
+ --yi;
+
+ gdk_draw_line (window,
+ style->dark_gc[state_type],
+ xi, y,
+ x + width, yi);
+
+ xi += 3;
+ yi -= 3;
+ }
+ }
+ break;
+ case GDK_WINDOW_EDGE_SOUTH_WEST:
+ {
+ gint xi, yi;
+
+ xi = x + width;
+ yi = y;
+
+ while (xi > x + 3)
+ {
+ gdk_draw_line (window,
+ style->dark_gc[state_type],
+ x, yi,
+ xi, y + height);
+
+ --xi;
+ ++yi;
+
+ gdk_draw_line (window,
+ style->dark_gc[state_type],
+ x, yi,
+ xi, y + height);
+
+ --xi;
+ ++yi;
+
+ gdk_draw_line (window,
+ style->light_gc[state_type],
+ x, yi,
+ xi, y + height);
+
+ xi -= 3;
+ yi += 3;
+
+ }
+ }
+ break;
case GDK_WINDOW_EDGE_SOUTH_EAST:
{
gint xi, yi;
}
}
-static void
-gtk_style_shade (GdkColor *a,
- GdkColor *b,
- gdouble k)
+void
+_gtk_style_shade (GdkColor *a,
+ GdkColor *b,
+ gdouble k)
{
gdouble red;
gdouble green;
* @style: a #GtkStyle
* @window: a #GdkWindow
* @state_type: a state
- * @area: rectangle to which the output is clipped
- * @widget:
- * @detail:
+ * @area: rectangle to which the output is clipped, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
* @x1: the starting x coordinate
* @x2: the ending x coordinate
* @y: the y coordinate
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_hline != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_hline (style, window, state_type, area, widget, detail, x1, x2, y);
}
* @style: a #GtkStyle
* @window: a #GdkWindow
* @state_type: a state
- * @area: rectangle to which the output is clipped
- * @widget:
- * @detail:
- * @y1: the starting y coordinate
- * @y2: the ending y coordinate
+ * @area: rectangle to which the output is clipped, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @y1_: the starting y coordinate
+ * @y2_: the ending y coordinate
* @x: the x coordinate
*
- * Draws a vertical line from (@x, @y1) to (@x, @y1) in @window
+ * Draws a vertical line from (@x, @y1_) to (@x, @y2_) in @window
* using the given style and state.
*/
void
GdkRectangle *area,
GtkWidget *widget,
const gchar *detail,
- gint y1,
- gint y2,
+ gint y1_,
+ gint y2_,
gint x)
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_vline != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
- GTK_STYLE_GET_CLASS (style)->draw_vline (style, window, state_type, area, widget, detail, y1, y2, x);
+ GTK_STYLE_GET_CLASS (style)->draw_vline (style, window, state_type, area, widget, detail, y1_, y2_, x);
}
+/**
+ * gtk_paint_shadow:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @area: clip rectangle or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the rectangle
+ * @y: y origin of the rectangle
+ * @width: width of the rectangle
+ * @height: width of the rectangle
+ *
+ * Draws a shadow around the given rectangle in @window
+ * using the given style and state and shadow type.
+ */
void
gtk_paint_shadow (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_shadow (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
}
+/**
+ * gtk_paint_polygon:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @points: an array of #GdkPoint<!-- -->s
+ * @npoints: length of @points
+ * @fill: %TRUE if the polygon should be filled
+ *
+ * Draws a polygon on @window with the given parameters.
+ */
void
gtk_paint_polygon (GtkStyle *style,
GdkWindow *window,
gboolean fill)
{
g_return_if_fail (GTK_IS_STYLE (style));
- g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow != NULL);
+ g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_polygon != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_polygon (style, window, state_type, shadow_type, area, widget, detail, points, npoints, fill);
}
+/**
+ * gtk_paint_arrow:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @arrow_type: the type of arrow to draw
+ * @fill: %TRUE if the arrow tip should be filled
+ * @x: x origin of the rectangle to draw the arrow in
+ * @y: y origin of the rectangle to draw the arrow in
+ * @width: width of the rectangle to draw the arrow in
+ * @height: height of the rectangle to draw the arrow in
+ *
+ * Draws an arrow in the given rectangle on @window using the given
+ * parameters. @arrow_type determines the direction of the arrow.
+ */
void
gtk_paint_arrow (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_arrow != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_arrow (style, window, state_type, shadow_type, area, widget, detail, arrow_type, fill, x, y, width, height);
}
+/**
+ * gtk_paint_diamond:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the rectangle to draw the diamond in
+ * @y: y origin of the rectangle to draw the diamond in
+ * @width: width of the rectangle to draw the diamond in
+ * @height: height of the rectangle to draw the diamond in
+ *
+ * Draws a diamond in the given rectangle on @window using the given
+ * parameters.
+ */
void
gtk_paint_diamond (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_diamond != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_diamond (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
}
* @style: a #GtkStyle
* @window: a #GdkWindow
* @state_type: a state
- * @area: clip rectangle
- * @widget: the widget
- * @detail: a style detail
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
* @x: x origin
* @y: y origin
* @string: the string to draw
*
* Draws a text string on @window with the given parameters.
*
- * This function is deprecated, use gtk_paint_layout() instead.
+ * Deprecated: Use gtk_paint_layout() instead.
*/
void
gtk_paint_string (GtkStyle *style,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_string != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_string (style, window, state_type, area, widget, detail, x, y, string);
}
+/**
+ * gtk_paint_box:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the box
+ * @y: y origin of the box
+ * @width: the width of the box
+ * @height: the height of the box
+ *
+ * Draws a box on @window with the given parameters.
+ */
void
gtk_paint_box (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
}
+/**
+ * gtk_paint_flat_box:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the box
+ * @y: y origin of the box
+ * @width: the width of the box
+ * @height: the height of the box
+ *
+ * Draws a flat box on @window with the given parameters.
+ */
void
gtk_paint_flat_box (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_flat_box != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_flat_box (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
}
+/**
+ * gtk_paint_check:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the rectangle to draw the check in
+ * @y: y origin of the rectangle to draw the check in
+ * @width: the width of the rectangle to draw the check in
+ * @height: the height of the rectangle to draw the check in
+ *
+ * Draws a check button indicator in the given rectangle on @window with
+ * the given parameters.
+ */
void
gtk_paint_check (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_check != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_check (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
}
+/**
+ * gtk_paint_option:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the rectangle to draw the option in
+ * @y: y origin of the rectangle to draw the option in
+ * @width: the width of the rectangle to draw the option in
+ * @height: the height of the rectangle to draw the option in
+ *
+ * Draws a radio button indicator in the given rectangle on @window with
+ * the given parameters.
+ */
void
gtk_paint_option (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_option != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_option (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
}
+/**
+ * gtk_paint_tab:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: the type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the rectangle to draw the tab in
+ * @y: y origin of the rectangle to draw the tab in
+ * @width: the width of the rectangle to draw the tab in
+ * @height: the height of the rectangle to draw the tab in
+ *
+ * Draws an option menu tab (i.e. the up and down pointing arrows)
+ * in the given rectangle on @window using the given parameters.
+ */
void
gtk_paint_tab (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_tab != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_tab (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height);
}
+/**
+ * gtk_paint_shadow_gap:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the rectangle
+ * @y: y origin of the rectangle
+ * @width: width of the rectangle
+ * @height: width of the rectangle
+ * @gap_side: side in which to leave the gap
+ * @gap_x: starting position of the gap
+ * @gap_width: width of the gap
+ *
+ * Draws a shadow around the given rectangle in @window
+ * using the given style and state and shadow type, leaving a
+ * gap in one side.
+*/
void
gtk_paint_shadow_gap (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_shadow_gap != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_shadow_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
}
+/**
+ * gtk_paint_box_gap:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the rectangle
+ * @y: y origin of the rectangle
+ * @width: width of the rectangle
+ * @height: width of the rectangle
+ * @gap_side: side in which to leave the gap
+ * @gap_x: starting position of the gap
+ * @gap_width: width of the gap
+ *
+ * Draws a box in @window using the given style and state and shadow type,
+ * leaving a gap in one side.
+ */
void
gtk_paint_box_gap (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_box_gap != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_box_gap (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side, gap_x, gap_width);
}
+/**
+ * gtk_paint_extension:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the extension
+ * @y: y origin of the extension
+ * @width: width of the extension
+ * @height: width of the extension
+ * @gap_side: the side on to which the extension is attached
+ *
+ * Draws an extension, i.e. a notebook tab.
+ **/
void
gtk_paint_extension (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_extension != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_extension (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, gap_side);
}
+/**
+ * gtk_paint_focus:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: the x origin of the rectangle around which to draw a focus indicator
+ * @y: the y origin of the rectangle around which to draw a focus indicator
+ * @width: the width of the rectangle around which to draw a focus indicator
+ * @height: the height of the rectangle around which to draw a focus indicator
+ *
+ * Draws a focus indicator around the given rectangle on @window using the
+ * given style.
+ */
void
gtk_paint_focus (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_focus != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_focus (style, window, state_type, area, widget, detail, x, y, width, height);
}
+/**
+ * gtk_paint_slider:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: a shadow
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: the x origin of the rectangle in which to draw a slider
+ * @y: the y origin of the rectangle in which to draw a slider
+ * @width: the width of the rectangle in which to draw a slider
+ * @height: the height of the rectangle in which to draw a slider
+ * @orientation: the orientation to be used
+ *
+ * Draws a slider in the given rectangle on @window using the
+ * given style and orientation.
+ **/
void
gtk_paint_slider (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_slider != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_slider (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
}
+/**
+ * gtk_paint_handle:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @shadow_type: type of shadow to draw
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin of the handle
+ * @y: y origin of the handle
+ * @width: with of the handle
+ * @height: height of the handle
+ * @orientation: the orientation of the handle
+ *
+ * Draws a handle as used in #GtkHandleBox and #GtkPaned.
+ **/
void
gtk_paint_handle (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_handle != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_handle (style, window, state_type, shadow_type, area, widget, detail, x, y, width, height, orientation);
}
+/**
+ * gtk_paint_expander:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: the x position to draw the expander at
+ * @y: the y position to draw the expander at
+ * @expander_style: the style to draw the expander in; determines
+ * whether the expander is collapsed, expanded, or in an
+ * intermediate state.
+ *
+ * Draws an expander as used in #GtkTreeView. @x and @y specify the
+ * center the expander. The size of the expander is determined by the
+ * "expander-size" style property of @widget. (If widget is not
+ * specified or doesn't have an "expander-size" property, an
+ * unspecified default size will be used, since the caller doesn't
+ * have sufficient information to position the expander, this is
+ * likely not useful.) The expander is expander_size pixels tall
+ * in the collapsed position and expander_size pixels wide in the
+ * expanded position.
+ **/
void
gtk_paint_expander (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_expander != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_expander (style, window, state_type, area,
widget, detail, x, y, expander_style);
}
+/**
+ * gtk_paint_layout:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @use_text: whether to use the text or foreground
+ * graphics context of @style
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @x: x origin
+ * @y: y origin
+ * @layout: the layout to draw
+ *
+ * Draws a layout on @window using the given parameters.
+ **/
void
gtk_paint_layout (GtkStyle *style,
GdkWindow *window,
GtkStateType state_type,
- gboolean use_text,
+ gboolean use_text,
GdkRectangle *area,
GtkWidget *widget,
const gchar *detail,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_layout != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_layout (style, window, state_type, use_text, area,
widget, detail, x, y, layout);
}
+/**
+ * gtk_paint_resize_grip:
+ * @style: a #GtkStyle
+ * @window: a #GdkWindow
+ * @state_type: a state
+ * @area: clip rectangle, or %NULL if the
+ * output should not be clipped
+ * @widget: the widget (may be %NULL)
+ * @detail: a style detail (may be %NULL)
+ * @edge: the edge in which to draw the resize grip
+ * @x: the x origin of the rectangle in which to draw the resize grip
+ * @y: the y origin of the rectangle in which to draw the resize grip
+ * @width: the width of the rectangle in which to draw the resize grip
+ * @height: the height of the rectangle in which to draw the resize grip
+ *
+ * Draws a resize grip in the given rectangle on @window using the given
+ * parameters.
+ */
void
gtk_paint_resize_grip (GtkStyle *style,
GdkWindow *window,
{
g_return_if_fail (GTK_IS_STYLE (style));
g_return_if_fail (GTK_STYLE_GET_CLASS (style)->draw_resize_grip != NULL);
+ g_return_if_fail (style->depth == gdk_drawable_get_depth (window));
GTK_STYLE_GET_CLASS (style)->draw_resize_grip (style, window, state_type,
area, widget, detail,
/**
* gtk_border_copy:
- * @border: a #GtkBorder.
- * @returns: a copy of @border.
+ * @border_: a #GtkBorder.
+ * @returns: a copy of @border_.
*
* Copies a #GtkBorder structure.
**/
/**
* gtk_border_free:
- * @border: a #GtkBorder.
+ * @border_: a #GtkBorder.
*
* Frees a #GtkBorder structure.
**/
static GType our_type = 0;
if (our_type == 0)
- our_type = g_boxed_type_register_static ("GtkTypeBorder",
+ our_type = g_boxed_type_register_static (I_("GtkBorder"),
(GBoxedCopyFunc) gtk_border_copy,
(GBoxedFreeFunc) gtk_border_free);
return our_type;
}
-/**
- * gtk_style_get_font:
- * @style: a #GtkStyle
- *
- * Gets the #GdkFont to use for the given style. This is
- * meant only as a replacement for direct access to @style->font
- * and should not be used in new code. New code should
- * use @style->font_desc instead.
- *
- * Return value: the #GdkFont for the style. This font is owned
- * by the style; if you want to keep around a copy, you must
- * call gdk_font_ref().
- **/
-GdkFont *
-gtk_style_get_font (GtkStyle *style)
+static GdkFont *
+gtk_style_get_font_internal (GtkStyle *style)
{
g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
if (!style->private_font)
{
+ GdkDisplay *display;
+
+ if (style->colormap)
+ {
+ display = gdk_screen_get_display (gdk_colormap_get_screen (style->colormap));
+ }
+ else
+ {
+ display = gdk_display_get_default ();
+ GTK_NOTE (MULTIHEAD,
+ g_warning ("gtk_style_get_font() should not be called on an unattached style"));
+ }
+
if (style->font_desc)
{
- style->private_font = gdk_font_from_description (style->font_desc);
+ style->private_font = gdk_font_from_description_for_display (display, style->font_desc);
style->private_font_desc = pango_font_description_copy (style->font_desc);
}
if (!style->private_font)
- style->private_font = gdk_font_load ("fixed");
-
+ style->private_font = gdk_font_load_for_display (display, "fixed");
+
if (!style->private_font)
g_error ("Unable to load \"fixed\" font");
}
return style->private_font;
}
+/**
+ * gtk_style_get_font:
+ * @style: a #GtkStyle
+ *
+ * Gets the #GdkFont to use for the given style. This is
+ * meant only as a replacement for direct access to @style->font
+ * and should not be used in new code. New code should
+ * use @style->font_desc instead.
+ *
+ * Return value: the #GdkFont for the style. This font is owned
+ * by the style; if you want to keep around a copy, you must
+ * call gdk_font_ref().
+ **/
+GdkFont *
+gtk_style_get_font (GtkStyle *style)
+{
+ g_return_val_if_fail (GTK_IS_STYLE (style), NULL);
+
+ return gtk_style_get_font_internal (style);
+}
+
/**
* gtk_style_set_font:
* @style: a #GtkStyle.
}
}
-/**
- * _gtk_draw_insertion_cursor:
- * @widget: a #GtkWidget
- * @drawable: a #GdkDrawable
- * @gc: a #GdkGC
- * @location: location where to draw the cursor (@location->width is ignored)
- * @direction: whether the cursor is left-to-right or
- * right-to-left. Should never be #GTK_TEXT_DIR_NONE
- * @draw_arrow: %TRUE to draw a directional arrow on the
- * cursor. Should be %FALSE unless the cursor is split.
- *
- * Draws a text caret on @drawable at @location. This is not a style function
- * but merely a convenience function for drawing the standard cursor shape.
- **/
-void
-_gtk_draw_insertion_cursor (GtkWidget *widget,
- GdkDrawable *drawable,
- GdkGC *gc,
- GdkRectangle *location,
- GtkTextDirection direction,
- gboolean draw_arrow)
+typedef struct _CursorInfo CursorInfo;
+
+struct _CursorInfo
+{
+ GType for_type;
+ GdkGC *primary_gc;
+ GdkGC *secondary_gc;
+};
+
+static void
+style_unrealize_cursor_gcs (GtkStyle *style)
+{
+ CursorInfo *
+
+ cursor_info = g_object_get_data (G_OBJECT (style), "gtk-style-cursor-info");
+ if (cursor_info)
+ {
+ if (cursor_info->primary_gc)
+ gtk_gc_release (cursor_info->primary_gc);
+
+ if (cursor_info->secondary_gc)
+ gtk_gc_release (cursor_info->secondary_gc);
+
+ g_free (cursor_info);
+ g_object_set_data (G_OBJECT (style), I_("gtk-style-cursor-info"), NULL);
+ }
+}
+
+static GdkGC *
+make_cursor_gc (GtkWidget *widget,
+ const gchar *property_name,
+ const GdkColor *fallback)
+{
+ GdkGCValues gc_values;
+ GdkGCValuesMask gc_values_mask;
+ GdkColor *cursor_color;
+
+ gtk_widget_style_get (widget, property_name, &cursor_color, NULL);
+
+ gc_values_mask = GDK_GC_FOREGROUND;
+ if (cursor_color)
+ {
+ gc_values.foreground = *cursor_color;
+ gdk_color_free (cursor_color);
+ }
+ else
+ gc_values.foreground = *fallback;
+
+ gdk_rgb_find_color (widget->style->colormap, &gc_values.foreground);
+ return gtk_gc_get (widget->style->depth, widget->style->colormap, &gc_values, gc_values_mask);
+}
+
+static GdkGC *
+get_insertion_cursor_gc (GtkWidget *widget,
+ gboolean is_primary)
+{
+ CursorInfo *cursor_info;
+
+ cursor_info = g_object_get_data (G_OBJECT (widget->style), "gtk-style-cursor-info");
+ if (!cursor_info)
+ {
+ cursor_info = g_new (CursorInfo, 1);
+ g_object_set_data (G_OBJECT (widget->style), I_("gtk-style-cursor-info"), cursor_info);
+ cursor_info->primary_gc = NULL;
+ cursor_info->secondary_gc = NULL;
+ cursor_info->for_type = G_TYPE_INVALID;
+ }
+
+ /* We have to keep track of the type because gtk_widget_style_get()
+ * can return different results when called on the same property and
+ * same style but for different widgets. :-(. That is,
+ * GtkEntry::cursor-color = "red" in a style will modify the cursor
+ * color for entries but not for text view.
+ */
+ if (cursor_info->for_type != G_OBJECT_TYPE (widget))
+ {
+ cursor_info->for_type = G_OBJECT_TYPE (widget);
+ if (cursor_info->primary_gc)
+ {
+ gtk_gc_release (cursor_info->primary_gc);
+ cursor_info->primary_gc = NULL;
+ }
+ if (cursor_info->secondary_gc)
+ {
+ gtk_gc_release (cursor_info->secondary_gc);
+ cursor_info->secondary_gc = NULL;
+ }
+ }
+
+ if (is_primary)
+ {
+ if (!cursor_info->primary_gc)
+ cursor_info->primary_gc = make_cursor_gc (widget,
+ "cursor-color",
+ &widget->style->black);
+
+ return cursor_info->primary_gc;
+ }
+ else
+ {
+ static const GdkColor gray = { 0, 0x8888, 0x8888, 0x8888 };
+
+ if (!cursor_info->secondary_gc)
+ cursor_info->secondary_gc = make_cursor_gc (widget,
+ "secondary-cursor-color",
+ &gray);
+
+ return cursor_info->secondary_gc;
+ }
+}
+
+static void
+draw_insertion_cursor (GtkWidget *widget,
+ GdkDrawable *drawable,
+ GdkGC *gc,
+ GdkRectangle *location,
+ GtkTextDirection direction,
+ gboolean draw_arrow)
{
gint stem_width;
gint arrow_width;
gfloat cursor_aspect_ratio;
gint offset;
- g_return_if_fail (direction != GTK_TEXT_DIR_NONE);
-
+ /* When changing the shape or size of the cursor here,
+ * propagate the changes to gtktextview.c:text_window_invalidate_cursors().
+ */
+
gtk_widget_style_get (widget, "cursor-aspect-ratio", &cursor_aspect_ratio, NULL);
stem_width = location->height * cursor_aspect_ratio + 1;
}
}
}
+
+/**
+ * gtk_draw_insertion_cursor:
+ * @widget: a #GtkWidget
+ * @drawable: a #GdkDrawable
+ * @area: rectangle to which the output is clipped, or %NULL if the
+ * output should not be clipped
+ * @location: location where to draw the cursor (@location->width is ignored)
+ * @is_primary: if the cursor should be the primary cursor color.
+ * @direction: whether the cursor is left-to-right or
+ * right-to-left. Should never be #GTK_TEXT_DIR_NONE
+ * @draw_arrow: %TRUE to draw a directional arrow on the
+ * cursor. Should be %FALSE unless the cursor is split.
+ *
+ * Draws a text caret on @drawable at @location. This is not a style function
+ * but merely a convenience function for drawing the standard cursor shape.
+ *
+ * Since: 2.4
+ **/
+void
+gtk_draw_insertion_cursor (GtkWidget *widget,
+ GdkDrawable *drawable,
+ GdkRectangle *area,
+ GdkRectangle *location,
+ gboolean is_primary,
+ GtkTextDirection direction,
+ gboolean draw_arrow)
+{
+ GdkGC *gc;
+
+ g_return_if_fail (GTK_IS_WIDGET (widget));
+ g_return_if_fail (GDK_IS_DRAWABLE (drawable));
+ g_return_if_fail (location != NULL);
+ g_return_if_fail (direction != GTK_TEXT_DIR_NONE);
+
+ gc = get_insertion_cursor_gc (widget, is_primary);
+ if (area)
+ gdk_gc_set_clip_rectangle (gc, area);
+
+ draw_insertion_cursor (widget, drawable, gc,
+ location, direction, draw_arrow);
+
+ if (area)
+ gdk_gc_set_clip_rectangle (gc, NULL);
+}
+
+#define __GTK_STYLE_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff