X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=cups%2Fppd-private.h;h=9e890e9edec86873e98316973f3c4d5df86a86f2;hb=7e86f2f686334cb3db458b4585dfce9c1b712bc4;hp=426c74ff871faf0a915f36bca30a7541aa7be034;hpb=3e7fe0ca760ad0054cf5c9ec7c90ca415cf6eb06;p=thirdparty%2Fcups.git diff --git a/cups/ppd-private.h b/cups/ppd-private.h index 426c74ff8..9e890e9ed 100644 --- a/cups/ppd-private.h +++ b/cups/ppd-private.h @@ -1,27 +1,27 @@ /* * "$Id$" * - * Private PPD definitions for CUPS. + * Private PPD definitions for CUPS. * - * Copyright 2007-2011 by Apple Inc. - * Copyright 1997-2007 by Easy Software Products, all rights reserved. + * Copyright 2007-2014 by Apple Inc. + * Copyright 1997-2007 by Easy Software Products, all rights reserved. * - * These coded instructions, statements, and computer programs are the - * property of Apple Inc. and are protected by Federal copyright - * law. Distribution and use rights are outlined in the file "LICENSE.txt" - * which should have been included with this file. If this file is - * file is missing or damaged, see the license at "http://www.cups.org/". + * These coded instructions, statements, and computer programs are the + * property of Apple Inc. and are protected by Federal copyright + * law. Distribution and use rights are outlined in the file "LICENSE.txt" + * which should have been included with this file. If this file is + * file is missing or damaged, see the license at "http://www.cups.org/". * - * PostScript is a trademark of Adobe Systems, Inc. + * PostScript is a trademark of Adobe Systems, Inc. * - * This code and any derivative of it may be used and distributed - * freely under the terms of the GNU General Public License when - * used with GNU Ghostscript or its derivatives. Use of the code - * (or any derivative of it) with software other than GNU - * GhostScript (or its derivatives) is governed by the CUPS license - * agreement. + * This code and any derivative of it may be used and distributed + * freely under the terms of the GNU General Public License when + * used with GNU Ghostscript or its derivatives. Use of the code + * (or any derivative of it) with software other than GNU + * GhostScript (or its derivatives) is governed by the CUPS license + * agreement. * - * This file is subject to the Apple OS-Developed Software exception. + * This file is subject to the Apple OS-Developed Software exception. */ #ifndef _CUPS_PPD_PRIVATE_H_ @@ -49,7 +49,7 @@ extern "C" { * Constants... */ -# define _PPD_CACHE_VERSION 3 /* Version number in cache file */ +# define _PPD_CACHE_VERSION 6 /* Version number in cache file */ /* @@ -104,17 +104,17 @@ typedef enum _pwg_print_quality_e /**** PWG print-quality values ****/ typedef struct _pwg_finishings_s /**** PWG finishings mapping data ****/ { - ipp_finish_t value; /* finishings value */ - int num_options; /* Number of options to apply */ - cups_option_t *options; /* Options to apply */ + ipp_finishings_t value; /* finishings value */ + int num_options; /* Number of options to apply */ + cups_option_t *options; /* Options to apply */ } _pwg_finishings_t; struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/ { int num_bins; /* Number of output bins */ - _pwg_map_t *bins; /* Output bins */ + pwg_map_t *bins; /* Output bins */ int num_sizes; /* Number of media sizes */ - _pwg_size_t *sizes; /* Media sizes */ + pwg_size_t *sizes; /* Media sizes */ int custom_max_width, /* Maximum custom width in 2540ths */ custom_max_length, /* Maximum custom length in 2540ths */ custom_min_width, /* Minimum custom width in 2540ths */ @@ -122,12 +122,12 @@ struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/ char *custom_max_keyword, /* Maximum custom size PWG keyword */ *custom_min_keyword, /* Minimum custom size PWG keyword */ custom_ppd_size[41]; /* Custom PPD size name */ - _pwg_size_t custom_size; /* Custom size record */ + pwg_size_t custom_size; /* Custom size record */ char *source_option; /* PPD option for media source */ int num_sources; /* Number of media sources */ - _pwg_map_t *sources; /* Media sources */ + pwg_map_t *sources; /* Media sources */ int num_types; /* Number of media types */ - _pwg_map_t *types; /* Media types */ + pwg_map_t *types; /* Media types */ int num_presets[_PWG_PRINT_COLOR_MODE_MAX][_PWG_PRINT_QUALITY_MAX]; /* Number of print-color-mode/print-quality options */ cups_option_t *presets[_PWG_PRINT_COLOR_MODE_MAX][_PWG_PRINT_QUALITY_MAX]; @@ -141,7 +141,13 @@ struct _ppd_cache_s /**** PPD cache and PWG conversion data ****/ *prefilters; /* cupsPreFilter values */ int single_file; /* cupsSingleFile value */ cups_array_t *finishings; /* cupsIPPFinishings values */ - int max_copies; /* cupsMaxCopies value */ + int max_copies, /* cupsMaxCopies value */ + account_id, /* cupsJobAccountId value */ + accounting_user_id; /* cupsJobAccountingUserId value */ + char *password; /* cupsJobPassword value */ + cups_array_t *mandatory; /* cupsMandatory value */ + char *charge_info_uri; /* cupsChargeInfoURI value */ + cups_array_t *support_files; /* Support files - ICC profiles, etc. */ }; @@ -155,12 +161,16 @@ extern _ppd_cache_t *_ppdCacheCreateWithPPD(ppd_file_t *ppd); extern void _ppdCacheDestroy(_ppd_cache_t *pc); extern const char *_ppdCacheGetBin(_ppd_cache_t *pc, const char *output_bin); -extern int _ppdCacheGetFinishingOptions(_ppd_cache_t *pc, ipp_t *job, - ipp_finish_t value, int num_options, +extern int _ppdCacheGetFinishingOptions(_ppd_cache_t *pc, + ipp_t *job, + ipp_finishings_t value, + int num_options, cups_option_t **options); -extern int _ppdCacheGetFinishingValues(_ppd_cache_t *pc, int num_options, +extern int _ppdCacheGetFinishingValues(_ppd_cache_t *pc, + int num_options, cups_option_t *options, - int max_values, int *values); + int max_values, + int *values); extern const char *_ppdCacheGetInputSlot(_ppd_cache_t *pc, ipp_t *job, const char *keyword); extern const char *_ppdCacheGetMediaType(_ppd_cache_t *pc, ipp_t *job, @@ -169,7 +179,7 @@ extern const char *_ppdCacheGetOutputBin(_ppd_cache_t *pc, const char *keyword); extern const char *_ppdCacheGetPageSize(_ppd_cache_t *pc, ipp_t *job, const char *keyword, int *exact); -extern _pwg_size_t *_ppdCacheGetSize(_ppd_cache_t *pc, +extern pwg_size_t *_ppdCacheGetSize(_ppd_cache_t *pc, const char *page_size); extern const char *_ppdCacheGetSource(_ppd_cache_t *pc, const char *input_slot); @@ -197,7 +207,7 @@ extern const char *_pwgInputSlotForSource(const char *media_source, char *name, size_t namesize); extern const char *_pwgMediaTypeForType(const char *media_type, char *name, size_t namesize); -extern const char *_pwgPageSizeForMedia(_pwg_media_t *media, +extern const char *_pwgPageSizeForMedia(pwg_media_t *media, char *name, size_t namesize);