psppire-output-view: Render only the visible parts of tables.

[pspp] / src / output / cairo.c

diff --git a/src/output/cairo.c b/src/output/cairo.c
index 85c8f67b938fb77b77b13246d0279122953eb30e..7c6cf925c64ee2418cef9966066729c987637c0a 100644 (file)
--- a/src/output/cairo.c
+++ b/src/output/cairo.c
@@ -39,6 +39,7 @@
 #include "output/charts/scree.h"
 #include "output/charts/scatterplot.h"
 #include "output/driver-provider.h"
+#include "output/group-item.h"
 #include "output/message-item.h"
 #include "output/options.h"
 #include "output/render.h"
@@ -424,6 +425,7 @@ xr_set_cairo (struct xr_driver *xr, cairo_t *cairo)
       for (i = 0; i < TABLE_N_AXES; i++)
         xr->params->min_break[i] = xr->min_break[i];
       xr->params->supports_margins = true;
+      xr->params->rtl = render_direction_rtl ();
     }
 
   cairo_set_source_rgb (xr->cairo, xr->fg.red, xr->fg.green, xr->fg.blue);
@@ -1406,6 +1408,9 @@ xr_rendering_create (struct xr_driver *xr, const struct output_item *item,
       r = xzalloc (sizeof *r);
       r->item = output_item_ref (item);
     }
+  else if (is_group_open_item (item))
+    r = xr_rendering_create_text (xr, to_group_open_item (item)->command_name,
+                                  cr);
 
   return r;
 }
@@ -1441,7 +1446,8 @@ static void xr_draw_chart (const struct chart_item *, cairo_t *,
 
 /* Draws onto CR */
 void
-xr_rendering_draw_all (struct xr_rendering *r, cairo_t *cr)
+xr_rendering_draw (struct xr_rendering *r, cairo_t *cr,
+                   int x0, int y0, int x1, int y1)
 {
   if (is_table_item (r->item))
     {
@@ -1449,8 +1455,8 @@ xr_rendering_draw_all (struct xr_rendering *r, cairo_t *cr)
 
       xr_set_cairo (xr, cr);
 
-      render_pager_draw (r->p);
-
+      render_pager_draw_region (r->p, x0 * XR_POINT, y0 * XR_POINT,
+                                (x1 - x0) * XR_POINT, (y1 - y0) * XR_POINT);
     }
   else
     xr_draw_chart (to_chart_item (r->item), cr,