/* GTK - The GIMP Toolkit
- * gtkprintbackendcups.h: Default implementation of GtkPrintBackend
+ * gtkprintbackendcups.h: Default implementation of GtkPrintBackend
* for the Common Unix Print System (CUPS)
* Copyright (C) 2006, 2007 Red Hat, Inc.
*
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
#ifdef __linux__
#include <sys/stat.h>
#include <stdlib.h>
#include <time.h>
+/* Cups 1.6 deprecates ppdFindAttr(), ppdFindCustomOption(),
+ * ppdFirstCustomParam(), and ppdNextCustomParam() among others. This
+ * turns off the warning so that it will compile.
+ */
+#ifdef HAVE_CUPS_API_1_6
+# define _PPD_DEPRECATED
+#endif
#include <cups/cups.h>
#include <cups/language.h>
#include <gtk/gtkprintbackend.h>
#include <gtk/gtkunixprint.h>
#include <gtk/gtkprinter-private.h>
+#ifdef HAVE_AVAHI_BROWSING
+#include <avahi-gobject/ga-client.h>
+#include <avahi-gobject/ga-service-browser.h>
+#include <avahi-gobject/ga-service-resolver.h>
+#include <avahi-gobject/ga-error.h>
+#endif
#include "gtkprintbackendcups.h"
#include "gtkprintercups.h"
#include "gtkcupsutils.h"
+#ifdef HAVE_COLORD
+#include <colord.h>
+#endif
typedef struct _GtkPrintBackendCupsClass GtkPrintBackendCupsClass;
#define GTK_IS_PRINT_BACKEND_CUPS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PRINT_BACKEND_CUPS))
#define GTK_PRINT_BACKEND_CUPS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PRINT_BACKEND_CUPS, GtkPrintBackendCupsClass))
-#define _CUPS_MAX_ATTEMPTS 10
+#define _CUPS_MAX_ATTEMPTS 10
#define _CUPS_MAX_CHUNK_SIZE 8192
/* define this to see warnings about ignored ppd options */
static GType print_backend_cups_type = 0;
typedef void (* GtkPrintCupsResponseCallbackFunc) (GtkPrintBackend *print_backend,
- GtkCupsResult *result,
+ GtkCupsResult *result,
gpointer user_data);
-typedef enum
+typedef enum
{
DISPATCH_SETUP,
DISPATCH_REQUEST,
DISPATCH_ERROR
} GtkPrintCupsDispatchState;
-typedef struct
+typedef struct
{
GSource source;
http_t *http;
GtkCupsRequest *request;
+ GtkCupsPollState poll_state;
GPollFD *data_poll;
GtkPrintBackendCups *backend;
GtkPrintCupsResponseCallbackFunc callback;
GtkPrintBackend parent_instance;
char *default_printer;
-
+
guint list_printers_poll;
guint list_printers_pending : 1;
gint list_printers_attempts;
guint got_default_printer : 1;
guint default_printer_poll;
GtkCupsConnectionTest *cups_connection_test;
+ gint reading_ppds;
char **covers;
int number_of_covers;
GHashTable *auth;
gchar *username;
gboolean authentication_lock;
+#ifdef HAVE_COLORD
+ CdClient *colord_client;
+#endif
+#ifdef HAVE_AVAHI_BROWSING
+ gchar *avahi_default_printer;
+ GList *avahi_resolvers;
+ GaServiceBrowser *avahi_ipp_browser;
+ GaServiceBrowser *avahi_ipps_browser;
+ GaClient *avahi_client;
+#endif
};
static GObjectClass *backend_parent_class;
static void cups_printer_request_details (GtkPrinter *printer);
static gboolean cups_request_default_printer (GtkPrintBackendCups *print_backend);
static gboolean cups_request_ppd (GtkPrinter *printer);
-static void cups_printer_get_hard_margins (GtkPrinter *printer,
- double *top,
- double *bottom,
- double *left,
- double *right);
+static gboolean cups_printer_get_hard_margins (GtkPrinter *printer,
+ gdouble *top,
+ gdouble *bottom,
+ gdouble *left,
+ gdouble *right);
static GtkPrintCapabilities cups_printer_get_capabilities (GtkPrinter *printer);
static void set_option_from_settings (GtkPrinterOption *option,
GtkPrintSettings *setting);
gdouble height,
GIOChannel *cache_io);
-static void gtk_print_backend_cups_set_password (GtkPrintBackend *backend,
+static void gtk_print_backend_cups_set_password (GtkPrintBackend *backend,
gchar **auth_info_required,
gchar **auth_info);
static gboolean is_address_local (const gchar *address);
static gboolean request_auth_info (gpointer data);
+#ifdef HAVE_AVAHI_BROWSING
+static void avahi_data_free (GtkPrintBackendCups *cups_backend);
+static void avahi_request_printer_list (GtkPrintBackendCups *cups_backend);
+#endif
+
static void
gtk_print_backend_cups_register_type (GTypeModule *module)
{
- static const GTypeInfo print_backend_cups_info =
+ const GTypeInfo print_backend_cups_info =
{
sizeof (GtkPrintBackendCupsClass),
NULL, /* base_init */
&print_backend_cups_info, 0);
}
-G_MODULE_EXPORT void
+G_MODULE_EXPORT void
pb_module_init (GTypeModule *module)
{
GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: Initializing the CUPS print backend module\n"));
+ g_print ("CUPS Backend: Initializing the CUPS print backend module\n"));
gtk_print_backend_cups_register_type (module);
gtk_printer_cups_register_type (module);
}
-G_MODULE_EXPORT void
+G_MODULE_EXPORT void
pb_module_exit (void)
{
}
-
-G_MODULE_EXPORT GtkPrintBackend *
+
+G_MODULE_EXPORT GtkPrintBackend *
pb_module_create (void)
{
return gtk_print_backend_cups_new ();
}
+/* CUPS 1.6 Getter/Setter Functions CUPS 1.6 makes private most of the
+ * IPP structures and enforces access via new getter functions, which
+ * are unfortunately not available in earlier versions. We define
+ * below those getter functions as macros for use when building
+ * against earlier CUPS versions.
+ */
+#ifndef HAVE_CUPS_API_1_6
+#define ippGetOperation(ipp_request) ipp_request->request.op.operation_id
+#define ippGetInteger(attr, index) attr->values[index].integer
+#define ippGetBoolean(attr, index) attr->values[index].boolean
+#define ippGetString(attr, index, foo) attr->values[index].string.text
+#define ippGetValueTag(attr) attr->value_tag
+#define ippGetName(attr) attr->name
+#define ippGetCount(attr) attr->num_values
+#define ippGetGroupTag(attr) attr->group_tag
+static int
+ippGetRange (ipp_attribute_t *attr,
+ int element,
+ int *upper)
+{
+ *upper = attr->values[element].range.upper;
+ return (attr->values[element].range.lower);
+}
+#endif
/*
* GtkPrintBackendCups
*/
gobject_class->finalize = gtk_print_backend_cups_finalize;
gobject_class->dispose = gtk_print_backend_cups_dispose;
- backend_class->request_printer_list = cups_get_printer_list;
+ backend_class->request_printer_list = cups_get_printer_list;
backend_class->print_stream = gtk_print_backend_cups_print_stream;
backend_class->printer_request_details = cups_printer_request_details;
backend_class->printer_create_cairo_surface = cups_printer_create_cairo_surface;
GTK_NOTE (PRINTING,
g_print ("CUPS Backend: Writing %i byte chunk to temp file\n", length));
- while (length > 0)
+ while (length > 0)
{
g_io_channel_write_chars (io, (gchar *)data, length, &written, &error);
if (error != NULL)
{
GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: Error writing to temp file, %s\n",
+ g_print ("CUPS Backend: Error writing to temp file, %s\n",
error->message));
g_error_free (error);
return CAIRO_STATUS_WRITE_ERROR;
- }
+ }
GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: Wrote %i bytes to temp file\n", written));
+ g_print ("CUPS Backend: Wrote %"G_GSIZE_FORMAT" bytes to temp file\n", written));
data += written;
length -= written;
static cairo_surface_t *
cups_printer_create_cairo_surface (GtkPrinter *printer,
GtkPrintSettings *settings,
- gdouble width,
+ gdouble width,
gdouble height,
GIOChannel *cache_io)
{
- cairo_surface_t *surface;
+ cairo_surface_t *surface;
ppd_file_t *ppd_file = NULL;
ppd_attr_t *ppd_attr = NULL;
ppd_attr_t *ppd_attr_res = NULL;
ppd_attr_t *ppd_attr_screen_freq = NULL;
ppd_attr_t *ppd_attr_res_screen_freq = NULL;
gchar *res_string = NULL;
- int level = 2;
-
- /* TODO: check if it is a ps or pdf printer */
-
- surface = cairo_ps_surface_create_for_stream (_cairo_write_to_cups, cache_io, width, height);
+ gint level = 2;
+
+ if (gtk_printer_accepts_pdf (printer))
+ surface = cairo_pdf_surface_create_for_stream (_cairo_write_to_cups, cache_io, width, height);
+ else
+ surface = cairo_ps_surface_create_for_stream (_cairo_write_to_cups, cache_io, width, height);
ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer));
}
}
- res_string = g_strdup_printf ("%ddpi",
+ res_string = g_strdup_printf ("%ddpi",
gtk_print_settings_get_resolution (settings));
ppd_attr_res_screen_freq = ppdFindAttr (ppd_file, "ResScreenFreq", res_string);
g_free (res_string);
if (ppd_attr_res_screen_freq == NULL)
{
- res_string = g_strdup_printf ("%dx%ddpi",
+ res_string = g_strdup_printf ("%dx%ddpi",
gtk_print_settings_get_resolution_x (settings),
gtk_print_settings_get_resolution_y (settings));
ppd_attr_res_screen_freq = ppdFindAttr (ppd_file, "ResScreenFreq", res_string);
gtk_print_settings_set_printer_lpi (settings, atof (ppd_attr_screen_freq->value));
}
- if (level == 2)
- cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_2);
+ if (cairo_surface_get_type (surface) == CAIRO_SURFACE_TYPE_PS)
+ {
+ if (level == 2)
+ cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_2);
- if (level == 3)
- cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_3);
+ if (level == 3)
+ cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_3);
+ }
cairo_surface_set_fallback_resolution (surface,
2.0 * gtk_print_settings_get_printer_lpi (settings),
GError *error = NULL;
CupsPrintStreamData *ps = user_data;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: %s\n", G_STRFUNC));
+ g_print ("CUPS Backend: %s\n", G_STRFUNC));
if (gtk_cups_result_is_error (result))
error = g_error_new_literal (gtk_print_error_quark (),
ipp_t *response = gtk_cups_result_get_response (result);
if ((attr = ippFindAttribute (response, "job-id", IPP_TAG_INTEGER)) != NULL)
- job_id = attr->values[0].integer;
+ job_id = ippGetInteger (attr, 0);
if (!gtk_print_job_get_track_print_status (ps->job) || job_id == 0)
gtk_print_job_set_status (ps->job, GTK_PRINT_STATUS_FINISHED);
gtk_print_job_set_status (ps->job, GTK_PRINT_STATUS_PENDING);
cups_begin_polling_info (print_backend, ps->job, job_id);
}
- }
+ }
else
gtk_print_job_set_status (ps->job, GTK_PRINT_STATUS_FINISHED_ABORTED);
-
+
if (error)
g_error_free (error);
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
}
+typedef struct {
+ GtkCupsRequest *request;
+ GtkPrinterCups *printer;
+} CupsOptionsData;
+
static void
add_cups_options (const gchar *key,
const gchar *value,
gpointer user_data)
{
- GtkCupsRequest *request = user_data;
+ CupsOptionsData *data = (CupsOptionsData *) user_data;
+ GtkCupsRequest *request = data->request;
+ GtkPrinterCups *printer = data->printer;
+ gboolean custom_value = FALSE;
+ gchar *new_value = NULL;
+ gint i;
+
+ if (!key || !value)
+ return;
if (!g_str_has_prefix (key, "cups-"))
return;
if (strcmp (value, "gtk-ignore-value") == 0)
return;
-
+
key = key + strlen ("cups-");
- gtk_cups_request_encode_option (request, key, value);
+ if (printer && printer->ppd_file)
+ {
+ ppd_coption_t *coption;
+ gboolean found = FALSE;
+ gboolean custom_values_enabled = FALSE;
+
+ coption = ppdFindCustomOption (printer->ppd_file, key);
+ if (coption && coption->option)
+ {
+ for (i = 0; i < coption->option->num_choices; i++)
+ {
+ /* Are custom values enabled ? */
+ if (g_str_equal (coption->option->choices[i].choice, "Custom"))
+ custom_values_enabled = TRUE;
+
+ /* Is the value among available choices ? */
+ if (g_str_equal (coption->option->choices[i].choice, value))
+ found = TRUE;
+ }
+
+ if (custom_values_enabled && !found)
+ custom_value = TRUE;
+ }
+ }
+
+ /* Add "Custom." prefix to custom values if not already added. */
+ if (custom_value && !g_str_has_prefix (value, "Custom."))
+ {
+ new_value = g_strdup_printf ("Custom.%s", value);
+ gtk_cups_request_encode_option (request, key, new_value);
+ g_free (new_value);
+ }
+ else
+ gtk_cups_request_encode_option (request, key, value);
}
static void
{
GtkPrinterCups *cups_printer;
CupsPrintStreamData *ps;
- GtkCupsRequest *request;
+ CupsOptionsData *options_data;
+ GtkCupsRequest *request = NULL;
GtkPrintSettings *settings;
const gchar *title;
char printer_absolute_uri[HTTP_MAX_URI];
GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: %s\n", G_STRFUNC));
+ g_print ("CUPS Backend: %s\n", G_STRFUNC));
cups_printer = GTK_PRINTER_CUPS (gtk_print_job_get_printer (job));
settings = gtk_print_job_get_settings (job);
- request = gtk_cups_request_new_with_username (NULL,
- GTK_CUPS_POST,
- IPP_PRINT_JOB,
- data_io,
- NULL,
- cups_printer->device_uri,
- GTK_PRINT_BACKEND_CUPS (print_backend)->username);
+#ifdef HAVE_AVAHI_BROWSING
+ if (cups_printer->avahi_browsed)
+ {
+ http_t *http;
-#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) || CUPS_VERSION_MAJOR > 1
- httpAssembleURIf (HTTP_URI_CODING_ALL,
- printer_absolute_uri,
- sizeof (printer_absolute_uri),
- "ipp",
- NULL,
- "localhost",
- ippPort (),
- "/printers/%s",
- gtk_printer_get_name (gtk_print_job_get_printer (job)));
-#else
- g_snprintf (printer_absolute_uri,
- sizeof (printer_absolute_uri),
- "ipp://localhost:%d/printers/%s",
- ippPort (),
- gtk_printer_get_name (gtk_print_job_get_printer (job)));
+ http = httpConnect (cups_printer->hostname, cups_printer->port);
+ if (http)
+ {
+ request = gtk_cups_request_new_with_username (http,
+ GTK_CUPS_POST,
+ IPP_PRINT_JOB,
+ data_io,
+ cups_printer->hostname,
+ cups_printer->device_uri,
+ GTK_PRINT_BACKEND_CUPS (print_backend)->username);
+ g_snprintf (printer_absolute_uri, HTTP_MAX_URI, cups_printer->printer_uri);
+ }
+ else
+ {
+ GError *error = NULL;
+
+ GTK_NOTE (PRINTING,
+ g_warning ("CUPS Backend: Error connecting to %s:%d",
+ cups_printer->hostname,
+ cups_printer->port));
+
+ error = g_error_new (gtk_print_error_quark (),
+ GTK_CUPS_ERROR_GENERAL,
+ "Error connecting to %s",
+ cups_printer->hostname);
+
+ gtk_print_job_set_status (job, GTK_PRINT_STATUS_FINISHED_ABORTED);
+
+ if (callback)
+ {
+ callback (job, user_data, error);
+ }
+
+ g_clear_error (&error);
+
+ return;
+ }
+ }
+ else
#endif
+ {
+ request = gtk_cups_request_new_with_username (NULL,
+ GTK_CUPS_POST,
+ IPP_PRINT_JOB,
+ data_io,
+ NULL,
+ cups_printer->device_uri,
+ GTK_PRINT_BACKEND_CUPS (print_backend)->username);
+
+ httpAssembleURIf (HTTP_URI_CODING_ALL,
+ printer_absolute_uri,
+ sizeof (printer_absolute_uri),
+ "ipp",
+ NULL,
+ "localhost",
+ ippPort (),
+ "/printers/%s",
+ gtk_printer_get_name (gtk_print_job_get_printer (job)));
+ }
- gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION,
+ gtk_cups_request_set_ipp_version (request,
+ cups_printer->ipp_version_major,
+ cups_printer->ipp_version_minor);
+
+ gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION,
IPP_TAG_URI, "printer-uri",
NULL, printer_absolute_uri);
title = gtk_print_job_get_title (job);
if (title)
- gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION,
- IPP_TAG_NAME, "job-name",
+ gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION,
+ IPP_TAG_NAME, "job-name",
NULL, title);
- gtk_print_settings_foreach (settings, add_cups_options, request);
-
+ options_data = g_new0 (CupsOptionsData, 1);
+ options_data->request = request;
+ options_data->printer = cups_printer;
+ gtk_print_settings_foreach (settings, add_cups_options, options_data);
+ g_free (options_data);
+
ps = g_new0 (CupsPrintStreamData, 1);
ps->callback = callback;
ps->user_data = user_data;
static void
gtk_print_backend_cups_init (GtkPrintBackendCups *backend_cups)
{
- backend_cups->list_printers_poll = FALSE;
- backend_cups->got_default_printer = FALSE;
+ backend_cups->list_printers_poll = FALSE;
+ backend_cups->got_default_printer = FALSE;
backend_cups->list_printers_pending = FALSE;
backend_cups->list_printers_attempts = 0;
+ backend_cups->reading_ppds = 0;
backend_cups->requests = NULL;
backend_cups->auth = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, overwrite_and_free);
backend_cups->username = NULL;
+#ifdef HAVE_COLORD
+ backend_cups->colord_client = cd_client_new ();
+#endif
+
+#ifdef HAVE_AVAHI_BROWSING
+ backend_cups->avahi_default_printer = NULL;
+ backend_cups->avahi_resolvers = NULL;
+ backend_cups->avahi_ipp_browser = NULL;
+ backend_cups->avahi_ipps_browser = NULL;
+ backend_cups->avahi_client = NULL;
+#endif
+
cups_get_local_default_printer (backend_cups);
}
gtk_print_backend_cups_finalize (GObject *object)
{
GtkPrintBackendCups *backend_cups;
-
+
GTK_NOTE (PRINTING,
g_print ("CUPS Backend: finalizing CUPS backend module\n"));
g_free (backend_cups->username);
+#ifdef HAVE_COLORD
+ g_object_unref (backend_cups->colord_client);
+#endif
+
+#ifdef HAVE_AVAHI_BROWSING
+ avahi_data_free (backend_cups);
+#endif
+
backend_parent_class->finalize (object);
}
g_source_remove (backend_cups->list_printers_poll);
backend_cups->list_printers_poll = 0;
backend_cups->list_printers_attempts = 0;
-
+
if (backend_cups->default_printer_poll > 0)
g_source_remove (backend_cups->default_printer_poll);
backend_cups->default_printer_poll = 0;
GtkPrintBackendCups *cups_backend = GTK_PRINT_BACKEND_CUPS (backend);
GList *l;
char dispatch_hostname[HTTP_MAX_URI];
- gchar *key;
gchar *username = NULL;
gchar *hostname = NULL;
gchar *password = NULL;
if (hostname != NULL && username != NULL && password != NULL)
{
- key = g_strconcat (username, "@", hostname, NULL);
+ gchar *key = g_strconcat (username, "@", hostname, NULL);
g_hash_table_insert (cups_backend->auth, key, g_strdup (password));
+ GTK_NOTE (PRINTING,
+ g_print ("CUPS backend: storing password for %s\n", key));
}
g_free (cups_backend->username);
cups_backend->username = g_strdup (username);
- GTK_NOTE (PRINTING,
- g_print ("CUPS backend: storing password for %s\n", key));
for (l = cups_backend->requests; l; l = l->next)
{
gint i;
if (dispatch->backend->authentication_lock)
- return FALSE;
+ return G_SOURCE_REMOVE;
httpGetHostname (dispatch->request->http, hostname, sizeof (hostname));
if (is_address_local (hostname))
dispatch->backend->authentication_lock = TRUE;
- switch (dispatch->request->ipp_request->request.op.operation_id)
+ switch (ippGetOperation (dispatch->request->ipp_request))
{
- case 0:
- prompt = g_strdup_printf ( _("Authentication is required to get a file from %s"), hostname);
- break;
case IPP_PRINT_JOB:
if (job_title != NULL && printer_name != NULL)
prompt = g_strdup_printf ( _("Authentication is required to print document '%s' on printer %s"), job_title, printer_name);
prompt = g_strdup_printf ( _("Authentication is required to get printers from %s"), hostname);
break;
default:
- prompt = g_strdup_printf ( _("Authentication is required on %s"), hostname);
+ /* work around gcc warning about 0 not being a value for this enum */
+ if (ippGetOperation (dispatch->request->ipp_request) == 0)
+ prompt = g_strdup_printf ( _("Authentication is required to get a file from %s"), hostname);
+ else
+ prompt = g_strdup_printf ( _("Authentication is required on %s"), hostname);
break;
}
g_free (printer_name);
- g_signal_emit_by_name (dispatch->backend, "request-password",
+ g_signal_emit_by_name (dispatch->backend, "request-password",
auth_info_required, auth_info_default, auth_info_display, auth_info_visible, prompt);
g_free (prompt);
g_free (auth_info_visible);
g_free (key);
- return FALSE;
+ return G_SOURCE_REMOVE;
}
static void
poll_state = gtk_cups_request_get_poll_state (dispatch->request);
+ /* Remove the old source if the poll state changed. */
+ if (poll_state != dispatch->poll_state && dispatch->data_poll != NULL)
+ {
+ g_source_remove_poll (source, dispatch->data_poll);
+ g_free (dispatch->data_poll);
+ dispatch->data_poll = NULL;
+ }
+
if (dispatch->request->http != NULL)
{
if (dispatch->data_poll == NULL)
{
dispatch->data_poll = g_new0 (GPollFD, 1);
+ dispatch->poll_state = poll_state;
if (poll_state == GTK_CUPS_HTTP_READ)
dispatch->data_poll->events = G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI;
else
dispatch->data_poll->events = 0;
-#ifdef HAVE_CUPS_API_1_2
dispatch->data_poll->fd = httpGetFd (dispatch->request->http);
-#else
- dispatch->data_poll->fd = dispatch->request->http->fd;
-#endif
g_source_add_poll (source, dispatch->data_poll);
}
}
"auth-info",
length,
NULL,
- dispatch->request->auth_info);
+ (const char * const *) dispatch->request->auth_info);
g_source_attach ((GSource *) dispatch, NULL);
g_source_unref ((GSource *) dispatch);
dispatch->request->auth_info = NULL;
}
- return FALSE;
+ return G_SOURCE_REMOVE;
}
- return TRUE;
+ return G_SOURCE_CONTINUE;
}
static gboolean
gboolean result;
GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: %s <source %p>\n", G_STRFUNC, source));
+ g_print ("CUPS Backend: %s <source %p>\n", G_STRFUNC, source));
dispatch = (GtkPrintCupsDispatchWatch *) source;
poll_state = gtk_cups_request_get_poll_state (dispatch->request);
- cups_dispatch_add_poll (source);
-
if (poll_state != GTK_CUPS_HTTP_IDLE && !dispatch->request->need_password)
- if (!(dispatch->data_poll->revents & dispatch->data_poll->events))
+ if (!(dispatch->data_poll->revents & dispatch->data_poll->events))
return FALSE;
-
- result = gtk_cups_request_read_write (dispatch->request);
+
+ result = gtk_cups_request_read_write (dispatch->request, FALSE);
if (result && dispatch->data_poll != NULL)
{
g_source_remove_poll (source, dispatch->data_poll);
g_idle_add (request_password, dispatch);
result = FALSE;
}
-
+
return result;
}
g_print ("CUPS Backend: %s <source %p>\n", G_STRFUNC, source));
*timeout_ = -1;
-
- result = gtk_cups_request_read_write (dispatch->request);
+
+ result = gtk_cups_request_read_write (dispatch->request, TRUE);
cups_dispatch_add_poll (source);
gpointer user_data)
{
GtkPrintCupsDispatchWatch *dispatch;
- GtkPrintCupsResponseCallbackFunc ep_callback;
+ GtkPrintCupsResponseCallbackFunc ep_callback;
GtkCupsResult *result;
-
+
g_assert (callback != NULL);
ep_callback = (GtkPrintCupsResponseCallbackFunc) callback;
-
+
dispatch = (GtkPrintCupsDispatchWatch *) source;
result = gtk_cups_request_get_result (dispatch->request);
if (gtk_cups_result_is_error (result))
{
- GTK_NOTE (PRINTING,
- g_print("Error result: %s (type %i, status %i, code %i)\n",
+ GTK_NOTE (PRINTING,
+ g_print("Error result: %s (type %i, status %i, code %i)\n",
gtk_cups_result_get_error_string (result),
gtk_cups_result_get_error_type (result),
gtk_cups_result_get_error_status (result),
}
ep_callback (GTK_PRINT_BACKEND (dispatch->backend), result, user_data);
-
+
return FALSE;
}
const gchar *username;
gchar hostname[HTTP_MAX_URI];
gchar *key;
-
+
httpGetHostname (dispatch->request->http, hostname, sizeof (hostname));
if (is_address_local (hostname))
strcpy (hostname, "localhost");
g_print ("CUPS backend: removing stored password for %s\n", key));
g_hash_table_remove (dispatch->backend->auth, key);
g_free (key);
-
+
if (dispatch->backend)
dispatch->backend->authentication_lock = FALSE;
}
dispatch->backend->requests = g_list_remove (dispatch->backend->requests, dispatch);
-
+
g_object_unref (dispatch->backend);
dispatch->backend = NULL;
}
- g_free (dispatch->data_poll);
+ if (dispatch->data_poll)
+ {
+ g_source_remove_poll (source, dispatch->data_poll);
+ g_free (dispatch->data_poll);
+ dispatch->data_poll = NULL;
+ }
}
static GSourceFuncs _cups_dispatch_watch_funcs = {
{
GtkPrintCupsDispatchWatch *dispatch;
- dispatch = (GtkPrintCupsDispatchWatch *) g_source_new (&_cups_dispatch_watch_funcs,
+ dispatch = (GtkPrintCupsDispatchWatch *) g_source_new (&_cups_dispatch_watch_funcs,
sizeof (GtkPrintCupsDispatchWatch));
+ g_source_set_name (&dispatch->source, "GTK+ CUPS backend");
GTK_NOTE (PRINTING,
g_print ("CUPS Backend: %s <source %p> - Executing cups request on server '%s' and resource '%s'\n", G_STRFUNC, dispatch, request->server, request->resource));
dispatch->request = request;
dispatch->backend = g_object_ref (print_backend);
+ dispatch->poll_state = GTK_CUPS_HTTP_IDLE;
dispatch->data_poll = NULL;
dispatch->callback = NULL;
dispatch->callback_data = NULL;
gchar *desc;
gchar *state_msg;
int job_count;
- gboolean status_changed;
+ gboolean status_changed;
g_assert (GTK_IS_PRINT_BACKEND_CUPS (backend));
}
cups_printer = GTK_PRINTER_CUPS (printer);
-
+
if (gtk_cups_result_is_error (result))
{
if (gtk_printer_is_new (printer))
response = gtk_cups_result_get_response (result);
/* TODO: determine printer type and use correct icon */
- gtk_printer_set_icon_name (printer, "gtk-print");
-
+ gtk_printer_set_icon_name (printer, "printer");
+
state_msg = "";
loc = "";
desc = "";
job_count = 0;
- for (attr = response->attrs; attr != NULL; attr = attr->next)
+ for (attr = response->attrs; attr != NULL; attr = attr->next)
{
if (!attr->name)
continue;
}
status_changed = gtk_printer_set_job_count (printer, job_count);
-
+
status_changed |= gtk_printer_set_location (printer, loc);
status_changed |= gtk_printer_set_description (printer, desc);
status_changed |= gtk_printer_set_state_message (printer, state_msg);
if (status_changed)
g_signal_emit_by_name (GTK_PRINT_BACKEND (backend),
- "printer-status-changed", printer);
+ "printer-status-changed", printer);
}
static void
gtk_cups_request_ipp_add_strings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
"requested-attributes", G_N_ELEMENTS (pattrs),
NULL, pattrs);
-
+
cups_request_execute (print_backend,
request,
(GtkPrintCupsResponseCallbackFunc) cups_request_printer_info_cb,
{
if (data->job)
g_object_weak_unref (G_OBJECT (data->job), job_object_died, data);
-
+
g_free (data);
}
int state;
gboolean done;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
if (data->job == NULL)
{
}
data->counter++;
-
+
response = gtk_cups_result_get_response (result);
state = 0;
- for (attr = response->attrs; attr != NULL; attr = attr->next)
+
+#ifdef HAVE_CUPS_API_1_6
+ attr = ippFindAttribute (response, "job-state", IPP_TAG_INTEGER);
+ state = ippGetInteger (attr, 0);
+#else
+ for (attr = response->attrs; attr != NULL; attr = attr->next)
{
if (!attr->name)
continue;
-
+
_CUPS_MAP_ATTR_INT (attr, state, "job-state");
}
-
+#endif
+
done = FALSE;
switch (state)
{
timeout = 500;
else
timeout = 1000;
-
+
g_timeout_add (timeout, cups_job_info_poll_timeout, data);
}
else
- cups_job_poll_data_free (data);
+ cups_job_poll_data_free (data);
done:
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
}
static void
cups_job_info_poll_timeout (gpointer user_data)
{
CupsJobPollData *data = user_data;
-
+
if (data->job == NULL)
cups_job_poll_data_free (data);
else
cups_request_job_info (data);
-
- return FALSE;
+
+ return G_SOURCE_REMOVE;
}
static void
}
static void
-mark_printer_inactive (GtkPrinter *printer,
+mark_printer_inactive (GtkPrinter *printer,
GtkPrintBackend *backend)
{
gtk_printer_set_is_active (printer, FALSE);
}
static gint
-find_printer (GtkPrinter *printer,
+find_printer (GtkPrinter *printer,
const gchar *find_name)
{
const gchar *printer_name;
printer_name = gtk_printer_get_name (printer);
return g_ascii_strcasecmp (printer_name, find_name);
}
+/* Printer messages we're interested in */
+static const char * const printer_messages[] =
+ {
+ "toner-low",
+ "toner-empty",
+ "developer-low",
+ "developer-empty",
+ "marker-supply-low",
+ "marker-supply-empty",
+ "cover-open",
+ "door-open",
+ "media-low",
+ "media-empty",
+ "offline",
+ "other"
+ };
+/* Our translatable versions of the printer messages */
+static const char * printer_strings[] =
+ {
+ N_("Printer '%s' is low on toner."),
+ N_("Printer '%s' has no toner left."),
+ /* Translators: "Developer" like on photo development context */
+ N_("Printer '%s' is low on developer."),
+ /* Translators: "Developer" like on photo development context */
+ N_("Printer '%s' is out of developer."),
+ /* Translators: "marker" is one color bin of the printer */
+ N_("Printer '%s' is low on at least one marker supply."),
+ /* Translators: "marker" is one color bin of the printer */
+ N_("Printer '%s' is out of at least one marker supply."),
+ N_("The cover is open on printer '%s'."),
+ N_("The door is open on printer '%s'."),
+ N_("Printer '%s' is low on paper."),
+ N_("Printer '%s' is out of paper."),
+ N_("Printer '%s' is currently offline."),
+ N_("There is a problem on printer '%s'.")
+ };
-static void
-cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
- GtkCupsResult *result,
- gpointer user_data)
-{
- GtkPrintBackend *backend = GTK_PRINT_BACKEND (cups_backend);
- ipp_attribute_t *attr;
- ipp_t *response;
- gboolean list_has_changed;
- GList *removed_printer_checklist;
- gchar *remote_default_printer = NULL;
+/* Attributes we're interested in for printers */
+static const char * const printer_attrs[] =
+ {
+ "printer-name",
+ "printer-uri-supported",
+ "member-uris",
+ "printer-location",
+ "printer-info",
+ "printer-state-message",
+ "printer-state-reasons",
+ "printer-state",
+ "queued-job-count",
+ "printer-is-accepting-jobs",
+ "job-sheets-supported",
+ "job-sheets-default",
+ "printer-type",
+ "auth-info-required",
+ "number-up-default",
+ "ipp-versions-supported",
+ "multiple-document-handling-supported",
+ "copies-supported",
+ "number-up-supported"
+ };
- GDK_THREADS_ENTER ();
+typedef enum
+ {
+ GTK_PRINTER_STATE_LEVEL_NONE = 0,
+ GTK_PRINTER_STATE_LEVEL_INFO = 1,
+ GTK_PRINTER_STATE_LEVEL_WARNING = 2,
+ GTK_PRINTER_STATE_LEVEL_ERROR = 3
+ } PrinterStateLevel;
- list_has_changed = FALSE;
+typedef struct
+{
+ const gchar *printer_name;
+ const gchar *printer_uri;
+ const gchar *member_uris;
+ const gchar *location;
+ const gchar *description;
+ gchar *state_msg;
+ const gchar *reason_msg;
+ PrinterStateLevel reason_level;
+ gint state;
+ gint job_count;
+ gboolean is_paused;
+ gboolean is_accepting_jobs;
+ const gchar *default_cover_before;
+ const gchar *default_cover_after;
+ gboolean default_printer;
+ gboolean got_printer_type;
+ gboolean remote_printer;
+#ifdef HAVE_AVAHI_BROWSING
+ gboolean avahi_printer;
+#endif
+ gchar **auth_info_required;
+ gint default_number_up;
+ guchar ipp_version_major;
+ guchar ipp_version_minor;
+ gboolean supports_copies;
+ gboolean supports_collate;
+ gboolean supports_number_up;
+} PrinterSetupInfo;
- GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: %s\n", G_STRFUNC));
+static void
+get_ipp_version (const char *ipp_version_string,
+ guchar *ipp_version_major,
+ guchar *ipp_version_minor)
+{
+ gchar **ipp_version_strv;
+ gchar *endptr;
- cups_backend->list_printers_pending = FALSE;
+ *ipp_version_major = 1;
+ *ipp_version_minor = 1;
- if (gtk_cups_result_is_error (result))
+ if (ipp_version_string)
{
- GTK_NOTE (PRINTING,
- g_warning ("CUPS Backend: Error getting printer list: %s %d %d",
- gtk_cups_result_get_error_string (result),
- gtk_cups_result_get_error_type (result),
- gtk_cups_result_get_error_code (result)));
+ ipp_version_strv = g_strsplit (ipp_version_string, ".", 0);
- if (gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_AUTH &&
- gtk_cups_result_get_error_code (result) == 1)
+ if (ipp_version_strv)
{
- /* Canceled by user, stop popping up more password dialogs */
- if (cups_backend->list_printers_poll > 0)
- g_source_remove (cups_backend->list_printers_poll);
- cups_backend->list_printers_poll = 0;
- cups_backend->list_printers_attempts = 0;
- }
+ if (g_strv_length (ipp_version_strv) == 2)
+ {
+ *ipp_version_major = (guchar) g_ascii_strtoull (ipp_version_strv[0], &endptr, 10);
+ if (endptr == ipp_version_strv[0])
+ *ipp_version_major = 1;
- goto done;
+ *ipp_version_minor = (guchar) g_ascii_strtoull (ipp_version_strv[1], &endptr, 10);
+ if (endptr == ipp_version_strv[1])
+ *ipp_version_minor = 1;
+ }
+
+ g_strfreev (ipp_version_strv);
+ }
}
-
- /* Gather the names of the printers in the current queue
- * so we may check to see if they were removed
- */
- removed_printer_checklist = gtk_print_backend_get_printer_list (backend);
-
- response = gtk_cups_result_get_response (result);
+}
- for (attr = response->attrs; attr != NULL; attr = attr->next)
- {
- GtkPrinter *printer;
- const gchar *printer_name = NULL;
- const gchar *printer_uri = NULL;
- const gchar *member_uris = NULL;
- const gchar *location = NULL;
- const gchar *description = NULL;
- const gchar *state_msg = NULL;
- gint state = 0;
- gint job_count = 0;
- gboolean status_changed = FALSE;
- GList *node;
- gint i,j;
- const gchar *reason_msg = NULL;
- gchar *reason_msg_desc = NULL;
- gchar *tmp_msg = NULL;
- gchar *tmp_msg2 = NULL;
- gint printer_state_reason_level = 0; /* 0 - none, 1 - report, 2 - warning, 3 - error */
- gboolean interested_in = FALSE;
- gboolean found = FALSE;
- static const char * const reasons[] = /* Reasons we're interested in */
- {
- "toner-low",
- "toner-empty",
- "developer-low",
- "developer-empty",
- "marker-supply-low",
- "marker-supply-empty",
- "cover-open",
- "door-open",
- "media-low",
- "media-empty",
- "offline",
- "connecting-to-device",
- "other"
- };
- static const char * reasons_descs[] =
- {
- N_("Printer '%s' is low on toner."),
- N_("Printer '%s' has no toner left."),
- /* Translators: "Developer" like on photo development context */
- N_("Printer '%s' is low on developer."),
- /* Translators: "Developer" like on photo development context */
- N_("Printer '%s' is out of developer."),
- /* Translators: "marker" is one color bin of the printer */
- N_("Printer '%s' is low on at least one marker supply."),
- /* Translators: "marker" is one color bin of the printer */
- N_("Printer '%s' is out of at least one marker supply."),
- N_("The cover is open on printer '%s'."),
- N_("The door is open on printer '%s'."),
- N_("Printer '%s' is low on paper."),
- N_("Printer '%s' is out of paper."),
- N_("Printer '%s' is currently off-line."),
- N_("Printer '%s' may not be connected."),
- N_("There is a problem on printer '%s'.")
- };
- gboolean is_paused = FALSE;
- gboolean is_accepting_jobs = TRUE;
- gboolean default_printer = FALSE;
- gboolean got_printer_type = FALSE;
- gchar *default_cover_before = NULL;
- gchar *default_cover_after = NULL;
- gboolean remote_printer = FALSE;
- gchar **auth_info_required = NULL;
-
- /* Skip leading attributes until we hit a printer...
- */
- while (attr != NULL && attr->group_tag != IPP_TAG_PRINTER)
- attr = attr->next;
+static void
+get_server_ipp_version (guchar *ipp_version_major,
+ guchar *ipp_version_minor)
+{
+ *ipp_version_major = 1;
+ *ipp_version_minor = 1;
- if (attr == NULL)
- break;
+ if (IPP_VERSION && strlen (IPP_VERSION) == 2)
+ {
+ *ipp_version_major = (unsigned char) IPP_VERSION[0];
+ *ipp_version_minor = (unsigned char) IPP_VERSION[1];
+ }
+}
- while (attr != NULL && attr->group_tag == IPP_TAG_PRINTER)
- {
- if (strcmp (attr->name, "printer-name") == 0 &&
- attr->value_tag == IPP_TAG_NAME)
- printer_name = attr->values[0].string.text;
- else if (strcmp (attr->name, "printer-uri-supported") == 0 &&
- attr->value_tag == IPP_TAG_URI)
- printer_uri = attr->values[0].string.text;
- else if (strcmp (attr->name, "member-uris") == 0 &&
- attr->value_tag == IPP_TAG_URI)
- member_uris = attr->values[0].string.text;
- else if (strcmp (attr->name, "printer-location") == 0)
- location = attr->values[0].string.text;
- else if (strcmp (attr->name, "printer-info") == 0)
- description = attr->values[0].string.text;
- else if (strcmp (attr->name, "printer-state-message") == 0)
- state_msg = attr->values[0].string.text;
- else if (strcmp (attr->name, "printer-state-reasons") == 0)
- /* Store most important reason to reason_msg and set
- its importance at printer_state_reason_level */
- {
- for (i = 0; i < attr->num_values; i++)
- {
- if (strcmp (attr->values[i].string.text, "none") != 0)
- {
- /* Sets is_paused flag for paused printer. */
- if (strcmp (attr->values[i].string.text, "paused") == 0)
- {
- is_paused = TRUE;
- }
-
- interested_in = FALSE;
- for (j = 0; j < G_N_ELEMENTS (reasons); j++)
- if (strncmp (attr->values[i].string.text, reasons[j], strlen (reasons[j])) == 0)
- {
- interested_in = TRUE;
- break;
- }
-
- if (interested_in)
- {
- if (g_str_has_suffix (attr->values[i].string.text, "-report"))
- {
- if (printer_state_reason_level <= 1)
- {
- reason_msg = attr->values[i].string.text;
- printer_state_reason_level = 1;
- }
- }
- else if (g_str_has_suffix (attr->values[i].string.text, "-warning"))
- {
- if (printer_state_reason_level <= 2)
- {
- reason_msg = attr->values[i].string.text;
- printer_state_reason_level = 2;
- }
- }
- else /* It is error in the case of no suffix. */
- {
- reason_msg = attr->values[i].string.text;
- printer_state_reason_level = 3;
- }
- }
- }
- }
- }
- else if (strcmp (attr->name, "printer-state") == 0)
- state = attr->values[0].integer;
- else if (strcmp (attr->name, "queued-job-count") == 0)
- job_count = attr->values[0].integer;
- else if (strcmp (attr->name, "printer-is-accepting-jobs") == 0)
- {
- if (attr->values[0].boolean == 1)
- is_accepting_jobs = TRUE;
- else
- is_accepting_jobs = FALSE;
- }
- else if (strcmp (attr->name, "job-sheets-supported") == 0)
- {
- if (cups_backend->covers == NULL)
- {
- cups_backend->number_of_covers = attr->num_values;
- cups_backend->covers = g_new (char *, cups_backend->number_of_covers + 1);
- for (i = 0; i < cups_backend->number_of_covers; i++)
- cups_backend->covers[i] = g_strdup (attr->values[i].string.text);
- cups_backend->covers[cups_backend->number_of_covers] = NULL;
- }
- }
- else if (strcmp (attr->name, "job-sheets-default") == 0)
- {
- if (attr->num_values == 2)
- {
- default_cover_before = attr->values[0].string.text;
- default_cover_after = attr->values[1].string.text;
- }
- }
- else if (strcmp (attr->name, "printer-type") == 0)
- {
- got_printer_type = TRUE;
- if (attr->values[0].integer & 0x00020000)
- default_printer = TRUE;
- else
- default_printer = FALSE;
+static gint
+ipp_version_cmp (guchar ipp_version_major1,
+ guchar ipp_version_minor1,
+ guchar ipp_version_major2,
+ guchar ipp_version_minor2)
+{
+ if (ipp_version_major1 == ipp_version_major2 &&
+ ipp_version_minor1 == ipp_version_minor2)
+ {
+ return 0;
+ }
+ else if (ipp_version_major1 < ipp_version_major2 ||
+ (ipp_version_major1 == ipp_version_major2 &&
+ ipp_version_minor1 < ipp_version_minor2))
+ {
+ return -1;
+ }
+ else
+ {
+ return 1;
+ }
+}
- if (attr->values[0].integer & 0x00000002)
- remote_printer = TRUE;
- else
- remote_printer = FALSE;
- }
- else if (strcmp (attr->name, "auth-info-required") == 0)
- {
- if (strcmp (attr->values[0].string.text, "none") != 0)
- {
- auth_info_required = g_new0 (gchar *, attr->num_values + 1);
- for (i = 0; i < attr->num_values; i++)
- auth_info_required[i] = g_strdup (attr->values[i].string.text);
- }
- }
- else
- {
- GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: Attribute %s ignored", attr->name));
- }
+static void
+cups_printer_handle_attribute (GtkPrintBackendCups *cups_backend,
+ ipp_attribute_t *attr,
+ PrinterSetupInfo *info)
+{
+ gint i, j;
+ if (strcmp (ippGetName (attr), "printer-name") == 0 &&
+ ippGetValueTag (attr) == IPP_TAG_NAME)
+ info->printer_name = ippGetString (attr, 0, NULL);
+ else if (strcmp (ippGetName (attr), "printer-uri-supported") == 0 &&
+ ippGetValueTag (attr) == IPP_TAG_URI)
+ info->printer_uri = ippGetString (attr, 0, NULL);
+ else if (strcmp (ippGetName (attr), "member-uris") == 0 &&
+ ippGetValueTag (attr) == IPP_TAG_URI)
+ info->member_uris = ippGetString (attr, 0, NULL);
+ else if (strcmp (ippGetName (attr), "printer-location") == 0)
+ info->location = ippGetString (attr, 0, NULL);
+ else if (strcmp (ippGetName (attr), "printer-info") == 0)
+ info->description = ippGetString (attr, 0, NULL);
+ else if (strcmp (ippGetName (attr), "printer-state-message") == 0)
+ info->state_msg = g_strdup (ippGetString (attr, 0, NULL));
+ else if (strcmp (ippGetName (attr), "printer-state-reasons") == 0)
+ /* Store most important reason to reason_msg and set
+ its importance at printer_state_reason_level */
+ {
+ for (i = 0; i < ippGetCount (attr); i++)
+ {
+ if (strcmp (ippGetString (attr, i, NULL), "none") != 0)
+ {
+ gboolean interested_in = FALSE;
+ /* Sets is_paused flag for paused printer. */
+ if (strcmp (ippGetString (attr, i, NULL), "paused") == 0)
+ {
+ info->is_paused = TRUE;
+ }
- attr = attr->next;
- }
+ for (j = 0; j < G_N_ELEMENTS (printer_messages); j++)
+ if (strncmp (ippGetString (attr, i, NULL), printer_messages[j],
+ strlen (printer_messages[j])) == 0)
+ {
+ interested_in = TRUE;
+ break;
+ }
- if (printer_name == NULL ||
- (printer_uri == NULL && member_uris == NULL))
- {
- if (attr == NULL)
- break;
- else
- continue;
- }
+ if (interested_in)
+ {
+ if (g_str_has_suffix (ippGetString (attr, i, NULL), "-report"))
+ {
+ if (info->reason_level <= GTK_PRINTER_STATE_LEVEL_INFO)
+ {
+ info->reason_msg = ippGetString (attr, i, NULL);
+ info->reason_level = GTK_PRINTER_STATE_LEVEL_INFO;
+ }
+ }
+ else if (g_str_has_suffix (ippGetString (attr, i, NULL), "-warning"))
+ {
+ if (info->reason_level <= GTK_PRINTER_STATE_LEVEL_WARNING)
+ {
+ info->reason_msg = ippGetString (attr, i, NULL);
+ info->reason_level = GTK_PRINTER_STATE_LEVEL_WARNING;
+ }
+ }
+ else /* It is error in the case of no suffix. */
+ {
+ info->reason_msg = ippGetString (attr, i, NULL);
+ info->reason_level = GTK_PRINTER_STATE_LEVEL_ERROR;
+ }
+ }
+ }
+ }
+ }
+ else if (strcmp (ippGetName (attr), "printer-state") == 0)
+ info->state = ippGetInteger (attr, 0);
+ else if (strcmp (ippGetName (attr), "queued-job-count") == 0)
+ info->job_count = ippGetInteger (attr, 0);
+ else if (strcmp (ippGetName (attr), "printer-is-accepting-jobs") == 0)
+ {
+ if (ippGetBoolean (attr, 0) == 1)
+ info->is_accepting_jobs = TRUE;
+ else
+ info->is_accepting_jobs = FALSE;
+ }
+ else if (strcmp (ippGetName (attr), "job-sheets-supported") == 0)
+ {
+ if (cups_backend->covers == NULL)
+ {
+ cups_backend->number_of_covers = ippGetCount (attr);
+ cups_backend->covers = g_new (char *, cups_backend->number_of_covers + 1);
+ for (i = 0; i < cups_backend->number_of_covers; i++)
+ cups_backend->covers[i] = g_strdup (ippGetString (attr, i, NULL));
+ cups_backend->covers[cups_backend->number_of_covers] = NULL;
+ }
+ }
+ else if (strcmp (ippGetName (attr), "job-sheets-default") == 0)
+ {
+ if (ippGetCount (attr) == 2)
+ {
+ info->default_cover_before = ippGetString (attr, 0, NULL);
+ info->default_cover_after = ippGetString (attr, 1, NULL);
+ }
+ }
+ else if (strcmp (ippGetName (attr), "printer-type") == 0)
+ {
+ info->got_printer_type = TRUE;
+ if (ippGetInteger (attr, 0) & 0x00020000)
+ info->default_printer = TRUE;
+ else
+ info->default_printer = FALSE;
- if (got_printer_type)
+ if (ippGetInteger (attr, 0) & 0x00000002)
+ info->remote_printer = TRUE;
+ else
+ info->remote_printer = FALSE;
+ }
+ else if (strcmp (ippGetName (attr), "auth-info-required") == 0)
+ {
+ if (strcmp (ippGetString (attr, 0, NULL), "none") != 0)
+ {
+ info->auth_info_required = g_new0 (gchar *, ippGetCount (attr) + 1);
+ for (i = 0; i < ippGetCount (attr); i++)
+ info->auth_info_required[i] = g_strdup (ippGetString (attr, i, NULL));
+ }
+ }
+ else if (strcmp (ippGetName (attr), "number-up-default") == 0)
+ {
+ info->default_number_up = ippGetInteger (attr, 0);
+ }
+ else if (g_strcmp0 (ippGetName (attr), "ipp-versions-supported") == 0)
+ {
+ guchar server_ipp_version_major;
+ guchar server_ipp_version_minor;
+ guchar ipp_version_major;
+ guchar ipp_version_minor;
+
+ get_server_ipp_version (&server_ipp_version_major,
+ &server_ipp_version_minor);
+
+ for (i = 0; i < ippGetCount (attr); i++)
{
- if (default_printer && !cups_backend->got_default_printer)
+ get_ipp_version (ippGetString (attr, i, NULL),
+ &ipp_version_major,
+ &ipp_version_minor);
+
+ if (ipp_version_cmp (ipp_version_major,
+ ipp_version_minor,
+ info->ipp_version_major,
+ info->ipp_version_minor) > 0 &&
+ ipp_version_cmp (ipp_version_major,
+ ipp_version_minor,
+ server_ipp_version_major,
+ server_ipp_version_minor) <= 0)
{
- if (!remote_printer)
- {
- cups_backend->got_default_printer = TRUE;
- cups_backend->default_printer = g_strdup (printer_name);
- }
- else
- {
- if (remote_default_printer == NULL)
- remote_default_printer = g_strdup (printer_name);
- }
+ info->ipp_version_major = ipp_version_major;
+ info->ipp_version_minor = ipp_version_minor;
}
}
- else
+ }
+ else if (g_strcmp0 (ippGetName (attr), "number-up-supported") == 0)
+ {
+ if (ippGetCount (attr) == 6)
{
- if (!cups_backend->got_default_printer)
- cups_get_default_printer (cups_backend);
+ info->supports_number_up = TRUE;
}
+ }
+ else if (g_strcmp0 (ippGetName (attr), "copies-supported") == 0)
+ {
+ int upper = 1;
- /* remove name from checklist if it was found */
- node = g_list_find_custom (removed_printer_checklist, printer_name, (GCompareFunc) find_printer);
- removed_printer_checklist = g_list_delete_link (removed_printer_checklist, node);
-
- printer = gtk_print_backend_find_printer (backend, printer_name);
- if (!printer)
+ ippGetRange (attr, 0, &upper);
+ if (upper > 1)
{
- GtkPrinterCups *cups_printer;
- char uri[HTTP_MAX_URI]; /* Printer URI */
- char method[HTTP_MAX_URI]; /* Method/scheme name */
- char username[HTTP_MAX_URI]; /* Username:password */
- char hostname[HTTP_MAX_URI]; /* Hostname */
- char resource[HTTP_MAX_URI]; /* Resource name */
- int port; /* Port number */
- char *cups_server; /* CUPS server */
-
- list_has_changed = TRUE;
- cups_printer = gtk_printer_cups_new (printer_name, backend);
+ info->supports_copies = TRUE;
+ }
+ }
+ else if (g_strcmp0 (ippGetName (attr), "multiple-document-handling-supported") == 0)
+ {
+ for (i = 0; i < ippGetCount (attr); i++)
+ {
+ if (g_strcmp0 (ippGetString (attr, i, NULL), "separate-documents-collated-copies") == 0)
+ {
+ info->supports_collate = TRUE;
+ }
+ }
+ }
+ else
+ {
+ GTK_NOTE (PRINTING,
+ g_print ("CUPS Backend: Attribute %s ignored", ippGetName (attr)));
+ }
+}
+
+static GtkPrinter*
+cups_create_printer (GtkPrintBackendCups *cups_backend,
+ PrinterSetupInfo *info)
+{
+ GtkPrinterCups *cups_printer;
+ GtkPrinter *printer;
+ GtkPrintBackend *backend = GTK_PRINT_BACKEND (cups_backend);
+ char uri[HTTP_MAX_URI]; /* Printer URI */
+ char method[HTTP_MAX_URI]; /* Method/scheme name */
+ char username[HTTP_MAX_URI]; /* Username:password */
+ char hostname[HTTP_MAX_URI]; /* Hostname */
+ char resource[HTTP_MAX_URI]; /* Resource name */
+ int port; /* Port number */
+ char *cups_server; /* CUPS server */
+
+#ifdef HAVE_COLORD
+#ifdef HAVE_AVAHI_BROWSING
+ if (info->avahi_printer)
+ cups_printer = gtk_printer_cups_new (info->printer_name,
+ backend,
+ NULL);
+ else
+#endif
+ cups_printer = gtk_printer_cups_new (info->printer_name,
+ backend,
+ cups_backend->colord_client);
+#else
+ cups_printer = gtk_printer_cups_new (info->printer_name, backend, NULL);
+#endif
- cups_printer->device_uri = g_strdup_printf ("/printers/%s", printer_name);
+ cups_printer->device_uri = g_strdup_printf ("/printers/%s",
+ info->printer_name);
- /* Check to see if we are looking at a class */
- if (member_uris)
- {
- cups_printer->printer_uri = g_strdup (member_uris);
- /* TODO if member_uris is a class we need to recursivly find a printer */
- GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: Found class with printer %s\n", member_uris));
- }
- else
- {
- cups_printer->printer_uri = g_strdup (printer_uri);
- GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: Found printer %s\n", printer_uri));
- }
+ /* Check to see if we are looking at a class */
+ if (info->member_uris)
+ {
+ cups_printer->printer_uri = g_strdup (info->member_uris);
+ /* TODO if member_uris is a class we need to recursivly find a printer */
+ GTK_NOTE (PRINTING,
+ g_print ("CUPS Backend: Found class with printer %s\n",
+ info->member_uris));
+ }
+ else
+ {
+ cups_printer->printer_uri = g_strdup (info->printer_uri);
+ GTK_NOTE (PRINTING,
+ g_print ("CUPS Backend: Found printer %s\n",
+ info->printer_uri));
+ }
-#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) || CUPS_VERSION_MAJOR > 1
- httpSeparateURI (HTTP_URI_CODING_ALL, cups_printer->printer_uri,
- method, sizeof (method),
- username, sizeof (username),
- hostname, sizeof (hostname),
- &port,
- resource, sizeof (resource));
+ httpSeparateURI (HTTP_URI_CODING_ALL, cups_printer->printer_uri,
+ method, sizeof (method),
+ username, sizeof (username),
+ hostname, sizeof (hostname),
+ &port,
+ resource, sizeof (resource));
-#else
- httpSeparate (cups_printer->printer_uri,
- method,
- username,
- hostname,
- &port,
- resource);
+ if (strncmp (resource, "/printers/", 10) == 0)
+ {
+ cups_printer->ppd_name = g_strdup (resource + 10);
+ GTK_NOTE (PRINTING,
+ g_print ("CUPS Backend: Setting ppd name '%s' for printer/class '%s'\n", cups_printer->ppd_name, info->printer_name));
+ }
+
+ gethostname (uri, sizeof (uri));
+ cups_server = g_strdup (cupsServer());
+
+ if (strcasecmp (uri, hostname) == 0)
+ strcpy (hostname, "localhost");
+
+ /* if the cups server is local and listening at a unix domain socket
+ * then use the socket connection
+ */
+ if ((strstr (hostname, "localhost") != NULL) &&
+ (cups_server[0] == '/'))
+ strcpy (hostname, cups_server);
+
+ g_free (cups_server);
+
+ cups_printer->default_cover_before = g_strdup (info->default_cover_before);
+ cups_printer->default_cover_after = g_strdup (info->default_cover_after);
+
+ if (info->default_number_up > 0)
+ cups_printer->default_number_up = info->default_number_up;
+
+ cups_printer->hostname = g_strdup (hostname);
+ cups_printer->port = port;
+
+ cups_printer->auth_info_required = g_strdupv (info->auth_info_required);
+ g_strfreev (info->auth_info_required);
+
+ printer = GTK_PRINTER (cups_printer);
+
+ if (cups_backend->default_printer != NULL &&
+ strcmp (cups_backend->default_printer, gtk_printer_get_name (printer)) == 0)
+ gtk_printer_set_is_default (printer, TRUE);
+
+#ifdef HAVE_AVAHI_BROWSING
+ cups_printer->avahi_browsed = info->avahi_printer;
#endif
- if (strncmp (resource, "/printers/", 10) == 0)
- {
- cups_printer->ppd_name = g_strdup (resource + 10);
- GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: Setting ppd name '%s' for printer/class '%s'\n", cups_printer->ppd_name, printer_name));
- }
+ gtk_print_backend_add_printer (backend, printer);
+ return printer;
+}
- gethostname (uri, sizeof (uri));
- cups_server = g_strdup (cupsServer());
+static void
+set_printer_icon_name_from_info (GtkPrinter *printer,
+ PrinterSetupInfo *info)
+{
+ /* Set printer icon according to importance
+ (none, report, warning, error - report is omitted). */
+ if (info->reason_level == GTK_PRINTER_STATE_LEVEL_ERROR)
+ gtk_printer_set_icon_name (printer, "printer-error");
+ else if (info->reason_level == GTK_PRINTER_STATE_LEVEL_WARNING)
+ gtk_printer_set_icon_name (printer, "printer-warning");
+ else if (gtk_printer_is_paused (printer))
+ gtk_printer_set_icon_name (printer, "printer-paused");
+ else
+ gtk_printer_set_icon_name (printer, "printer");
+}
- if (strcasecmp (uri, hostname) == 0)
- strcpy (hostname, "localhost");
+static void
+set_info_state_message (PrinterSetupInfo *info)
+{
+ gint i;
- /* if the cups server is local and listening at a unix domain socket
- * then use the socket connection
- */
- if ((strstr (hostname, "localhost") != NULL) &&
- (cups_server[0] == '/'))
- strcpy (hostname, cups_server);
+ if (info->state_msg && strlen (info->state_msg) == 0)
+ {
+ gchar *tmp_msg2 = NULL;
+ if (info->is_paused && !info->is_accepting_jobs)
+ /* Translators: this is a printer status. */
+ tmp_msg2 = g_strdup ( N_("Paused ; Rejecting Jobs"));
+ if (info->is_paused && info->is_accepting_jobs)
+ /* Translators: this is a printer status. */
+ tmp_msg2 = g_strdup ( N_("Paused"));
+ if (!info->is_paused && !info->is_accepting_jobs)
+ /* Translators: this is a printer status. */
+ tmp_msg2 = g_strdup ( N_("Rejecting Jobs"));
- g_free (cups_server);
+ if (tmp_msg2 != NULL)
+ {
+ g_free (info->state_msg);
+ info->state_msg = tmp_msg2;
+ }
+ }
- cups_printer->default_cover_before = g_strdup (default_cover_before);
- cups_printer->default_cover_after = g_strdup (default_cover_after);
+ /* Set description of the reason and combine it with printer-state-message. */
+ if (info->reason_msg)
+ {
+ gchar *reason_msg_desc = NULL;
+ gboolean found = FALSE;
- cups_printer->hostname = g_strdup (hostname);
- cups_printer->port = port;
-
- cups_printer->auth_info_required = g_strdupv (auth_info_required);
- g_strfreev (auth_info_required);
+ for (i = 0; i < G_N_ELEMENTS (printer_messages); i++)
+ {
+ if (strncmp (info->reason_msg, printer_messages[i],
+ strlen (printer_messages[i])) == 0)
+ {
+ reason_msg_desc = g_strdup_printf (printer_strings[i],
+ info->printer_name);
+ found = TRUE;
+ break;
+ }
+ }
- printer = GTK_PRINTER (cups_printer);
-
- if (cups_backend->default_printer != NULL &&
- strcmp (cups_backend->default_printer, gtk_printer_get_name (printer)) == 0)
- gtk_printer_set_is_default (printer, TRUE);
+ if (!found)
+ info->reason_level = GTK_PRINTER_STATE_LEVEL_NONE;
-
- gtk_print_backend_add_printer (backend, printer);
+ if (info->reason_level >= GTK_PRINTER_STATE_LEVEL_WARNING)
+ {
+ if (strlen (info->state_msg) == 0)
+ {
+ g_free (info->state_msg);
+ info->state_msg = reason_msg_desc;
+ reason_msg_desc = NULL;
+ }
+ else
+ {
+ gchar *tmp_msg = NULL;
+ tmp_msg = g_strjoin (" ; ", info->state_msg,
+ reason_msg_desc, NULL);
+ g_free (info->state_msg);
+ info->state_msg = tmp_msg;
+ }
}
- else
- g_object_ref (printer);
- GTK_PRINTER_CUPS (printer)->remote = remote_printer;
+ g_free (reason_msg_desc);
+ }
+}
- gtk_printer_set_is_paused (printer, is_paused);
- gtk_printer_set_is_accepting_jobs (printer, is_accepting_jobs);
+static void
+set_default_printer (GtkPrintBackendCups *cups_backend,
+ const gchar *default_printer_name)
+{
+ cups_backend->default_printer = g_strdup (default_printer_name);
+ cups_backend->got_default_printer = TRUE;
- if (!gtk_printer_is_active (printer))
+ if (cups_backend->default_printer != NULL)
+ {
+ GtkPrinter *default_printer = NULL;
+ default_printer = gtk_print_backend_find_printer (GTK_PRINT_BACKEND (cups_backend),
+ cups_backend->default_printer);
+ if (default_printer != NULL)
{
- gtk_printer_set_is_active (printer, TRUE);
- gtk_printer_set_is_new (printer, TRUE);
- list_has_changed = TRUE;
+ gtk_printer_set_is_default (default_printer, TRUE);
+ g_signal_emit_by_name (GTK_PRINT_BACKEND (cups_backend),
+ "printer-status-changed", default_printer);
}
+ }
+}
- if (gtk_printer_is_new (printer))
+#ifdef HAVE_AVAHI_BROWSING
+typedef struct
+{
+ gchar *name;
+ gchar *type;
+ gchar *domain;
+ gchar *host;
+ gint port;
+} AvahiService;
+
+void
+avahi_service_free (AvahiService *service)
+{
+ if (service)
+ {
+ g_free (service->name);
+ g_free (service->type);
+ g_free (service->domain);
+ g_free (service->host);
+ g_free (service);
+ }
+}
+
+static void
+avahi_data_free (GtkPrintBackendCups *cups_backend)
+{
+ if (cups_backend)
+ {
+ g_clear_pointer (&cups_backend->avahi_default_printer, g_free);
+ g_list_free_full (cups_backend->avahi_resolvers, g_object_unref);
+ cups_backend->avahi_resolvers = NULL;
+ g_clear_object (&cups_backend->avahi_ipp_browser);
+ g_clear_object (&cups_backend->avahi_ipps_browser);
+ g_clear_object (&cups_backend->avahi_client);
+ }
+}
+
+static void
+cups_request_avahi_printer_info_cb (GtkPrintBackendCups *cups_backend,
+ GtkCupsResult *result,
+ gpointer user_data)
+{
+ PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo);
+ GtkPrintBackend *backend = GTK_PRINT_BACKEND (cups_backend);
+ ipp_attribute_t *attr;
+ AvahiService *service = (AvahiService *) user_data;
+ GtkPrinter *printer;
+ gboolean list_has_changed = FALSE;
+ gboolean status_changed = FALSE;
+ ipp_t *response;
+
+ gdk_threads_enter ();
+
+ GTK_NOTE (PRINTING,
+ g_print ("CUPS Backend: %s\n", G_STRFUNC));
+
+ if (gtk_cups_result_is_error (result))
+ {
+ GTK_NOTE (PRINTING,
+ g_warning ("CUPS Backend: Error getting printer info: %s %d %d",
+ gtk_cups_result_get_error_string (result),
+ gtk_cups_result_get_error_type (result),
+ gtk_cups_result_get_error_code (result)));
+
+ goto done;
+ }
+
+ response = gtk_cups_result_get_response (result);
+ attr = ippFirstAttribute (response);
+ while (attr && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
+ attr = ippNextAttribute (response);
+
+ if (attr)
+ {
+ while (attr && ippGetGroupTag (attr) == IPP_TAG_PRINTER)
{
- g_signal_emit_by_name (backend, "printer-added", printer);
+ cups_printer_handle_attribute (cups_backend, attr, info);
+ attr = ippNextAttribute (response);
+ }
- gtk_printer_set_is_new (printer, FALSE);
+ if (info->printer_name && info->printer_uri)
+ {
+ info->avahi_printer = TRUE;
+
+ if (info->got_printer_type &&
+ info->default_printer &&
+ cups_backend->avahi_default_printer == NULL)
+ cups_backend->avahi_default_printer = g_strdup (info->printer_name);
+
+ set_info_state_message (info);
+
+ printer = gtk_print_backend_find_printer (backend, info->printer_name);
+ if (!printer)
+ {
+ printer = cups_create_printer (cups_backend, info);
+ list_has_changed = TRUE;
+ }
+ else
+ {
+ g_object_ref (printer);
+ }
+
+ gtk_printer_set_is_paused (printer, info->is_paused);
+ gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs);
+
+ if (!gtk_printer_is_active (printer))
+ {
+ gtk_printer_set_is_active (printer, TRUE);
+ gtk_printer_set_is_new (printer, TRUE);
+ list_has_changed = TRUE;
+ }
+
+ GTK_PRINTER_CUPS (printer)->remote = info->remote_printer;
+ GTK_PRINTER_CUPS (printer)->avahi_name = g_strdup (service->name);
+ GTK_PRINTER_CUPS (printer)->avahi_type = g_strdup (service->type);
+ GTK_PRINTER_CUPS (printer)->avahi_domain = g_strdup (service->domain);
+ GTK_PRINTER_CUPS (printer)->hostname = g_strdup (service->host);
+ GTK_PRINTER_CUPS (printer)->port = service->port;
+ GTK_PRINTER_CUPS (printer)->state = info->state;
+ GTK_PRINTER_CUPS (printer)->ipp_version_major = info->ipp_version_major;
+ GTK_PRINTER_CUPS (printer)->ipp_version_minor = info->ipp_version_minor;
+ GTK_PRINTER_CUPS (printer)->supports_copies = info->supports_copies;
+ GTK_PRINTER_CUPS (printer)->supports_collate = info->supports_collate;
+ GTK_PRINTER_CUPS (printer)->supports_number_up = info->supports_number_up;
+ status_changed = gtk_printer_set_job_count (printer, info->job_count);
+ status_changed |= gtk_printer_set_location (printer, info->location);
+ status_changed |= gtk_printer_set_description (printer, info->description);
+ status_changed |= gtk_printer_set_state_message (printer, info->state_msg);
+ status_changed |= gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs);
+
+ set_printer_icon_name_from_info (printer, info);
+
+ if (gtk_printer_is_new (printer))
+ {
+ g_signal_emit_by_name (backend, "printer-added", printer);
+ gtk_printer_set_is_new (printer, FALSE);
+ }
+
+ if (status_changed)
+ g_signal_emit_by_name (GTK_PRINT_BACKEND (backend),
+ "printer-status-changed", printer);
+
+ /* The ref is held by GtkPrintBackend, in add_printer() */
+ g_object_unref (printer);
}
+ }
-#if 0
- /* Getting printer info with separate requests overwhelms cups
- * when the printer list has more than a handful of printers.
- */
- cups_request_printer_info (cups_backend, gtk_printer_get_name (printer));
+done:
+ if (list_has_changed)
+ g_signal_emit_by_name (backend, "printer-list-changed");
+
+ if (!cups_backend->got_default_printer &&
+ gtk_print_backend_printer_list_is_done (backend) &&
+ cups_backend->avahi_default_printer != NULL)
+ {
+ set_default_printer (cups_backend, cups_backend->avahi_default_printer);
+ }
+
+ g_slice_free (PrinterSetupInfo, info);
+
+ gdk_threads_leave ();
+}
+
+static void
+cups_request_avahi_printer_info (const gchar *printer_uri,
+ const gchar *host,
+ gint port,
+ const gchar *name,
+ const gchar *type,
+ const gchar *domain,
+ GtkPrintBackendCups *backend)
+{
+ GtkCupsRequest *request;
+ AvahiService *service;
+ http_t *http;
+
+ http = httpConnect (host, port);
+ if (http)
+ {
+ service = (AvahiService *) g_new0 (AvahiService, 1);
+ service->name = g_strdup (name);
+ service->type = g_strdup (type);
+ service->domain = g_strdup (domain);
+ service->host = g_strdup (host);
+ service->port = port;
+
+ request = gtk_cups_request_new_with_username (http,
+ GTK_CUPS_POST,
+ IPP_GET_PRINTER_ATTRIBUTES,
+ NULL,
+ NULL,
+ NULL,
+ backend->username);
+
+ gtk_cups_request_set_ipp_version (request, 1, 1);
+
+ gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, IPP_TAG_URI,
+ "printer-uri", NULL, printer_uri);
+
+ gtk_cups_request_ipp_add_strings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
+ "requested-attributes", G_N_ELEMENTS (printer_attrs),
+ NULL, printer_attrs);
+
+ cups_request_execute (backend,
+ request,
+ (GtkPrintCupsResponseCallbackFunc) cups_request_avahi_printer_info_cb,
+ service,
+ (GDestroyNotify) avahi_service_free);
+ }
+}
+
+static void
+avahi_resolver_found_cb (GaServiceResolver *resolver,
+ int interface,
+ GaProtocol protocol,
+ const char *name,
+ const char *type,
+ const char *domain,
+ const char *host_name,
+ const AvahiAddress *address,
+ guint16 port,
+ AvahiStringList *txt,
+ glong flags,
+ gpointer *user_data)
+{
+ GtkPrintBackendCups *backend = GTK_PRINT_BACKEND_CUPS (user_data);
+ AvahiStringList *item;
+ gchar host[AVAHI_ADDRESS_STR_MAX];
+ gchar *suffix = NULL;
+ gchar *printer_uri;
+
+ avahi_address_snprint (host, sizeof (host), address);
+
+ item = avahi_string_list_find (txt, "rp");
+ if (item)
+ avahi_string_list_get_pair (item, NULL, &suffix, NULL);
+
+ if (suffix)
+ {
+ if (g_strcmp0 (type, "_ipp._tcp") == 0)
+ printer_uri = g_strdup_printf ("ipp://%s:%u/%s", host, port, suffix);
+ else
+ printer_uri = g_strdup_printf ("ipps://%s:%u/%s", host, port, suffix);
+
+ cups_request_avahi_printer_info (printer_uri,
+ host,
+ port,
+ name,
+ type,
+ domain,
+ backend);
+
+ g_free (printer_uri);
+ g_free (suffix);
+ }
+}
+
+static void
+avahi_browser_new_service_cb (GaServiceBrowser *browser,
+ int interface,
+ GaProtocol protocol,
+ const char *name,
+ const char *type,
+ const char *domain,
+ glong flags,
+ gpointer user_data)
+{
+ GtkPrintBackendCups *backend = GTK_PRINT_BACKEND_CUPS (user_data);
+ GaServiceResolver *resolver;
+ GError *error = NULL;
+
+ resolver = ga_service_resolver_new (AVAHI_IF_UNSPEC,
+ AVAHI_PROTO_UNSPEC,
+ name, type, domain,
+ AVAHI_PROTO_UNSPEC,
+ GA_LOOKUP_USE_MULTICAST);
+
+ g_signal_connect (resolver, "found",
+ G_CALLBACK (avahi_resolver_found_cb), user_data);
+
+ if (!ga_service_resolver_attach (resolver,
+ backend->avahi_client,
+ &error))
+ {
+ GTK_NOTE (PRINTING,
+ g_warning ("CUPS Backend: Error resolving Avahi service %s: %s",
+ name, error->message));
+ g_clear_object (&resolver);
+ g_clear_error (&error);
+ return;
+ }
+
+ backend->avahi_resolvers = g_list_append (backend->avahi_resolvers, resolver);
+}
+
+static void
+avahi_browser_removed_service_cb (GaServiceBrowser *browser,
+ int interface,
+ GaProtocol protocol,
+ const char *name,
+ const char *type,
+ const char *domain,
+ glong flags,
+ gpointer user_data)
+{
+ GtkPrintBackendCups *backend = GTK_PRINT_BACKEND_CUPS (user_data);
+ GtkPrinterCups *printer;
+ GList *list;
+ GList *iter;
+
+ list = gtk_print_backend_get_printer_list (GTK_PRINT_BACKEND (backend));
+ for (iter = list; iter; iter = iter->next)
+ {
+ printer = GTK_PRINTER_CUPS (iter->data);
+ if (g_strcmp0 (printer->avahi_name, name) == 0 &&
+ g_strcmp0 (printer->avahi_type, type) == 0 &&
+ g_strcmp0 (printer->avahi_domain, domain) == 0)
+ {
+ if (g_strcmp0 (gtk_printer_get_name (GTK_PRINTER (printer)),
+ backend->avahi_default_printer) == 0)
+ g_clear_pointer (&backend->avahi_default_printer, g_free);
+
+ g_signal_emit_by_name (backend, "printer-removed", printer);
+ gtk_print_backend_remove_printer (GTK_PRINT_BACKEND (backend),
+ GTK_PRINTER (printer));
+ g_signal_emit_by_name (backend, "printer-list-changed");
+ break;
+ }
+ }
+
+ g_list_free (list);
+}
+
+static gboolean
+avahi_client_renew (gpointer user_data)
+{
+ GtkPrintBackendCups *backend = GTK_PRINT_BACKEND_CUPS (user_data);
+ gboolean avahi_printers_removed = TRUE;
+ GList *list;
+ GList *iter;
+
+ list = gtk_print_backend_get_printer_list (GTK_PRINT_BACKEND (backend));
+ for (iter = list; iter; iter = iter->next)
+ if (GTK_PRINTER_CUPS (iter->data)->avahi_browsed)
+ avahi_printers_removed = FALSE;
+
+ g_list_free (list);
+
+ if (avahi_printers_removed)
+ {
+ avahi_data_free (backend);
+ avahi_request_printer_list (backend);
+ return FALSE;
+ }
+ else
+ {
+ return TRUE;
+ }
+}
+
+static void
+avahi_client_state_changed_cb (GaClient *ga_client,
+ GaClientState state,
+ gpointer user_data)
+{
+ GtkPrintBackendCups *backend = GTK_PRINT_BACKEND_CUPS (user_data);
+ GtkPrinterCups *printer;
+ gboolean list_has_changed = FALSE;
+ GError *error = NULL;
+ GList *list;
+ GList *iter;
+
+ switch (state)
+ {
+ case GA_CLIENT_STATE_FAILURE:
+ if (avahi_client_errno (ga_client->avahi_client) == AVAHI_ERR_DISCONNECTED)
+ {
+ list = gtk_print_backend_get_printer_list (GTK_PRINT_BACKEND (backend));
+
+ for (iter = list; iter; iter = iter->next)
+ {
+ printer = GTK_PRINTER_CUPS (iter->data);
+ if (printer->avahi_browsed)
+ {
+ g_signal_emit_by_name (backend, "printer-removed", printer);
+ gtk_print_backend_remove_printer (GTK_PRINT_BACKEND (backend),
+ GTK_PRINTER (printer));
+ list_has_changed = TRUE;
+ }
+ }
+
+ if (list_has_changed)
+ g_signal_emit_by_name (backend, "printer-list-changed");
+
+ g_idle_add (avahi_client_renew, backend);
+
+ g_list_free (list);
+ }
+ break;
+
+ case GA_CLIENT_STATE_S_RUNNING:
+ backend->avahi_ipp_browser = ga_service_browser_new ("_ipp._tcp");
+
+ g_signal_connect (backend->avahi_ipp_browser, "new-service",
+ G_CALLBACK (avahi_browser_new_service_cb),
+ user_data);
+
+ g_signal_connect (backend->avahi_ipp_browser, "removed-service",
+ G_CALLBACK (avahi_browser_removed_service_cb),
+ user_data);
+
+ if (!ga_service_browser_attach (backend->avahi_ipp_browser,
+ backend->avahi_client,
+ &error))
+ {
+ GTK_NOTE (PRINTING,
+ g_warning ("CUPS Backend: Error getting printer list from Avahi: %s",
+ error->message));
+ g_clear_object (&backend->avahi_ipp_browser);
+ g_clear_error (&error);
+ }
+
+ backend->avahi_ipps_browser = ga_service_browser_new ("_ipps._tcp");
+
+ g_signal_connect (backend->avahi_ipps_browser, "new-service",
+ G_CALLBACK (avahi_browser_new_service_cb),
+ user_data);
+
+ g_signal_connect (backend->avahi_ipps_browser, "removed-service",
+ G_CALLBACK (avahi_browser_removed_service_cb),
+ user_data);
+
+ if (!ga_service_browser_attach (backend->avahi_ipps_browser,
+ backend->avahi_client,
+ &error))
+ {
+ GTK_NOTE (PRINTING,
+ g_warning ("CUPS Backend: Error getting printer list from Avahi: %s",
+ error->message));
+ g_clear_object (&backend->avahi_ipps_browser);
+ g_clear_error (&error);
+ }
+ break;
+
+ default:
+ break;
+ }
+}
+
+static void
+avahi_request_printer_list (GtkPrintBackendCups *cups_backend)
+{
+ GError *error = NULL;
+
+ if (!cups_backend->avahi_client)
+ {
+ cups_backend->avahi_client = ga_client_new (GA_CLIENT_FLAG_NO_FAIL);
+
+ g_signal_connect (cups_backend->avahi_client, "state-changed",
+ G_CALLBACK (avahi_client_state_changed_cb),
+ cups_backend);
+
+ if (!ga_client_start (cups_backend->avahi_client, &error))
+ {
+ GTK_NOTE (PRINTING,
+ g_warning ("CUPS Backend: Error getting printer list from Avahi: %s",
+ error->message));
+ g_clear_object (&cups_backend->avahi_client);
+ g_clear_error (&error);
+ }
+ }
+}
#endif
- GTK_PRINTER_CUPS (printer)->state = state;
- status_changed = gtk_printer_set_job_count (printer, job_count);
- status_changed |= gtk_printer_set_location (printer, location);
- status_changed |= gtk_printer_set_description (printer, description);
+static void
+cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
+ GtkCupsResult *result,
+ gpointer user_data)
+{
+ GtkPrintBackend *backend = GTK_PRINT_BACKEND (cups_backend);
+ ipp_attribute_t *attr;
+ ipp_t *response;
+ gboolean list_has_changed;
+ GList *removed_printer_checklist;
+ gchar *remote_default_printer = NULL;
+ GList *iter;
+
+ gdk_threads_enter ();
+
+ list_has_changed = FALSE;
+
+ GTK_NOTE (PRINTING,
+ g_print ("CUPS Backend: %s\n", G_STRFUNC));
+
+ cups_backend->list_printers_pending = FALSE;
+
+ if (gtk_cups_result_is_error (result))
+ {
+ GTK_NOTE (PRINTING,
+ g_warning ("CUPS Backend: Error getting printer list: %s %d %d",
+ gtk_cups_result_get_error_string (result),
+ gtk_cups_result_get_error_type (result),
+ gtk_cups_result_get_error_code (result)));
- if (state_msg != NULL && strlen (state_msg) == 0)
+ if (gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_AUTH &&
+ gtk_cups_result_get_error_code (result) == 1)
{
- if (is_paused && !is_accepting_jobs)
- /* Translators: this is a printer status. */
- tmp_msg2 = g_strdup ( N_("Paused ; Rejecting Jobs"));
- if (is_paused && is_accepting_jobs)
- /* Translators: this is a printer status. */
- tmp_msg2 = g_strdup ( N_("Paused"));
- if (!is_paused && !is_accepting_jobs)
- /* Translators: this is a printer status. */
- tmp_msg2 = g_strdup ( N_("Rejecting Jobs"));
-
- if (tmp_msg2 != NULL)
- state_msg = tmp_msg2;
+ /* Canceled by user, stop popping up more password dialogs */
+ if (cups_backend->list_printers_poll > 0)
+ g_source_remove (cups_backend->list_printers_poll);
+ cups_backend->list_printers_poll = 0;
+ cups_backend->list_printers_attempts = 0;
}
- /* Set description of the reason and combine it with printer-state-message. */
- if ( (reason_msg != NULL))
+ goto done;
+ }
+
+ /* Gather the names of the printers in the current queue
+ * so we may check to see if they were removed
+ */
+ removed_printer_checklist = gtk_print_backend_get_printer_list (backend);
+
+ response = gtk_cups_result_get_response (result);
+#ifdef HAVE_CUPS_API_1_6
+ for (attr = ippFirstAttribute (response); attr != NULL;
+ attr = ippNextAttribute (response))
+ {
+ GtkPrinter *printer;
+ gboolean status_changed = FALSE;
+ GList *node;
+ PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo);
+
+ /* Skip leading attributes until we hit a printer...
+ */
+ while (attr != NULL && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
+ attr = ippNextAttribute (response);
+
+ if (attr == NULL)
+ break;
+ while (attr != NULL && ippGetGroupTag (attr) == IPP_TAG_PRINTER)
+ {
+ cups_printer_handle_attribute (cups_backend, attr, info);
+ attr = ippNextAttribute (response);
+ }
+#else
+ for (attr = response->attrs; attr != NULL; attr = attr->next)
+ {
+ GtkPrinter *printer;
+ gboolean status_changed = FALSE;
+ GList *node;
+ PrinterSetupInfo *info = g_slice_new0 (PrinterSetupInfo);
+ info->default_number_up = 1;
+
+ /* Skip leading attributes until we hit a printer...
+ */
+ while (attr != NULL && ippGetGroupTag (attr) != IPP_TAG_PRINTER)
+ attr = attr->next;
+
+ if (attr == NULL)
+ break;
+ while (attr != NULL && ippGetGroupTag (attr) == IPP_TAG_PRINTER)
+ {
+ cups_printer_handle_attribute (cups_backend, attr, info);
+ attr = attr->next;
+ }
+#endif
+
+ if (info->printer_name == NULL ||
+ (info->printer_uri == NULL && info->member_uris == NULL))
+ {
+ if (attr == NULL)
+ break;
+ else
+ continue;
+ }
+
+ if (info->got_printer_type)
{
- for (i = 0; i < G_N_ELEMENTS (reasons); i++)
+ if (info->default_printer && !cups_backend->got_default_printer)
{
- if (strncmp (reason_msg, reasons[i], strlen (reasons[i])) == 0)
+ if (!info->remote_printer)
{
- reason_msg_desc = g_strdup_printf (reasons_descs[i], printer_name);
- found = TRUE;
- break;
+ cups_backend->got_default_printer = TRUE;
+ cups_backend->default_printer = g_strdup (info->printer_name);
+ }
+ else
+ {
+ if (remote_default_printer == NULL)
+ remote_default_printer = g_strdup (info->printer_name);
}
}
+ }
+ else
+ {
+ if (!cups_backend->got_default_printer)
+ cups_get_default_printer (cups_backend);
+ }
+
+ /* remove name from checklist if it was found */
+ node = g_list_find_custom (removed_printer_checklist,
+ info->printer_name,
+ (GCompareFunc) find_printer);
+ removed_printer_checklist = g_list_delete_link (removed_printer_checklist,
+ node);
+
+ printer = gtk_print_backend_find_printer (backend, info->printer_name);
+ if (!printer)
+ {
+ printer = cups_create_printer (cups_backend, info);
+ list_has_changed = TRUE;
+ }
+
+ else
+ g_object_ref (printer);
+
+ GTK_PRINTER_CUPS (printer)->remote = info->remote_printer;
- if (!found)
- printer_state_reason_level = 0;
+ gtk_printer_set_is_paused (printer, info->is_paused);
+ gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs);
+
+ if (!gtk_printer_is_active (printer))
+ {
+ gtk_printer_set_is_active (printer, TRUE);
+ gtk_printer_set_is_new (printer, TRUE);
+ list_has_changed = TRUE;
+ }
+
+ if (gtk_printer_is_new (printer))
+ {
+ g_signal_emit_by_name (backend, "printer-added", printer);
- if (printer_state_reason_level >= 2)
- {
- if (strlen (state_msg) == 0)
- state_msg = reason_msg_desc;
- else
- {
- tmp_msg = g_strjoin (" ; ", state_msg, reason_msg_desc, NULL);
- state_msg = tmp_msg;
- }
- }
+ gtk_printer_set_is_new (printer, FALSE);
}
- status_changed |= gtk_printer_set_state_message (printer, state_msg);
- status_changed |= gtk_printer_set_is_accepting_jobs (printer, is_accepting_jobs);
+#if 0
+ /* Getting printer info with separate requests overwhelms cups
+ * when the printer list has more than a handful of printers.
+ */
+ cups_request_printer_info (cups_backend, gtk_printer_get_name (printer));
+#endif
+
+ GTK_PRINTER_CUPS (printer)->state = info->state;
+ GTK_PRINTER_CUPS (printer)->ipp_version_major = info->ipp_version_major;
+ GTK_PRINTER_CUPS (printer)->ipp_version_minor = info->ipp_version_minor;
+ GTK_PRINTER_CUPS (printer)->supports_copies = info->supports_copies;
+ GTK_PRINTER_CUPS (printer)->supports_collate = info->supports_collate;
+ GTK_PRINTER_CUPS (printer)->supports_number_up = info->supports_number_up;
+ status_changed = gtk_printer_set_job_count (printer, info->job_count);
+ status_changed |= gtk_printer_set_location (printer, info->location);
+ status_changed |= gtk_printer_set_description (printer,
+ info->description);
- if (tmp_msg != NULL)
- g_free (tmp_msg);
+ set_info_state_message (info);
- if (tmp_msg2 != NULL)
- g_free (tmp_msg2);
-
- if (reason_msg_desc != NULL)
- g_free (reason_msg_desc);
-
- /* Set printer icon according to importance
- (none, report, warning, error - report is omitted). */
- if (printer_state_reason_level == 3)
- gtk_printer_set_icon_name (printer, "gtk-print-error");
- else if (printer_state_reason_level == 2)
- gtk_printer_set_icon_name (printer, "gtk-print-warning");
- else if (gtk_printer_is_paused (printer))
- gtk_printer_set_icon_name (printer, "gtk-print-paused");
- else
- gtk_printer_set_icon_name (printer, "gtk-print");
+ status_changed |= gtk_printer_set_state_message (printer, info->state_msg);
+ status_changed |= gtk_printer_set_is_accepting_jobs (printer, info->is_accepting_jobs);
+
+ set_printer_icon_name_from_info (printer, info);
if (status_changed)
g_signal_emit_by_name (GTK_PRINT_BACKEND (backend),
/* The ref is held by GtkPrintBackend, in add_printer() */
g_object_unref (printer);
-
+ g_free (info->state_msg);
+ g_slice_free (PrinterSetupInfo, info);
+
if (attr == NULL)
break;
}
as inactive if it is in the list, emitting a printer_removed signal */
if (removed_printer_checklist != NULL)
{
- g_list_foreach (removed_printer_checklist, (GFunc) mark_printer_inactive, backend);
+ for (iter = removed_printer_checklist; iter; iter = iter->next)
+ {
+#ifdef HAVE_AVAHI_BROWSING
+ if (!GTK_PRINTER_CUPS (iter->data)->avahi_browsed)
+#endif
+ {
+ mark_printer_inactive (GTK_PRINTER (iter->data), backend);
+ list_has_changed = TRUE;
+ }
+ }
+
g_list_free (removed_printer_checklist);
- list_has_changed = TRUE;
}
-
+
done:
if (list_has_changed)
g_signal_emit_by_name (backend, "printer-list-changed");
-
+
gtk_print_backend_set_list_done (backend);
if (!cups_backend->got_default_printer && remote_default_printer != NULL)
{
- cups_backend->default_printer = g_strdup (remote_default_printer);
- cups_backend->got_default_printer = TRUE;
+ set_default_printer (cups_backend, remote_default_printer);
g_free (remote_default_printer);
+ }
- if (cups_backend->default_printer != NULL)
- {
- GtkPrinter *default_printer = NULL;
- default_printer = gtk_print_backend_find_printer (GTK_PRINT_BACKEND (cups_backend),
- cups_backend->default_printer);
- if (default_printer != NULL)
- {
- gtk_printer_set_is_default (default_printer, TRUE);
- g_signal_emit_by_name (GTK_PRINT_BACKEND (cups_backend),
- "printer-status-changed", default_printer);
- }
- }
+#ifdef HAVE_AVAHI_BROWSING
+ if (!cups_backend->got_default_printer && cups_backend->avahi_default_printer != NULL)
+ {
+ set_default_printer (cups_backend, cups_backend->avahi_default_printer);
}
+#endif
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
}
static void
{
GtkCupsConnectionState state;
GtkCupsRequest *request;
- static const char * const pattrs[] = /* Attributes we're interested in */
- {
- "printer-name",
- "printer-uri-supported",
- "member-uris",
- "printer-location",
- "printer-info",
- "printer-state-message",
- "printer-state-reasons",
- "printer-state",
- "queued-job-count",
- "printer-is-accepting-jobs",
- "job-sheets-supported",
- "job-sheets-default",
- "printer-type",
- "auth-info-required"
- };
- if (cups_backend->list_printers_pending)
+ if (cups_backend->reading_ppds > 0 || cups_backend->list_printers_pending)
return TRUE;
state = gtk_cups_connection_test_get_state (cups_backend->cups_connection_test);
cups_backend->username);
gtk_cups_request_ipp_add_strings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
- "requested-attributes", G_N_ELEMENTS (pattrs),
- NULL, pattrs);
+ "requested-attributes", G_N_ELEMENTS (printer_attrs),
+ NULL, printer_attrs);
cups_request_execute (cups_backend,
request,
cups_backend->list_printers_poll = gdk_threads_add_timeout (50,
(GSourceFunc) cups_request_printer_list,
backend);
+
+#ifdef HAVE_AVAHI_BROWSING
+ avahi_request_printer_list (cups_backend);
+#endif
}
}
GtkCupsResult *result,
GetPPDData *data)
{
- ipp_t *response;
GtkPrinter *printer;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
GTK_NOTE (PRINTING,
g_print ("CUPS Backend: %s\n", G_STRFUNC));
printer = GTK_PRINTER (data->printer);
GTK_PRINTER_CUPS (printer)->reading_ppd = FALSE;
+ print_backend->reading_ppds--;
if (gtk_cups_result_is_error (result))
{
gboolean success = FALSE;
- /* if we get a 404 then it is just a raw printer without a ppd
- and not an error */
- if ((gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_HTTP) &&
- (gtk_cups_result_get_error_status (result) == HTTP_NOT_FOUND))
+ /* If we get a 404 then it is just a raw printer without a ppd
+ and not an error. Standalone Avahi printers also don't have
+ PPD files. */
+ if (((gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_HTTP) &&
+ (gtk_cups_result_get_error_status (result) == HTTP_NOT_FOUND))
+#ifdef HAVE_AVAHI_BROWSING
+ || GTK_PRINTER_CUPS (printer)->avahi_browsed
+#endif
+ )
{
gtk_printer_set_has_details (printer, TRUE);
success = TRUE;
- }
-
+ }
+
g_signal_emit_by_name (printer, "details-acquired", success);
goto done;
}
- response = gtk_cups_result_get_response (result);
-
/* let ppdOpenFd take over the ownership of the open file */
g_io_channel_seek_position (data->ppd_io, 0, G_SEEK_SET, NULL);
data->printer->ppd_file = ppdOpenFd (dup (g_io_channel_unix_get_fd (data->ppd_io)));
-
+ ppdLocalize (data->printer->ppd_file);
ppdMarkDefaults (data->printer->ppd_file);
-
+
gtk_printer_set_has_details (printer, TRUE);
g_signal_emit_by_name (printer, "details-acquired", TRUE);
done:
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
}
static gboolean
}
}
- http = httpConnectEncrypt (cups_printer->hostname,
+ http = httpConnectEncrypt (cups_printer->hostname,
cups_printer->port,
cupsEncryption ());
-
+
data = g_new0 (GetPPDData, 1);
- fd = g_file_open_tmp ("gtkprint_ppd_XXXXXX",
- &ppd_filename,
+ fd = g_file_open_tmp ("gtkprint_ppd_XXXXXX",
+ &ppd_filename,
&error);
-#ifdef G_ENABLE_DEBUG
+#ifdef G_ENABLE_DEBUG
/* If we are debugging printing don't delete the tmp files */
- if (!(gtk_debug_flags & GTK_DEBUG_PRINTING))
+ if (!(gtk_get_debug_flags () & GTK_DEBUG_PRINTING))
unlink (ppd_filename);
#else
unlink (ppd_filename);
if (error != NULL)
{
- GTK_NOTE (PRINTING,
- g_warning ("CUPS Backend: Failed to create temp file, %s\n",
+ GTK_NOTE (PRINTING,
+ g_warning ("CUPS Backend: Failed to create temp file, %s\n",
error->message));
g_error_free (error);
httpClose (http);
g_signal_emit_by_name (printer, "details-acquired", FALSE);
return FALSE;
}
-
+
data->http = http;
fchmod (fd, S_IRUSR | S_IWUSR);
data->ppd_io = g_io_channel_unix_new (fd);
data->printer = g_object_ref (printer);
- resource = g_strdup_printf ("/printers/%s.ppd",
+ resource = g_strdup_printf ("/printers/%s.ppd",
gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
print_backend = gtk_printer_get_backend (printer);
resource,
GTK_PRINT_BACKEND_CUPS (print_backend)->username);
+ gtk_cups_request_set_ipp_version (request,
+ cups_printer->ipp_version_major,
+ cups_printer->ipp_version_minor);
+
GTK_NOTE (PRINTING,
g_print ("CUPS Backend: Requesting resource %s to be written to temp file %s\n", resource, ppd_filename));
cups_printer->reading_ppd = TRUE;
+ GTK_PRINT_BACKEND_CUPS (print_backend)->reading_ppds++;
cups_request_execute (GTK_PRINT_BACKEND_CUPS (print_backend),
request,
/* Ordering matters for default preference */
static const char *lpoptions_locations[] = {
"/etc/cups/lpoptions",
- ".lpoptions",
+ ".lpoptions",
".cups/lpoptions"
};
{
FILE *fp;
char line[1024], *lineptr, *defname = NULL;
-
+
if ((fp = g_fopen (filename, "r")) == NULL)
return;
cups_parse_user_default_printer (lpoptions_locations[i],
printer_name);
}
- else
+ else
{
char *filename;
- filename = g_build_filename (g_get_home_dir (),
+ filename = g_build_filename (g_get_home_dir (),
lpoptions_locations[i], NULL);
cups_parse_user_default_printer (filename, printer_name);
g_free (filename);
for (i = 0; i < G_N_ELEMENTS (lpoptions_locations); i++)
{
if (g_path_is_absolute (lpoptions_locations[i]))
- {
+ {
num_options = cups_parse_user_options (lpoptions_locations[i],
printer_name,
num_options,
{
char *filename;
- filename = g_build_filename (g_get_home_dir (),
+ filename = g_build_filename (g_get_home_dir (),
lpoptions_locations[i], NULL);
num_options = cups_parse_user_options (filename, printer_name,
num_options, options);
backend->got_default_printer = TRUE;
return;
}
-
- /* Figure out user setting for default printer */
+
+ /* Figure out user setting for default printer */
cups_get_user_default_printer (&name);
if (name != NULL)
{
ipp_attribute_t *attr;
GtkPrinter *printer;
- GDK_THREADS_ENTER ();
+ gdk_threads_enter ();
if (gtk_cups_result_is_error (result))
{
}
response = gtk_cups_result_get_response (result);
-
+
if ((attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME)) != NULL)
- print_backend->default_printer = g_strdup (attr->values[0].string.text);
+ print_backend->default_printer = g_strdup (ippGetString (attr, 0, NULL));
print_backend->got_default_printer = TRUE;
}
}
- /* Make sure to kick off get_printers if we are polling it,
- * as we could have blocked this reading the default printer
+ /* Make sure to kick off get_printers if we are polling it,
+ * as we could have blocked this reading the default printer
*/
if (print_backend->list_printers_poll != 0)
cups_request_printer_list (print_backend);
- GDK_THREADS_LEAVE ();
+ gdk_threads_leave ();
}
static gboolean
NULL,
NULL,
print_backend->username);
-
+
cups_request_execute (print_backend,
request,
(GtkPrintCupsResponseCallbackFunc) cups_request_default_printer_cb,
GtkPrinterCups *cups_printer;
cups_printer = GTK_PRINTER_CUPS (printer);
- if (!cups_printer->reading_ppd &&
+ if (!cups_printer->reading_ppd &&
gtk_printer_cups_get_ppd (cups_printer) == NULL)
{
if (cups_printer->remote)
}
static char *
-ppd_text_to_utf8 (ppd_file_t *ppd_file,
+ppd_text_to_utf8 (ppd_file_t *ppd_file,
const char *text)
{
const char *encoding = NULL;
char *res;
-
+
if (g_ascii_strcasecmp (ppd_file->lang_encoding, "UTF-8") == 0)
{
return g_strdup (text);
{
encoding = "WINDOWS-1252";
}
- else
+ else
{
/* Fallback, try iso-8859-1... */
encoding = "ISO-8859-1";
g_warning ("CUPS Backend: Unable to convert PPD text\n"));
res = g_strdup ("???");
}
-
+
return res;
}
static const struct {
const char *ppd_keyword;
const char *name;
-} option_names[] = {
+} ppd_option_names[] = {
{"Duplex", "gtk-duplex" },
{"MediaType", "gtk-paper-type"},
{"InputSlot", "gtk-paper-source"},
{"OutputBin", "gtk-output-tray"},
};
+static const struct {
+ const char *lpoption;
+ const char *name;
+} lpoption_names[] = {
+ {"number-up", "gtk-n-up" },
+ {"number-up-layout", "gtk-n-up-layout"},
+ {"job-billing", "gtk-billing-info"},
+ {"job-priority", "gtk-job-prio"},
+};
+
/* keep sorted when changing */
static const char *color_option_whitelist[] = {
"BRColorEnhancement",
"FPColorWise5",
"HPColorOptionsPanel",
};
-
+
/* keep sorted when changing */
static const char *image_quality_option_whitelist[] = {
"BRDocument",
/* keep sorted when changing */
static const char *cups_option_blacklist[] = {
"Collate",
- "Copies",
+ "Copies",
"OutputOrder",
"PageRegion",
"PageSize",
};
static char *
-get_option_text (ppd_file_t *ppd_file,
+get_option_text (ppd_file_t *ppd_file,
ppd_option_t *option)
{
int i;
char *utf8;
-
+
for (i = 0; i < G_N_ELEMENTS (cups_option_translations); i++)
{
if (strcmp (cups_option_translations[i].keyword, option->keyword) == 0)
/* Some ppd files have spaces in the text before the colon */
g_strchomp (utf8);
-
+
return utf8;
}
static char *
-get_choice_text (ppd_file_t *ppd_file,
+get_choice_text (ppd_file_t *ppd_file,
ppd_choice_t *choice)
{
int i;
ppd_option_t *option = choice->option;
const char *keyword = option->keyword;
-
+
for (i = 0; i < G_N_ELEMENTS (cups_choice_translations); i++)
{
if (strcmp (cups_choice_translations[i].keyword, keyword) == 0 &&
}
static gboolean
-group_has_option (ppd_group_t *group,
+group_has_option (ppd_group_t *group,
ppd_option_t *option)
{
int i;
if (group == NULL)
return FALSE;
-
+
if (group->num_options > 0 &&
option >= group->options && option < group->options + group->num_options)
return TRUE;
-
+
for (i = 0; i < group->num_subgroups; i++)
{
if (group_has_option (&group->subgroups[i],option))
static char *
ppd_group_name (ppd_group_t *group)
{
-#if CUPS_VERSION_MAJOR > 1 || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR > 1) || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR == 1 && CUPS_VERSION_PATCH >= 18)
return group->name;
-#else
- return group->text;
-#endif
}
static int
installed_options = NULL;
for (i = 0; i < ppd->num_groups; i++)
{
- char *name;
+ char *name;
name = ppd_group_name (&ppd->groups[i]);
if (strcmp (name, "InstallableOptions") == 0)
if (!found_auto)
add_auto = 1;
}
-
+
if (available)
{
*available = g_new (ppd_choice_t *, option->num_choices - num_conflicts + add_auto);
(*available)[i++] = &option->choices[j];
}
- if (add_auto)
+ if (add_auto)
(*available)[i++] = NULL;
}
g_free (conflicts);
-
+
return option->num_choices - num_conflicts + add_auto;
}
char *label;
int n_choices;
int i;
-#ifdef HAVE_CUPS_API_1_2
ppd_coption_t *coption;
-#endif
g_assert (ppd_option->ui == PPD_UI_PICKONE);
-
+
option = NULL;
n_choices = available_choices (ppd_file, ppd_option, &available, g_str_has_prefix (gtk_name, "gtk-"));
if (n_choices > 0)
{
-
- /* right now only support one parameter per custom option
+
+ /* right now only support one parameter per custom option
* if more than one print warning and only offer the default choices
*/
label = get_option_text (ppd_file, ppd_option);
-#ifdef HAVE_CUPS_API_1_2
coption = ppdFindCustomOption (ppd_file, ppd_option->keyword);
if (coption)
GTK_PRINTER_OPTION_TYPE_PICKONE_STRING);
break;
#ifdef PRINT_IGNORED_OPTIONS
- case PPD_CUSTOM_POINTS:
+ case PPD_CUSTOM_POINTS:
g_warning ("CUPS Backend: PPD Custom Points Option not supported");
break;
case PPD_CUSTOM_CURVE:
g_warning ("CUPS Backend: PPD Custom Curve Option not supported");
break;
- case PPD_CUSTOM_INVCURVE:
+ case PPD_CUSTOM_INVCURVE:
g_warning ("CUPS Backend: PPD Custom Inverse Curve Option not supported");
break;
#endif
- default:
+ default:
break;
}
}
g_warning ("CUPS Backend: Multi-parameter PPD Custom Option not supported");
#endif
}
-#endif /* HAVE_CUPS_API_1_2 */
if (!option)
option = gtk_printer_option_new (gtk_name, label,
GTK_PRINTER_OPTION_TYPE_PICKONE);
g_free (label);
-
+
gtk_printer_option_allocate_choices (option, n_choices);
for (i = 0; i < n_choices; i++)
{
option->choices_display[i] = get_choice_text (ppd_file, available[i]);
}
}
- gtk_printer_option_set (option, ppd_option->defchoice);
+
+ if (option->type != GTK_PRINTER_OPTION_TYPE_PICKONE)
+ {
+ if (g_str_has_prefix (ppd_option->defchoice, "Custom."))
+ gtk_printer_option_set (option, ppd_option->defchoice + 7);
+ else
+ gtk_printer_option_set (option, ppd_option->defchoice);
+ }
+ else
+ {
+ gtk_printer_option_set (option, ppd_option->defchoice);
+ }
}
#ifdef PRINT_IGNORED_OPTIONS
else
int n_choices;
g_assert (ppd_option->ui == PPD_UI_BOOLEAN);
-
+
option = NULL;
n_choices = available_choices (ppd_file, ppd_option, &available, g_str_has_prefix (gtk_name, "gtk-"));
option = gtk_printer_option_new (gtk_name, label,
GTK_PRINTER_OPTION_TYPE_BOOLEAN);
g_free (label);
-
+
gtk_printer_option_allocate_choices (option, 2);
option->choices[0] = g_strdup ("True");
option->choices_display[0] = g_strdup ("True");
option->choices[1] = g_strdup ("False");
option->choices_display[1] = g_strdup ("False");
-
+
gtk_printer_option_set (option, ppd_option->defchoice);
}
#ifdef PRINT_IGNORED_OPTIONS
}
static gchar *
-get_option_name (const gchar *keyword)
+get_ppd_option_name (const gchar *keyword)
{
int i;
- for (i = 0; i < G_N_ELEMENTS (option_names); i++)
- if (strcmp (option_names[i].ppd_keyword, keyword) == 0)
- return g_strdup (option_names[i].name);
+ for (i = 0; i < G_N_ELEMENTS (ppd_option_names); i++)
+ if (strcmp (ppd_option_names[i].ppd_keyword, keyword) == 0)
+ return g_strdup (ppd_option_names[i].name);
return g_strdup_printf ("cups-%s", keyword);
}
+static gchar *
+get_lpoption_name (const gchar *lpoption)
+{
+ int i;
+
+ for (i = 0; i < G_N_ELEMENTS (ppd_option_names); i++)
+ if (strcmp (ppd_option_names[i].ppd_keyword, lpoption) == 0)
+ return g_strdup (ppd_option_names[i].name);
+
+ for (i = 0; i < G_N_ELEMENTS (lpoption_names); i++)
+ if (strcmp (lpoption_names[i].lpoption, lpoption) == 0)
+ return g_strdup (lpoption_names[i].name);
+
+ return g_strdup_printf ("cups-%s", lpoption);
+}
+
static int
-strptr_cmp (const void *a,
+strptr_cmp (const void *a,
const void *b)
{
char **aa = (char **)a;
static gboolean
-string_in_table (gchar *str,
- const gchar *table[],
+string_in_table (gchar *str,
+ const gchar *table[],
gint table_len)
{
return bsearch (&str, table, table_len, sizeof (char *), (void *)strptr_cmp) != NULL;
if (STRING_IN_TABLE (ppd_option->keyword, cups_option_blacklist))
return;
- name = get_option_name (ppd_option->keyword);
+ name = get_ppd_option_name (ppd_option->keyword);
option = NULL;
if (ppd_option->ui == PPD_UI_PICKONE)
#ifdef PRINT_IGNORED_OPTIONS
else
g_warning ("CUPS Backend: Ignoring pickmany setting %s\n", ppd_option->text);
-#endif
-
+#endif
+
if (option)
{
char *name;
}
set_option_from_settings (option, settings);
-
+
gtk_printer_option_set_add (set, option);
}
-
+
g_free (name);
}
{
gint i;
gchar *name;
-
+
/* Ignore installable options */
name = ppd_group_name (toplevel_group);
if (strcmp (name, "InstallableOptions") == 0)
return;
-
+
for (i = 0; i < group->num_options; i++)
handle_option (set, ppd_file, &group->options[i], toplevel_group, settings);
}
+#ifdef HAVE_COLORD
+
+typedef struct {
+ GtkPrintSettings *settings;
+ GtkPrinter *printer;
+} GtkPrintBackendCupsColordHelper;
+
+static void
+colord_printer_option_set_changed_cb (GtkPrinterOptionSet *set,
+ GtkPrintBackendCupsColordHelper *helper)
+{
+ gtk_printer_cups_update_settings (GTK_PRINTER_CUPS (helper->printer),
+ helper->settings,
+ set);
+}
+#endif
+
static GtkPrinterOptionSet *
cups_printer_get_options (GtkPrinter *printer,
GtkPrintSettings *settings,
char *print_at[] = { "now", "at", "on-hold" };
char *n_up[] = {"1", "2", "4", "6", "9", "16" };
char *prio[] = {"100", "80", "50", "30" };
- /* Translators: These strings name the possible values of the
+ /* Translators: These strings name the possible values of the
* job priority option in the print dialog
*/
char *prio_display[] = {N_("Urgent"), N_("High"), N_("Medium"), N_("Low") };
/* Translators: These strings name the possible arrangements of
* multiple pages on a sheet when printing
*/
- char *n_up_layout_display[] = { N_("Left to right, top to bottom"), N_("Left to right, bottom to top"),
- N_("Right to left, top to bottom"), N_("Right to left, bottom to top"),
- N_("Top to bottom, left to right"), N_("Top to bottom, right to left"),
+ char *n_up_layout_display[] = { N_("Left to right, top to bottom"), N_("Left to right, bottom to top"),
+ N_("Right to left, top to bottom"), N_("Right to left, bottom to top"),
+ N_("Top to bottom, left to right"), N_("Top to bottom, right to left"),
N_("Bottom to top, left to right"), N_("Bottom to top, right to left") };
char *name;
int num_opts;
GtkPrintBackendCups *backend;
GtkTextDirection text_direction;
GtkPrinterCups *cups_printer = NULL;
-
+#ifdef HAVE_COLORD
+ GtkPrintBackendCupsColordHelper *helper;
+#endif
+ char *default_number_up;
set = gtk_printer_option_set_new ();
/* Cups specific, non-ppd related settings */
- /* Translators, this string is used to label the pages-per-sheet option
- * in the print dialog
- */
- option = gtk_printer_option_new ("gtk-n-up", _("Pages per Sheet"), GTK_PRINTER_OPTION_TYPE_PICKONE);
- gtk_printer_option_choices_from_array (option, G_N_ELEMENTS (n_up),
- n_up, n_up);
- gtk_printer_option_set (option, "1");
- set_option_from_settings (option, settings);
- gtk_printer_option_set_add (set, option);
- g_object_unref (option);
-
- if (cups_printer_get_capabilities (printer) & GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT)
- {
- for (i = 0; i < G_N_ELEMENTS (n_up_layout_display); i++)
- n_up_layout_display[i] = _(n_up_layout_display[i]);
-
- /* Translators, this string is used to label the option in the print
- * dialog that controls in what order multiple pages are arranged
- */
- option = gtk_printer_option_new ("gtk-n-up-layout", _("Page Ordering"), GTK_PRINTER_OPTION_TYPE_PICKONE);
- gtk_printer_option_choices_from_array (option, G_N_ELEMENTS (n_up_layout),
- n_up_layout, n_up_layout_display);
-
- text_direction = gtk_widget_get_default_direction ();
- if (text_direction == GTK_TEXT_DIR_LTR)
- gtk_printer_option_set (option, "lrtb");
- else
- gtk_printer_option_set (option, "rltb");
-
- set_option_from_settings (option, settings);
- gtk_printer_option_set_add (set, option);
- g_object_unref (option);
- }
-
for (i = 0; i < G_N_ELEMENTS(prio_display); i++)
prio_display[i] = _(prio_display[i]);
-
- /* Translators, this string is used to label the job priority option
- * in the print dialog
+
+ /* Translators, this string is used to label the job priority option
+ * in the print dialog
*/
option = gtk_printer_option_new ("gtk-job-prio", _("Job Priority"), GTK_PRINTER_OPTION_TYPE_PICKONE);
gtk_printer_option_choices_from_array (option, G_N_ELEMENTS (prio),
g_object_unref (option);
/* Translators, this string is used to label the billing info entry
- * in the print dialog
+ * in the print dialog
*/
option = gtk_printer_option_new ("gtk-billing-info", _("Billing Info"), GTK_PRINTER_OPTION_TYPE_STRING);
gtk_printer_option_set (option, "");
if (backend != NULL && printer != NULL)
{
char *cover_default[] = {"none", "classified", "confidential", "secret", "standard", "topsecret", "unclassified" };
- /* Translators, these strings are names for various 'standard' cover
+ /* Translators, these strings are names for various 'standard' cover
* pages that the printing system may support.
*/
char *cover_display_default[] = {N_("None"), N_("Classified"), N_("Confidential"), N_("Secret"), N_("Standard"), N_("Top Secret"), N_("Unclassified"),};
gpointer value;
gint j;
+ /* Translators, this string is used to label the pages-per-sheet option
+ * in the print dialog
+ */
+ option = gtk_printer_option_new ("gtk-n-up", _("Pages per Sheet"), GTK_PRINTER_OPTION_TYPE_PICKONE);
+ gtk_printer_option_choices_from_array (option, G_N_ELEMENTS (n_up),
+ n_up, n_up);
+ default_number_up = g_strdup_printf ("%d", cups_printer->default_number_up);
+ gtk_printer_option_set (option, default_number_up);
+ g_free (default_number_up);
+ set_option_from_settings (option, settings);
+ gtk_printer_option_set_add (set, option);
+ g_object_unref (option);
+
+ if (cups_printer_get_capabilities (printer) & GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT)
+ {
+ for (i = 0; i < G_N_ELEMENTS (n_up_layout_display); i++)
+ n_up_layout_display[i] = _(n_up_layout_display[i]);
+
+ /* Translators, this string is used to label the option in the print
+ * dialog that controls in what order multiple pages are arranged
+ */
+ option = gtk_printer_option_new ("gtk-n-up-layout", _("Page Ordering"), GTK_PRINTER_OPTION_TYPE_PICKONE);
+ gtk_printer_option_choices_from_array (option, G_N_ELEMENTS (n_up_layout),
+ n_up_layout, n_up_layout_display);
+
+ text_direction = gtk_widget_get_default_direction ();
+ if (text_direction == GTK_TEXT_DIR_LTR)
+ gtk_printer_option_set (option, "lrtb");
+ else
+ gtk_printer_option_set (option, "rltb");
+
+ set_option_from_settings (option, settings);
+ gtk_printer_option_set_add (set, option);
+ g_object_unref (option);
+ }
+
num_of_covers = backend->number_of_covers;
cover = g_new (char *, num_of_covers + 1);
cover[num_of_covers] = NULL;
for (i = 0; i < num_of_covers; i++)
cover_display_translated[i] = _(cover_display[i]);
-
- /* Translators, this is the label used for the option in the print
+
+ /* Translators, this is the label used for the option in the print
* dialog that controls the front cover page.
*/
option = gtk_printer_option_new ("gtk-cover-before", _("Before"), GTK_PRINTER_OPTION_TYPE_PICKONE);
gtk_printer_option_set_add (set, option);
g_object_unref (option);
- /* Translators, this is the label used for the option in the print
+ /* Translators, this is the label used for the option in the print
* dialog that controls the back cover page.
*/
option = gtk_printer_option_new ("gtk-cover-after", _("After"), GTK_PRINTER_OPTION_TYPE_PICKONE);
set_option_from_settings (option, settings);
gtk_printer_option_set_add (set, option);
g_object_unref (option);
-
+
/* Translators: this is the name of the option that allows the user
* to specify a time when a print job will be printed.
*/
set_option_from_settings (option, settings);
gtk_printer_option_set_add (set, option);
g_object_unref (option);
-
+
/* Printer (ppd) specific settings */
ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer));
if (ppd_file)
option = ppdFindOption (ppd_file, "PageSize");
ppd_name = gtk_paper_size_get_ppd_name (paper_size);
-
+
if (ppd_name)
strncpy (option->defchoice, ppd_name, PPD_MAX_NAME);
else
if (STRING_IN_TABLE (opts[i].name, cups_option_blacklist))
continue;
- name = get_option_name (opts[i].name);
- option = gtk_printer_option_set_lookup (set, name);
- if (option)
- gtk_printer_option_set (option, opts[i].value);
+ name = get_lpoption_name (opts[i].name);
+ if (strcmp (name, "cups-job-sheets") == 0)
+ {
+ gchar **values;
+ gint num_values;
+
+ values = g_strsplit (opts[i].value, ",", 2);
+ num_values = g_strv_length (values);
+
+ option = gtk_printer_option_set_lookup (set, "gtk-cover-before");
+ if (option && num_values > 0)
+ gtk_printer_option_set (option, g_strstrip (values[0]));
+
+ option = gtk_printer_option_set_lookup (set, "gtk-cover-after");
+ if (option && num_values > 1)
+ gtk_printer_option_set (option, g_strstrip (values[1]));
+
+ g_strfreev (values);
+ }
+ else if (strcmp (name, "cups-job-hold-until") == 0)
+ {
+ GtkPrinterOption *option2 = NULL;
+
+ option = gtk_printer_option_set_lookup (set, "gtk-print-time-text");
+ if (option && opts[i].value)
+ {
+ option2 = gtk_printer_option_set_lookup (set, "gtk-print-time");
+ if (option2)
+ {
+ if (strcmp (opts[i].value, "indefinite") == 0)
+ gtk_printer_option_set (option2, "on-hold");
+ else
+ {
+ gtk_printer_option_set (option2, "at");
+ gtk_printer_option_set (option, opts[i].value);
+ }
+ }
+ }
+ }
+ else if (strcmp (name, "cups-sides") == 0)
+ {
+ option = gtk_printer_option_set_lookup (set, "gtk-duplex");
+ if (option && opts[i].value)
+ {
+ if (strcmp (opts[i].value, "two-sided-short-edge") == 0)
+ gtk_printer_option_set (option, "DuplexTumble");
+ else if (strcmp (opts[i].value, "two-sided-long-edge") == 0)
+ gtk_printer_option_set (option, "DuplexNoTumble");
+ }
+ }
+ else
+ {
+ option = gtk_printer_option_set_lookup (set, name);
+ if (option)
+ gtk_printer_option_set (option, opts[i].value);
+ }
g_free (name);
}
cupsFreeOptions (num_opts, opts);
+#ifdef HAVE_COLORD
+ /* TRANSLATORS: this this the ICC color profile to use for this job */
+ option = gtk_printer_option_new ("colord-profile",
+ _("Printer Profile"),
+ GTK_PRINTER_OPTION_TYPE_INFO);
+
+ /* assign it to the color page */
+ option->group = g_strdup ("ColorPage");
+
+ /* TRANSLATORS: this is when color profile information is unavailable */
+ gtk_printer_option_set (option, _("Unavailable"));
+ gtk_printer_option_set_add (set, option);
+
+ /* watch to see if the user changed the options */
+ helper = g_new (GtkPrintBackendCupsColordHelper, 1);
+ helper->printer = printer;
+ helper->settings = settings;
+ g_signal_connect_data (set, "changed",
+ G_CALLBACK (colord_printer_option_set_changed_cb),
+ helper,
+ (GClosureNotify) g_free,
+ 0);
+
+ /* initial coldplug */
+ gtk_printer_cups_update_settings (GTK_PRINTER_CUPS (printer),
+ settings, set);
+ g_object_bind_property (printer, "profile-title",
+ option, "value",
+ G_BINDING_DEFAULT);
+
+#endif
+
return set;
}
ppd_option_t *ppd_option)
{
GtkPrinterOption *option;
- char *name = get_option_name (ppd_option->keyword);
+ char *name = get_ppd_option_name (ppd_option->keyword);
option = gtk_printer_option_set_lookup (set, name);
if (option)
ppdMarkOption (ppd_file, ppd_option->keyword, option->value);
-
+
g_free (name);
}
if (ppd_option->conflicted)
{
- name = get_option_name (ppd_option->keyword);
+ name = get_ppd_option_name (ppd_option->keyword);
option = gtk_printer_option_set_lookup (set, name);
if (option)
else
g_warning ("CUPS Backend: Ignoring conflict for option %s", ppd_option->keyword);
#endif
-
+
g_free (name);
}
}
ppd_file_t *ppd_file;
int num_conflicts;
int i;
-
+
ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer));
if (ppd_file == NULL)
for (i = 0; i < ppd_file->num_groups; i++)
set_conflicts_from_group (options, ppd_file, &ppd_file->groups[i]);
}
-
+
return num_conflicts > 0;
}
name = g_strdup_printf ("cups-%s", cups_name);
cups_value = gtk_print_settings_get (settings, name);
g_free (name);
-
- if (cups_value != NULL)
+
+ if (cups_value != NULL)
{
gtk_printer_option_set (option, cups_value);
return;
{
const char *cups_value;
char *value;
-
+
if (settings == NULL)
return;
gtk_printer_option_set (option, cups_value);
else
{
- int res = gtk_print_settings_get_resolution (settings);
- int res_x = gtk_print_settings_get_resolution_x (settings);
- int res_y = gtk_print_settings_get_resolution_y (settings);
+ if (gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_RESOLUTION, -1) != -1 ||
+ gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_RESOLUTION_X, -1) != -1 ||
+ gtk_print_settings_get_int_with_default (settings, GTK_PRINT_SETTINGS_RESOLUTION_Y, -1) != -1 ||
+ option->value == NULL || option->value[0] == '\0')
+ {
+ int res = gtk_print_settings_get_resolution (settings);
+ int res_x = gtk_print_settings_get_resolution_x (settings);
+ int res_y = gtk_print_settings_get_resolution_y (settings);
- if (res_x != res_y)
- {
- value = g_strdup_printf ("%dx%ddpi", res_x, res_y);
- gtk_printer_option_set (option, value);
- g_free (value);
+ if (res_x != res_y)
+ {
+ value = g_strdup_printf ("%dx%ddpi", res_x, res_y);
+ gtk_printer_option_set (option, value);
+ g_free (value);
+ }
+ else if (res != 0)
+ {
+ value = g_strdup_printf ("%ddpi", res);
+ gtk_printer_option_set (option, value);
+ g_free (value);
+ }
}
- else if (res != 0)
- {
- value = g_strdup_printf ("%ddpi", res);
- gtk_printer_option_set (option, value);
- g_free (value);
- }
- }
+ }
}
else if (strcmp (option->name, "gtk-paper-type") == 0)
map_settings_to_option (option, media_type_map, G_N_ELEMENTS (media_type_map),
cups_value = gtk_print_settings_get (settings, "cups-job-billing");
if (cups_value)
gtk_printer_option_set (option, cups_value);
- }
+ }
else if (strcmp (option->name, "gtk-job-prio") == 0)
{
cups_value = gtk_print_settings_get (settings, "cups-job-priority");
if (cups_value)
gtk_printer_option_set (option, cups_value);
- }
+ }
else if (strcmp (option->name, "gtk-cover-before") == 0)
{
cups_value = gtk_print_settings_get (settings, "cover-before");
if (cups_value)
gtk_printer_option_set (option, cups_value);
- }
+ }
else if (strcmp (option->name, "gtk-cover-after") == 0)
{
cups_value = gtk_print_settings_get (settings, "cover-after");
if (cups_value)
gtk_printer_option_set (option, cups_value);
- }
+ }
else if (strcmp (option->name, "gtk-print-time") == 0)
{
cups_value = gtk_print_settings_get (settings, "print-at");
if (cups_value)
gtk_printer_option_set (option, cups_value);
- }
+ }
else if (strcmp (option->name, "gtk-print-time-text") == 0)
{
cups_value = gtk_print_settings_get (settings, "print-at-time");
if (cups_value)
gtk_printer_option_set (option, cups_value);
- }
+ }
else if (g_str_has_prefix (option->name, "cups-"))
{
cups_value = gtk_print_settings_get (settings, option->name);
if (cups_value)
gtk_printer_option_set (option, cups_value);
- }
+ }
}
static void
data.options = options;
data.settings = settings;
data.ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer));
-
+
+ gtk_printer_option_set_foreach (options, foreach_option_get_settings, &data);
if (data.ppd_file != NULL)
{
GtkPrinterOption *cover_before, *cover_after;
-
- gtk_printer_option_set_foreach (options, foreach_option_get_settings, &data);
cover_before = gtk_printer_option_set_lookup (options, "gtk-cover-before");
cover_after = gtk_printer_option_set_lookup (options, "gtk-cover-after");
if (strcmp (print_at, "at") == 0)
{
gchar *utc_time = NULL;
-
+
utc_time = localtime_to_utctime (print_at_time);
if (utc_time != NULL)
GtkPrintSettings *settings,
GtkPageSetup *page_setup)
{
+ GtkPrintPages pages;
+ GtkPageRange *ranges;
+ gint n_ranges;
GtkPageSet page_set;
GtkPaperSize *paper_size;
const char *ppd_paper_name;
double scale;
+ GtkPrintCapabilities capabilities;
+
+ capabilities = cups_printer_get_capabilities (printer);
+ pages = gtk_print_settings_get_print_pages (settings);
+ gtk_print_job_set_pages (print_job, pages);
+
+ if (pages == GTK_PRINT_PAGES_RANGES)
+ ranges = gtk_print_settings_get_page_ranges (settings, &n_ranges);
+ else
+ {
+ ranges = NULL;
+ n_ranges = 0;
+ }
- print_job->print_pages = gtk_print_settings_get_print_pages (settings);
- print_job->page_ranges = NULL;
- print_job->num_page_ranges = 0;
-
- if (print_job->print_pages == GTK_PRINT_PAGES_RANGES)
- print_job->page_ranges =
- gtk_print_settings_get_page_ranges (settings,
- &print_job->num_page_ranges);
-
- if (gtk_print_settings_get_collate (settings))
- gtk_print_settings_set (settings, "cups-Collate", "True");
- print_job->collate = FALSE;
-
- if (gtk_print_settings_get_reverse (settings))
- gtk_print_settings_set (settings, "cups-OutputOrder", "Reverse");
- print_job->reverse = FALSE;
-
- if (gtk_print_settings_get_n_copies (settings) > 1)
- gtk_print_settings_set_int (settings, "cups-copies",
- gtk_print_settings_get_n_copies (settings));
- print_job->num_copies = 1;
+ gtk_print_job_set_page_ranges (print_job, ranges, n_ranges);
+
+ if (capabilities & GTK_PRINT_CAPABILITY_COLLATE)
+ {
+ if (gtk_print_settings_get_collate (settings))
+ gtk_print_settings_set (settings, "cups-Collate", "True");
+ gtk_print_job_set_collate (print_job, FALSE);
+ }
+ else
+ {
+ gtk_print_job_set_collate (print_job, gtk_print_settings_get_collate (settings));
+ }
+
+ if (capabilities & GTK_PRINT_CAPABILITY_REVERSE)
+ {
+ if (gtk_print_settings_get_reverse (settings))
+ gtk_print_settings_set (settings, "cups-OutputOrder", "Reverse");
+ gtk_print_job_set_reverse (print_job, FALSE);
+ }
+ else
+ {
+ gtk_print_job_set_reverse (print_job, gtk_print_settings_get_reverse (settings));
+ }
+
+ if (capabilities & GTK_PRINT_CAPABILITY_COPIES)
+ {
+ if (gtk_print_settings_get_n_copies (settings) > 1)
+ gtk_print_settings_set_int (settings, "cups-copies",
+ gtk_print_settings_get_n_copies (settings));
+ gtk_print_job_set_num_copies (print_job, 1);
+ }
+ else
+ {
+ gtk_print_job_set_num_copies (print_job, gtk_print_settings_get_n_copies (settings));
+ }
scale = gtk_print_settings_get_scale (settings);
- print_job->scale = 1.0;
if (scale != 100.0)
- print_job->scale = scale/100.0;
+ gtk_print_job_set_scale (print_job, scale / 100.0);
page_set = gtk_print_settings_get_page_set (settings);
if (page_set == GTK_PAGE_SET_EVEN)
gtk_print_settings_set (settings, "cups-page-set", "even");
else if (page_set == GTK_PAGE_SET_ODD)
gtk_print_settings_set (settings, "cups-page-set", "odd");
- print_job->page_set = GTK_PAGE_SET_ALL;
+ gtk_print_job_set_page_set (print_job, GTK_PAGE_SET_ALL);
paper_size = gtk_page_setup_get_paper_size (page_setup);
ppd_paper_name = gtk_paper_size_get_ppd_name (paper_size);
enum_value = g_enum_get_value (enum_class, layout);
gtk_print_settings_set (settings, "cups-number-up-layout", enum_value->value_nick);
g_type_class_unref (enum_class);
+
+ if (!(capabilities & GTK_PRINT_CAPABILITY_NUMBER_UP))
+ {
+ gtk_print_job_set_n_up (print_job, gtk_print_settings_get_number_up (settings));
+ gtk_print_job_set_n_up_layout (print_job, gtk_print_settings_get_number_up_layout (settings));
+ }
}
- print_job->rotate_to_orientation = TRUE;
+ gtk_print_job_set_rotate (print_job, TRUE);
}
static GtkPageSetup *
if (display_name == NULL)
display_name = g_strdup (size->name);
-
+
page_setup = gtk_page_setup_new ();
paper_size = gtk_paper_size_new_from_ppd (size->name,
display_name,
size->length);
gtk_page_setup_set_paper_size (page_setup, paper_size);
gtk_paper_size_free (paper_size);
-
+
gtk_page_setup_set_top_margin (page_setup, size->length - size->top, GTK_UNIT_POINTS);
gtk_page_setup_set_bottom_margin (page_setup, size->bottom, GTK_UNIT_POINTS);
gtk_page_setup_set_left_margin (page_setup, size->left, GTK_UNIT_POINTS);
gtk_page_setup_set_right_margin (page_setup, size->width - size->right, GTK_UNIT_POINTS);
-
+
g_free (display_name);
return page_setup;
return NULL;
l = NULL;
-
+
for (i = 0; i < ppd_file->num_sizes; i++)
{
- size = &ppd_file->sizes[i];
+ size = &ppd_file->sizes[i];
page_setup = create_page_setup (ppd_file, size);
return NULL;
option = ppdFindOption (ppd_file, "PageSize");
- size = ppdPageSize (ppd_file, option->defchoice);
+ if (option == NULL)
+ return NULL;
+
+ size = ppdPageSize (ppd_file, option->defchoice);
+ if (size == NULL)
+ return NULL;
return create_page_setup (ppd_file, size);
}
-static void
+static gboolean
cups_printer_get_hard_margins (GtkPrinter *printer,
gdouble *top,
gdouble *bottom,
ppd_file = gtk_printer_cups_get_ppd (GTK_PRINTER_CUPS (printer));
if (ppd_file == NULL)
- return;
+ return FALSE;
*left = ppd_file->custom_margins[0];
*bottom = ppd_file->custom_margins[1];
*right = ppd_file->custom_margins[2];
*top = ppd_file->custom_margins[3];
+
+ return TRUE;
}
static GtkPrintCapabilities
cups_printer_get_capabilities (GtkPrinter *printer)
{
- return
- GTK_PRINT_CAPABILITY_COPIES |
- GTK_PRINT_CAPABILITY_COLLATE |
- GTK_PRINT_CAPABILITY_REVERSE |
-#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 1 && CUPS_VERSION_PATCH >= 15) || (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR > 1) || CUPS_VERSION_MAJOR > 1
- GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT |
-#endif
- GTK_PRINT_CAPABILITY_NUMBER_UP;
+ GtkPrintCapabilities capabilities = 0;
+ GtkPrinterCups *cups_printer = GTK_PRINTER_CUPS (printer);
+
+ if (gtk_printer_cups_get_ppd (cups_printer))
+ {
+ capabilities = GTK_PRINT_CAPABILITY_REVERSE;
+ }
+
+ if (cups_printer->supports_copies)
+ {
+ capabilities |= GTK_PRINT_CAPABILITY_COPIES;
+ }
+
+ if (cups_printer->supports_collate)
+ {
+ capabilities |= GTK_PRINT_CAPABILITY_COLLATE;
+ }
+
+ if (cups_printer->supports_number_up)
+ {
+ capabilities |= GTK_PRINT_CAPABILITY_NUMBER_UP_LAYOUT |
+ GTK_PRINT_CAPABILITY_NUMBER_UP;
+ }
+
+ return capabilities;
}
projects / ~andy / gtk / blobdiff