*
* gtk_text_buffer_create_tag() is the best way to create tags.
* See <application>gtk3-demo</application> for numerous examples.
+ *
+ * For each property of #GtkTextTag, there is a "set" property, e.g.
+ * "font-set" corresponds to "font". These "set" properties reflect
+ * whether a property has been set or not.
+ * They are maintained by GTK+ and you should not set them independently.
*/
#include "config.h"
#include <stdlib.h>
#include <string.h>
-#include "gtkmainprivate.h"
#include "gtktexttag.h"
#include "gtktexttypes.h"
#include "gtktexttagtable.h"
PROP_FOREGROUND,
PROP_BACKGROUND_GDK,
PROP_FOREGROUND_GDK,
+ PROP_BACKGROUND_RGBA,
+ PROP_FOREGROUND_RGBA,
PROP_FONT,
PROP_FONT_DESC,
PROP_FAMILY,
PROP_INVISIBLE,
PROP_PARAGRAPH_BACKGROUND,
PROP_PARAGRAPH_BACKGROUND_GDK,
+ PROP_PARAGRAPH_BACKGROUND_RGBA,
/* Behavior args */
PROP_ACCUMULATIVE_MARGIN,
NULL,
GTK_PARAM_WRITABLE));
+ /**
+ * GtkTextTag:background-gdk:
+ *
+ * Background color as a #GdkColor.
+ *
+ * Deprecated: 3.4: Use #GtkTextTag:background-rgba instead.
+ */
g_object_class_install_property (object_class,
PROP_BACKGROUND_GDK,
g_param_spec_boxed ("background-gdk",
P_("Background color"),
- P_("Background color as a (possibly unallocated) GdkColor"),
+ P_("Background color as a GdkColor"),
GDK_TYPE_COLOR,
+ GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
+
+ /**
+ * GtkTextTag:background-rgba:
+ *
+ * Background color as a #GdkRGBA.
+ *
+ * Since: 3.2
+ */
+ g_object_class_install_property (object_class,
+ PROP_BACKGROUND_RGBA,
+ g_param_spec_boxed ("background-rgba",
+ P_("Background RGBA"),
+ P_("Background color as a GdkRGBA"),
+ GDK_TYPE_RGBA,
GTK_PARAM_READWRITE));
g_object_class_install_property (object_class,
NULL,
GTK_PARAM_WRITABLE));
+ /**
+ * GtkTextTag:foreground-gdk:
+ *
+ * Foreground color as a #GdkColor.
+ *
+ * Deprecated: 3.4: Use #GtkTextTag:foreground-rgba instead.
+ */
g_object_class_install_property (object_class,
PROP_FOREGROUND_GDK,
g_param_spec_boxed ("foreground-gdk",
P_("Foreground color"),
- P_("Foreground color as a (possibly unallocated) GdkColor"),
+ P_("Foreground color as a GdkColor"),
GDK_TYPE_COLOR,
+ GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
+
+ /**
+ * GtkTextTag:foreground-rgba:
+ *
+ * Foreground color as a #GdkRGBA.
+ *
+ * Since: 3.2
+ */
+ g_object_class_install_property (object_class,
+ PROP_FOREGROUND_RGBA,
+ g_param_spec_boxed ("foreground-rgba",
+ P_("Foreground RGBA"),
+ P_("Foreground color as a GdkRGBA"),
+ GDK_TYPE_RGBA,
GTK_PARAM_READWRITE));
g_object_class_install_property (object_class,
/**
* GtkTextTag:paragraph-background-gdk:
*
- * The paragraph background color as a as a (possibly unallocated)
- * #GdkColor.
+ * The paragraph background color as a as a #GdkColor.
*
* Since: 2.8
+ *
+ * Deprecated: 3.4: Use #GtkTextTag:paragraph-background-rgba instead.
*/
g_object_class_install_property (object_class,
PROP_PARAGRAPH_BACKGROUND_GDK,
g_param_spec_boxed ("paragraph-background-gdk",
P_("Paragraph background color"),
- P_("Paragraph background color as a (possibly unallocated) GdkColor"),
+ P_("Paragraph background color as a GdkColor"),
GDK_TYPE_COLOR,
+ GTK_PARAM_READWRITE | G_PARAM_DEPRECATED));
+
+ /**
+ * GtkTextTag:paragraph-background-rgba:
+ *
+ * The paragraph background color as a as a #GdkRGBA.
+ *
+ * Since: 3.2
+ */
+ g_object_class_install_property (object_class,
+ PROP_PARAGRAPH_BACKGROUND_RGBA,
+ g_param_spec_boxed ("paragraph-background-rgba",
+ P_("Paragraph background RGBA"),
+ P_("Paragraph background RGBA as a GdkRGBA"),
+ GDK_TYPE_RGBA,
GTK_PARAM_READWRITE));
/**
}
static void
-set_bg_color (GtkTextTag *tag, GdkColor *color)
+copy_rgba_to_gdk_color (GdkRGBA *src,
+ GdkColor *dest)
+{
+ dest->red = CLAMP (src->red, 0.0, 1.0) * 65535.0;
+ dest->green = CLAMP (src->green, 0.0, 1.0) * 65535.0;
+ dest->blue = CLAMP (src->blue, 0.0, 1.0) * 65535.0;
+}
+
+static void
+copy_gdk_color_to_rgba (GdkColor *src,
+ GdkRGBA *dest)
+{
+ dest->red = src->red / 65535.;
+ dest->green = src->green / 65535.;
+ dest->blue = src->blue / 65535.;
+ dest->alpha = 1;
+}
+
+static void
+set_bg_rgba (GtkTextTag *tag, GdkRGBA *rgba)
{
GtkTextTagPrivate *priv = tag->priv;
- if (color)
+ if (priv->values->appearance.rgba[0])
+ gdk_rgba_free (priv->values->appearance.rgba[0]);
+
+ priv->values->appearance.rgba[0] = NULL;
+
+ if (rgba)
{
if (!priv->bg_color_set)
{
g_object_notify (G_OBJECT (tag), "background-set");
}
- priv->values->appearance.bg_color = *color;
+ priv->values->appearance.rgba[0] = gdk_rgba_copy (rgba);
+
+ copy_rgba_to_gdk_color (rgba, &priv->values->appearance.bg_color);
}
else
{
}
static void
-set_fg_color (GtkTextTag *tag, GdkColor *color)
+set_fg_rgba (GtkTextTag *tag, GdkRGBA *rgba)
{
GtkTextTagPrivate *priv = tag->priv;
- if (color)
+ if (priv->values->appearance.rgba[1])
+ gdk_rgba_free (priv->values->appearance.rgba[1]);
+
+ priv->values->appearance.rgba[1] = NULL;
+
+ if (rgba)
{
if (!priv->fg_color_set)
{
priv->fg_color_set = TRUE;
g_object_notify (G_OBJECT (tag), "foreground-set");
}
- priv->values->appearance.fg_color = *color;
+
+ priv->values->appearance.rgba[1] = gdk_rgba_copy (rgba);
+
+ copy_rgba_to_gdk_color (rgba, &priv->values->appearance.fg_color);
}
else
{
}
static void
-set_pg_bg_color (GtkTextTag *tag, GdkColor *color)
+set_pg_bg_rgba (GtkTextTag *tag, GdkRGBA *rgba)
{
GtkTextTagPrivate *priv = tag->priv;
- if (color)
+ if (priv->values->pg_bg_rgba)
+ gdk_rgba_free (priv->values->pg_bg_rgba);
+
+ if (priv->values->pg_bg_color)
+ gdk_color_free (priv->values->pg_bg_color);
+
+ priv->values->pg_bg_rgba = NULL;
+ priv->values->pg_bg_color = NULL;
+
+ if (rgba)
{
+ GdkColor color = { 0, };
+
if (!priv->pg_bg_color_set)
{
priv->pg_bg_color_set = TRUE;
g_object_notify (G_OBJECT (tag), "paragraph-background-set");
}
- else
- gdk_color_free (priv->values->pg_bg_color);
- priv->values->pg_bg_color = gdk_color_copy (color);
+ priv->values->pg_bg_rgba = gdk_rgba_copy (rgba);
+
+ copy_rgba_to_gdk_color (rgba, &color);
+ priv->values->pg_bg_color = gdk_color_copy (&color);
}
else
{
{
priv->pg_bg_color_set = FALSE;
g_object_notify (G_OBJECT (tag), "paragraph-background-set");
- gdk_color_free (priv->values->pg_bg_color);
}
+ }
+}
+
+
+static void
+set_bg_color (GtkTextTag *tag, GdkColor *color)
+{
+ if (color)
+ {
+ GdkRGBA rgba;
- priv->values->pg_bg_color = NULL;
+ copy_gdk_color_to_rgba (color, &rgba);
+ set_bg_rgba (tag, &rgba);
}
+ else
+ set_bg_rgba (tag, NULL);
+}
+
+static void
+set_fg_color (GtkTextTag *tag, GdkColor *color)
+{
+ if (color)
+ {
+ GdkRGBA rgba;
+
+ copy_gdk_color_to_rgba (color, &rgba);
+ set_fg_rgba (tag, &rgba);
+ }
+ else
+ set_fg_rgba (tag, NULL);
+}
+
+static void
+set_pg_bg_color (GtkTextTag *tag, GdkColor *color)
+{
+ if (color)
+ {
+ GdkRGBA rgba;
+
+ copy_gdk_color_to_rgba (color, &rgba);
+ set_pg_bg_rgba (tag, &rgba);
+ }
+ else
+ set_pg_bg_rgba (tag, NULL);
}
static PangoFontMask
case PROP_BACKGROUND:
{
- GdkColor color;
+ GdkRGBA rgba;
if (!g_value_get_string (value))
- set_bg_color (text_tag, NULL); /* reset to background_set to FALSE */
- else if (gdk_color_parse (g_value_get_string (value), &color))
- set_bg_color (text_tag, &color);
+ set_bg_rgba (text_tag, NULL); /* reset background_set to FALSE */
+ else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
+ set_bg_rgba (text_tag, &rgba);
else
g_warning ("Don't know color `%s'", g_value_get_string (value));
case PROP_FOREGROUND:
{
- GdkColor color;
+ GdkRGBA rgba;
if (!g_value_get_string (value))
- set_fg_color (text_tag, NULL); /* reset to foreground_set to FALSE */
- else if (gdk_color_parse (g_value_get_string (value), &color))
- set_fg_color (text_tag, &color);
+ set_fg_rgba (text_tag, NULL); /* reset to foreground_set to FALSE */
+ else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
+ set_fg_rgba (text_tag, &rgba);
else
g_warning ("Don't know color `%s'", g_value_get_string (value));
}
break;
+ case PROP_BACKGROUND_RGBA:
+ {
+ GdkRGBA *color = g_value_get_boxed (value);
+
+ set_bg_rgba (text_tag, color);
+ }
+ break;
+
+ case PROP_FOREGROUND_RGBA:
+ {
+ GdkRGBA *color = g_value_get_boxed (value);
+
+ set_fg_rgba (text_tag, color);
+ }
+ break;
+
case PROP_FONT:
{
PangoFontDescription *font_desc = NULL;
case PROP_PARAGRAPH_BACKGROUND:
{
- GdkColor color;
+ GdkRGBA rgba;
if (!g_value_get_string (value))
- set_pg_bg_color (text_tag, NULL); /* reset to paragraph_background_set to FALSE */
- else if (gdk_color_parse (g_value_get_string (value), &color))
- set_pg_bg_color (text_tag, &color);
+ set_pg_bg_rgba (text_tag, NULL); /* reset paragraph_background_set to FALSE */
+ else if (gdk_rgba_parse (&rgba, g_value_get_string (value)))
+ set_pg_bg_rgba (text_tag, &rgba);
else
g_warning ("Don't know color `%s'", g_value_get_string (value));
}
break;
+ case PROP_PARAGRAPH_BACKGROUND_RGBA:
+ {
+ GdkRGBA *color = g_value_get_boxed (value);
+
+ set_pg_bg_rgba (text_tag, color);
+ }
+ break;
+
case PROP_ACCUMULATIVE_MARGIN:
priv->accumulative_margin = g_value_get_boolean (value);
g_object_notify (object, "accumulative-margin");
g_value_set_boxed (value, &priv->values->appearance.bg_color);
break;
+ case PROP_BACKGROUND_RGBA:
+ g_value_set_boxed (value, priv->values->appearance.rgba[0]);
+ break;
+
case PROP_FOREGROUND_GDK:
g_value_set_boxed (value, &priv->values->appearance.fg_color);
break;
+ case PROP_FOREGROUND_RGBA:
+ g_value_set_boxed (value, priv->values->appearance.rgba[1]);
+ break;
+
case PROP_FONT:
{
gchar *str;
g_value_set_boxed (value, priv->values->pg_bg_color);
break;
+ case PROP_PARAGRAPH_BACKGROUND_RGBA:
+ g_value_set_boxed (value, priv->values->pg_bg_rgba);
+ break;
+
case PROP_ACCUMULATIVE_MARGIN:
g_value_set_boolean (value, priv->accumulative_margin);
break;
case PROP_FOREGROUND:
case PROP_PARAGRAPH_BACKGROUND:
g_warning ("'foreground', 'background' and 'paragraph_background' properties are not readable, use 'foreground_gdk', 'background_gdk' and 'paragraph_background_gdk'");
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
projects / ~andy / gtk / blobdiff