mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-12-25 21:21:21 +00:00
contour: Some reactoring
Make a default print implementation, and use it.
This commit is contained in:
Matthias Clasen
parent
ead88c36ec
commit
167b38dfa1
208
gsk/gskcontour.c
208
gsk/gskcontour.c
@ -96,34 +96,30 @@ struct _GskContourClass
|
||||
gpointer measure_data);
|
||||
};
|
||||
|
||||
static gsize
|
||||
gsk_contour_get_size_default (const GskContour *contour)
|
||||
{
|
||||
return contour->klass->struct_size;
|
||||
}
|
||||
|
||||
/* {{{ Utilities */
|
||||
|
||||
#define DEG_TO_RAD(x) ((x) * (G_PI / 180.f))
|
||||
#define RAD_TO_DEG(x) ((x) / (G_PI / 180.f))
|
||||
|
||||
static void
|
||||
_g_string_append_double (GString *string,
|
||||
double d)
|
||||
_g_string_append_double (GString *string,
|
||||
const char *prefix,
|
||||
double d)
|
||||
{
|
||||
char buf[G_ASCII_DTOSTR_BUF_SIZE];
|
||||
|
||||
g_ascii_dtostr (buf, G_ASCII_DTOSTR_BUF_SIZE, d);
|
||||
g_string_append (string, prefix);
|
||||
g_string_append (string, buf);
|
||||
}
|
||||
|
||||
static void
|
||||
_g_string_append_point (GString *string,
|
||||
const char *prefix,
|
||||
const graphene_point_t *pt)
|
||||
{
|
||||
_g_string_append_double (string, pt->x);
|
||||
g_string_append_c (string, ' ');
|
||||
_g_string_append_double (string, pt->y);
|
||||
_g_string_append_double (string, prefix, pt->x);
|
||||
_g_string_append_double (string, " ", pt->y);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
@ -180,6 +176,69 @@ convert_to_standard_contour (const GskContour *contour)
|
||||
return gsk_path_builder_free_to_path (builder);
|
||||
}
|
||||
|
||||
/* }}} */
|
||||
/* {{{ Default implementations */
|
||||
|
||||
static gsize
|
||||
gsk_contour_get_size_default (const GskContour *contour)
|
||||
{
|
||||
return contour->klass->struct_size;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
foreach_print (GskPathOperation op,
|
||||
const graphene_point_t *pts,
|
||||
gsize n_pts,
|
||||
float weight,
|
||||
gpointer data)
|
||||
{
|
||||
GString *string = data;
|
||||
|
||||
switch (op)
|
||||
{
|
||||
case GSK_PATH_MOVE:
|
||||
_g_string_append_point (string, "M ", &pts[0]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_CLOSE:
|
||||
g_string_append (string, " Z");
|
||||
break;
|
||||
|
||||
case GSK_PATH_LINE:
|
||||
_g_string_append_point (string, " L ", &pts[1]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_QUAD:
|
||||
_g_string_append_point (string, " Q ", &pts[1]);
|
||||
_g_string_append_point (string, ", ", &pts[2]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_CUBIC:
|
||||
_g_string_append_point (string, " C ", &pts[1]);
|
||||
_g_string_append_point (string, ", ", &pts[2]);
|
||||
_g_string_append_point (string, ", ", &pts[3]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_CONIC:
|
||||
_g_string_append_point (string, " O ", &pts[1]);
|
||||
_g_string_append_point (string, ", ", &pts[2]);
|
||||
_g_string_append_double (string, ", ", weight);
|
||||
break;
|
||||
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
gsk_contour_print_default (const GskContour *contour,
|
||||
GString *string)
|
||||
{
|
||||
gsk_contour_foreach (contour, 0.5, foreach_print, string);
|
||||
}
|
||||
|
||||
/* }}} */
|
||||
/* {{{ Standard */
|
||||
|
||||
@ -316,65 +375,6 @@ gsk_standard_contour_get_flags (const GskContour *contour)
|
||||
return self->flags;
|
||||
}
|
||||
|
||||
static void
|
||||
gsk_standard_contour_print (const GskContour *contour,
|
||||
GString *string)
|
||||
{
|
||||
const GskStandardContour *self = (const GskStandardContour *) contour;
|
||||
gsize i;
|
||||
|
||||
for (i = 0; i < self->n_ops; i ++)
|
||||
{
|
||||
const graphene_point_t *pt = gsk_pathop_points (self->ops[i]);
|
||||
|
||||
switch (gsk_pathop_op (self->ops[i]))
|
||||
{
|
||||
case GSK_PATH_MOVE:
|
||||
g_string_append (string, "M ");
|
||||
_g_string_append_point (string, &pt[0]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_CLOSE:
|
||||
g_string_append (string, " Z");
|
||||
break;
|
||||
|
||||
case GSK_PATH_LINE:
|
||||
g_string_append (string, " L ");
|
||||
_g_string_append_point (string, &pt[1]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_QUAD:
|
||||
g_string_append (string, " Q ");
|
||||
_g_string_append_point (string, &pt[1]);
|
||||
g_string_append (string, ", ");
|
||||
_g_string_append_point (string, &pt[2]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_CUBIC:
|
||||
g_string_append (string, " C ");
|
||||
_g_string_append_point (string, &pt[1]);
|
||||
g_string_append (string, ", ");
|
||||
_g_string_append_point (string, &pt[2]);
|
||||
g_string_append (string, ", ");
|
||||
_g_string_append_point (string, &pt[3]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_CONIC:
|
||||
g_string_append (string, " O ");
|
||||
_g_string_append_point (string, &pt[1]);
|
||||
g_string_append (string, ", ");
|
||||
_g_string_append_point (string, &pt[3]);
|
||||
g_string_append (string, ", ");
|
||||
_g_string_append_double (string, pt[2].x);
|
||||
break;
|
||||
|
||||
default:
|
||||
g_assert_not_reached();
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gsk_standard_contour_get_bounds (const GskContour *contour,
|
||||
GskBoundingBox *bounds)
|
||||
@ -1015,7 +1015,7 @@ static const GskContourClass GSK_STANDARD_CONTOUR_CLASS =
|
||||
gsk_standard_contour_copy,
|
||||
gsk_standard_contour_get_size,
|
||||
gsk_standard_contour_get_flags,
|
||||
gsk_standard_contour_print,
|
||||
gsk_contour_print_default,
|
||||
gsk_standard_contour_get_bounds,
|
||||
gsk_standard_contour_get_stroke_bounds,
|
||||
gsk_standard_contour_get_start_end,
|
||||
@ -1113,70 +1113,6 @@ gsk_circle_contour_get_flags (const GskContour *contour)
|
||||
return GSK_PATH_CLOSED;
|
||||
}
|
||||
|
||||
static gboolean
|
||||
foreach_print (GskPathOperation op,
|
||||
const graphene_point_t *pts,
|
||||
gsize n_pts,
|
||||
float weight,
|
||||
gpointer data)
|
||||
{
|
||||
GString *string = data;
|
||||
|
||||
switch (op)
|
||||
{
|
||||
case GSK_PATH_MOVE:
|
||||
g_string_append (string, "M ");
|
||||
_g_string_append_point (string, &pts[0]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_CLOSE:
|
||||
g_string_append (string, " Z");
|
||||
break;
|
||||
|
||||
case GSK_PATH_LINE:
|
||||
g_string_append (string, " L ");
|
||||
_g_string_append_point (string, &pts[1]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_QUAD:
|
||||
g_string_append (string, " Q ");
|
||||
_g_string_append_point (string, &pts[1]);
|
||||
g_string_append (string, ", ");
|
||||
_g_string_append_point (string, &pts[2]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_CUBIC:
|
||||
g_string_append (string, " C ");
|
||||
_g_string_append_point (string, &pts[1]);
|
||||
g_string_append (string, ", ");
|
||||
_g_string_append_point (string, &pts[2]);
|
||||
g_string_append (string, ", ");
|
||||
_g_string_append_point (string, &pts[3]);
|
||||
break;
|
||||
|
||||
case GSK_PATH_CONIC:
|
||||
g_string_append (string, " O ");
|
||||
_g_string_append_point (string, &pts[1]);
|
||||
g_string_append (string, ", ");
|
||||
_g_string_append_point (string, &pts[2]);
|
||||
g_string_append (string, ", ");
|
||||
_g_string_append_double (string, weight);
|
||||
break;
|
||||
|
||||
default:
|
||||
g_assert_not_reached ();
|
||||
}
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
|
||||
static void
|
||||
gsk_circle_contour_print (const GskContour *contour,
|
||||
GString *string)
|
||||
{
|
||||
gsk_contour_foreach (contour, 0.5, foreach_print, string);
|
||||
}
|
||||
|
||||
static gboolean
|
||||
gsk_circle_contour_get_bounds (const GskContour *contour,
|
||||
GskBoundingBox *bounds)
|
||||
@ -1527,7 +1463,7 @@ static const GskContourClass GSK_CIRCLE_CONTOUR_CLASS =
|
||||
gsk_circle_contour_copy,
|
||||
gsk_contour_get_size_default,
|
||||
gsk_circle_contour_get_flags,
|
||||
gsk_circle_contour_print,
|
||||
gsk_contour_print_default,
|
||||
gsk_circle_contour_get_bounds,
|
||||
gsk_circle_contour_get_stroke_bounds,
|
||||
gsk_circle_contour_get_start_end,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user