summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-02-06 13:50:10 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-02-06 13:50:10 +0000
commit522ce4d5b39e325471edf77cea9ad15ed98505af (patch)
tree1e7c3eba8911f6e795ba6f364caba8a1d21702a4 /examples
parent8c71138ba5500a3d1bf446357992e8f165101173 (diff)
downloadpango-522ce4d5b39e325471edf77cea9ad15ed98505af.tar.gz
If NULL is passed to _copy, return NULL with no warning. If NULL is passed
2006-02-06 Behdad Esfahbod <behdad@gnome.org> * pango/pango-utils.c (pango_matrix_copy, pango_matrix_free): If NULL is passed to _copy, return NULL with no warning. If NULL is passed to _free, do nothing with no warning. Docs updated. * examples/viewer-pangoxft.c (render_callback): Multiply x,y by PANGO_SCALE, as pango_xft_render_layout takes coordinates in Pango units weirdly enough. * viewer-pangocairo.c (render_callback): Do cairo_translate, to draw correct bounding boxes for x,y nonzero. * examples/renderdemo.c (do_output): If context has an all-zero matrix set, interpret it as backend does not support transformation, so warn on --rotate, and do not try to rotate. * examples/viewer-pangox.c (pangox_view_get_context): Set an all-zero matrix on context, to negotiate that we don't support transformations.
Diffstat (limited to 'examples')
-rw-r--r--examples/renderdemo.c56
-rw-r--r--examples/viewer-pangocairo.c8
-rw-r--r--examples/viewer-pangox.c11
-rw-r--r--examples/viewer-pangoxft.c2
4 files changed, 63 insertions, 14 deletions
diff --git a/examples/renderdemo.c b/examples/renderdemo.c
index 85f0ddb7..a4bbf3b7 100644
--- a/examples/renderdemo.c
+++ b/examples/renderdemo.c
@@ -169,11 +169,26 @@ output_body (PangoContext *context,
gpointer cb_context,
gpointer cb_data,
int *width,
- int *height)
+ int *height,
+ gboolean supports_matrix)
{
PangoLayout *layout;
PangoRectangle logical_rect;
int size, start_size, end_size, increment;
+ int x = 0, y = 0;
+
+ if (!supports_matrix)
+ {
+ const PangoMatrix* matrix;
+ const PangoMatrix identity = PANGO_MATRIX_INIT;
+ matrix = pango_context_get_matrix (context);
+ if (matrix)
+ {
+ x += matrix->x0;
+ y += matrix->y0;
+ }
+ pango_context_set_matrix (context, &identity);
+ }
if (opt_waterfall)
{
@@ -196,7 +211,7 @@ output_body (PangoContext *context,
pango_layout_get_extents (layout, NULL, &logical_rect);
if (render_cb)
- (*render_cb) (layout, 0, *height, cb_context, cb_data);
+ (*render_cb) (layout, x, y+*height, cb_context, cb_data);
*width = MAX (*width, PANGO_PIXELS (logical_rect.x + logical_rect.width));
*height += PANGO_PIXELS (logical_rect.height);
@@ -212,10 +227,9 @@ set_transform (PangoContext *context,
gpointer cb_data,
PangoMatrix *matrix)
{
+ pango_context_set_matrix (context, matrix);
if (transform_cb)
(*transform_cb) (context, matrix, cb_context, cb_data);
- else
- pango_context_set_matrix (context, matrix);
}
void
@@ -230,6 +244,8 @@ do_output (PangoContext *context,
PangoLayout *layout;
PangoRectangle logical_rect;
PangoMatrix matrix = PANGO_MATRIX_INIT;
+ const PangoMatrix *orig_matrix;
+ gboolean supports_matrix;
int rotated_width, rotated_height;
int x = opt_margin;
int y = opt_margin;
@@ -244,6 +260,15 @@ do_output (PangoContext *context,
width = 0;
height = 0;
+ orig_matrix = pango_matrix_copy (pango_context_get_matrix (context));
+ /* If the backend sets an all-zero matrix on the context,
+ * means that it doesn't support transformations.
+ */
+ supports_matrix = !orig_matrix ||
+ (orig_matrix->xx != 0. || orig_matrix->xy != 0. ||
+ orig_matrix->yx != 0. || orig_matrix->yy != 0. ||
+ orig_matrix->x0 != 0. || orig_matrix->y0 != 0.);
+
set_transform (context, transform_cb, cb_context, cb_data, NULL);
pango_context_set_language (context, pango_language_from_string ("en_US"));
@@ -268,11 +293,21 @@ do_output (PangoContext *context,
g_free (options_string);
}
- pango_matrix_rotate (&matrix, opt_rotate);
+ if (opt_rotate != 0)
+ {
+ if (supports_matrix)
+ pango_matrix_rotate (&matrix, opt_rotate);
+ else
+ g_printerr ("The backend does not support rotated text\n");
+ }
set_transform (context, transform_cb, cb_context, cb_data, &matrix);
- output_body (context, text, NULL, NULL, NULL, &rotated_width, &rotated_height);
+ output_body (context,
+ text,
+ NULL, NULL, NULL,
+ &rotated_width, &rotated_height,
+ supports_matrix);
transform_point (&matrix, 0, 0, &p1x, &p1y);
transform_point (&matrix, rotated_width, 0, &p2x, &p2y);
@@ -291,7 +326,11 @@ do_output (PangoContext *context,
set_transform (context, transform_cb, cb_context, cb_data, &matrix);
if (render_cb)
- output_body (context, text, render_cb, cb_context, cb_data, &rotated_width, &rotated_height);
+ output_body (context,
+ text,
+ render_cb, cb_context, cb_data,
+ &rotated_width, &rotated_height,
+ supports_matrix);
width = MAX (width, maxx - minx);
height += maxy - miny;
@@ -303,6 +342,9 @@ do_output (PangoContext *context,
*width_out = width;
if (height_out)
*height_out = height;
+
+ pango_context_set_matrix (context, orig_matrix);
+ pango_matrix_free (orig_matrix);
}
diff --git a/examples/viewer-pangocairo.c b/examples/viewer-pangocairo.c
index e1472aa7..d2d64e6d 100644
--- a/examples/viewer-pangocairo.c
+++ b/examples/viewer-pangocairo.c
@@ -140,7 +140,8 @@ render_callback (PangoLayout *layout,
cairo_t *cr = (cairo_t *) context;
gboolean show_borders = GPOINTER_TO_UINT (data) == 0xdeadbeef;
- cairo_move_to (cr, x, y);
+ cairo_save (cr);
+ cairo_translate (cr, x, y);
pango_cairo_show_layout (cr,
layout);
@@ -151,7 +152,6 @@ render_callback (PangoLayout *layout,
pango_layout_get_extents (layout, &ink, &logical);
- cairo_save (cr);
cairo_set_source_rgba (cr, 1.0, 0.0, 0.0, 0.75);
cairo_rectangle (cr,
@@ -169,9 +169,8 @@ render_callback (PangoLayout *layout,
(double)ink.width / PANGO_SCALE + lw,
(double)ink.height / PANGO_SCALE + lw);
cairo_stroke (cr);
-
- cairo_restore (cr);
}
+ cairo_restore (cr);
}
static void
@@ -199,7 +198,6 @@ transform_callback (PangoContext *context,
cairo_set_matrix (cr, &cairo_matrix);
- pango_context_set_matrix (context, matrix);
pango_cairo_update_context (cr, context);
}
diff --git a/examples/viewer-pangox.c b/examples/viewer-pangox.c
index c4d499af..f3a88e67 100644
--- a/examples/viewer-pangox.c
+++ b/examples/viewer-pangox.c
@@ -39,8 +39,17 @@ static PangoContext *
pangox_view_get_context (gpointer instance)
{
XViewer *x = (XViewer *) instance;
+ PangoContext *context;
+ PangoMatrix matrix = {0., 0., 0., 0., 0., 0.};
- return pango_x_get_context (x->display);
+ context = pango_x_get_context (x->display);
+
+ /* We set an all-zero matrix on the context, to negotiate that
+ * this backend doesn't support transformations.
+ */
+ pango_context_set_matrix (context, &matrix);
+
+ return context;
}
typedef struct
diff --git a/examples/viewer-pangoxft.c b/examples/viewer-pangoxft.c
index 497c17af..8b308167 100644
--- a/examples/viewer-pangoxft.c
+++ b/examples/viewer-pangoxft.c
@@ -93,7 +93,7 @@ render_callback (PangoLayout *layout,
pango_xft_render_layout (xft_context->draw,
&xft_context->color,
layout,
- x, y);
+ x * PANGO_SCALE, y * PANGO_SCALE);
}
static void