X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=shell%2Fev-print-operation.c;h=a6f8d53aecfeb818d9ac1ed0ea11cd0a6f0fcd99;hb=206bc8045e1d217e09f0e640d14791f2669a92ac;hp=e737d296be3d7f1dabf03421151491c86f7e42a4;hpb=873b9c54bc7a5c7d8f000dca29a751d632726f5b;p=evince.git diff --git a/shell/ev-print-operation.c b/shell/ev-print-operation.c index e737d296..a6f8d53a 100644 --- a/shell/ev-print-operation.c +++ b/shell/ev-print-operation.c @@ -21,7 +21,9 @@ #include "ev-print-operation.h" +#if GTKUNIXPRINT_ENABLED #include +#endif #include #include #include @@ -297,6 +299,7 @@ ev_print_operation_get_progress (EvPrintOperation *op) return op->progress; } +#if GTK_CHECK_VERSION (2, 17, 1) | GTKUNIXPRINT_ENABLED static void ev_print_operation_update_status (EvPrintOperation *op, gint page, @@ -322,6 +325,9 @@ ev_print_operation_update_status (EvPrintOperation *op, g_signal_emit (op, signals[STATUS_CHANGED], 0); } +#endif + +#if GTKUNIXPRINT_ENABLED /* Export interface */ #define EV_TYPE_PRINT_OPERATION_EXPORT (ev_print_operation_export_get_type()) @@ -367,7 +373,9 @@ struct _EvPrintOperationExport { gint n_pages_to_print; gint uncollated_copies; gint collated_copies; - gint uncollated, collated, total, blank; + gint uncollated, collated, total; + + gint sheet, page_count; gint range, n_ranges; GtkPageRange *ranges; @@ -664,10 +672,40 @@ export_print_inc_page (EvPrintOperationExport *export) { do { export->page += export->inc; + + /* note: when NOT collating, page_count is increased in export_print_page */ + if (export->collate) { + export->page_count++; + export->sheet = 1 + (export->page_count - 1) / export->pages_per_sheet; + } + if (export->page == export->end) { export->range += export->inc; if (export->range == -1 || export->range == export->n_ranges) { export->uncollated++; + + /* when printing multiple collated copies & multiple pages per sheet we want to + * prevent the next copy bleeding into the last sheet of the previous one + * we've reached the last range to be printed now, so this is the time to do it */ + if (export->pages_per_sheet > 1 && export->collate == 1 && + (export->page_count - 1) % export->pages_per_sheet != 0) { + + EvPrintOperation *op = EV_PRINT_OPERATION (export); + ev_document_doc_mutex_lock (); + + /* keep track of all blanks but only actualise those + * which are in the current odd / even sheet set */ + + export->page_count += export->pages_per_sheet - (export->page_count - 1) % export->pages_per_sheet; + if (export->page_set == GTK_PAGE_SET_ALL || + (export->page_set == GTK_PAGE_SET_EVEN && export->sheet % 2 == 0) || + (export->page_set == GTK_PAGE_SET_ODD && export->sheet % 2 == 1) ) { + ev_file_exporter_end_page (EV_FILE_EXPORTER (op->document)); + } + ev_document_doc_mutex_unlock (); + export->sheet = 1 + (export->page_count - 1) / export->pages_per_sheet; + } + if (export->uncollated == export->uncollated_copies) return FALSE; @@ -676,8 +714,12 @@ export_print_inc_page (EvPrintOperationExport *export) find_range (export); export->page = export->start; } - } while ((export->page_set == GTK_PAGE_SET_EVEN && (export->page / export->pages_per_sheet) % 2 == 0) || - (export->page_set == GTK_PAGE_SET_ODD && (export->page / export->pages_per_sheet) % 2 == 1)); + + /* in/decrement the page number until we reach the first page on the next EVEN or ODD sheet + * if we're not collating, we have to make sure that this is done only once! */ + } while ( export->collate == 1 && + ((export->page_set == GTK_PAGE_SET_EVEN && export->sheet % 2 == 1) || + (export->page_set == GTK_PAGE_SET_ODD && export->sheet % 2 == 0))); return TRUE; } @@ -875,7 +917,12 @@ export_job_finished (EvJobExport *job, { EvPrintOperation *op = EV_PRINT_OPERATION (export); - if (export->pages_per_sheet == 1 || (export->total + export->blank) % export->pages_per_sheet == 0 ) { + if (export->pages_per_sheet == 1 || + ( export->page_count % export->pages_per_sheet == 0 && + ( export->page_set == GTK_PAGE_SET_ALL || + ( export->page_set == GTK_PAGE_SET_EVEN && export->sheet % 2 == 0 ) || + ( export->page_set == GTK_PAGE_SET_ODD && export->sheet % 2 == 1 ) ) ) ) { + ev_document_doc_mutex_lock (); ev_file_exporter_end_page (EV_FILE_EXPORTER (op->document)); ev_document_doc_mutex_unlock (); @@ -944,28 +991,16 @@ export_print_page (EvPrintOperationExport *export) if (!export->temp_file) return FALSE; /* cancelled */ - + export->total++; export->collated++; - /* when printing multiple collated copies & multiple pages per sheet we want to - prevent the next copy bleeding into the last sheet of the previous one - we therefore check whether we've reached the last page in a document - if that is the case and the given sheet is not filled with pages, - we introduce a few blank pages to finish off the sheet - to make sure nothing goes wrong, the final condition ensures that - we're not at the end of a sheet, otherwise we'd introduce a blank sheet! */ - - if (export->collate == 1 && export->total > 1 && export->pages_per_sheet > 1 && - (export->page + 1) % export->n_pages == 0 && (export->total - 1 + export->blank) % export->pages_per_sheet != 0) { - ev_document_doc_mutex_lock (); - ev_file_exporter_end_page (EV_FILE_EXPORTER (op->document)); - /* keep track of how many blank pages have been added */ - export->blank += export->pages_per_sheet - (export->total - 1 + export->blank) % export->pages_per_sheet; - ev_document_doc_mutex_unlock (); + /* note: when collating, page_count is increased in export_print_inc_page */ + if (!export->collate) { + export->page_count++; + export->sheet = 1 + (export->page_count - 1) / export->pages_per_sheet; } - if (export->collated == export->collated_copies) { export->collated = 0; if (!export_print_inc_page (export)) { @@ -982,12 +1017,49 @@ export_print_page (EvPrintOperationExport *export) } } - if (export->pages_per_sheet == 1 || (export->total + export->blank) % export->pages_per_sheet == 1) { + /* we're not collating and we've reached a sheet from the wrong sheet set */ + if (!export->collate && + ((export->page_set == GTK_PAGE_SET_EVEN && export->sheet % 2 != 0) || + (export->page_set == GTK_PAGE_SET_ODD && export->sheet % 2 != 1))) { + + do { + export->page_count++; + export->collated++; + export->sheet = 1 + (export->page_count - 1) / export->pages_per_sheet; + + if (export->collated == export->collated_copies) { + export->collated = 0; + + if (!export_print_inc_page (export)) { + ev_document_doc_mutex_lock (); + ev_file_exporter_end (EV_FILE_EXPORTER (op->document)); + ev_document_doc_mutex_unlock (); + + close (export->fd); + export->fd = -1; + + update_progress (export); + + export_print_done (export); + return FALSE; + } + } + + } while ((export->page_set == GTK_PAGE_SET_EVEN && export->sheet % 2 != 0) || + (export->page_set == GTK_PAGE_SET_ODD && export->sheet % 2 != 1)); + + } + + if (export->pages_per_sheet == 1 || + (export->page_count % export->pages_per_sheet == 1 && + (export->page_set == GTK_PAGE_SET_ALL || + (export->page_set == GTK_PAGE_SET_EVEN && export->sheet % 2 == 0) || + (export->page_set == GTK_PAGE_SET_ODD && export->sheet % 2 == 1)))) { ev_document_doc_mutex_lock (); ev_file_exporter_begin_page (EV_FILE_EXPORTER (op->document)); ev_document_doc_mutex_unlock (); } - + if (!export->job_export) { export->job_export = ev_job_export_new (op->document); g_signal_connect (export->job_export, "finished", @@ -1076,7 +1148,7 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog *dial file_format = gtk_print_settings_get (print_settings, GTK_PRINT_SETTINGS_OUTPUT_FILE_FORMAT); - filename = g_strdup_printf ("evince_print.%s.XXXXXX", file_format); + filename = g_strdup_printf ("evince_print.%s.XXXXXX", file_format != NULL ? file_format : ""); export->fd = g_file_open_tmp (filename, &export->temp_file, &error); g_free (filename); if (export->fd <= -1) { @@ -1114,6 +1186,8 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog *dial export->ranges[i].end = export->n_pages - 1; } break; + default: + g_warning ("Unsupported print pages setting\n"); case GTK_PRINT_PAGES_ALL: export->ranges = &export->one_range; @@ -1123,6 +1197,7 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog *dial break; } + if (export->n_ranges < 1 || !clamp_ranges (export)) { GtkWidget *message_dialog; @@ -1178,8 +1253,13 @@ ev_print_operation_export_print_dialog_response_cb (GtkDialog *dial get_first_and_last_page (export, &first_page, &last_page); - export->fc.format = file_format && g_ascii_strcasecmp (file_format, "pdf") == 0 ? - EV_FILE_FORMAT_PDF : EV_FILE_FORMAT_PS; + if (file_format) { + export->fc.format = g_ascii_strcasecmp (file_format, "pdf") == 0 ? + EV_FILE_FORMAT_PDF : EV_FILE_FORMAT_PS; + } else { + export->fc.format = gtk_printer_accepts_pdf (printer) ? + EV_FILE_FORMAT_PDF : EV_FILE_FORMAT_PS; + } export->fc.filename = export->temp_file; export->fc.first_page = MIN (first_page, last_page); export->fc.last_page = MAX (first_page, last_page); @@ -1330,6 +1410,8 @@ ev_print_operation_export_finalize (GObject *object) static void ev_print_operation_export_init (EvPrintOperationExport *export) { + /* sheets are counted from 1 to be physical */ + export->sheet = 1; } static GObject * @@ -1372,6 +1454,8 @@ ev_print_operation_export_class_init (EvPrintOperationExportClass *klass) g_object_class->finalize = ev_print_operation_export_finalize; } +#endif /* GTKUNIXPRINT_ENABLED */ + #if GTK_CHECK_VERSION (2, 17, 1) /* Print to cairo interface */ #define EV_TYPE_PRINT_OPERATION_PRINT (ev_print_operation_print_get_type()) @@ -1388,6 +1472,8 @@ struct _EvPrintOperationPrint { EvPrintOperation parent; GtkPrintOperation *op; + gint n_pages_to_print; + gint total; EvJob *job_print; gchar *job_name; }; @@ -1505,8 +1591,6 @@ ev_print_operation_print_begin_print (EvPrintOperationPrint *print, n_pages = ev_page_cache_get_n_pages (ev_page_cache_get (op->document)); gtk_print_operation_set_n_pages (print->op, n_pages); - - /* FIXME: gtk_print should provide the progress */ ev_print_operation_update_status (op, -1, n_pages, 0); g_signal_emit (op, signals[BEGIN_PRINT], 0); @@ -1518,17 +1602,36 @@ ev_print_operation_print_done (EvPrintOperationPrint *print, { EvPrintOperation *op = EV_PRINT_OPERATION (print); - /* FIXME: gtk_print should provide the progress */ - ev_print_operation_update_status (op, 0, 1, 1.0); + ev_print_operation_update_status (op, 0, print->n_pages_to_print, 1.0); g_signal_emit (op, signals[DONE], 0, result); } +static void +ev_print_operation_print_status_changed (EvPrintOperationPrint *print) +{ +#ifdef HAVE_GTK_PRINT_OPERATION_GET_N_PAGES_TO_PRINT + GtkPrintStatus status; + + status = gtk_print_operation_get_status (print->op); + if (status == GTK_PRINT_STATUS_GENERATING_DATA) + print->n_pages_to_print = gtk_print_operation_get_n_pages_to_print (print->op); +#endif +} + static void print_job_finished (EvJobPrint *job, EvPrintOperationPrint *print) { + EvPrintOperation *op = EV_PRINT_OPERATION (print); + gtk_print_operation_draw_page_finish (print->op); +#ifdef HAVE_GTK_PRINT_OPERATION_GET_N_PAGES_TO_PRINT + print->total++; + ev_print_operation_update_status (op, print->total, + print->n_pages_to_print, + print->total / (gdouble)print->n_pages_to_print); +#endif ev_job_print_set_cairo (job, NULL); } @@ -1619,6 +1722,9 @@ ev_print_operation_print_init (EvPrintOperationPrint *print) g_signal_connect_swapped (print->op, "draw_page", G_CALLBACK (ev_print_operation_print_draw_page), print); + g_signal_connect_swapped (print->op, "status_changed", + G_CALLBACK (ev_print_operation_print_status_changed), + print); gtk_print_operation_set_allow_async (print->op, TRUE); } @@ -1643,11 +1749,30 @@ ev_print_operation_print_class_init (EvPrintOperationPrintClass *klass) } #endif /* GTK_CHECK_VERSION (2, 17, 1) */ +gboolean ev_print_operation_exists_for_document (EvDocument *document) +{ +#if GTKUNIXPRINT_ENABLED +#if GTK_CHECK_VERSION (2, 17, 1) + return (EV_IS_FILE_EXPORTER(document) || EV_IS_DOCUMENT_PRINT(document)); +#else + return EV_IS_FILE_EXPORTER(document); +#endif +#else /* ! GTKUNIXPRINT_ENABLED */ +#if GTK_CHECK_VERSION (2, 17, 1) + return EV_IS_DOCUMENT_PRINT(document); +#else + return FALSE; +#endif +#endif /* GTKUNIXPRINT_ENABLED */ +} + /* Factory method */ EvPrintOperation * ev_print_operation_new (EvDocument *document) { - EvPrintOperation *op; + EvPrintOperation *op = NULL; + + g_return_val_if_fail (ev_print_operation_exists_for_document (document), NULL); #if GTK_CHECK_VERSION (2, 17, 1) if (EV_IS_DOCUMENT_PRINT (document)) @@ -1655,8 +1780,9 @@ ev_print_operation_new (EvDocument *document) "document", document, NULL)); else #endif +#if GTKUNIXPRINT_ENABLED op = EV_PRINT_OPERATION (g_object_new (EV_TYPE_PRINT_OPERATION_EXPORT, "document", document, NULL)); - +#endif return op; }