callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Misc cleanups

Browse Source
This commit is contained in:
Matthias Clasen
2012-02-04 00:02:49 -05:00
parent ed5aa953d5
commit d7cff0797e
7 changed files with 523 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

300
gtk/gtkcolorscale.c
View File

@ -20,10 +20,12 @@
#include "config.h"
#include "gtkcolorscale.h"
#include "gtkcolorutils.h"
#include "gtkorientable.h"
#include "gtkstylecontext.h"
#include "gtkaccessible.h"
#include "gtkprivate.h"
#include "gtkintl.h"
struct _GtkColorScalePrivate
@ -34,6 +36,12 @@ struct _GtkColorScalePrivate
GtkColorScaleType type;
};
enum
{
PROP_ZERO,
PROP_SCALE_TYPE
};
G_DEFINE_TYPE (GtkColorScale, gtk_color_scale, GTK_TYPE_SCALE)
static cairo_pattern_t *
@ -58,84 +66,10 @@ get_checkered_pattern (void)
}
static void
create_h_surface (GtkColorScale *scale)
create_surface (GtkColorScale *scale)
{
GtkWidget *widget = GTK_WIDGET (scale);
cairo_t *cr;
cairo_surface_t *surface;
gint width, height, stride;
cairo_surface_t *tmp;
guint red, green, blue;
guint32 *data, *p;
gdouble h;
gdouble r, g, b;
gdouble f;
gint x, y;
if (!gtk_widget_get_realized (widget))
return;
width = gtk_widget_get_allocated_width (widget);
height = gtk_widget_get_allocated_height (widget);
if (width != scale->priv->width ||
height != scale->priv->height)
{
surface = gdk_window_create_similar_surface (gtk_widget_get_window (widget),
CAIRO_CONTENT_COLOR,
width, height);
if (scale->priv->surface)
cairo_surface_destroy (scale->priv->surface);
scale->priv->surface = surface;
scale->priv->width = width;
scale->priv->height= height;
}
else
surface = scale->priv->surface;
if (width == 1 || height == 1)
return;
stride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, width);
data = g_malloc (height * stride);
f = 1.0 / (height - 1);
for (y = 0; y < height; y++)
{
h = CLAMP (y * f, 0.0, 1.0);
p = data + y * (stride / 4);
for (x = 0; x < width; x++)
{
gtk_hsv_to_rgb (h, 1, 1, &r, &g, &b);
red = CLAMP (r * 255, 0, 255);
green = CLAMP (g * 255, 0, 255);
blue = CLAMP (b * 255, 0, 255);
p[x] = (red << 16) | (green << 8) | blue;
}
}
tmp = cairo_image_surface_create_for_data ((guchar *)data, CAIRO_FORMAT_RGB24,
width, height, stride);
cr = cairo_create (surface);
cairo_set_source_surface (cr, tmp, 0, 0);
cairo_paint (cr);
cairo_destroy (cr);
cairo_surface_destroy (tmp);
g_free (data);
}
static void
create_a_surface (GtkColorScale *scale)
{
GtkWidget *widget = GTK_WIDGET (scale);
cairo_t *cr;
cairo_surface_t *surface;
cairo_pattern_t *pattern;
cairo_matrix_t matrix;
GdkRGBA *color;
gint width, height;
if (!gtk_widget_get_realized (widget))
@ -155,49 +89,85 @@ create_a_surface (GtkColorScale *scale)
cairo_surface_destroy (scale->priv->surface);
scale->priv->surface = surface;
scale->priv->width = width;
scale->priv->height = height;
scale->priv->height= height;
}
else
return;
surface = scale->priv->surface;
if (width == 1 || height == 1)
return;
cr = cairo_create (surface);
cairo_set_source_rgb (cr, 0.33, 0.33, 0.33);
cairo_paint (cr);
cairo_set_source_rgb (cr, 0.66, 0.66, 0.66);
pattern = get_checkered_pattern ();
cairo_matrix_init_scale (&matrix, 0.125, 0.125);
cairo_pattern_set_matrix (pattern, &matrix);
cairo_mask (cr, pattern);
cairo_pattern_destroy (pattern);
color = &scale->priv->color;
pattern = cairo_pattern_create_linear (0, 0, width, 0);
cairo_pattern_add_color_stop_rgba (pattern, 0, color->red, color->green, color->blue, 0);
cairo_pattern_add_color_stop_rgba (pattern, width, color->red, color->green, color->blue, 1);
cairo_set_source (cr, pattern);
cairo_paint (cr);
cairo_pattern_destroy (pattern);
cairo_destroy (cr);
}
static void
create_surface (GtkColorScale *scale)
{
switch (scale->priv->type)
if (scale->priv->type == GTK_COLOR_SCALE_HUE)
{
case GTK_COLOR_SCALE_HUE:
create_h_surface (scale);
break;
case GTK_COLOR_SCALE_ALPHA:
create_a_surface (scale);
break;
cairo_t *cr;
gint stride;
cairo_surface_t *tmp;
guint red, green, blue;
guint32 *data, *p;
gdouble h;
gdouble r, g, b;
gdouble f;
gint x, y;
stride = cairo_format_stride_for_width (CAIRO_FORMAT_RGB24, width);
data = g_malloc (height * stride);
f = 1.0 / (height - 1);
for (y = 0; y < height; y++)
{
h = CLAMP (y * f, 0.0, 1.0);
p = data + y * (stride / 4);
for (x = 0; x < width; x++)
{
gtk_hsv_to_rgb (h, 1, 1, &r, &g, &b);
red = CLAMP (r * 255, 0, 255);
green = CLAMP (g * 255, 0, 255);
blue = CLAMP (b * 255, 0, 255);
p[x] = (red << 16) | (green << 8) | blue;
}
}
tmp = cairo_image_surface_create_for_data ((guchar *)data, CAIRO_FORMAT_RGB24,
width, height, stride);
cr = cairo_create (surface);
cairo_set_source_surface (cr, tmp, 0, 0);
cairo_paint (cr);
cairo_destroy (cr);
cairo_surface_destroy (tmp);
g_free (data);
}
else if (scale->priv->type == GTK_COLOR_SCALE_ALPHA)
{
cairo_t *cr;
cairo_pattern_t *pattern;
cairo_matrix_t matrix;
GdkRGBA *color;
cr = cairo_create (surface);
cairo_set_source_rgb (cr, 0.33, 0.33, 0.33);
cairo_paint (cr);
cairo_set_source_rgb (cr, 0.66, 0.66, 0.66);
pattern = get_checkered_pattern ();
cairo_matrix_init_scale (&matrix, 0.125, 0.125);
cairo_pattern_set_matrix (pattern, &matrix);
cairo_mask (cr, pattern);
cairo_pattern_destroy (pattern);
color = &scale->priv->color;
pattern = cairo_pattern_create_linear (0, 0, width, 0);
cairo_pattern_add_color_stop_rgba (pattern, 0, color->red, color->green, color->blue, 0);
cairo_pattern_add_color_stop_rgba (pattern, width, color->red, color->green, color->blue, 1);
cairo_set_source (cr, pattern);
cairo_paint (cr);
cairo_pattern_destroy (pattern);
cairo_destroy (cr);
}
}
@ -264,8 +234,6 @@ gtk_color_scale_init (GtkColorScale *scale)
scale->priv = G_TYPE_INSTANCE_GET_PRIVATE (scale,
GTK_TYPE_COLOR_SCALE,
GtkColorScalePrivate);
scale->priv->type = GTK_COLOR_SCALE_HUE;
}
static void
@ -280,46 +248,31 @@ scale_finalize (GObject *object)
}
static void
gtk_color_scale_class_init (GtkColorScaleClass *class)
scale_get_property (GObject *object,
guint prop_id,
GValue *value,
GParamSpec *pspec)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
GtkColorScale *scale = GTK_COLOR_SCALE (object);
object_class->finalize = scale_finalize;
widget_class->draw = scale_draw;
g_type_class_add_private (class, sizeof (GtkColorScalePrivate));
}
void
gtk_color_scale_set_rgba (GtkColorScale *scale,
const GdkRGBA *color)
{
scale->priv->color.red = color->red;
scale->priv->color.green = color->green;
scale->priv->color.blue = color->blue;
scale->priv->color.alpha = color->alpha;
if (scale->priv->surface)
switch (prop_id)
{
cairo_surface_destroy (scale->priv->surface);
scale->priv->surface = NULL;
case PROP_SCALE_TYPE:
g_value_set_int (value, scale->priv->type);
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
create_surface (scale);
gtk_widget_queue_draw (GTK_WIDGET (scale));
}
static void
gtk_color_scale_set_type (GtkColorScale *scale,
GtkColorScaleType type)
scale_set_type (GtkColorScale *scale,
GtkColorScaleType type)
{
AtkObject *atk_obj;
scale->priv->type = type;
cairo_surface_destroy (scale->priv->surface);
scale->priv->surface = NULL;
create_surface (scale);
gtk_widget_queue_draw (GTK_WIDGET (scale));
atk_obj = gtk_widget_get_accessible (GTK_WIDGET (scale));
if (GTK_IS_ACCESSIBLE (atk_obj))
@ -332,17 +285,62 @@ gtk_color_scale_set_type (GtkColorScale *scale,
}
}
static void
scale_set_property (GObject *object,
guint prop_id,
const GValue *value,
GParamSpec *pspec)
{
GtkColorScale *scale = GTK_COLOR_SCALE (object);
switch (prop_id)
{
case PROP_SCALE_TYPE:
scale_set_type (scale, (GtkColorScaleType)g_value_get_int (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
}
static void
gtk_color_scale_class_init (GtkColorScaleClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
object_class->finalize = scale_finalize;
object_class->get_property = scale_get_property;
object_class->set_property = scale_set_property;
widget_class->draw = scale_draw;
g_object_class_install_property (object_class, PROP_SCALE_TYPE,
g_param_spec_int ("scale-type", P_("Scale type"), P_("Scale type"),
0, 1, 0,
GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_type_class_add_private (class, sizeof (GtkColorScalePrivate));
}
void
gtk_color_scale_set_rgba (GtkColorScale *scale,
const GdkRGBA *color)
{
scale->priv->color = *color;
scale->priv->width = -1; /* force surface refresh */
create_surface (scale);
gtk_widget_queue_draw (GTK_WIDGET (scale));
}
GtkWidget *
gtk_color_scale_new (GtkAdjustment *adjustment,
GtkColorScaleType type)
{
GtkWidget *scale;
scale = (GtkWidget *) g_object_new (GTK_TYPE_COLOR_SCALE,
"adjustment", adjustment,
"draw-value", FALSE,
NULL);
gtk_color_scale_set_type (GTK_COLOR_SCALE (scale), type);
return scale;
return (GtkWidget *) g_object_new (GTK_TYPE_COLOR_SCALE,
"adjustment", adjustment,
"draw-value", FALSE,
"scale-type", type,
NULL);
}