/* This file uses TABLE_HORZ and TABLE_VERT enough to warrant abbreviating. */
#define H TABLE_HORZ
#define V TABLE_VERT
-
+\f
struct xr_fsm_style *
xr_fsm_style_ref (const struct xr_fsm_style *style_)
{
return style;
}
+struct xr_fsm_style *
+xr_fsm_style_unshare (struct xr_fsm_style *old)
+{
+ assert (old->ref_cnt > 0);
+ if (old->ref_cnt == 1)
+ return old;
+
+ xr_fsm_style_unref (old);
+
+ struct xr_fsm_style *new = xmemdup (old, sizeof *old);
+ new->ref_cnt = 1;
+ for (int i = 0; i < XR_N_FONTS; i++)
+ if (old->fonts[i])
+ new->fonts[i] = pango_font_description_copy (old->fonts[i]);
+
+ return new;
+}
+
void
xr_fsm_style_unref (struct xr_fsm_style *style)
{
|| a->min_break[H] != b->min_break[H]
|| a->min_break[V] != b->min_break[V]
|| a->use_system_colors != b->use_system_colors
- || a->transparent != b->transparent
- || a->font_scale != b->font_scale)
+ || a->font_resolution != b->font_resolution)
return false;
for (size_t i = 0; i < XR_N_FONTS; i++)
struct xr_fsm *xr = xr_;
int w, h, brk;
- if (!xr->style->transparent)
+ const struct cell_color *bg = &cell->style->font_style.bg[color_idx];
+ if ((bg->r != 255 || bg->g != 255 || bg->b != 255) && bg->alpha)
{
cairo_save (xr->cairo);
int bg_clip[TABLE_N_AXES][2];
bg_clip[axis][1] += spill[axis][1];
}
xr_clip (xr, bg_clip);
- xr_set_source_rgba (xr->cairo, &cell->style->font_style.bg[color_idx]);
+ xr_set_source_rgba (xr->cairo, bg);
fill_rectangle (xr,
bb[H][0] - spill[H][0],
bb[V][0] - spill[V][0],
xr_layout_cell (xr, cell, bb, clip, &w, &h, &brk);
return brk;
}
+
+static void
+xrr_scale (void *xr_, double scale)
+{
+ struct xr_fsm *xr = xr_;
+ cairo_scale (xr->cairo, scale, scale);
+}
\f
static void
xr_clip (struct xr_fsm *xr, int clip[TABLE_N_AXES][2])
if (font_style->typeface)
desc = parse_font (
font_style->typeface,
- font_style->size ? font_style->size * 1000 * xr->style->font_scale : 10000,
+ font_style->size ? font_style->size * 1000 : 10000,
font_style->bold, font_style->italic);
if (!desc)
desc = xr->style->fonts[font_type];
assert (xr->cairo);
- PangoLayout *layout = pango_cairo_create_layout (xr->cairo);
+ PangoContext *context = pango_cairo_create_context (xr->cairo);
+ pango_cairo_context_set_resolution (context, xr->style->font_resolution);
+ PangoLayout *layout = pango_layout_new (context);
+ g_object_unref (context);
+
pango_layout_set_font_description (layout, desc);
const char *text = cell->text;
*brk = bb[V][0];
*height = xr_layout_cell_text (xr, cell, bb, clip, width, brk);
}
-\f
-#if 0
-static bool
-xr_table_render (struct xr_render_fsm *fsm, struct xr_fsm *xr)
-{
- struct xr_table_state *ts = UP_CAST (fsm, struct xr_table_state, fsm);
-
- while (render_pager_has_next (ts->p))
- {
- int used;
-
- used = render_pager_draw_next (ts->p, xr->length);
- if (!used)
- {
- assert (xr->y > 0);
- return true;
- }
- else
- xr->y += used;
- }
- return false;
-}
-
-static void
-xr_table_destroy (struct xr_render_fsm *fsm)
-{
- struct xr_table_state *ts = UP_CAST (fsm, struct xr_table_state, fsm);
-
- render_pager_destroy (ts->p);
- free (ts);
-}
-
-static struct xr_render_fsm *
-xr_render_table (struct xr_fsm *xr, struct table_item *table_item)
-{
- struct xr_table_state *ts;
-
- ts = xmalloc (sizeof *ts);
- ts->fsm.render = xr_table_render;
- ts->fsm.destroy = xr_table_destroy;
-
- if (xr->y > 0)
- xr->y += xr->char_height;
-
- ts->p = render_pager_create (xr->params, table_item);
- table_item_unref (table_item);
-
- return &ts->fsm;
-}
-\f
-static bool
-xr_eject_render (struct xr_render_fsm *fsm UNUSED, struct xr_fsm *xr)
-{
- return xr->y > 0;
-}
-
-static void
-xr_eject_destroy (struct xr_render_fsm *fsm UNUSED)
-{
- /* Nothing to do. */
-}
-
-static struct xr_render_fsm *
-xr_render_eject (void)
-{
- static struct xr_render_fsm eject_renderer =
- {
- xr_eject_render,
- xr_eject_destroy
- };
-
- return &eject_renderer;
-}
-\f
-#define CHART_WIDTH 500
-#define CHART_HEIGHT 375
-
-static struct xr_render_fsm *
-xr_render_text (struct xr_fsm *xr, const struct text_item *text_item)
-{
- enum text_item_type type = text_item_get_type (text_item);
-
- switch (type)
- {
- case TEXT_ITEM_PAGE_TITLE:
- break;
-
- case TEXT_ITEM_EJECT_PAGE:
- if (xr->y > 0)
- return xr_render_eject ();
- break;
-
- default:
- return xr_render_table (
- xr, text_item_to_table_item (text_item_ref (text_item)));
- }
-
- return NULL;
-}
-#endif
#define CHART_WIDTH 500
#define CHART_HEIGHT 375
item = table_item_super (
text_item_to_table_item (
text_item_create (TEXT_ITEM_TITLE,
- to_group_open_item (item_)->command_name)));
+ to_group_open_item (item_)->command_name,
+ NULL)));
}
else
NOT_REACHED ();
.adjust_break = xrr_adjust_break,
.draw_line = xrr_draw_line,
.draw_cell = xrr_draw_cell,
+ .scale = xrr_scale,
};
enum { LW = XR_LINE_WIDTH, LS = XR_LINE_SPACE };
.ops = &xrr_render_ops,
.aux = fsm,
.size = { [H] = style->size[H], [V] = style->size[V] },
- /* XXX font_size */
.line_widths = xr_line_widths,
.min_break = { [H] = style->min_break[H], [V] = style->min_break[V] },
.supports_margins = true,
for (int i = 0; i < XR_N_FONTS; i++)
{
- PangoLayout *layout = pango_cairo_create_layout (cr);
+ PangoContext *context = pango_cairo_create_context (cr);
+ pango_cairo_context_set_resolution (context, style->font_resolution);
+ PangoLayout *layout = pango_layout_new (context);
+ g_object_unref (context);
+
pango_layout_set_font_description (layout, style->fonts[i]);
pango_layout_set_text (layout, "0", 1);
int char_size[TABLE_N_AXES];
pango_layout_get_size (layout, &char_size[H], &char_size[V]);
- for (int j = 0; j < TABLE_N_AXES; j++)
+ for (int a = 0; a < TABLE_N_AXES; a++)
{
- int csj = pango_to_xr (char_size[j]);
- fsm->rp.font_size[j] = MAX (fsm->rp.font_size[j], csj);
+ int csa = pango_to_xr (char_size[a]);
+ fsm->rp.font_size[a] = MAX (fsm->rp.font_size[a], csa);
}
g_object_unref (G_OBJECT (layout));
}
}
-
/* This is primarily meant for use with screen rendering since the result is a
fixed value for charts. */
void
static int
xr_fsm_draw_table (struct xr_fsm *fsm, int space)
{
- int used = 0;
- while (render_pager_has_next (fsm->p))
- {
- int chunk = render_pager_draw_next (fsm->p, space - used);
- if (!chunk)
- return used;
-
- used += chunk;
- cairo_translate (fsm->cairo, 0, chunk);
- }
- return used;
+ return (render_pager_has_next (fsm->p)
+ ? render_pager_draw_next (fsm->p, space)
+ : 0);
}
static int
projects / pspp / blobdiff