Fix by Johan for 436304.

[inkscape.git] / src / print.cpp

diff --git a/src/print.cpp b/src/print.cpp
index 624021c9a38291c728448fb5c0ef5a210abb4801..044dffe345102d60d107d37b61756d11cf7827de 100644 (file)
--- a/src/print.cpp
+++ b/src/print.cpp
@@ -6,6 +6,7 @@
 /*
  * Author:
  *   Lauris Kaplinski <lauris@kaplinski.com>
+ *   Kees Cook <kees@outflux.net>
  *
  * This code is in public domain
  */
@@ -14,35 +15,26 @@
 # include "config.h"
 #endif
 
-
-
+#include "inkscape.h"
+#include "desktop.h"
 #include "sp-item.h"
 #include "extension/print.h"
 #include "extension/system.h"
 #include "print.h"
 
-#if 0
-# include <extension/internal/ps.h>
+#include "ui/dialog/print.h"
 
-# ifdef WIN32
-#  include <extension/internal/win32.h>
-# endif
-
-# ifdef WITH_GNOME_PRINT
-#  include <extension/internal/gnome.h>
-# endif
-#endif
 
 /* Identity typedef */
 
-unsigned int sp_print_bind(SPPrintContext *ctx, NR::Matrix const &transform, float opacity)
+unsigned int sp_print_bind(SPPrintContext *ctx, Geom::Matrix const &transform, float opacity)
 {
-    NRMatrix const ntransform(transform);
+    Geom::Matrix const ntransform(transform);
     return sp_print_bind(ctx, &ntransform, opacity);
 }
 
 unsigned int
-sp_print_bind(SPPrintContext *ctx, NRMatrix const *transform, float opacity)
+sp_print_bind(SPPrintContext *ctx, Geom::Matrix const *transform, float opacity)
 {
     return ctx->module->bind(transform, opacity);
 }
@@ -60,28 +52,28 @@ sp_print_comment(SPPrintContext *ctx, char const *comment)
 }
 
 unsigned int
-sp_print_fill(SPPrintContext *ctx, NRBPath const *bpath, NRMatrix const *ctm, SPStyle const *style,
+sp_print_fill(SPPrintContext *ctx, Geom::PathVector const &pathv, Geom::Matrix const *ctm, SPStyle const *style,
               NRRect const *pbox, NRRect const *dbox, NRRect const *bbox)
 {
-    return ctx->module->fill(bpath, ctm, style, pbox, dbox, bbox);
+    return ctx->module->fill(pathv, ctm, style, pbox, dbox, bbox);
 }
 
 unsigned int
-sp_print_stroke(SPPrintContext *ctx, NRBPath const *bpath, NRMatrix const *ctm, SPStyle const *style,
+sp_print_stroke(SPPrintContext *ctx, Geom::PathVector const &pathv, Geom::Matrix const *ctm, SPStyle const *style,
                 NRRect const *pbox, NRRect const *dbox, NRRect const *bbox)
 {
-    return ctx->module->stroke(bpath, ctm, style, pbox, dbox, bbox);
+    return ctx->module->stroke(pathv, ctm, style, pbox, dbox, bbox);
 }
 
 unsigned int
 sp_print_image_R8G8B8A8_N(SPPrintContext *ctx,
                           guchar *px, unsigned int w, unsigned int h, unsigned int rs,
-                          NRMatrix const *transform, SPStyle const *style)
+                          Geom::Matrix const *transform, SPStyle const *style)
 {
     return ctx->module->image(px, w, h, rs, transform, style);
 }
 
-unsigned int sp_print_text(SPPrintContext *ctx, char const *text, NR::Point p,
+unsigned int sp_print_text(SPPrintContext *ctx, char const *text, Geom::Point p,
                            SPStyle const *style)
 {
     return ctx->module->text(text, p, style);
@@ -121,7 +113,6 @@ sp_print_preview_document(SPDocument *doc)
         /* Release arena */
         sp_item_invoke_hide(mod->base, mod->dkey);
         mod->base = NULL;
-        nr_arena_item_unref(mod->root);
         mod->root = NULL;
         nr_object_unref((NRObject *) mod->arena);
         mod->arena = NULL;
@@ -131,45 +122,24 @@ sp_print_preview_document(SPDocument *doc)
 }
 
 void
-sp_print_document(SPDocument *doc, unsigned int direct)
+sp_print_document(Gtk::Window& parentWindow, SPDocument *doc)
 {
-    Inkscape::Extension::Print *mod;
-    unsigned int ret;
-
     sp_document_ensure_up_to_date(doc);
 
-    if (direct) {
-        mod = Inkscape::Extension::get_print(SP_MODULE_KEY_PRINT_PS);
-    } else {
-        mod = Inkscape::Extension::get_print(SP_MODULE_KEY_PRINT_DEFAULT);
-    }
-
-    ret = mod->setup();
+    // Build arena
+    SPItem      *base = SP_ITEM(sp_document_root(doc));
+    NRArena    *arena = NRArena::create();
+    unsigned int dkey = sp_item_display_key_new(1);
+    NRArenaItem *root = sp_item_invoke_show(base, arena, dkey, SP_ITEM_SHOW_DISPLAY);
 
-    if (ret) {
-        SPPrintContext context;
-        context.module = mod;
+    // Run print dialog
+    Inkscape::UI::Dialog::Print printop(doc,base);
+    Gtk::PrintOperationResult res = printop.run(Gtk::PRINT_OPERATION_ACTION_PRINT_DIALOG, parentWindow);
+    (void)res; // TODO handle this
 
-        /* fixme: This has to go into module constructor somehow */
-        /* Create new arena */
-        mod->base = SP_ITEM(sp_document_root(doc));
-        mod->arena = NRArena::create();
-        mod->dkey = sp_item_display_key_new(1);
-        mod->root = sp_item_invoke_show(mod->base, mod->arena, mod->dkey, SP_ITEM_SHOW_DISPLAY);
-        /* Print document */
-        ret = mod->begin(doc);
-        sp_item_invoke_print(mod->base, &context);
-        ret = mod->finish();
-        /* Release arena */
-        sp_item_invoke_hide(mod->base, mod->dkey);
-        mod->base = NULL;
-        nr_arena_item_unref(mod->root);
-        mod->root = NULL;
-        nr_object_unref((NRObject *) mod->arena);
-        mod->arena = NULL;
-    }
-
-    return;
+    // Release arena
+    sp_item_invoke_hide(base, dkey);
+    nr_object_unref((NRObject *) arena);
 }
 
 void
@@ -203,7 +173,6 @@ sp_print_document_to_file(SPDocument *doc, gchar const *filename)
     /* Release arena */
     sp_item_invoke_hide(mod->base, mod->dkey);
     mod->base = NULL;
-    nr_arena_item_unref(mod->root);
     mod->root = NULL;
     nr_object_unref((NRObject *) mod->arena);
     mod->arena = NULL;