GUI changes for 5.0 branch.

Distribution changes for 5.0 branch.

Preliminary changes for PPD stuff...

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/branches/branch-1.2@1669 7a7537e8-13f0-0310-91df-b6672ffda945

diff --git a/cups/mark.c b/cups/mark.c
index ab22dcac535b6f197e2604a05b9f2f6b6ef52255..3bb6061827f4e1772cb8abe40bca942af3332767 100644 (file)
--- a/cups/mark.c
+++ b/cups/mark.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: mark.c,v 1.24 2001/01/22 15:03:30 mike Exp $"
+ * "$Id: mark.c,v 1.24.2.1 2001/04/11 00:24:11 mike Exp $"
  *
  *   Option marking routines for the Common UNIX Printing System (CUPS).
  *
@@ -31,6 +31,7 @@
  *   ppdFindOption()       - Return a pointer to the specified option.
  *   ppdIsMarked()         - Check to see if an option is marked...
  *   ppdMarkDefaults()     - Mark all default options in the PPD file.
+ *   ppdMarkNumeric()      - Mark a numeric option.
  *   ppdMarkOption()       - Mark an option in a PPD file.
  *   ppd_defaults()        - Set the defaults for this group and all sub-groups.
  */
@@ -307,6 +308,20 @@ ppdMarkDefaults(ppd_file_t *ppd)/* I - PPD file record */
 }
 
 
+/*
+ * 'ppdMarkNumeric()' - Mark a numeric option.
+ */
+
+int                                    /* O - 0 or number of comflicts */
+ppdMarkNumeric(ppd_file_t *ppd,                /* I - PPD file */
+               const char *keyword,    /* I - Option name */
+               int        num_values,  /* I - Number of values */
+              float      *values)      /* I - Values */
+{
+  return (ppdConflicts(ppd));
+}
+
+
 /*
  * 'ppdMarkOption()' - Mark an option in a PPD file.
  *
@@ -437,5 +452,5 @@ ppd_defaults(ppd_file_t  *ppd,      /* I - PPD file */
 
 
 /*
- * End of "$Id: mark.c,v 1.24 2001/01/22 15:03:30 mike Exp $".
+ * End of "$Id: mark.c,v 1.24.2.1 2001/04/11 00:24:11 mike Exp $".
  */

diff --git a/cups/ppd.c b/cups/ppd.c
index 6c78af99f3407ded6d309cc5c3b74392866c904a..7ebf350384383affd0bfe2180604e3791a34ac4d 100644 (file)
--- a/cups/ppd.c
+++ b/cups/ppd.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.c,v 1.51 2001/02/15 13:34:15 mike Exp $"
+ * "$Id: ppd.c,v 1.51.2.1 2001/04/11 00:24:11 mike Exp $"
  *
  *   PPD file routines for the Common UNIX Printing System (CUPS).
  *
@@ -547,6 +547,11 @@ ppdOpen(FILE *fp)          /* I - File to read from */
       ppd->modelname = string;
       string = NULL;                   /* Don't free this string below */
     }
+    else if (strcmp(keyword, "PCFileName") == 0)
+    {
+      ppd->pcfilename = string;
+      string = NULL;                   /* Don't free this string below */
+    }
     else if (strcmp(keyword, "NickName") == 0)
     {
       ppd->nickname = string;
@@ -1935,5 +1940,5 @@ ppd_fix(char *string)             /* IO - String to fix */
 
 
 /*
- * End of "$Id: ppd.c,v 1.51 2001/02/15 13:34:15 mike Exp $".
+ * End of "$Id: ppd.c,v 1.51.2.1 2001/04/11 00:24:11 mike Exp $".
  */

diff --git a/cups/ppd.h b/cups/ppd.h
index d2ccf6648e9e05421b8f367f1dc820a23cd16d0c..c67936fcebefe76409e341a689210118cc4342e4 100644 (file)
--- a/cups/ppd.h
+++ b/cups/ppd.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: ppd.h,v 1.24 2001/03/02 13:42:20 mike Exp $"
+ * "$Id: ppd.h,v 1.24.2.1 2001/04/11 00:24:11 mike Exp $"
  *
  *   PostScript Printer Description definitions for the Common UNIX Printing
  *   System (CUPS).
@@ -75,7 +75,10 @@ typedef enum                 /**** UI types ****/
 {
   PPD_UI_BOOLEAN,              /* True or False option */
   PPD_UI_PICKONE,              /* Pick one from a list */
-  PPD_UI_PICKMANY              /* Pick zero or more from a list */
+  PPD_UI_PICKMANY,             /* Pick zero or more from a list */
+  PPD_UI_CUPS_NUMBER,          /* Specify a linear number */
+  PPD_UI_CUPS_GAMMA,           /* Specify a gamma number */
+  PPD_UI_CUPS_CURVE            /* Specify a gamma/density LUT */
 } ppd_ui_t;
 
 typedef enum                   /**** Order dependency sections ****/
@@ -123,6 +126,12 @@ typedef struct                     /**** Options ****/
   float                order;          /* Order number */
   int          num_choices;    /* Number of option choices */
   ppd_choice_t *choices;       /* Option choices */
+  const char   *command;       /* Command for numeric options */
+  int          num_values;     /* Number of numeric values */
+  float                *values,        /* Current value(s) */
+               lower,          /* Lower bounds for numeric value */
+               upper,          /* Upper bounds for numeric value */
+               precision;      /* Precision of values */
 } ppd_option_t;
 
 typedef struct ppd_group_str   /**** Groups ****/
@@ -200,6 +209,7 @@ typedef struct                      /**** Files ****/
                *jcl_end,       /* End JCL commands */
                *lang_encoding, /* Language encoding */
                *lang_version,  /* Language version (English, Spanish, etc.) */
+               *pcfilename,    /* PC filename */
                *modelname,     /* Model name (general) */
                *ttrasterizer,  /* Truetype rasterizer */
                *manufacturer,  /* Manufacturer name */
@@ -244,6 +254,8 @@ extern int          ppdIsMarked(ppd_file_t *ppd, const char *keyword,
 extern void            ppdMarkDefaults(ppd_file_t *ppd);
 extern int             ppdMarkOption(ppd_file_t *ppd, const char *keyword,
                                      const char *option);
+extern int             ppdMarkNumeric(ppd_file_t *ppd, const char *keyword,
+                                      int num_values, float *values);
 extern ppd_choice_t    *ppdFindChoice(ppd_option_t *o, const char *option);
 extern ppd_choice_t    *ppdFindMarkedChoice(ppd_file_t *ppd, const char *keyword);
 extern ppd_option_t    *ppdFindOption(ppd_file_t *ppd, const char *keyword);
@@ -264,5 +276,5 @@ extern float                ppdPageWidth(ppd_file_t *ppd, const char *name);
 #endif /* !_CUPS_PPD_H_ */
 
 /*
- * End of "$Id: ppd.h,v 1.24 2001/03/02 13:42:20 mike Exp $".
+ * End of "$Id: ppd.h,v 1.24.2.1 2001/04/11 00:24:11 mike Exp $".
  */

diff --git a/scheduler/printers.c b/scheduler/printers.c
index bc85c9e6ba6f76e14533863bd144c1fa97967939..1e0a3850c21374f353be41990c24183b4211159d 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -1,5 +1,5 @@
 /*
- * "$Id: printers.c,v 1.93.2.1 2001/04/02 19:51:50 mike Exp $"
+ * "$Id: printers.c,v 1.93.2.2 2001/04/11 00:24:14 mike Exp $"
  *
  *   Printer routines for the Common UNIX Printing System (CUPS).
  *
@@ -897,10 +897,8 @@ SetPrinterAttrs(printer_t *p)              /* I - Printer to setup */
   ipp_finish_t finishings[5];
   const char   *multiple_document_handling[] =
                {
-                 "single-document",
                  "separate-documents-uncollated-copies",
-                 "separate-documents-collated-copies",
-                 "single-document-new-sheet"
+                 "separate-documents-collated-copies"
                };
 #ifdef __sgi
   FILE         *fp;            /* Interface script file */
@@ -1789,5 +1787,5 @@ write_printcap(void)
 
 
 /*
- * End of "$Id: printers.c,v 1.93.2.1 2001/04/02 19:51:50 mike Exp $".
+ * End of "$Id: printers.c,v 1.93.2.2 2001/04/11 00:24:14 mike Exp $".
  */