7d674db9d2
The ClutterColor API has some inconsistencies:
- the string deserialization function does not match the rest of
the conversion function naming policy; the naming should be:
clutter_color_parse() -> clutter_color_from_string()
and the first parameter should be the ClutterColor that will
be set from the string, not the string itself (a GDK-ism).
- the fixed point API should not be exposed, especially in the
form of ClutterFixed values
- the non-fixed point HLS conversion functions do not make any
sense. The values returned should be:
hue := range [ 0, 360 ]
luminance := range [ 0, 1 ]
saturation := range [ 0, 1 ]
like the current fixed point API does. Returning a value in
the [ 0, 255 ] range is completely useless
- the clutter_color_equal() should be converted for its use inside
a GHashTable; a clutter_color_hash() should be added as well
- the second parameter of the clutter_color_shade() function should
be the shading factor, not the result (another GDK-ism). this way
the function call can be translated from this:
color.shade(out result, factor)
to the more natural:
color.shade(factor, out result)
This somewhat large commit fixes all these issues and updates the
internal users of the API.
153 lines
5.6 KiB
C
153 lines
5.6 KiB
C
/*
|
|
* Clutter.
|
|
*
|
|
* An OpenGL based 'interactive canvas' library.
|
|
*
|
|
* Authored By: Matthew Allum <mallum@openedhand.com>
|
|
* Emmanuele Bassi <ebassi@linux.intel.com>
|
|
*
|
|
* Copyright (C) 2006, 2007, 2008 OpenedHand
|
|
* Copyright (C) 2009 Intel Corp.
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* 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, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#if !defined(__CLUTTER_H_INSIDE__) && !defined(CLUTTER_COMPILATION)
|
|
#error "Only <clutter/clutter.h> can be included directly."
|
|
#endif
|
|
|
|
#ifndef __CLUTTER_COLOR_H__
|
|
#define __CLUTTER_COLOR_H__
|
|
|
|
#include <glib-object.h>
|
|
#include <clutter/clutter-fixed.h>
|
|
|
|
G_BEGIN_DECLS
|
|
|
|
#define CLUTTER_TYPE_COLOR (clutter_color_get_type ())
|
|
|
|
typedef struct _ClutterColor ClutterColor;
|
|
|
|
/**
|
|
* ClutterColor:
|
|
* @red: red component, between 0 and 255
|
|
* @green: green component, between 0 and 255
|
|
* @blue: blue component, between 0 and 255
|
|
* @alpha: alpha component, between 0 and 255
|
|
*
|
|
* Color representation.
|
|
*/
|
|
struct _ClutterColor
|
|
{
|
|
/*< public >*/
|
|
guint8 red;
|
|
guint8 green;
|
|
guint8 blue;
|
|
|
|
guint8 alpha;
|
|
};
|
|
|
|
GType clutter_color_get_type (void) G_GNUC_CONST;
|
|
|
|
ClutterColor *clutter_color_new (guint8 red,
|
|
guint8 green,
|
|
guint8 blue,
|
|
guint8 alpha);
|
|
ClutterColor *clutter_color_copy (const ClutterColor *color);
|
|
void clutter_color_free (ClutterColor *color);
|
|
|
|
void clutter_color_add (const ClutterColor *a,
|
|
const ClutterColor *b,
|
|
ClutterColor *result);
|
|
void clutter_color_subtract (const ClutterColor *a,
|
|
const ClutterColor *b,
|
|
ClutterColor *result);
|
|
void clutter_color_lighten (const ClutterColor *color,
|
|
ClutterColor *result);
|
|
void clutter_color_darken (const ClutterColor *color,
|
|
ClutterColor *result);
|
|
void clutter_color_shade (const ClutterColor *color,
|
|
gdouble factor,
|
|
ClutterColor *result);
|
|
|
|
gchar * clutter_color_to_string (const ClutterColor *color);
|
|
gboolean clutter_color_from_string (ClutterColor *color,
|
|
const gchar *str);
|
|
|
|
void clutter_color_to_hls (const ClutterColor *color,
|
|
gfloat *hue,
|
|
gfloat *luminance,
|
|
gfloat *saturation);
|
|
void clutter_color_from_hls (ClutterColor *color,
|
|
gfloat hue,
|
|
gfloat luminance,
|
|
gfloat saturation);
|
|
|
|
guint32 clutter_color_to_pixel (const ClutterColor *color);
|
|
void clutter_color_from_pixel (ClutterColor *color,
|
|
guint32 pixel);
|
|
|
|
guint clutter_color_hash (gconstpointer v);
|
|
gboolean clutter_color_equal (gconstpointer v1,
|
|
gconstpointer v2);
|
|
|
|
#define CLUTTER_TYPE_PARAM_COLOR (clutter_param_color_get_type ())
|
|
#define CLUTTER_PARAM_SPEC_COLOR(pspec) (G_TYPE_CHECK_INSTANCE_CAST ((pspec), CLUTTER_TYPE_PARAM_COLOR, ClutterParamSpecColor))
|
|
#define CLUTTER_IS_PARAM_SPEC_COLOR(pspec) (G_TYPE_CHECK_INSTANCE_TYPE ((pspec), CLUTTER_TYPE_PARAM_COLOR))
|
|
|
|
/**
|
|
* CLUTTER_VALUE_HOLDS_COLOR:
|
|
* @x: a #GValue
|
|
*
|
|
* Evaluates to %TRUE if @x holds a #ClutterColor<!-- -->.
|
|
*
|
|
* Since: 1.0
|
|
*/
|
|
#define CLUTTER_VALUE_HOLDS_COLOR(x) (G_VALUE_HOLDS ((x), CLUTTER_TYPE_COLOR))
|
|
|
|
typedef struct _ClutterParamSpecColor ClutterParamSpecColor;
|
|
|
|
/**
|
|
* ClutterParamSpecColor:
|
|
* @default_value: default color value
|
|
*
|
|
* A #GParamSpec subclass for defining properties holding
|
|
* a #ClutterColor.
|
|
*
|
|
* Since: 1.0
|
|
*/
|
|
struct _ClutterParamSpecColor
|
|
{
|
|
/*< private >*/
|
|
GParamSpec parent_instance;
|
|
|
|
/*< public >*/
|
|
ClutterColor *default_value;
|
|
};
|
|
|
|
void clutter_value_set_color (GValue *value,
|
|
const ClutterColor *color);
|
|
G_CONST_RETURN ClutterColor *clutter_value_get_color (const GValue *value);
|
|
|
|
GType clutter_param_color_get_type (void) G_GNUC_CONST;
|
|
GParamSpec *clutter_param_spec_color (const gchar *name,
|
|
const gchar *nick,
|
|
const gchar *blurb,
|
|
const ClutterColor *default_value,
|
|
GParamFlags flags);
|
|
|
|
G_END_DECLS
|
|
|
|
#endif /* _HAVE_CLUTTER_COLOR_H */
|