diff options
author | Matthias Clasen <mclasen@redhat.com> | 2006-06-16 17:17:56 +0000 |
---|---|---|
committer | Matthias Clasen <matthiasc@src.gnome.org> | 2006-06-16 17:17:56 +0000 |
commit | 92bbb2fe7d76587e2e7445c38175186a7f25dae5 (patch) | |
tree | cd496b32d0076c04a69414c5b9e907d7f2ad77a6 /gtk/gtkprintoperation-unix.c | |
parent | 0b05edb04fdef579fa268243c391e75c145991b6 (diff) | |
download | gtk+-92bbb2fe7d76587e2e7445c38175186a7f25dae5.tar.gz |
Require cvs glib.
2006-06-16 Matthias Clasen <mclasen@redhat.com>
* configure.in: Require cvs glib.
* gtk/gtkprintoperation-unix.c:
(_gtk_print_operation_platform_backend_create_preview_surface):
Don't use a temporary directory for preview files, since it
is not clear who cleans it up. Instead, use g_mkstemp() directly
to create a temp pdf file, and make the preview app responsible
for cleaning it up.
Diffstat (limited to 'gtk/gtkprintoperation-unix.c')
-rw-r--r-- | gtk/gtkprintoperation-unix.c | 63 |
1 files changed, 49 insertions, 14 deletions
diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c index 0b7014b84c..a72866d73e 100644 --- a/gtk/gtkprintoperation-unix.c +++ b/gtk/gtkprintoperation-unix.c @@ -604,6 +604,41 @@ _gtk_print_operation_platform_backend_run_dialog_async (GtkPrintOperation } } +static cairo_status_t +write_preview (void *closure, + const unsigned char *data, + unsigned int length) +{ + gint fd = GPOINTER_TO_INT (closure); + gssize written; + + while (length > 0) + { + written = write (fd, data, length); + + if (written == -1) + { + if (errno == EAGAIN || errno == EINTR) + continue; + + return CAIRO_STATUS_WRITE_ERROR; + } + + data += written; + length -= written; + } + + return CAIRO_STATUS_SUCCESS; +} + +static void +close_preview (void *data) +{ + gint fd = GPOINTER_TO_INT (data); + + close (fd); +} + cairo_surface_t * _gtk_print_operation_platform_backend_create_preview_surface (GtkPrintOperation *op, GtkPageSetup *page_setup, @@ -611,29 +646,29 @@ _gtk_print_operation_platform_backend_create_preview_surface (GtkPrintOperation gdouble *dpi_y, gchar **target) { - gchar *tmp_dir, *dir_template, *preview_filename; + gchar *filename; + gint fd; GtkPaperSize *paper_size; gdouble w, h; + cairo_surface_t *surface; + static cairo_user_data_key_t key; - dir_template = g_build_filename (g_get_tmp_dir (), "print-preview-XXXXXX", NULL); - - /* use temp dirs because apps like evince need to have extensions - * to determine the mime type - */ - tmp_dir = mkdtemp (dir_template); - /* print preview pdf filename (please leave the trailing .pdf in place) */ - preview_filename = g_build_filename (tmp_dir, - _("Print Preview.pdf"), - NULL); - g_free (dir_template); - *target = preview_filename; + filename = g_build_filename (g_get_tmp_dir (), "previewXXXXXX.pdf", NULL); + fd = g_mkstemp (filename); + *target = filename; + g_print ("target is %s\n", filename); + paper_size = gtk_page_setup_get_paper_size (page_setup); w = gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS); h = gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS); *dpi_x = *dpi_y = 72; - return cairo_pdf_surface_create (preview_filename, w, h); + surface = cairo_pdf_surface_create_for_stream (write_preview, GINT_TO_POINTER(fd), w, h); + + cairo_surface_set_user_data (surface, &key, GINT_TO_POINTER (fd), close_preview); + + return surface; } void |