* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#include "config.h"
#include <cairo-gobject.h>
#include "gtkstyleprovider.h"
-#include "gtksymboliccolor.h"
#include "gtkthemingengine.h"
-#include "gtkanimationdescription.h"
-#include "gtkgradient.h"
-#include "gtkshadowprivate.h"
#include "gtkcssshorthandpropertyprivate.h"
+#include "gtkcsstypedvalueprivate.h"
#include "gtkcsstypesprivate.h"
#include "gtkborderimageprivate.h"
#include "gtkstylepropertyprivate.h"
#include "gtkstyleproviderprivate.h"
#include "gtkintl.h"
-
#include "gtkwin32themeprivate.h"
+#include "deprecated/gtkgradient.h"
+#include "deprecated/gtksymboliccolorprivate.h"
+
/**
* SECTION:gtkstyleproperties
* @Short_description: Store for style property information
struct ValueData
{
GtkStateFlags state;
- GValue value;
+ GtkCssValue *value;
};
struct PropertyData
{
GHashTable *color_map;
GHashTable *properties;
- GtkSymbolicColorLookupFunc color_lookup_func;
- gpointer color_lookup_data;
};
static void gtk_style_properties_provider_init (GtkStyleProviderIface *iface);
value_data = &g_array_index (data->values, ValueData, i);
- if (G_IS_VALUE (&value_data->value))
- g_value_unset (&value_data->value);
+ _gtk_css_value_unref (value_data->value);
+ value_data->value = NULL;
}
if (data->values->len > 0)
return found;
}
-static GValue *
+static ValueData *
property_data_get_value (PropertyData *data,
GtkStateFlags state)
{
- ValueData *val_data;
guint pos;
if (!property_data_find_position (data, state, &pos))
g_array_insert_val (data->values, pos, new);
}
- val_data = &g_array_index (data->values, ValueData, pos);
-
- return &val_data->value;
+ return &g_array_index (data->values, ValueData, pos);
}
-static GValue *
+static GtkCssValue *
property_data_match_state (PropertyData *data,
GtkStateFlags state)
{
/* Exact match */
val_data = &g_array_index (data->values, ValueData, pos);
- return &val_data->value;
+ return val_data->value;
}
if (pos >= data->values->len)
if (val_data->state == 0 ||
((val_data->state & state) != 0 &&
(val_data->state & ~state) == 0))
- return &val_data->value;
+ return val_data->value;
}
return NULL;
G_OBJECT_CLASS (gtk_style_properties_parent_class)->finalize (object);
}
-GtkStyleProperties *
-gtk_style_properties_get_style (GtkStyleProvider *provider,
- GtkWidgetPath *path)
-{
- /* Return style set itself */
- return g_object_ref (provider);
-}
-
static void
gtk_style_properties_provider_init (GtkStyleProviderIface *iface)
{
- iface->get_style = gtk_style_properties_get_style;
}
-static GtkSymbolicColor *
+static GtkCssValue *
gtk_style_properties_provider_get_color (GtkStyleProviderPrivate *provider,
const char *name)
{
- return gtk_style_properties_lookup_color (GTK_STYLE_PROPERTIES (provider), name);
+ GtkSymbolicColor *symbolic;
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
+
+ symbolic = gtk_style_properties_lookup_color (GTK_STYLE_PROPERTIES (provider), name);
+ if (symbolic == NULL)
+ return NULL;
+
+ return _gtk_symbolic_color_get_css_value (symbolic);
+
+ G_GNUC_END_IGNORE_DEPRECATIONS;
}
static void
gtk_style_properties_provider_lookup (GtkStyleProviderPrivate *provider,
- GtkWidgetPath *path,
- GtkStateFlags state,
+ const GtkCssMatcher *matcher,
GtkCssLookup *lookup)
{
GtkStyleProperties *props;
{
GtkCssStyleProperty *prop = key;
PropertyData *data = value;
- const GValue *value;
+ GtkCssValue *value;
guint id;
id = _gtk_css_style_property_get_id (prop);
if (!_gtk_css_lookup_is_missing (lookup, id))
continue;
- value = property_data_match_state (data, state);
+ value = property_data_match_state (data, _gtk_css_matcher_get_state (matcher));
if (value == NULL)
continue;
- _gtk_css_lookup_set (lookup, id, NULL, value);
+ _gtk_css_lookup_set_computed (lookup, id, NULL, value);
}
}
+static GtkCssChange
+gtk_style_properties_provider_get_change (GtkStyleProviderPrivate *provider,
+ const GtkCssMatcher *matcher)
+{
+ return GTK_CSS_CHANGE_STATE;
+}
+
static void
gtk_style_properties_provider_private_init (GtkStyleProviderPrivateInterface *iface)
{
iface->get_color = gtk_style_properties_provider_get_color;
iface->lookup = gtk_style_properties_provider_lookup;
+ iface->get_change = gtk_style_properties_provider_get_change;
}
/* GtkStyleProperties methods */
return g_object_new (GTK_TYPE_STYLE_PROPERTIES, NULL);
}
-void
-_gtk_style_properties_set_color_lookup_func (GtkStyleProperties *props,
- GtkSymbolicColorLookupFunc func,
- gpointer data)
-{
- GtkStylePropertiesPrivate *priv;
-
- g_return_if_fail (GTK_IS_STYLE_PROPERTIES (props));
- g_return_if_fail (func != NULL);
-
- priv = props->priv;
- g_return_if_fail (priv->color_map == NULL);
-
- priv->color_lookup_func = func;
- priv->color_lookup_data = data;
-}
-
/**
* gtk_style_properties_map_color:
* @props: a #GtkStyleProperties
* gtk_style_properties_lookup_color()
*
* Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
**/
void
gtk_style_properties_map_color (GtkStyleProperties *props,
g_return_if_fail (color != NULL);
priv = props->priv;
- g_return_if_fail (priv->color_lookup_func == NULL);
+
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
if (G_UNLIKELY (!priv->color_map))
priv->color_map = g_hash_table_new_full (g_str_hash,
g_hash_table_replace (priv->color_map,
g_strdup (name),
gtk_symbolic_color_ref (color));
+
+ G_GNUC_END_IGNORE_DEPRECATIONS;
+
+ _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (props));
}
/**
* Returns: (transfer none): The mapped color
*
* Since: 3.0
+ *
+ * Deprecated: 3.8: #GtkSymbolicColor is deprecated.
**/
GtkSymbolicColor *
gtk_style_properties_lookup_color (GtkStyleProperties *props,
priv = props->priv;
- if (priv->color_lookup_func)
- return priv->color_lookup_func (priv->color_lookup_data, name);
-
if (!priv->color_map)
return NULL;
_gtk_style_properties_set_property_by_property (GtkStyleProperties *props,
GtkCssStyleProperty *style_prop,
GtkStateFlags state,
- const GValue *value)
+ GtkCssValue *value)
{
GtkStylePropertiesPrivate *priv;
PropertyData *prop;
- GValue *val;
+ ValueData *val;
priv = props->priv;
prop = g_hash_table_lookup (priv->properties, style_prop);
val = property_data_get_value (prop, state);
- if (G_VALUE_TYPE (val) == G_VALUE_TYPE (value))
- g_value_reset (val);
- else
- {
- if (G_IS_VALUE (val))
- g_value_unset (val);
+ _gtk_css_value_unref (val->value);
+ val->value = _gtk_css_value_ref (value);
- g_value_init (val, G_VALUE_TYPE (value));
- }
-
- g_value_copy (value, val);
- if (_gtk_style_property_get_value_type (GTK_STYLE_PROPERTY (style_prop)) == G_VALUE_TYPE (value))
- g_param_value_validate (GTK_STYLE_PROPERTY (style_prop)->pspec, val);
+ _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (props));
}
/**
va_end (args);
}
-const GValue *
+GtkCssValue *
_gtk_style_properties_peek_property (GtkStyleProperties *props,
GtkCssStyleProperty *property,
GtkStateFlags state)
return property_data_match_state (prop, state);
}
-gboolean
-_gtk_style_properties_get_property (GtkStyleProperties *props,
- const gchar *property,
- GtkStateFlags state,
- GtkStylePropertyContext *context,
- GValue *value)
-{
- GtkStyleProperty *node;
-
- g_return_val_if_fail (GTK_IS_STYLE_PROPERTIES (props), FALSE);
- g_return_val_if_fail (property != NULL, FALSE);
- g_return_val_if_fail (value != NULL, FALSE);
+typedef struct {
+ GtkStyleProperties *props;
+ GtkStateFlags state;
+} StyleQueryData;
- node = _gtk_style_property_lookup (property);
- if (!node)
- {
- g_warning ("Style property \"%s\" is not registered", property);
- return FALSE;
- }
- if (_gtk_style_property_get_value_type (node) == G_TYPE_NONE)
- {
- g_warning ("Style property \"%s\" is not gettable", property);
- return FALSE;
- }
+static GtkCssValue *
+style_query_func (guint id,
+ gpointer data)
+{
+ StyleQueryData *query = data;
- _gtk_style_property_query (node, props, state, context, value);
- return TRUE;
+ return _gtk_style_properties_peek_property (query->props,
+ _gtk_css_style_property_lookup_by_id (id),
+ query->state);
}
/**
GtkStateFlags state,
GValue *value)
{
- GtkStylePropertyContext context = { 100, 100};
+ StyleQueryData query = { props, state };
+ GtkStyleProperty *node;
g_return_val_if_fail (GTK_IS_STYLE_PROPERTIES (props), FALSE);
g_return_val_if_fail (property != NULL, FALSE);
g_return_val_if_fail (value != NULL, FALSE);
- return _gtk_style_properties_get_property (props,
- property,
- state, &context, value);
+ node = _gtk_style_property_lookup (property);
+ if (!node)
+ {
+ g_warning ("Style property \"%s\" is not registered", property);
+ return FALSE;
+ }
+ if (_gtk_style_property_get_value_type (node) == G_TYPE_NONE)
+ {
+ g_warning ("Style property \"%s\" is not gettable", property);
+ return FALSE;
+ }
+
+ _gtk_style_property_query (node,
+ value,
+ style_query_func,
+ &query);
+
+ return TRUE;
}
+/**
+ * gtk_style_properties_get_valist:
+ * @props: a #GtkStyleProperties
+ * @state: state to retrieve the property values for
+ * @args: va_list of property name/return location pairs, followed by %NULL
+ *
+ * Retrieves several style property values from @props for a given state.
+ *
+ * Since: 3.0
+ **/
void
-_gtk_style_properties_get_valist (GtkStyleProperties *props,
- GtkStateFlags state,
- GtkStylePropertyContext *context,
- va_list args)
+gtk_style_properties_get_valist (GtkStyleProperties *props,
+ GtkStateFlags state,
+ va_list args)
{
const gchar *property_name;
gchar *error = NULL;
GValue value = G_VALUE_INIT;
- if (!_gtk_style_properties_get_property (props,
- property_name,
- state,
- context,
- &value))
+ if (!gtk_style_properties_get_property (props,
+ property_name,
+ state,
+ &value))
break;
G_VALUE_LCOPY (&value, args, 0, &error);
}
}
-/**
- * gtk_style_properties_get_valist:
- * @props: a #GtkStyleProperties
- * @state: state to retrieve the property values for
- * @args: va_list of property name/return location pairs, followed by %NULL
- *
- * Retrieves several style property values from @props for a given state.
- *
- * Since: 3.0
- **/
-void
-gtk_style_properties_get_valist (GtkStyleProperties *props,
- GtkStateFlags state,
- va_list args)
-{
- GtkStylePropertyContext context = { 100, 100};
-
- return _gtk_style_properties_get_valist (props, state, &context, args);
-}
-
-void
-_gtk_style_properties_get (GtkStyleProperties *props,
- GtkStateFlags state,
- GtkStylePropertyContext *context,
- ...)
-{
- va_list args;
-
- g_return_if_fail (GTK_IS_STYLE_PROPERTIES (props));
-
- va_start (args, context);
- _gtk_style_properties_get_valist (props, state, context, args);
- va_end (args);
-}
-
/**
* gtk_style_properties_get:
* @props: a #GtkStyleProperties
data = &g_array_index (prop->values, ValueData, pos);
- if (G_IS_VALUE (&data->value))
- g_value_unset (&data->value);
+ _gtk_css_value_unref (data->value);
+ data->value = NULL;
g_array_remove_index (prop->values, pos);
+
+ _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (props));
}
}
priv = props->priv;
g_hash_table_remove_all (priv->properties);
+
+ _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (props));
}
/**
g_hash_table_lookup (priv->color_map, name))
continue;
+ G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
gtk_style_properties_map_color (props, name, color);
+ G_GNUC_END_IGNORE_DEPRECATIONS;
}
}
for (i = 0; i < prop_to_merge->values->len; i++)
{
ValueData *data;
- GValue *value;
+ ValueData *value;
data = &g_array_index (prop_to_merge->values, ValueData, i);
if (replace && data->state == GTK_STATE_FLAG_NORMAL &&
- G_VALUE_TYPE (&data->value) != PANGO_TYPE_FONT_DESCRIPTION)
+ _gtk_is_css_typed_value_of_type (data->value, PANGO_TYPE_FONT_DESCRIPTION))
{
/* Let normal state override all states
* previously set in the original set
value = property_data_get_value (prop, data->state);
- if (G_VALUE_TYPE (&data->value) == PANGO_TYPE_FONT_DESCRIPTION &&
- G_IS_VALUE (value))
+ if (_gtk_is_css_typed_value_of_type (data->value, PANGO_TYPE_FONT_DESCRIPTION) &&
+ value->value != NULL)
{
PangoFontDescription *font_desc;
PangoFontDescription *font_desc_to_merge;
/* Handle merging of font descriptions */
- font_desc = g_value_get_boxed (value);
- font_desc_to_merge = g_value_get_boxed (&data->value);
+ font_desc = g_value_get_boxed (_gtk_css_typed_value_get (value->value));
+ font_desc_to_merge = g_value_get_boxed (_gtk_css_typed_value_get (data->value));
pango_font_description_merge (font_desc, font_desc_to_merge, replace);
}
- else if (G_VALUE_TYPE (&data->value) == G_TYPE_PTR_ARRAY &&
- G_IS_VALUE (value))
+ else if (_gtk_is_css_typed_value_of_type (data->value, G_TYPE_PTR_ARRAY) &&
+ value->value != NULL)
{
GPtrArray *array, *array_to_merge;
gint i;
/* Append the array, mainly thought
* for the gtk-key-bindings property
*/
- array = g_value_get_boxed (value);
- array_to_merge = g_value_get_boxed (&data->value);
+ array = g_value_get_boxed (_gtk_css_typed_value_get (value->value));
+ array_to_merge = g_value_get_boxed (_gtk_css_typed_value_get (data->value));
for (i = 0; i < array_to_merge->len; i++)
g_ptr_array_add (array, g_ptr_array_index (array_to_merge, i));
}
- else if (replace || !G_IS_VALUE (value))
+ else if (replace || value->value == NULL)
{
- if (!G_IS_VALUE (value))
- g_value_init (value, G_VALUE_TYPE (&data->value));
- else if (G_VALUE_TYPE (value) != G_VALUE_TYPE (&data->value))
- {
- g_value_unset (value);
- g_value_init (value, G_VALUE_TYPE (&data->value));
- }
-
- g_value_copy (&data->value, value);
+ _gtk_css_value_unref (value->value);
+ value->value = _gtk_css_value_ref (data->value);
}
}
}
+
+ _gtk_style_provider_private_changed (GTK_STYLE_PROVIDER_PRIVATE (props));
}
projects / ~andy / gtk / blobdiff