Load cups into easysw/current.

[thirdparty/cups.git] / cups / cups.h

diff --git a/cups/cups.h b/cups/cups.h
index 84a0f3793f4dfc7ba40ec7fdfeda6ae556a37415..64b389a08f6c2ee0729bdc3c34c52530cac047c0 100644 (file)
--- a/cups/cups.h
+++ b/cups/cups.h
@@ -1,5 +1,5 @@
 /*
- * "$Id: cups.h 4918 2006-01-12 05:14:40Z mike $"
+ * "$Id: cups.h 5233 2006-03-06 03:39:28Z mike $"
  *
  *   API definitions for the Common UNIX Printing System (CUPS).
  *
@@ -33,10 +33,12 @@
 
 #  include "ipp.h"
 #  include "ppd.h"
+#  include "language.h"
+
 
 /*
  * With GCC 3.0 and higher, we can mark old APIs "deprecated" so you get
- * an error at compile-time.
+ * a warning at compile-time.
  */
 
 #  if defined(__GNUC__) && __GNUC__ > 2
@@ -59,10 +61,10 @@ extern "C" {
  * Constants...
  */
 
-#  define CUPS_VERSION         1.0190
+#  define CUPS_VERSION         1.0200
 #  define CUPS_VERSION_MAJOR   1
 #  define CUPS_VERSION_MINOR   2
-#  define CUPS_VERSION_PATCH   -10
+#  define CUPS_VERSION_PATCH   0
 #  define CUPS_DATE_ANY                -1
 
 
@@ -97,10 +99,12 @@ enum cups_ptype_e                   /* Not a typedef'd enum so we can OR */
   CUPS_PRINTER_DELETE = 0x100000,      /* Delete printer @since CUPS 1.2@ */
   CUPS_PRINTER_NOT_SHARED = 0x200000,  /* Printer is not shared @since CUPS 1.2@ */
   CUPS_PRINTER_AUTHENTICATED = 0x400000,/* Printer requires authentication @since CUPS 1.2@ */
-  CUPS_PRINTER_OPTIONS = 0x66fffc      /* ~(CLASS | REMOTE | IMPLICIT) */
+  CUPS_PRINTER_COMMANDS = 0x800000,    /* Printer supports maintenance commands @since CUPS 1.2@ */
+  CUPS_PRINTER_OPTIONS = 0xe6fffc      /* ~(CLASS | REMOTE | IMPLICIT) */
 };
 
 typedef const char *(*cups_password_cb_t)(const char *);
+                                       /**** Password callback ****/
 
 typedef struct cups_option_s           /**** Printer Options ****/
 {
@@ -120,16 +124,16 @@ typedef struct cups_dest_s                /**** Destination ****/
 typedef struct cups_job_s              /**** Job ****/
 {
   int          id;                     /* The job ID */
-  char         *dest,                  /* Printer or class name */
-               *title,                 /* Title/job name */
-               *user,                  /* User the submitted the job */
-               *format;                /* Document format */
+  char         *dest;                  /* Printer or class name */
+  char         *title;                 /* Title/job name */
+  char         *user;                  /* User the submitted the job */
+  char         *format;                /* Document format */
   ipp_jstate_t state;                  /* Job state */
-  int          size,                   /* Size in kilobytes */
-               priority;               /* Priority (1-100) */
-  time_t       completed_time,         /* Time the job was completed */
-               creation_time,          /* Time the job was created */
-               processing_time;        /* Time the job was processed */
+  int          size;                   /* Size in kilobytes */
+  int          priority;               /* Priority (1-100) */
+  time_t       completed_time;         /* Time the job was completed */
+  time_t       creation_time;          /* Time the job was created */
+  time_t       processing_time;        /* Time the job was processed */
 } cups_job_t;
 
 
@@ -138,9 +142,11 @@ typedef struct cups_job_s          /**** Job ****/
  */
 
 extern int             cupsCancelJob(const char *printer, int job);
-#define                        cupsDoRequest(http,request,resource) cupsDoFileRequest((http),(request),(resource),NULL)
 extern ipp_t           *cupsDoFileRequest(http_t *http, ipp_t *request,
-                                          const char *resource, const char *filename);
+                                          const char *resource,
+                                          const char *filename);
+extern ipp_t           *cupsDoRequest(http_t *http, ipp_t *request,
+                                      const char *resource);
 extern http_encryption_t cupsEncryption(void);
 extern void            cupsFreeJobs(int num_jobs, cups_job_t *jobs);
 extern int             cupsGetClasses(char ***classes) _CUPS_DEPRECATED;
@@ -174,10 +180,10 @@ extern void               cupsEncodeOptions(ipp_t *ipp, int num_options,
 extern void            cupsFreeOptions(int num_options, cups_option_t *options);
 extern const char      *cupsGetOption(const char *name, int num_options,
                                       cups_option_t *options);
-extern int             cupsParseOptions(const char *arg, int num_options,
-                                        cups_option_t **options);
 extern int             cupsMarkOptions(ppd_file_t *ppd, int num_options,
                                        cups_option_t *options);
+extern int             cupsParseOptions(const char *arg, int num_options,
+                                        cups_option_t **options);
 
 extern const char      *cupsGetPassword(const char *prompt);
 extern const char      *cupsServer(void);
@@ -216,13 +222,18 @@ extern int                cupsSetDests2(http_t *http, int num_dests,
                                      cups_dest_t *dests);
 
 /**** New in CUPS 1.2 ****/
-extern int             cupsBackchannelRead(char *buffer, int bytes, double timeout);
-extern int             cupsBackchannelWrite(const char *buffer, int bytes,
+extern ssize_t         cupsBackChannelRead(char *buffer, size_t bytes,
+                                           double timeout);
+extern ssize_t         cupsBackChannelWrite(const char *buffer, size_t bytes,
                                             double timeout);
 extern void            cupsEncodeOptions2(ipp_t *ipp, int num_options,
                                           cups_option_t *options,
                                           ipp_tag_t group_tag);
 extern const char      *cupsLastErrorString(void);
+extern char            *cupsNotifySubject(cups_lang_t *lang, ipp_t *event);
+extern char            *cupsNotifyText(cups_lang_t *lang, ipp_t *event);
+extern int             cupsRemoveOption(const char *name, int num_options,
+                                        cups_option_t **options);
 extern cups_file_t     *cupsTempFile2(char *filename, int len);
 
 
@@ -233,5 +244,5 @@ extern cups_file_t  *cupsTempFile2(char *filename, int len);
 #endif /* !_CUPS_CUPS_H_ */
 
 /*
- * End of "$Id: cups.h 4918 2006-01-12 05:14:40Z mike $".
+ * End of "$Id: cups.h 5233 2006-03-06 03:39:28Z mike $".
  */