Merge the gtk-printing branch. For more detailed ChangeLog entries, see

2006-04-21  Alexander Larsson  <alexl@redhat.com>

        Merge the gtk-printing branch.
	For more detailed ChangeLog entries, see the branch.

	* .cvsignore:
	* Makefile.am:
	* configure.in:
	* docs/tools/widgets.c:
	* gtk+-unix-print-2.0.pc.in:
	* gtk/Makefile.am:
	* gtk/gen-paper-names.c:
	* gtk/gtk.h:
	* gtk/gtk.symbols:
	* gtk/gtkenums.h:
	* gtk/gtkiconfactory.c:
	* gtk/gtkmarshalers.list:
	* gtk/gtkpagesetup.[ch]:
	* gtk/gtkpagesetupunixdialog.[ch]:
	* gtk/gtkpapersize.[ch]:
	* gtk/gtkprint-win32.[ch]:
	* gtk/gtkprintbackend.[ch]:
	* gtk/gtkprintcontext.[ch]:
	* gtk/gtkprinter-private.h:
	* gtk/gtkprinter.[ch]:
	* gtk/gtkprinteroption.[ch]:
	* gtk/gtkprinteroptionset.[ch]:
	* gtk/gtkprinteroptionwidget.[ch]:
	* gtk/gtkprintjob.[ch]:
	* gtk/gtkprintoperation-private.h:
	* gtk/gtkprintoperation-unix.c:
	* gtk/gtkprintoperation-win32.c:
	* gtk/gtkprintoperation.[ch]:
	* gtk/gtkprintsettings.[ch]:
	* gtk/gtkprintunixdialog.[ch]:
	* gtk/paper_names.c:
	* gtk/paper_names_offsets.c:
	Platform independent printing API and implementations
	for unix and windows.

	* gtk/gtkstock.h:
	* gtk/stock-icons/24/gtk-orientation-landscape.png:
	* gtk/stock-icons/24/gtk-orientation-portrait.png:
	* gtk/stock-icons/24/gtk-orientation-reverse-landscape.png:
	Add stock icons for page orientation.

	* modules/Makefile.am:
	* modules/printbackends/Makefile.am:
	* modules/printbackends/cups/Makefile.am:
	* modules/printbackends/cups/gtkcupsutils.[ch]:
	* modules/printbackends/cups/gtkprintbackendcups.[ch]:
	* modules/printbackends/cups/gtkprintercups.[ch]:

	Cups printing backend for unix.

	* modules/printbackends/lpr/Makefile.am:
	* modules/printbackends/lpr/gtkprintbackendlpr.[ch]:
	lpr printing backend for unix.

	* modules/printbackends/pdf/Makefile.am:
	* modules/printbackends/pdf/gtkprintbackendpdf.[ch]:
	print-to-pdf printing backend for unix.

	* tests/.cvsignore:
	* tests/Makefile.am:
	* tests/print-editor.c:
	Test application for printing.

	* gdk/gdk.symbols:
	* gdk/win32/gdkevents-win32.c:
	* gdk/win32/gdkwin32.h:
	Add gdk_win32_set_modal_dialog_libgtk_only so that we can pump the
	mainloop while displaying a win32 common dialog.

	* gdk/directfb/Makefile.am:
	Whitespace cleanup.

1 files changed, 472 insertions, 0 deletions

diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
new file mode 100644
index 0000000000..3abffaa076
--- /dev/null
+++ b/gtk/gtkprintjob.c
@@ -0,0 +1,472 @@
+/* GtkPrintJob
+ * Copyright (C) 2006 John (J5) Palmieri  <johnp@redhat.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <fcntl.h>
+#include <errno.h>
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+#include <sys/types.h>
+#include <sys/stat.h>
+
+#include <glib/gstdio.h>
+#include "gtkintl.h"
+#include "gtkprivate.h"
+
+#include "gtkprintjob.h"
+#include "gtkprinter.h"
+#include "gtkprintbackend.h"
+#include "gtkalias.h"
+
+#ifndef O_BINARY
+#define O_BINARY 0
+#endif
+
+struct _GtkPrintJobPrivate
+{
+  gchar *title;
+
+  int spool_file_fd;
+  cairo_surface_t *surface;
+
+  GtkPrintStatus status;
+  GtkPrintBackend *backend;  
+  GtkPrinter *printer;
+  GtkPrintSettings *settings;
+  GtkPageSetup *page_setup;
+
+  gint printer_set : 1;
+  gint page_setup_set : 1;
+  gint settings_set  : 1;
+};
+
+
+#define GTK_PRINT_JOB_GET_PRIVATE(o)  \
+   (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_PRINT_JOB, GtkPrintJobPrivate))
+
+static void     gtk_print_job_finalize     (GObject               *object);
+static void     gtk_print_job_set_property (GObject               *object,
+					    guint                  prop_id,
+					    const GValue          *value,
+					    GParamSpec            *pspec);
+static void     gtk_print_job_get_property (GObject               *object,
+					    guint                  prop_id,
+					    GValue                *value,
+					    GParamSpec            *pspec);
+static GObject* gtk_print_job_constructor  (GType                  type,
+					    guint                  n_construct_properties,
+					    GObjectConstructParam *construct_params);
+
+enum {
+  STATUS_CHANGED,
+  LAST_SIGNAL
+};
+
+enum {
+  PROP_0,
+  GTK_PRINT_JOB_PROP_TITLE,
+  GTK_PRINT_JOB_PROP_PRINTER,
+  GTK_PRINT_JOB_PROP_PAGE_SETUP,
+  GTK_PRINT_JOB_PROP_SETTINGS
+};
+
+static guint signals[LAST_SIGNAL] = { 0 };
+
+G_DEFINE_TYPE (GtkPrintJob, gtk_print_job, G_TYPE_OBJECT);
+
+static void
+gtk_print_job_class_init (GtkPrintJobClass *class)
+{
+  GObjectClass *object_class;
+  object_class = (GObjectClass *) class;
+
+  object_class->finalize = gtk_print_job_finalize;
+  object_class->constructor = gtk_print_job_constructor;
+  object_class->set_property = gtk_print_job_set_property;
+  object_class->get_property = gtk_print_job_get_property;
+
+  g_type_class_add_private (class, sizeof (GtkPrintJobPrivate));
+
+  g_object_class_install_property (G_OBJECT_CLASS (class),
+                                   GTK_PRINT_JOB_PROP_TITLE,
+                                   g_param_spec_string ("title",
+						        P_("Title"),
+						        P_("Title of the print job"),
+						        NULL,
+							GTK_PARAM_READWRITE |
+						        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (G_OBJECT_CLASS (class),
+                                   GTK_PRINT_JOB_PROP_PRINTER,
+                                   g_param_spec_object ("printer",
+						        P_("Printer"),
+						        P_("Printer to print the job to"),
+						        GTK_TYPE_PRINTER,
+							GTK_PARAM_READWRITE |
+						        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (G_OBJECT_CLASS (class),
+                                   GTK_PRINT_JOB_PROP_SETTINGS,
+                                   g_param_spec_object ("settings",
+						        P_("Settings"),
+						        P_("Printer settings"),
+						        GTK_TYPE_PRINT_SETTINGS,
+							GTK_PARAM_READWRITE |
+						        G_PARAM_CONSTRUCT_ONLY));
+
+  g_object_class_install_property (G_OBJECT_CLASS (class),
+                                   GTK_PRINT_JOB_PROP_PAGE_SETUP,
+                                   g_param_spec_object ("page-setup",
+						        P_("Page Setup"),
+						        P_("Page Setup"),
+						        GTK_TYPE_PAGE_SETUP,
+							GTK_PARAM_READWRITE |
+						        G_PARAM_CONSTRUCT_ONLY));
+
+  signals[STATUS_CHANGED] =
+   g_signal_new ("status-changed",
+                 G_TYPE_FROM_CLASS (class),
+                 G_SIGNAL_RUN_LAST,
+                 G_STRUCT_OFFSET (GtkPrintJobClass, status_changed),
+                 NULL, NULL,
+                 g_cclosure_marshal_VOID__VOID,
+                 G_TYPE_NONE, 0);
+}
+
+static void
+gtk_print_job_init (GtkPrintJob *print_job)
+{
+  print_job->priv = GTK_PRINT_JOB_GET_PRIVATE (print_job); 
+  print_job->priv->spool_file_fd = -1;
+
+  print_job->priv->title = g_strdup ("");
+  print_job->priv->surface = NULL;
+  print_job->priv->backend = NULL;
+  print_job->priv->printer = NULL;
+
+  print_job->priv->printer_set = FALSE;
+  print_job->priv->settings_set = FALSE;
+  print_job->priv->page_setup_set = FALSE;
+  print_job->priv->status = GTK_PRINT_STATUS_INITIAL;
+
+  print_job->print_pages = GTK_PRINT_PAGES_ALL;
+  print_job->page_ranges = NULL;
+  print_job->num_page_ranges = 0;
+  print_job->collate = FALSE;
+  print_job->reverse = FALSE;
+  print_job->num_copies = 1;
+  print_job->scale = 1.0;
+  print_job->page_set = GTK_PAGE_SET_ALL;
+  print_job->rotate_to_orientation = FALSE;
+}
+
+
+static GObject*
+gtk_print_job_constructor (GType                  type,
+			   guint                  n_construct_properties,
+			   GObjectConstructParam *construct_params)
+{
+  GtkPrintJob *job;
+  GObject *object;
+
+  object =
+    G_OBJECT_CLASS (gtk_print_job_parent_class)->constructor (type,
+							      n_construct_properties,
+							      construct_params);
+
+  job = GTK_PRINT_JOB (object);
+  
+  g_assert (job->priv->printer_set &&
+	    job->priv->settings_set &&
+	    job->priv->page_setup_set);
+  
+  _gtk_printer_prepare_for_print (job->priv->printer,
+				  job,
+				  job->priv->settings,
+				  job->priv->page_setup);
+
+  return object;
+}
+
+
+static void
+gtk_print_job_finalize (GObject *object)
+{
+  GtkPrintJob *print_job;
+  
+  g_return_if_fail (object != NULL);
+
+  print_job = GTK_PRINT_JOB (object);
+
+  if (print_job->priv->spool_file_fd > 0)
+    {
+      close (print_job->priv->spool_file_fd);
+      print_job->priv->spool_file_fd = -1;
+    }
+  
+  if (print_job->priv->backend)
+    g_object_unref (G_OBJECT (print_job->priv->backend));
+
+  if (print_job->priv->printer)
+    g_object_unref (G_OBJECT (print_job->priv->printer));
+
+  if (print_job->priv->surface)
+    cairo_surface_destroy (print_job->priv->surface);
+
+  if (print_job->priv->settings)
+    g_object_unref (print_job->priv->settings);
+  
+  if (print_job->priv->page_setup)
+    g_object_unref (print_job->priv->page_setup);
+
+  g_free (print_job->page_ranges);
+  print_job->page_ranges = NULL;
+  
+  g_free (print_job->priv->title);
+  print_job->priv->title = NULL;
+  
+  if (G_OBJECT_CLASS (gtk_print_job_parent_class)->finalize)
+    G_OBJECT_CLASS (gtk_print_job_parent_class)->finalize (object);
+}
+
+/**
+ * gtk_print_job_new:
+ *
+ * Creates a new #GtkPrintJob.
+ *
+ * Return value: a new #GtkPrintJob
+ *
+ * Since: 2.8
+ **/
+GtkPrintJob *
+gtk_print_job_new (const gchar *title,
+		   GtkPrinter *printer,
+		   GtkPrintSettings *settings,
+		   GtkPageSetup *page_setup)
+{
+  GObject *result;
+  result = g_object_new (GTK_TYPE_PRINT_JOB,
+                         "title", title,
+			 "printer", printer,
+			 "settings", settings,
+			 "page-setup", page_setup,
+			 NULL);
+  return (GtkPrintJob *) result;
+}
+
+GtkPrintSettings *
+gtk_print_job_get_settings (GtkPrintJob *print_job)
+{
+  g_return_val_if_fail (GTK_IS_PRINT_JOB (print_job), NULL);
+  
+  return print_job->priv->settings;
+}
+
+GtkPrinter *
+gtk_print_job_get_printer (GtkPrintJob *print_job)
+{
+  g_return_val_if_fail (GTK_IS_PRINT_JOB (print_job), NULL);
+  
+  return print_job->priv->printer;
+}
+
+const char *
+gtk_print_job_get_title (GtkPrintJob *print_job)
+{
+  g_return_val_if_fail (GTK_IS_PRINT_JOB (print_job), NULL);
+  
+  return print_job->priv->title;
+}
+
+GtkPrintStatus
+gtk_print_job_get_status (GtkPrintJob *print_job)
+{
+  g_return_val_if_fail (GTK_IS_PRINT_JOB (print_job), GTK_PRINT_STATUS_FINISHED);
+  
+  return print_job->priv->status;
+}
+
+void
+gtk_print_job_set_status (GtkPrintJob   *job,
+			  GtkPrintStatus status)
+{
+  if (job->priv->status == status)
+    return;
+
+  job->priv->status = status;
+  g_signal_emit (job, signals[STATUS_CHANGED], 0);
+}
+
+gboolean
+gtk_print_job_set_source_file (GtkPrintJob *job,
+			       const char  *filename,
+			       GError     **error)
+{
+  g_return_val_if_fail (GTK_IS_PRINT_JOB (job), FALSE);
+  
+  job->priv->spool_file_fd = g_open (filename, O_RDONLY|O_BINARY);
+  if (job->priv->spool_file_fd < 0)
+    {
+      gchar *display_filename = g_filename_display_name (filename);
+      int save_errno = errno;
+      
+      g_set_error (error,
+                   G_FILE_ERROR,
+                   g_file_error_from_errno (save_errno),
+                   _("Failed to open file '%s': %s"),
+                   display_filename, 
+		   g_strerror (save_errno));
+      
+      g_free (display_filename);
+
+      return FALSE;
+    }
+    return TRUE;
+}
+
+cairo_surface_t *
+gtk_print_job_get_surface (GtkPrintJob *job,
+			   GError **error)
+{
+  char *filename;
+  double width, height;
+  GtkPaperSize *paper_size;
+  
+  g_return_val_if_fail (GTK_IS_PRINT_JOB (job), NULL);
+
+  if (job->priv->surface)
+    return job->priv->surface;
+  
+  job->priv->spool_file_fd = g_file_open_tmp ("gtkprint_XXXXXX", 
+					      &filename, 
+					      error);
+  if (job->priv->spool_file_fd == -1)
+    return NULL;
+
+  fchmod (job->priv->spool_file_fd, S_IRUSR | S_IWUSR);
+  unlink (filename);
+
+  paper_size = gtk_page_setup_get_paper_size (job->priv->page_setup);
+  width = gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS);
+  height = gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS);
+
+  job->priv->surface = _gtk_printer_create_cairo_surface (job->priv->printer,
+							  width, height,
+							  job->priv->spool_file_fd);
+ 
+  return job->priv->surface;
+}
+
+static void
+gtk_print_job_set_property (GObject      *object,
+	                    guint         prop_id,
+	                    const GValue *value,
+                            GParamSpec   *pspec)
+
+{
+  GtkPrintJob *job = GTK_PRINT_JOB (object);
+  GtkPrintSettings *settings;
+
+  switch (prop_id)
+    {
+    case GTK_PRINT_JOB_PROP_TITLE:
+      job->priv->title = g_value_dup_string (value);
+      break;
+    
+    case GTK_PRINT_JOB_PROP_PRINTER:
+      job->priv->printer = GTK_PRINTER (g_value_dup_object (value));
+      job->priv->printer_set = TRUE;
+      job->priv->backend = g_object_ref (gtk_printer_get_backend (job->priv->printer));
+      break;
+
+    case GTK_PRINT_JOB_PROP_PAGE_SETUP:
+      job->priv->page_setup = GTK_PAGE_SETUP (g_value_dup_object (value));
+      job->priv->page_setup_set = TRUE;
+      break;
+      
+    case GTK_PRINT_JOB_PROP_SETTINGS:
+      /* We save a copy of the settings since we modify
+       * if when preparing the printer job. */
+      settings = GTK_PRINT_SETTINGS (g_value_get_object (value));
+      job->priv->settings = gtk_print_settings_copy (settings);
+      job->priv->settings_set = TRUE;
+      break;
+
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_print_job_get_property (GObject    *object,
+			    guint       prop_id,
+			    GValue     *value,
+			    GParamSpec *pspec)
+{
+  GtkPrintJob *job = GTK_PRINT_JOB (object);
+
+  switch (prop_id)
+    {
+    case GTK_PRINT_JOB_PROP_TITLE:
+      g_value_set_string (value, job->priv->title);
+      break;
+    case GTK_PRINT_JOB_PROP_PRINTER:
+      g_value_set_object (value, job->priv->printer);
+      break;
+    case GTK_PRINT_JOB_PROP_SETTINGS:
+      g_value_set_object (value, job->priv->settings);
+      break;
+    case GTK_PRINT_JOB_PROP_PAGE_SETUP:
+      g_value_set_object (value, job->priv->page_setup);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+gboolean
+gtk_print_job_send (GtkPrintJob *print_job,
+                    GtkPrintJobCompleteFunc callback,
+                    gpointer user_data,
+		    GDestroyNotify dnotify,
+		    GError **error)
+{
+  g_return_val_if_fail (GTK_IS_PRINT_JOB (print_job), FALSE);
+  g_return_val_if_fail (print_job->priv->spool_file_fd > 0, FALSE);
+
+  gtk_print_job_set_status (print_job, GTK_PRINT_STATUS_SENDING_DATA);
+  lseek (print_job->priv->spool_file_fd, 0, SEEK_SET);
+  gtk_print_backend_print_stream (print_job->priv->backend,
+                                  print_job,
+				  print_job->priv->spool_file_fd,
+                                  callback,
+                                  user_data,
+				  dnotify);
+
+  return TRUE;
+}
+
+#define __GTK_PRINT_JOB_C__
+#include "gtkaliasdef.c"