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, 111 insertions, 0 deletions

diff --git a/gtk/gtkprint-win32.c b/gtk/gtkprint-win32.c
new file mode 100644
index 0000000000..69b508a6e4
--- /dev/null
+++ b/gtk/gtkprint-win32.c
@@ -0,0 +1,111 @@
+/* GTK - The GIMP Toolkit
+ * gtkprintoperation.c: Print Operation
+ * Copyright (C) 2006, Red Hat, Inc.
+ *
+ * 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.
+ */
+
+#ifndef _MSC_VER
+#define _WIN32_WINNT 0x0500
+#define WINVER _WIN32_WINNT
+#endif
+
+#include "config.h"
+#include "gtkprint-win32.h"
+#include "gtkalias.h"
+
+void
+gtk_print_win32_devnames_free (GtkPrintWin32Devnames *devnames)
+{
+  g_free (devnames->driver);
+  g_free (devnames->device);
+  g_free (devnames->output);
+  g_free (devnames);
+}
+
+GtkPrintWin32Devnames *
+gtk_print_win32_devnames_from_win32 (HGLOBAL global)
+{
+  LPDEVNAMES win = GlobalLock (global);
+  gunichar2 *data = (gunichar2 *)win;
+  GtkPrintWin32Devnames *devnames = g_new (GtkPrintWin32Devnames, 1);
+  
+  devnames->driver = g_utf16_to_utf8 (data + win->wDriverOffset, 
+				      -1, NULL, NULL, NULL);
+  devnames->device = g_utf16_to_utf8 (data + win->wDeviceOffset, 
+				      -1, NULL, NULL, NULL);
+  devnames->output = g_utf16_to_utf8 (data + win->wOutputOffset, 
+				      -1, NULL, NULL, NULL);
+  devnames->flags = win->wDefault;
+  
+  GlobalUnlock (global);
+
+  return devnames;
+}
+
+HGLOBAL 
+gtk_print_win32_devnames_to_win32 (const GtkPrintWin32Devnames *devnames)
+{
+  HGLOBAL global;
+  LPDEVNAMES windevnames;
+  gunichar2 *data;
+  gunichar2 *driver, *device, *output;
+  glong driver_len, device_len, output_len;
+  int i;
+
+  driver = g_utf8_to_utf16 (devnames->driver, -1, NULL, &driver_len, NULL);
+  device = g_utf8_to_utf16 (devnames->device, -1, NULL, &device_len, NULL);
+  output = g_utf8_to_utf16 (devnames->output, -1, NULL, &output_len, NULL);
+
+  global = GlobalAlloc (GMEM_MOVEABLE, 
+			sizeof (DEVNAMES) + 
+			(driver_len + 1) * 2 + 
+			(device_len + 1) * 2 +
+			(output_len + 1) * 2);
+
+  windevnames = GlobalLock (global);
+  data = (gunichar2 *)windevnames;
+  i = sizeof(DEVNAMES) / sizeof (gunichar2);
+
+  windevnames->wDriverOffset = i;
+  memcpy (data + i, driver, (driver_len + 1) * sizeof (gunichar2));
+  i += driver_len + 1;
+  windevnames->wDeviceOffset = i;
+  memcpy (data + i, device, (device_len + 1) * sizeof (gunichar2));
+  i += device_len + 1;
+  windevnames->wOutputOffset = i;
+  memcpy (data + i, output, (output_len + 1) * sizeof (gunichar2));
+  i += output_len + 1;
+  windevnames->wDefault = devnames->flags;
+  GlobalUnlock (global);
+
+  g_free (driver);
+  g_free (device);
+  g_free (output);
+
+  return global;
+}
+
+HGLOBAL 
+gtk_print_win32_devnames_from_printer_name (const char *printer)
+{
+  const GtkPrintWin32Devnames devnames = { "", (char *)printer, "", 0 };
+  return gtk_print_win32_devnames_to_win32 (&devnames);
+}
+
+
+#define __GTK_PRINT_WIN32_C__
+#include "gtkaliasdef.c"