Report default media in media/-col/-ready (Issue #1388)

diff --git a/CHANGES.md b/CHANGES.md
index 41d1baf4104c756d66f1ac061be5947f032da1ba..dceb0fb65e9df976dd1defdc81698a0a4fd3f786 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -84,6 +84,8 @@ Changes in CUPS v2.5b1 (YYYY-MM-DD)
   values.
 - Updated the setuid/gid checks in libcups to use `getauxval` on Linux to avoid
   potential security issues (Issue #1258)
+- Updated the ready media support to report the default paper size/source/type
+  from the PPD file (Issue #1388)
 - Deprecated the "page-border" Job Template attribute (Issue #1020)
 - Removed the `cups-config` utility (use `pkg-config` instead)
 - Fixed use-after-free in `cupsdAcceptClient()` when we log warning during error

diff --git a/scheduler/printers.c b/scheduler/printers.c
index 0469734c26f35c5af6b68093f6fdc4583ce41c4c..3e3d38334850f9fe9041fed15cb36da04f6f7c67 100644 (file)
--- a/scheduler/printers.c
+++ b/scheduler/printers.c
@@ -3767,8 +3767,11 @@ load_ppd(cupsd_printer_t *p)             /* I - Printer */
   int          xdpi,                   /* Horizontal resolution */
                ydpi;                   /* Vertical resolution */
   const char   *resptr;                /* Pointer into resolution keyword */
-  pwg_size_t   *pwgsize;               /* Current PWG size */
-  pwg_map_t    *pwgsource,             /* Current PWG source */
+  pwg_size_t   *defsize = NULL,        /* Default PWG size */
+               *pwgsize;               /* Current PWG size */
+  pwg_map_t    *defsource = NULL,      /* Default PWG source */
+               *deftype = NULL,        /* Default PWG type */
+               *pwgsource,             /* Current PWG source */
                *pwgtype;               /* Current PWG type */
   ipp_attribute_t *attr;               /* Attribute data */
   _ipp_value_t *val;                   /* Attribute value */
@@ -4300,23 +4303,21 @@ load_ppd(cupsd_printer_t *p)            /* I - Printer */
       */
 
       if ((size = ppdPageSize(ppd, NULL)) != NULL)
-       pwgsize = _ppdCacheGetSize(p->pc, size->name, size);
+       defsize = _ppdCacheGetSize(p->pc, size->name, size);
       else
-        pwgsize = NULL;
+        defsize = NULL;
 
-      ippAddString(p->ppd_attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD,
-                  "media-default", NULL,
-                  pwgsize ? pwgsize->map.pwg : "unknown");
+      ippAddString(p->ppd_attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-default", NULL, defsize ? defsize->map.pwg : "unknown");
 
      /*
       * media-col-default
       */
 
-      if (pwgsize)
+      if (defsize)
       {
         ipp_t  *col;                   /* Collection value */
 
-       col = new_media_col(pwgsize);
+       col = new_media_col(defsize);
 
         if ((ppd_attr = ppdFindAttr(ppd, "DefaultMediaType", NULL)) != NULL)
         {
@@ -4326,7 +4327,8 @@ load_ppd(cupsd_printer_t *p)              /* I - Printer */
           {
             if (!strcmp(pwgtype->ppd, ppd_attr->value))
             {
-              ippAddString(col, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-type", NULL, pwgtype->pwg);
+              deftype = pwgtype;
+              ippAddString(col, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-type", NULL, deftype->pwg);
               break;
             }
           }
@@ -4340,7 +4342,8 @@ load_ppd(cupsd_printer_t *p)              /* I - Printer */
           {
             if (!strcmp(pwgsource->ppd, ppd_attr->value))
             {
-              ippAddString(col, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-source", NULL, pwgsource->pwg);
+              defsource = pwgsource;
+              ippAddString(col, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-source", NULL, defsource->pwg);
               break;
             }
           }
@@ -4620,6 +4623,52 @@ load_ppd(cupsd_printer_t *p)             /* I - Printer */
       }
     }
 
+    if (defsize)
+    {
+      // Add default size to media[-col]-ready as needed...
+      ipp_t *col = new_media_col(defsize);
+                                       // media-col-ready value
+
+      if (defsource)
+      {
+       ippAddString(col, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-source", NULL, defsource->pwg);
+      }
+      else if (media_col_ready)
+      {
+       char    source[128];            // media-source value
+
+       snprintf(source, sizeof(source), "auto.%d", ippGetCount(media_col_ready) + 1);
+       ippAddString(col, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-source", NULL, source);
+      }
+      else
+      {
+       ippAddString(col, IPP_TAG_PRINTER, IPP_CONST_TAG(IPP_TAG_KEYWORD), "media-source", NULL, "auto");
+      }
+
+      if (deftype)
+       ippAddString(col, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-type", NULL, deftype->pwg);
+
+      if (media_ready)
+      {
+        // Only add the default size if it isn't already in the ready list...
+        if (!ippContainsString(media_ready, defsize->map.pwg))
+          ippSetString(p->ppd_attrs, &media_ready, ippGetCount(media_ready), defsize->map.pwg);
+      }
+      else
+      {
+        // Add "media-ready"...
+        media_ready = ippAddString(p->ppd_attrs, IPP_TAG_PRINTER, IPP_TAG_KEYWORD, "media-ready", NULL, defsize->map.pwg);
+      }
+
+      // Add/update media-col-ready...
+      if (media_col_ready)
+        ippSetCollection(p->ppd_attrs, &media_col_ready, ippGetCount(media_col_ready), col);
+      else
+       media_col_ready = ippAddCollection(p->ppd_attrs, IPP_TAG_PRINTER, "media-col-ready", col);
+
+      ippDelete(col);
+    }
+
     ippAddString(p->ppd_attrs, IPP_TAG_PRINTER, IPP_CONST_TAG(IPP_TAG_TEXT), "mopria-certified", NULL, "1.3");
 
    /*