Merge changes from CUPS 1.4svn-r7394.

[thirdparty/cups.git] / filter / rastertoepson.c

diff --git a/filter/rastertoepson.c b/filter/rastertoepson.c
index f1ad6547cf87b1a9364972c25228f29d97a3819b..62ecb347b8a089cf9748cb14d40271c902f021bf 100644 (file)
--- a/filter/rastertoepson.c
+++ b/filter/rastertoepson.c
@@ -77,7 +77,8 @@ int           DotBit,                 /* Bit in buffers */
                LineCount,              /* # of lines processed */
                EvenOffset,             /* Offset into 'even' buffers */
                OddOffset,              /* Offset into 'odd' buffers */
-               Shingling;              /* Shingle output? */
+               Shingling,              /* Shingle output? */
+               Canceled;               /* Has the current job been canceled? */
 
 
 /*
@@ -85,15 +86,15 @@ int         DotBit,                 /* Bit in buffers */
  */
 
 void   Setup(void);
-void   StartPage(const ppd_file_t *ppd, const cups_page_header_t *header);
-void   EndPage(const cups_page_header_t *header);
+void   StartPage(const ppd_file_t *ppd, const cups_page_header2_t *header);
+void   EndPage(const cups_page_header2_t *header);
 void   Shutdown(void);
 
 void   CancelJob(int sig);
 void   CompressData(const unsigned char *line, int length, int plane,
                     int type, int xstep, int ystep);
-void   OutputLine(const cups_page_header_t *header);
-void   OutputRows(const cups_page_header_t *header, int row);
+void   OutputLine(const cups_page_header2_t *header);
+void   OutputRows(const cups_page_header2_t *header, int row);
 
 
 /*
@@ -123,31 +124,11 @@ Setup(void)
 
 void
 StartPage(const ppd_file_t         *ppd,       /* I - PPD file */
-          const cups_page_header_t *header)    /* I - Page header */
+          const cups_page_header2_t *header)   /* I - Page header */
 {
   int  n, t;                                   /* Numbers */
   int  plane;                                  /* Looping var */
-#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
-  struct sigaction action;                     /* Actions for POSIX signals */
-#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-
-
- /*
-  * Register a signal handler to eject the current page if the
-  * job is cancelled.
-  */
 
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, CancelJob);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-
-  sigemptyset(&action.sa_mask);
-  action.sa_handler = CancelJob;
-  sigaction(SIGTERM, &action, NULL);
-#else
-  signal(SIGTERM, CancelJob);
-#endif /* HAVE_SIGSET */
 
  /*
   * Send a reset sequence.
@@ -339,7 +320,7 @@ StartPage(const ppd_file_t         *ppd,    /* I - PPD file */
  */
 
 void
-EndPage(const cups_page_header_t *header)      /* I - Page header */
+EndPage(const cups_page_header2_t *header)     /* I - Page header */
 {
 #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
   struct sigaction action;                     /* Actions for POSIX signals */
@@ -377,22 +358,6 @@ EndPage(const cups_page_header_t *header)  /* I - Page header */
     putchar(12);               /* Form feed */
   fflush(stdout);
 
- /*
-  * Unregister the signal handler...
-  */
-
-#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
-  sigset(SIGTERM, SIG_IGN);
-#elif defined(HAVE_SIGACTION)
-  memset(&action, 0, sizeof(action));
-
-  sigemptyset(&action.sa_mask);
-  action.sa_handler = SIG_IGN;
-  sigaction(SIGTERM, &action, NULL);
-#else
-  signal(SIGTERM, SIG_IGN);
-#endif /* HAVE_SIGSET */
-
  /*
   * Free memory...
   */
@@ -429,31 +394,9 @@ Shutdown(void)
 void
 CancelJob(int sig)                     /* I - Signal */
 {
-  int  i;                              /* Looping var */
-
-
   (void)sig;
 
- /*
-  * Send out lots of NUL bytes to clear out any pending raster data...
-  */
-
-  if (DotBytes)
-    i = DotBytes * 360 * 8;
-  else
-    i = 720;
-
-  for (; i > 0; i --)
-    putchar(0);
-
- /*
-  * End the current page and exit...
-  */
-
-  EndPage(NULL);
-  Shutdown();
-
-  exit(0);
+  Canceled = 1;
 }
 
 
@@ -670,7 +613,7 @@ CompressData(const unsigned char *line,     /* I - Data to compress */
  */
 
 void
-OutputLine(const cups_page_header_t *header)   /* I - Page header */
+OutputLine(const cups_page_header2_t *header)  /* I - Page header */
 {
   if (header->cupsRowCount)
   {
@@ -838,7 +781,7 @@ OutputLine(const cups_page_header_t *header)        /* I - Page header */
  */
 
 void
-OutputRows(const cups_page_header_t *header,   /* I - Page image header */
+OutputRows(const cups_page_header2_t *header,  /* I - Page image header */
            int                      row)       /* I - Row number (0 or 1) */
 {
   unsigned     i, n;                           /* Looping vars */
@@ -1012,16 +955,19 @@ OutputRows(const cups_page_header_t *header,     /* I - Page image header */
  * 'main()' - Main entry and processing of driver.
  */
 
-int                            /* O - Exit status */
-main(int  argc,                        /* I - Number of command-line arguments */
-     char *argv[])             /* I - Command-line arguments */
+int                                    /* O - Exit status */
+main(int  argc,                                /* I - Number of command-line arguments */
+     char *argv[])                     /* I - Command-line arguments */
 {
-  int                  fd;     /* File descriptor */
-  cups_raster_t                *ras;   /* Raster stream for printing */
-  cups_page_header_t   header; /* Page header from file */
-  ppd_file_t           *ppd;   /* PPD file */
-  int                  page;   /* Current page */
-  int                  y;      /* Current line */
+  int                  fd;             /* File descriptor */
+  cups_raster_t                *ras;           /* Raster stream for printing */
+  cups_page_header2_t  header;         /* Page header from file */
+  ppd_file_t           *ppd;           /* PPD file */
+  int                  page;           /* Current page */
+  int                  y;              /* Current line */
+#if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
+  struct sigaction action;             /* Actions for POSIX signals */
+#endif /* HAVE_SIGACTION && !HAVE_SIGSET */
 
 
  /*
@@ -1064,6 +1010,25 @@ main(int  argc,                  /* I - Number of command-line arguments */
 
   ras = cupsRasterOpen(fd, CUPS_RASTER_READ);
 
+ /*
+  * Register a signal handler to eject the current page if the
+  * job is cancelled.
+  */
+
+  Canceled = 0;
+
+#ifdef HAVE_SIGSET /* Use System V signals over POSIX to avoid bugs */
+  sigset(SIGTERM, CancelJob);
+#elif defined(HAVE_SIGACTION)
+  memset(&action, 0, sizeof(action));
+
+  sigemptyset(&action.sa_mask);
+  action.sa_handler = CancelJob;
+  sigaction(SIGTERM, &action, NULL);
+#else
+  signal(SIGTERM, CancelJob);
+#endif /* HAVE_SIGSET */
+
  /*
   * Initialize the print device...
   */
@@ -1080,12 +1045,15 @@ main(int  argc,                 /* I - Number of command-line arguments */
 
   page = 0;
 
-  while (cupsRasterReadHeader(ras, &header))
+  while (cupsRasterReadHeader2(ras, &header))
   {
    /*
     * Write a status message with the page number and number of copies.
     */
 
+    if (Canceled)
+      break;
+
     page ++;
 
     fprintf(stderr, "PAGE: %d %d\n", page, header.NumCopies);
@@ -1106,6 +1074,9 @@ main(int  argc,                   /* I - Number of command-line arguments */
       * Let the user know how far we have progressed...
       */
 
+      if (Canceled)
+       break;
+
       if ((y & 127) == 0)
         fprintf(stderr, _("INFO: Printing page %d, %d%% complete...\n"), page,
                100 * y / header.cupsHeight);
@@ -1129,6 +1100,9 @@ main(int  argc,                   /* I - Number of command-line arguments */
     */
 
     EndPage(&header);
+
+    if (Canceled)
+      break;
   }
 
  /*