X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=ps%2Fps-document.c;h=cfd22d9d0f0f0eeb910a6916b6502937e51da37e;hb=5cc8e92ad9fb04792682b474a670aaa803666f78;hp=8aa9bd1c79ffff7a678713623d3d50bbfc9462b3;hpb=74ddcfcb4098d77e261b95d5ff678bd853c61e10;p=evince.git

diff --git a/ps/ps-document.c b/ps/ps-document.c
index 8aa9bd1c..cfd22d9d 100644
--- a/ps/ps-document.c
+++ b/ps/ps-document.c
@@ -43,10 +43,6 @@
 #include <stdio.h>
 #include <math.h>
 
-#ifdef HAVE_LOCALE_H
-#include <locale.h>
-#endif
-
 #include "ps-document.h"
 #include "ev-debug.h"
 #include "gsdefaults.h"
@@ -182,6 +178,12 @@ ps_document_dispose (GObject *object)
 		gs->input_buffer = NULL;
 	}
 
+	if (gs->target_window) {
+		gtk_widget_destroy (gs->target_window);
+		gs->target_window = NULL;
+		gs->pstarget = NULL;
+	}
+
 	stop_interpreter (gs);
 
 	G_OBJECT_CLASS (parent_class)->dispose (object);
@@ -459,32 +461,22 @@ setup_page (PSDocument *gs, int page, double scale)
 {
 	char buf[1024];
 	int urx, ury, llx, lly, orientation;
-#ifdef HAVE_LOCALE_H
-	char *savelocale;
-#endif
+	char scaled_xdpi[G_ASCII_DTOSTR_BUF_SIZE];	
+	char scaled_ydpi[G_ASCII_DTOSTR_BUF_SIZE];
 
 	LOG ("Setup the page");
 
-#ifdef HAVE_LOCALE_H
-	/* gs needs floating point parameters with '.' as decimal point
-	 * while some (european) locales use ',' instead, so we set the 
-	 * locale for this snprintf to "C".
-	 */
-	savelocale = setlocale (LC_NUMERIC, "C");
-#endif
 	get_page_box (gs, page, &urx, &ury, &llx, &lly);
 	orientation = get_page_orientation (gs, page);
+	g_ascii_dtostr (scaled_xdpi, G_ASCII_DTOSTR_BUF_SIZE, get_xdpi (gs) * scale);
+	g_ascii_dtostr (scaled_ydpi, G_ASCII_DTOSTR_BUF_SIZE, get_ydpi (gs) * scale);
 
-	g_snprintf (buf, 1024, "%ld %d %d %d %d %d %f %f %d %d %d %d",
+	g_snprintf (buf, 1024, "%ld %d %d %d %d %d %s %s %d %d %d %d",
 		    0L, orientation * 90, llx, lly, urx, ury,
-		    get_xdpi (gs) * scale,
-		    get_ydpi (gs) * scale,
+		    scaled_xdpi, scaled_ydpi,		    
 		    0, 0, 0, 0);
 	LOG ("GS property %s", buf);
 
-#ifdef HAVE_LOCALE_H
-	setlocale(LC_NUMERIC, savelocale);
-#endif
 	gdk_property_change (gs->pstarget, gs_class->gs_atom, gs_class->string_atom,
 			     8, GDK_PROP_MODE_REPLACE, (guchar *)buf, strlen(buf));
 	gdk_flush ();
@@ -1211,15 +1203,13 @@ ps_async_renderer_render_pixbuf (EvAsyncRenderer *renderer, int page, double sca
 	PSDocument *gs = PS_DOCUMENT (renderer);
 
 	if (gs->pstarget == NULL) {
-		GtkWidget *widget;
-
-		widget = gtk_window_new (GTK_WINDOW_POPUP);
-	        gtk_widget_realize (widget);
-		gs->pstarget = widget->window;
+		gs->target_window = gtk_window_new (GTK_WINDOW_POPUP);
+	        gtk_widget_realize (gs->target_window);
+		gs->pstarget = gs->target_window->window;
 
 	        g_assert (gs->pstarget != NULL);
 
-		g_signal_connect (widget, "event",
+		g_signal_connect (gs->target_window, "event",
 			    	  G_CALLBACK (ps_document_widget_event),
 			          gs);
 	}
@@ -1250,58 +1240,6 @@ ps_document_get_info (EvDocument *document)
 	return info;
 }
 
-static EvOrientation
-ps_document_get_orientation (EvDocument *document)
-{
-	EvOrientation orientation;
-	PSDocument *ps = PS_DOCUMENT (document);
-
-	g_return_val_if_fail (ps != NULL, EV_ORIENTATION_PORTRAIT);
-
-	switch (ps->orientation) {
-		case GTK_GS_ORIENTATION_PORTRAIT:
-			orientation = EV_ORIENTATION_PORTRAIT;
-			break;
-		case GTK_GS_ORIENTATION_LANDSCAPE:
-			orientation = EV_ORIENTATION_LANDSCAPE;
-			break;
-		case GTK_GS_ORIENTATION_UPSIDEDOWN:
-			orientation = EV_ORIENTATION_UPSIDEDOWN;
-			break;
-		case GTK_GS_ORIENTATION_SEASCAPE:
-			orientation = EV_ORIENTATION_SEASCAPE;
-			break;
-		default:
-			orientation = EV_ORIENTATION_PORTRAIT;
-			break;
-	}
-
-	return orientation;
-}
-
-static void
-ps_document_set_orientation (EvDocument *document, EvOrientation orientation)
-{
-	PSDocument *ps = PS_DOCUMENT (document);
-
-	g_return_if_fail (ps != NULL);
-
-	switch (orientation) {
-		case EV_ORIENTATION_PORTRAIT:
-			ps->orientation = GTK_GS_ORIENTATION_PORTRAIT;
-			break;
-		case EV_ORIENTATION_LANDSCAPE:
-			ps->orientation = GTK_GS_ORIENTATION_LANDSCAPE;
-			break;
-		case EV_ORIENTATION_UPSIDEDOWN:
-			ps->orientation = GTK_GS_ORIENTATION_UPSIDEDOWN;
-			break;
-		case EV_ORIENTATION_SEASCAPE:
-			ps->orientation = GTK_GS_ORIENTATION_SEASCAPE;
-			break;
-	}
-}
-
 static void
 ps_document_document_iface_init (EvDocumentIface *iface)
 {
@@ -1311,8 +1249,6 @@ ps_document_document_iface_init (EvDocumentIface *iface)
 	iface->get_n_pages = ps_document_get_n_pages;
 	iface->get_page_size = ps_document_get_page_size;
 	iface->get_info = ps_document_get_info;
-	iface->set_orientation = ps_document_set_orientation;
-	iface->get_orientation = ps_document_get_orientation;
 }
 
 static void
@@ -1323,7 +1259,8 @@ ps_async_renderer_iface_init (EvAsyncRendererIface *iface)
 
 static void
 ps_document_ps_export_begin (EvPSExporter *exporter, const char *filename,
-			     int first_page, int last_page)
+			     int first_page, int last_page,
+                             double width, double height, gboolean duplex)
 {
 	PSDocument *document = PS_DOCUMENT (exporter);
 
@@ -1334,11 +1271,11 @@ ps_document_ps_export_begin (EvPSExporter *exporter, const char *filename,
 }
 
 static void
-ps_document_ps_export_do_page (EvPSExporter *exporter, int page)
+ps_document_ps_export_do_page (EvPSExporter *exporter, EvRenderContext *rc)
 {
 	PSDocument *document = PS_DOCUMENT (exporter);
 	
-	document->ps_export_pagelist[page] = 1;
+	document->ps_export_pagelist[rc->page] = 1;
 }
 
 static void