* Boston, MA 02111-1307, USA.
*/
+#ifdef __linux__
+#define _GNU_SOURCE
+#endif
+
#include "config.h"
#include <ctype.h>
#include <unistd.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <stdlib.h>
+#include <time.h>
#include <cups/cups.h>
#include <cups/language.h>
guint list_printers_poll;
guint list_printers_pending : 1;
guint got_default_printer : 1;
+ guint default_printer_poll;
+ GtkCupsConnectionTest *cups_connection_test;
char **covers;
- char *default_cover_before;
- char *default_cover_after;
int number_of_covers;
+
+ GList *requests;
+ GHashTable *auth;
+ gchar *username;
+ gboolean authentication_lock;
};
static GObjectClass *backend_parent_class;
static void gtk_print_backend_cups_finalize (GObject *object);
static void gtk_print_backend_cups_dispose (GObject *object);
static void cups_get_printer_list (GtkPrintBackend *print_backend);
+static void cups_get_default_printer (GtkPrintBackendCups *print_backend);
+static void cups_get_local_default_printer (GtkPrintBackendCups *print_backend);
static void cups_request_execute (GtkPrintBackendCups *print_backend,
GtkCupsRequest *request,
GtkPrintCupsResponseCallbackFunc callback,
static GList * cups_printer_list_papers (GtkPrinter *printer);
static GtkPageSetup * cups_printer_get_default_page_size (GtkPrinter *printer);
static void cups_printer_request_details (GtkPrinter *printer);
-static void cups_request_default_printer (GtkPrintBackendCups *print_backend);
-static void cups_request_ppd (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,
gdouble height,
GIOChannel *cache_io);
+static void gtk_print_backend_cups_set_password (GtkPrintBackend *backend,
+ const gchar *hostname,
+ const gchar *username,
+ const gchar *password);
+
+void overwrite_and_free (gpointer data);
+static gboolean is_address_local (const gchar *address);
static void
gtk_print_backend_cups_register_type (GTypeModule *module)
backend_class->printer_get_default_page_size = cups_printer_get_default_page_size;
backend_class->printer_get_hard_margins = cups_printer_get_hard_margins;
backend_class->printer_get_capabilities = cups_printer_get_capabilities;
+ backend_class->set_password = gtk_print_backend_cups_set_password;
}
static cairo_status_t
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 */
if (ppd_attr != NULL)
level = atoi (ppd_attr->value);
+
+ if (gtk_print_settings_get_resolution (settings) == 0)
+ {
+ ppd_attr_res = ppdFindAttr (ppd_file, "DefaultResolution", NULL);
+
+ if (ppd_attr_res != NULL)
+ {
+ int res, res_x, res_y;
+
+ if (sscanf (ppd_attr_res->value, "%dx%ddpi", &res_x, &res_y) == 2)
+ {
+ if (res_x > 0 && res_y > 0)
+ gtk_print_settings_set_resolution_xy (settings, res_x, res_y);
+ }
+ else if (sscanf (ppd_attr_res->value, "%ddpi", &res) == 1)
+ {
+ if (res > 0)
+ gtk_print_settings_set_resolution (settings, res);
+ }
+ }
+ }
+
+ 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",
+ 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);
+ g_free (res_string);
+ }
+
+ ppd_attr_screen_freq = ppdFindAttr (ppd_file, "ScreenFreq", NULL);
+
+ if (ppd_attr_res_screen_freq != NULL && atof (ppd_attr_res_screen_freq->value) > 0.0)
+ gtk_print_settings_set_printer_lpi (settings, atof (ppd_attr_res_screen_freq->value));
+ else if (ppd_attr_screen_freq != NULL && atof (ppd_attr_screen_freq->value) > 0.0)
+ gtk_print_settings_set_printer_lpi (settings, atof (ppd_attr_screen_freq->value));
}
if (level == 2)
if (level == 3)
cairo_ps_surface_restrict_to_level (surface, CAIRO_PS_LEVEL_3);
- /* TODO: DPI from settings object? */
- cairo_surface_set_fallback_resolution (surface, 300, 300);
+ cairo_surface_set_fallback_resolution (surface,
+ 2.0 * gtk_print_settings_get_printer_lpi (settings),
+ 2.0 * gtk_print_settings_get_printer_lpi (settings));
return surface;
}
cups_printer = GTK_PRINTER_CUPS (gtk_print_job_get_printer (job));
settings = gtk_print_job_get_settings (job);
- request = gtk_cups_request_new (NULL,
- GTK_CUPS_POST,
- IPP_PRINT_JOB,
- data_io,
- NULL,
- cups_printer->device_uri);
+ 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);
#if (CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2) || CUPS_VERSION_MAJOR > 1
httpAssembleURIf (HTTP_URI_CODING_ALL,
(GDestroyNotify)cups_free_print_stream_data);
}
+void overwrite_and_free (gpointer data)
+{
+ gchar *password = (gchar *) data;
+
+ if (password != NULL)
+ {
+ memset (password, 0, strlen (password));
+ g_free (password);
+ }
+}
static void
gtk_print_backend_cups_init (GtkPrintBackendCups *backend_cups)
backend_cups->got_default_printer = FALSE;
backend_cups->list_printers_pending = FALSE;
+ 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->authentication_lock = FALSE;
+
backend_cups->covers = NULL;
- backend_cups->default_cover_before = NULL;
- backend_cups->default_cover_after = NULL;
backend_cups->number_of_covers = 0;
- cups_request_default_printer (backend_cups);
+ backend_cups->default_printer_poll = 0;
+ backend_cups->cups_connection_test = NULL;
+
+ backend_cups->username = NULL;
+
+ cups_get_local_default_printer (backend_cups);
}
static void
g_strfreev (backend_cups->covers);
backend_cups->number_of_covers = 0;
- g_free (backend_cups->default_cover_before);
- g_free (backend_cups->default_cover_after);
-
+ gtk_cups_connection_test_free (backend_cups->cups_connection_test);
+ backend_cups->cups_connection_test = NULL;
+
+ g_hash_table_destroy (backend_cups->auth);
+
+ g_free (backend_cups->username);
+
backend_parent_class->finalize (object);
}
g_source_remove (backend_cups->list_printers_poll);
backend_cups->list_printers_poll = 0;
+ if (backend_cups->default_printer_poll > 0)
+ g_source_remove (backend_cups->default_printer_poll);
+ backend_cups->default_printer_poll = 0;
+
backend_parent_class->dispose (object);
}
+static gboolean
+is_address_local (const gchar *address)
+{
+ if (address[0] == '/' ||
+ strcmp (address, "127.0.0.1") == 0 ||
+ strcmp (address, "[::1]") == 0)
+ return TRUE;
+ else
+ return FALSE;
+}
+
+static void
+gtk_print_backend_cups_set_password (GtkPrintBackend *backend,
+ const gchar *hostname,
+ const gchar *username,
+ const gchar *password)
+{
+ GtkPrintBackendCups *cups_backend = GTK_PRINT_BACKEND_CUPS (backend);
+ GList *l;
+ char dispatch_hostname[HTTP_MAX_URI];
+ gchar *key;
+
+ key = g_strconcat (username, "@", hostname, NULL);
+ g_hash_table_insert (cups_backend->auth, key, g_strdup (password));
+
+ 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)
+ {
+ GtkPrintCupsDispatchWatch *dispatch = l->data;
+
+ httpGetHostname (dispatch->request->http, dispatch_hostname, sizeof (dispatch_hostname));
+ if (is_address_local (dispatch_hostname))
+ strcpy (dispatch_hostname, "localhost");
+
+ if (strcmp (hostname, dispatch_hostname) == 0)
+ {
+ overwrite_and_free (dispatch->request->password);
+ dispatch->request->password = g_strdup (password);
+ g_free (dispatch->request->username);
+ dispatch->request->username = g_strdup (username);
+ dispatch->request->password_state = GTK_CUPS_PASSWORD_HAS;
+ dispatch->backend->authentication_lock = FALSE;
+ }
+ }
+}
static gboolean
-cups_dispatch_watch_check (GSource *source)
+request_password (gpointer data)
+{
+ GtkPrintCupsDispatchWatch *dispatch = data;
+ const gchar *username;
+ gchar *password;
+ gchar *prompt = NULL;
+ gchar *key = NULL;
+ char hostname[HTTP_MAX_URI];
+
+ if (dispatch->backend->authentication_lock)
+ return FALSE;
+
+ httpGetHostname (dispatch->request->http, hostname, sizeof (hostname));
+ if (is_address_local (hostname))
+ strcpy (hostname, "localhost");
+
+ if (dispatch->backend->username != NULL)
+ username = dispatch->backend->username;
+ else
+ username = cupsUser ();
+
+ key = g_strconcat (username, "@", hostname, NULL);
+ password = g_hash_table_lookup (dispatch->backend->auth, key);
+
+ if (password && dispatch->request->password_state != GTK_CUPS_PASSWORD_NOT_VALID)
+ {
+ GTK_NOTE (PRINTING,
+ g_print ("CUPS backend: using stored password for %s\n", key));
+
+ overwrite_and_free (dispatch->request->password);
+ dispatch->request->password = g_strdup (password);
+ g_free (dispatch->request->username);
+ dispatch->request->username = g_strdup (username);
+ dispatch->request->password_state = GTK_CUPS_PASSWORD_HAS;
+ }
+ else
+ {
+ const char *job_title = gtk_cups_request_ipp_get_string (dispatch->request, IPP_TAG_NAME, "job-name");
+ const char *printer_uri = gtk_cups_request_ipp_get_string (dispatch->request, IPP_TAG_URI, "printer-uri");
+ char *printer_name = NULL;
+
+ if (printer_uri != NULL && strrchr (printer_uri, '/') != NULL)
+ printer_name = g_strdup (strrchr (printer_uri, '/') + 1);
+
+ if (dispatch->request->password_state == GTK_CUPS_PASSWORD_NOT_VALID)
+ g_hash_table_remove (dispatch->backend->auth, key);
+
+ dispatch->request->password_state = GTK_CUPS_PASSWORD_REQUESTED;
+
+ dispatch->backend->authentication_lock = TRUE;
+
+ switch (dispatch->request->ipp_request->request.op.operation_id)
+ {
+ 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);
+ else
+ prompt = g_strdup_printf ( _("Authentication is required to print a document on %s"), hostname);
+ break;
+ case IPP_GET_JOB_ATTRIBUTES:
+ if (job_title != NULL)
+ prompt = g_strdup_printf ( _("Authentication is required to get attributes of job '%s'"), job_title);
+ else
+ prompt = g_strdup ( _("Authentication is required to get attributes of a job"));
+ break;
+ case IPP_GET_PRINTER_ATTRIBUTES:
+ if (printer_name != NULL)
+ prompt = g_strdup_printf ( _("Authentication is required to get attributes of printer %s"), printer_name);
+ else
+ prompt = g_strdup ( _("Authentication is required to get attributes of a printer"));
+ break;
+ case CUPS_GET_DEFAULT:
+ prompt = g_strdup_printf ( _("Authentication is required to get default printer of %s"), hostname);
+ break;
+ case CUPS_GET_PRINTERS:
+ 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);
+ break;
+ }
+
+ g_free (printer_name);
+
+ g_signal_emit_by_name (dispatch->backend, "request-password",
+ hostname, username, prompt);
+
+ g_free (prompt);
+ }
+
+ g_free (key);
+
+ return FALSE;
+}
+
+static void
+cups_dispatch_add_poll (GSource *source)
{
GtkPrintCupsDispatchWatch *dispatch;
GtkCupsPollState poll_state;
- gboolean result;
-
- GTK_NOTE (PRINTING,
- g_print ("CUPS Backend: %s <source %p>\n", G_STRFUNC, source));
dispatch = (GtkPrintCupsDispatchWatch *) source;
if (dispatch->request->http != NULL)
{
if (dispatch->data_poll == NULL)
- {
+ {
dispatch->data_poll = g_new0 (GPollFD, 1);
- g_source_add_poll (source, dispatch->data_poll);
- }
- else
- {
+
if (poll_state == GTK_CUPS_HTTP_READ)
dispatch->data_poll->events = G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_PRI;
else if (poll_state == GTK_CUPS_HTTP_WRITE)
dispatch->data_poll->events = G_IO_OUT | G_IO_ERR;
else
dispatch->data_poll->events = 0;
- }
#ifdef HAVE_CUPS_API_1_2
- dispatch->data_poll->fd = httpGetFd (dispatch->request->http);
+ dispatch->data_poll->fd = httpGetFd (dispatch->request->http);
#else
- dispatch->data_poll->fd = dispatch->request->http->fd;
+ dispatch->data_poll->fd = dispatch->request->http->fd;
#endif
+ g_source_add_poll (source, dispatch->data_poll);
+ }
}
+}
+
+static gboolean
+cups_dispatch_watch_check (GSource *source)
+{
+ GtkPrintCupsDispatchWatch *dispatch;
+ GtkCupsPollState poll_state;
+ gboolean result;
+
+ GTK_NOTE (PRINTING,
+ 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)
+ if (poll_state != GTK_CUPS_HTTP_IDLE && !dispatch->request->need_password)
if (!(dispatch->data_poll->revents & dispatch->data_poll->events))
return FALSE;
g_free (dispatch->data_poll);
dispatch->data_poll = NULL;
}
+
+ if (dispatch->request->need_password && dispatch->request->password_state != GTK_CUPS_PASSWORD_REQUESTED)
+ {
+ dispatch->request->need_password = FALSE;
+ g_idle_add (request_password, dispatch);
+ result = FALSE;
+ }
return result;
}
gint *timeout_)
{
GtkPrintCupsDispatchWatch *dispatch;
+ gboolean result;
dispatch = (GtkPrintCupsDispatchWatch *) source;
*timeout_ = -1;
- return gtk_cups_request_read_write (dispatch->request);
+ result = gtk_cups_request_read_write (dispatch->request);
+
+ cups_dispatch_add_poll (source);
+
+ return result;
}
static gboolean
cups_dispatch_watch_finalize (GSource *source)
{
GtkPrintCupsDispatchWatch *dispatch;
+ GtkCupsResult *result;
GTK_NOTE (PRINTING,
g_print ("CUPS Backend: %s <source %p>\n", G_STRFUNC, source));
dispatch = (GtkPrintCupsDispatchWatch *) source;
+ result = gtk_cups_request_get_result (dispatch->request);
+ if (gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_AUTH)
+ {
+ 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");
+
+ if (dispatch->backend->username != NULL)
+ username = dispatch->backend->username;
+ else
+ username = cupsUser ();
+
+ key = g_strconcat (username, "@", hostname, NULL);
+ GTK_NOTE (PRINTING,
+ 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;
+ }
+
gtk_cups_request_free (dispatch->request);
if (dispatch->backend)
* of print backends. See _gtk_print_backend_create for the
* disabling.
*/
+
+ dispatch->backend->requests = g_list_remove (dispatch->backend->requests, dispatch);
+
+
g_object_unref (dispatch->backend);
dispatch->backend = NULL;
}
dispatch->backend = g_object_ref (print_backend);
dispatch->data_poll = NULL;
+ print_backend->requests = g_list_prepend (print_backend->requests, dispatch);
+
g_source_set_callback ((GSource *) dispatch, (GSourceFunc) callback, user_data, notify);
g_source_attach ((GSource *) dispatch, NULL);
"job-sheets-default"
};
- request = gtk_cups_request_new (NULL,
- GTK_CUPS_POST,
- IPP_GET_PRINTER_ATTRIBUTES,
- NULL,
- NULL,
- NULL);
+ request = gtk_cups_request_new_with_username (NULL,
+ GTK_CUPS_POST,
+ IPP_GET_PRINTER_ATTRIBUTES,
+ NULL,
+ NULL,
+ NULL,
+ print_backend->username);
printer_uri = g_strdup_printf ("ipp://localhost/printers/%s",
printer_name);
GtkCupsRequest *request;
gchar *job_uri;
- request = gtk_cups_request_new (NULL,
- GTK_CUPS_POST,
- IPP_GET_JOB_ATTRIBUTES,
- NULL,
- NULL,
- NULL);
+ request = gtk_cups_request_new_with_username (NULL,
+ GTK_CUPS_POST,
+ IPP_GET_JOB_ATTRIBUTES,
+ NULL,
+ NULL,
+ NULL,
+ data->print_backend->username);
job_uri = g_strdup_printf ("ipp://localhost/jobs/%d", data->job_id);
gtk_cups_request_ipp_add_string (request, IPP_TAG_OPERATION, IPP_TAG_URI,
ipp_t *response;
gboolean list_has_changed;
GList *removed_printer_checklist;
+ gchar *remote_default_printer = NULL;
GDK_THREADS_ENTER ();
if (gtk_cups_result_is_error (result))
{
GTK_NOTE (PRINTING,
- g_warning ("CUPS Backend: Error getting printer list: %s",
- gtk_cups_result_get_error_string (result)));
+ 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 (gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_AUTH &&
+ gtk_cups_result_get_error_code (result) == 1)
+ {
+ /* 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;
+ }
goto done;
}
};
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;
/* Skip leading attributes until we hit a printer...
*/
{
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 ( (cups_backend->default_cover_before == NULL) && (cups_backend->default_cover_after == NULL))
+ if (attr->num_values == 2)
{
- if (attr->num_values == 2)
- {
- cups_backend->default_cover_before = g_strdup (attr->values[0].string.text);
- cups_backend->default_cover_after = g_strdup (attr->values[1].string.text);
- }
+ 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;
+
+ if (attr->values[0].integer & 0x00000002)
+ remote_printer = TRUE;
+ else
+ remote_printer = FALSE;
+ }
else
{
GTK_NOTE (PRINTING,
else
continue;
}
-
+
+ if (got_printer_type)
+ {
+ if (default_printer && !cups_backend->got_default_printer)
+ {
+ 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);
+ }
+ }
+ }
+ 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, printer_name, (GCompareFunc) find_printer);
removed_printer_checklist = g_list_delete_link (removed_printer_checklist, node);
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);
}
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 (default_cover_before);
+ cups_printer->default_cover_after = g_strdup (default_cover_after);
+
cups_printer->hostname = g_strdup (hostname);
cups_printer->port = port;
else
g_object_ref (printer);
+ GTK_PRINTER_CUPS (printer)->remote = remote_printer;
+
gtk_printer_set_is_paused (printer, is_paused);
gtk_printer_set_is_accepting_jobs (printer, is_accepting_jobs);
if (state_msg != NULL && strlen (state_msg) == 0)
{
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)
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;
+ 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);
+ }
+ }
+ }
+
GDK_THREADS_LEAVE ();
}
+static void
+update_backend_status (GtkPrintBackendCups *cups_backend,
+ GtkCupsConnectionState state)
+{
+ switch (state)
+ {
+ case GTK_CUPS_CONNECTION_NOT_AVAILABLE:
+ g_object_set (cups_backend, "status", GTK_PRINT_BACKEND_STATUS_UNAVAILABLE, NULL);
+ break;
+ case GTK_CUPS_CONNECTION_AVAILABLE:
+ g_object_set (cups_backend, "status", GTK_PRINT_BACKEND_STATUS_OK, NULL);
+ break;
+ default: ;
+ }
+}
+
static gboolean
cups_request_printer_list (GtkPrintBackendCups *cups_backend)
{
+ GtkCupsConnectionState state;
GtkCupsRequest *request;
static const char * const pattrs[] = /* Attributes we're interested in */
{
"queued-job-count",
"printer-is-accepting-jobs",
"job-sheets-supported",
- "job-sheets-default"
+ "job-sheets-default",
+ "printer-type"
};
-
- if (cups_backend->list_printers_pending ||
- !cups_backend->got_default_printer)
+
+ if (cups_backend->list_printers_pending)
+ return TRUE;
+
+ state = gtk_cups_connection_test_get_state (cups_backend->cups_connection_test);
+ update_backend_status (cups_backend, state);
+
+ if (state == GTK_CUPS_CONNECTION_IN_PROGRESS || state == GTK_CUPS_CONNECTION_NOT_AVAILABLE)
return TRUE;
cups_backend->list_printers_pending = TRUE;
- request = gtk_cups_request_new (NULL,
- GTK_CUPS_POST,
- CUPS_GET_PRINTERS,
- NULL,
- NULL,
- NULL);
+ request = gtk_cups_request_new_with_username (NULL,
+ GTK_CUPS_POST,
+ CUPS_GET_PRINTERS,
+ NULL,
+ NULL,
+ NULL,
+ cups_backend->username);
gtk_cups_request_ipp_add_strings (request, IPP_TAG_OPERATION, IPP_TAG_KEYWORD,
"requested-attributes", G_N_ELEMENTS (pattrs),
GtkPrintBackendCups *cups_backend;
cups_backend = GTK_PRINT_BACKEND_CUPS (backend);
+
+ if (cups_backend->cups_connection_test == NULL)
+ cups_backend->cups_connection_test = gtk_cups_connection_test_new (NULL);
+
if (cups_backend->list_printers_poll == 0)
{
- cups_request_printer_list (cups_backend);
- cups_backend->list_printers_poll = gdk_threads_add_timeout (3000,
+ if (cups_request_printer_list (cups_backend))
+ cups_backend->list_printers_poll = gdk_threads_add_timeout_seconds (3,
(GSourceFunc) cups_request_printer_list,
backend);
}
GDK_THREADS_LEAVE ();
}
-static void
+static gboolean
cups_request_ppd (GtkPrinter *printer)
{
GError *error;
GTK_NOTE (PRINTING,
g_print ("CUPS Backend: %s\n", G_STRFUNC));
+ if (cups_printer->remote)
+ {
+ GtkCupsConnectionState state;
+
+ state = gtk_cups_connection_test_get_state (cups_printer->remote_cups_connection_test);
+
+ if (state == GTK_CUPS_CONNECTION_IN_PROGRESS)
+ return TRUE;
+
+ gtk_cups_connection_test_free (cups_printer->remote_cups_connection_test);
+ cups_printer->remote_cups_connection_test = NULL;
+ cups_printer->get_remote_ppd_poll = 0;
+
+ if (state == GTK_CUPS_CONNECTION_NOT_AVAILABLE)
+ {
+ g_signal_emit_by_name (printer, "details-acquired", FALSE);
+ return FALSE;
+ }
+ }
+
http = httpConnectEncrypt (cups_printer->hostname,
cups_printer->port,
cupsEncryption ());
g_free (data);
g_signal_emit_by_name (printer, "details-acquired", FALSE);
- return;
+ return FALSE;
}
data->http = http;
resource = g_strdup_printf ("/printers/%s.ppd",
gtk_printer_cups_get_ppd_name (GTK_PRINTER_CUPS (printer)));
- request = gtk_cups_request_new (data->http,
- GTK_CUPS_GET,
- 0,
- data->ppd_io,
- cups_printer->hostname,
- resource);
+ print_backend = gtk_printer_get_backend (printer);
+
+ request = gtk_cups_request_new_with_username (data->http,
+ GTK_CUPS_GET,
+ 0,
+ data->ppd_io,
+ cups_printer->hostname,
+ resource,
+ GTK_PRINT_BACKEND_CUPS (print_backend)->username);
GTK_NOTE (PRINTING,
g_print ("CUPS Backend: Requesting resource %s to be written to temp file %s\n", resource, ppd_filename));
- g_free (resource);
- g_free (ppd_filename);
cups_printer->reading_ppd = TRUE;
- print_backend = gtk_printer_get_backend (printer);
-
cups_request_execute (GTK_PRINT_BACKEND_CUPS (print_backend),
request,
(GtkPrintCupsResponseCallbackFunc) cups_request_ppd_cb,
data,
(GDestroyNotify)get_ppd_data_free);
+
+ g_free (resource);
+ g_free (ppd_filename);
+
+ return FALSE;
}
/* Ordering matters for default preference */
return num_options;
}
+/* This function requests default printer from a CUPS server in regular intervals.
+ * In the case of unreachable CUPS server the request is repeated later.
+ * The default printer is not requested in the case of previous success.
+ */
static void
-cups_request_default_printer_cb (GtkPrintBackendCups *print_backend,
- GtkCupsResult *result,
- gpointer user_data)
+cups_get_default_printer (GtkPrintBackendCups *backend)
{
- ipp_t *response;
- ipp_attribute_t *attr;
+ GtkPrintBackendCups *cups_backend;
- 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);
+ cups_backend = backend;
- print_backend->got_default_printer = TRUE;
+ if (cups_backend->cups_connection_test == NULL)
+ cups_backend->cups_connection_test = gtk_cups_connection_test_new (NULL);
- /* 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);
+ if (cups_backend->default_printer_poll == 0)
+ {
+ if (cups_request_default_printer (cups_backend))
+ cups_backend->default_printer_poll = gdk_threads_add_timeout (500,
+ (GSourceFunc) cups_request_default_printer,
+ backend);
+ }
}
+/* This function gets default printer from local settings.*/
static void
-cups_request_default_printer (GtkPrintBackendCups *print_backend)
+cups_get_local_default_printer (GtkPrintBackendCups *backend)
{
- GtkCupsRequest *request;
const char *str;
char *name = NULL;
if ((str = g_getenv ("LPDEST")) != NULL)
{
- print_backend->default_printer = g_strdup (str);
- print_backend->got_default_printer = TRUE;
+ backend->default_printer = g_strdup (str);
+ backend->got_default_printer = TRUE;
return;
}
else if ((str = g_getenv ("PRINTER")) != NULL &&
strcmp (str, "lp") != 0)
{
- print_backend->default_printer = g_strdup (str);
- print_backend->got_default_printer = TRUE;
+ backend->default_printer = g_strdup (str);
+ backend->got_default_printer = TRUE;
return;
}
cups_get_user_default_printer (&name);
if (name != NULL)
{
- print_backend->default_printer = name;
- print_backend->got_default_printer = TRUE;
- return;
+ backend->default_printer = name;
+ backend->got_default_printer = TRUE;
+ return;
+ }
+}
+
+static void
+cups_request_default_printer_cb (GtkPrintBackendCups *print_backend,
+ GtkCupsResult *result,
+ gpointer user_data)
+{
+ ipp_t *response;
+ ipp_attribute_t *attr;
+ GtkPrinter *printer;
+
+ GDK_THREADS_ENTER ();
+
+ if (gtk_cups_result_is_error (result))
+ {
+ if (gtk_cups_result_get_error_type (result) == GTK_CUPS_ERROR_AUTH &&
+ gtk_cups_result_get_error_code (result) == 1)
+ {
+ /* Canceled by user, stop popping up more password dialogs */
+ if (print_backend->list_printers_poll > 0)
+ g_source_remove (print_backend->list_printers_poll);
+ print_backend->list_printers_poll = 0;
+ }
+
+ return;
}
- request = gtk_cups_request_new (NULL,
- GTK_CUPS_POST,
- CUPS_GET_DEFAULT,
- NULL,
- NULL,
- NULL);
+ 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->got_default_printer = TRUE;
+
+ if (print_backend->default_printer != NULL)
+ {
+ printer = gtk_print_backend_find_printer (GTK_PRINT_BACKEND (print_backend), print_backend->default_printer);
+ if (printer != NULL)
+ {
+ gtk_printer_set_is_default (printer, TRUE);
+ g_signal_emit_by_name (GTK_PRINT_BACKEND (print_backend), "printer-status-changed", 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 ();
+}
+
+static gboolean
+cups_request_default_printer (GtkPrintBackendCups *print_backend)
+{
+ GtkCupsConnectionState state;
+ GtkCupsRequest *request;
+
+ state = gtk_cups_connection_test_get_state (print_backend->cups_connection_test);
+ update_backend_status (print_backend, state);
+
+ if (state == GTK_CUPS_CONNECTION_IN_PROGRESS || state == GTK_CUPS_CONNECTION_NOT_AVAILABLE)
+ return TRUE;
+
+ request = gtk_cups_request_new_with_username (NULL,
+ GTK_CUPS_POST,
+ CUPS_GET_DEFAULT,
+ NULL,
+ NULL,
+ NULL,
+ print_backend->username);
cups_request_execute (print_backend,
request,
(GtkPrintCupsResponseCallbackFunc) cups_request_default_printer_cb,
g_object_ref (print_backend),
g_object_unref);
+
+ return FALSE;
}
static void
cups_printer = GTK_PRINTER_CUPS (printer);
if (!cups_printer->reading_ppd &&
gtk_printer_cups_get_ppd (cups_printer) == NULL)
- cups_request_ppd (printer);
+ {
+ if (cups_printer->remote)
+ {
+ if (cups_printer->get_remote_ppd_poll == 0)
+ {
+ cups_printer->remote_cups_connection_test = gtk_cups_connection_test_new (cups_printer->hostname);
+
+ if (cups_request_ppd (printer))
+ cups_printer->get_remote_ppd_poll = gdk_threads_add_timeout (200,
+ (GSourceFunc) cups_request_ppd,
+ printer);
+ }
+ }
+ else
+ cups_request_ppd (printer);
+ }
}
static char *
{ "MediaType", N_("Paper Type") },
{ "InputSlot", N_("Paper Source") },
{ "OutputBin", N_("Output Tray") },
+ { "Resolution", N_("Resolution") },
+ { "PreFilter", N_("GhostScript pre-filtering") },
};
const char *translation;
} cups_choice_translations[] = {
{ "Duplex", "None", N_("One Sided") },
+ /* Translators: this is an option of "Two Sided" */
+ { "Duplex", "DuplexNoTumble", N_("Long Edge (Standard)") },
+ /* Translators: this is an option of "Two Sided" */
+ { "Duplex", "DuplexTumble", N_("Short Edge (Flip)") },
+ /* Translators: this is an option of "Paper Source" */
{ "InputSlot", "Auto", N_("Auto Select") },
+ /* Translators: this is an option of "Paper Source" */
{ "InputSlot", "AutoSelect", N_("Auto Select") },
+ /* Translators: this is an option of "Paper Source" */
{ "InputSlot", "Default", N_("Printer Default") },
+ /* Translators: this is an option of "Paper Source" */
{ "InputSlot", "None", N_("Printer Default") },
+ /* Translators: this is an option of "Paper Source" */
{ "InputSlot", "PrinterDefault", N_("Printer Default") },
+ /* Translators: this is an option of "Paper Source" */
{ "InputSlot", "Unspecified", N_("Auto Select") },
+ /* Translators: this is an option of "Resolution" */
+ { "Resolution", "default", N_("Printer Default") },
+ /* Translators: this is an option of "GhostScript" */
+ { "PreFilter", "EmbedFonts", N_("Embed GhostScript fonts only") },
+ /* Translators: this is an option of "GhostScript" */
+ { "PreFilter", "Level1", N_("Convert to PS level 1") },
+ /* Translators: this is an option of "GhostScript" */
+ { "PreFilter", "Level2", N_("Convert to PS level 2") },
+ /* Translators: this is an option of "GhostScript" */
+ { "PreFilter", "No", N_("No pre-filtering") },
+};
+
+static const struct {
+ const char *name;
+ const char *translation;
+} cups_group_translations[] = {
+/* Translators: "Miscellaneous" is the label for a button, that opens
+ up an extra panel of settings in a print dialog. */
+ { "Miscellaneous", N_("Miscellaneous") },
};
static const struct {
{
GtkPrinterOption *option;
char *name;
+ int i;
if (STRING_IN_TABLE (ppd_option->keyword, cups_option_blacklist))
return;
}
else
{
- option->group = g_strdup (toplevel_group->text);
+ for (i = 0; i < G_N_ELEMENTS (cups_group_translations); i++)
+ {
+ if (strcmp (cups_group_translations[i].name, toplevel_group->name) == 0)
+ {
+ option->group = g_strdup (_(cups_group_translations[i].translation));
+ break;
+ }
+ }
+
+ if (i == G_N_ELEMENTS (cups_group_translations))
+ option->group = g_strdup (toplevel_group->text);
}
set_option_from_settings (option, 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
+ * job priority option in the print dialog
+ */
char *prio_display[] = {N_("Urgent"), N_("High"), N_("Medium"), N_("Low") };
+ char *n_up_layout[] = { "lrtb", "lrbt", "rltb", "rlbt", "tblr", "tbrl", "btlr", "btrl" };
+ /* 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"),
+ N_("Bottom to top, left to right"), N_("Bottom to top, right to left") };
char *name;
int num_opts;
cups_option_t *opts = NULL;
GtkPrintBackendCups *backend;
+ GtkTextDirection text_direction;
+ GtkPrinterCups *cups_printer = NULL;
set = gtk_printer_option_set_new ();
/* Cups specific, non-ppd related settings */
- option = gtk_printer_option_new ("gtk-n-up", "Pages Per Sheet", GTK_PRINTER_OPTION_TYPE_PICKONE);
+ /* 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");
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]);
- option = gtk_printer_option_new ("gtk-job-prio", "Job Priority", GTK_PRINTER_OPTION_TYPE_PICKONE);
+ /* 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),
prio, prio_display);
gtk_printer_option_set (option, "50");
gtk_printer_option_set_add (set, option);
g_object_unref (option);
- option = gtk_printer_option_new ("gtk-billing-info", "Billing Info", GTK_PRINTER_OPTION_TYPE_STRING);
+ /* Translators, this string is used to label the billing info entry
+ * in the print dialog
+ */
+ option = gtk_printer_option_new ("gtk-billing-info", _("Billing Info"), GTK_PRINTER_OPTION_TYPE_STRING);
gtk_printer_option_set (option, "");
set_option_from_settings (option, settings);
gtk_printer_option_set_add (set, option);
g_object_unref (option);
backend = GTK_PRINT_BACKEND_CUPS (gtk_printer_get_backend (printer));
+ cups_printer = GTK_PRINTER_CUPS (printer);
- if (backend != NULL)
+ if (backend != NULL && printer != NULL)
{
char *cover_default[] = {"none", "classified", "confidential", "secret", "standard", "topsecret", "unclassified" };
+ /* 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"),};
char **cover = NULL;
char **cover_display = NULL;
+ char **cover_display_translated = NULL;
gint num_of_covers = 0;
gpointer value;
gint j;
cover[num_of_covers] = NULL;
cover_display = g_new (char *, num_of_covers + 1);
cover_display[num_of_covers] = NULL;
+ cover_display_translated = g_new (char *, num_of_covers + 1);
+ cover_display_translated[num_of_covers] = NULL;
for (i = 0; i < num_of_covers; i++)
{
}
for (i = 0; i < num_of_covers; i++)
- cover_display[i] = _(cover_display[i]);
+ cover_display_translated[i] = _(cover_display[i]);
- option = gtk_printer_option_new ("gtk-cover-before", "Before", GTK_PRINTER_OPTION_TYPE_PICKONE);
+ /* 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_choices_from_array (option, num_of_covers,
- cover, cover_display);
+ cover, cover_display_translated);
- if (backend->default_cover_before != NULL)
- gtk_printer_option_set (option, backend->default_cover_before);
+ if (cups_printer->default_cover_before != NULL)
+ gtk_printer_option_set (option, cups_printer->default_cover_before);
else
gtk_printer_option_set (option, "none");
set_option_from_settings (option, settings);
gtk_printer_option_set_add (set, option);
g_object_unref (option);
- option = gtk_printer_option_new ("gtk-cover-after", "After", GTK_PRINTER_OPTION_TYPE_PICKONE);
+ /* 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);
gtk_printer_option_choices_from_array (option, num_of_covers,
- cover, cover_display);
- if (backend->default_cover_after != NULL)
- gtk_printer_option_set (option, backend->default_cover_after);
+ cover, cover_display_translated);
+ if (cups_printer->default_cover_after != NULL)
+ gtk_printer_option_set (option, cups_printer->default_cover_after);
else
gtk_printer_option_set (option, "none");
set_option_from_settings (option, settings);
g_strfreev (cover);
g_strfreev (cover_display);
+ g_free (cover_display_translated);
}
- option = gtk_printer_option_new ("gtk-print-time", "Print at", GTK_PRINTER_OPTION_TYPE_PICKONE);
+ /* Translators: this is the name of the option that controls when
+ * a print job is printed. Possible values are 'now', a specified time,
+ * or 'on hold'
+ */
+ option = gtk_printer_option_new ("gtk-print-time", _("Print at"), GTK_PRINTER_OPTION_TYPE_PICKONE);
gtk_printer_option_choices_from_array (option, G_N_ELEMENTS (print_at),
print_at, print_at);
gtk_printer_option_set (option, "now");
gtk_printer_option_set_add (set, option);
g_object_unref (option);
- option = gtk_printer_option_new ("gtk-print-time-text", "Print at time", GTK_PRINTER_OPTION_TYPE_STRING);
+ /* Translators: this is the name of the option that allows the user
+ * to specify a time when a print job will be printed.
+ */
+ option = gtk_printer_option_new ("gtk-print-time-text", _("Print at time"), GTK_PRINTER_OPTION_TYPE_STRING);
gtk_printer_option_set (option, "");
set_option_from_settings (option, settings);
gtk_printer_option_set_add (set, option);
g_ascii_formatd (width, sizeof (width), "%.2f", gtk_paper_size_get_width (paper_size, GTK_UNIT_POINTS));
g_ascii_formatd (height, sizeof (height), "%.2f", gtk_paper_size_get_height (paper_size, GTK_UNIT_POINTS));
+ /* Translators: this format is used to display a custom paper
+ * size. The two placeholders are replaced with the width and height
+ * in points. E.g: "Custom 230.4x142.9"
+ */
custom_name = g_strdup_printf (_("Custom %sx%s"), width, height);
strncpy (option->defchoice, custom_name, PPD_MAX_NAME);
g_free (custom_name);
else
{
int res = gtk_print_settings_get_resolution (settings);
- if (res != 0)
+ 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);
+ }
+ else if (res != 0)
{
value = g_strdup_printf ("%ddpi", res);
gtk_printer_option_set (option, value);
map_settings_to_option (option, all_map, G_N_ELEMENTS (all_map),
settings, GTK_PRINT_SETTINGS_NUMBER_UP, "number-up");
}
+ else if (strcmp (option->name, "gtk-n-up-layout") == 0)
+ {
+ map_settings_to_option (option, all_map, G_N_ELEMENTS (all_map),
+ settings, GTK_PRINT_SETTINGS_NUMBER_UP_LAYOUT, "number-up-layout");
+ }
else if (strcmp (option->name, "gtk-billing-info") == 0)
{
cups_value = gtk_print_settings_get (settings, "cups-job-billing");
settings, GTK_PRINT_SETTINGS_QUALITY, "OutputMode");
else if (strcmp (option->name, "cups-Resolution") == 0)
{
- int res = atoi (value);
- /* TODO: What if resolution is on XXXxYYYdpi form? */
- if (res != 0)
- gtk_print_settings_set_resolution (settings, res);
+ int res, res_x, res_y;
+
+ if (sscanf (value, "%dx%ddpi", &res_x, &res_y) == 2)
+ {
+ if (res_x > 0 && res_y > 0)
+ gtk_print_settings_set_resolution_xy (settings, res_x, res_y);
+ }
+ else if (sscanf (value, "%ddpi", &res) == 1)
+ {
+ if (res > 0)
+ gtk_print_settings_set_resolution (settings, res);
+ }
+
gtk_print_settings_set (settings, option->name, value);
}
else if (strcmp (option->name, "gtk-paper-type") == 0)
else if (strcmp (option->name, "gtk-n-up") == 0)
map_option_to_settings (value, all_map, G_N_ELEMENTS (all_map),
settings, GTK_PRINT_SETTINGS_NUMBER_UP, "number-up");
+ else if (strcmp (option->name, "gtk-n-up-layout") == 0)
+ map_option_to_settings (value, all_map, G_N_ELEMENTS (all_map),
+ settings, GTK_PRINT_SETTINGS_NUMBER_UP_LAYOUT, "number-up-layout");
else if (strcmp (option->name, "gtk-billing-info") == 0 && strlen (value) > 0)
gtk_print_settings_set (settings, "cups-job-billing", value);
else if (strcmp (option->name, "gtk-job-prio") == 0)
gtk_print_settings_set (settings, option->name, value);
}
+static gboolean
+supports_am_pm (void)
+{
+ struct tm tmp_tm = { 0 };
+ char time[8];
+ int length;
+
+ length = strftime (time, sizeof (time), "%p", &tmp_tm);
+
+ return length != 0;
+}
+
+/* Converts local time to UTC time. Local time has to be in one of these
+ * formats: HH:MM:SS, HH:MM, HH:MM:SS {am, pm}, HH:MM {am, pm}, HH {am, pm},
+ * {am, pm} HH:MM:SS, {am, pm} HH:MM, {am, pm} HH.
+ * Returns a newly allocated string holding UTC time in HH:MM:SS format
+ * or NULL.
+ */
+gchar *
+localtime_to_utctime (const char *local_time)
+{
+ const char *formats_0[] = {" %I : %M : %S %p ", " %p %I : %M : %S ",
+ " %H : %M : %S ",
+ " %I : %M %p ", " %p %I : %M ",
+ " %H : %M ",
+ " %I %p ", " %p %I "};
+ const char *formats_1[] = {" %H : %M : %S ", " %H : %M "};
+ const char *end = NULL;
+ struct tm *actual_local_time;
+ struct tm *actual_utc_time;
+ struct tm local_print_time;
+ struct tm utc_print_time;
+ struct tm diff_time;
+ gchar *utc_time = NULL;
+ int i, n;
+
+ if (local_time == NULL || local_time[0] == '\0')
+ return NULL;
+
+ n = supports_am_pm () ? G_N_ELEMENTS (formats_0) : G_N_ELEMENTS (formats_1);
+
+ for (i = 0; i < n; i++)
+ {
+ local_print_time.tm_hour = 0;
+ local_print_time.tm_min = 0;
+ local_print_time.tm_sec = 0;
+
+ if (supports_am_pm ())
+ end = strptime (local_time, formats_0[i], &local_print_time);
+ else
+ end = strptime (local_time, formats_1[i], &local_print_time);
+
+ if (end != NULL && end[0] == '\0')
+ break;
+ }
+
+ if (end != NULL && end[0] == '\0')
+ {
+ time_t rawtime;
+ time (&rawtime);
+
+ actual_utc_time = g_memdup (gmtime (&rawtime), sizeof (struct tm));
+ actual_local_time = g_memdup (localtime (&rawtime), sizeof (struct tm));
+
+ diff_time.tm_hour = actual_utc_time->tm_hour - actual_local_time->tm_hour;
+ diff_time.tm_min = actual_utc_time->tm_min - actual_local_time->tm_min;
+ diff_time.tm_sec = actual_utc_time->tm_sec - actual_local_time->tm_sec;
+
+ utc_print_time.tm_hour = ((local_print_time.tm_hour + diff_time.tm_hour) + 24) % 24;
+ utc_print_time.tm_min = ((local_print_time.tm_min + diff_time.tm_min) + 60) % 60;
+ utc_print_time.tm_sec = ((local_print_time.tm_sec + diff_time.tm_sec) + 60) % 60;
+
+ utc_time = g_strdup_printf ("%02d:%02d:%02d",
+ utc_print_time.tm_hour,
+ utc_print_time.tm_min,
+ utc_print_time.tm_sec);
+ }
+
+ return utc_time;
+}
+
static void
cups_printer_get_settings_from_options (GtkPrinter *printer,
GtkPrinterOptionSet *options,
print_at = gtk_print_settings_get (settings, "print-at");
print_at_time = gtk_print_settings_get (settings, "print-at-time");
+
if (strcmp (print_at, "at") == 0)
- gtk_print_settings_set (settings, "cups-job-hold-until", print_at_time);
+ {
+ gchar *utc_time = NULL;
+
+ utc_time = localtime_to_utctime (print_at_time);
+
+ if (utc_time != NULL)
+ {
+ gtk_print_settings_set (settings, "cups-job-hold-until", utc_time);
+ g_free (utc_time);
+ }
+ else
+ gtk_print_settings_set (settings, "cups-job-hold-until", print_at_time);
+ }
else if (strcmp (print_at, "on-hold") == 0)
gtk_print_settings_set (settings, "cups-job-hold-until", "indefinite");
}
g_free (custom_name);
}
+ if (gtk_print_settings_get_number_up (settings) > 1)
+ {
+ GtkNumberUpLayout layout = gtk_print_settings_get_number_up_layout (settings);
+ GEnumClass *enum_class;
+ GEnumValue *enum_value;
+
+ switch (gtk_page_setup_get_orientation (page_setup))
+ {
+ case GTK_PAGE_ORIENTATION_PORTRAIT:
+ break;
+ case GTK_PAGE_ORIENTATION_LANDSCAPE:
+ if (layout < 4)
+ layout = layout + 5 - 2 * (layout % 2);
+ else
+ layout = layout - 6 + 4 * (1 - (layout - 4) / 2);
+ break;
+ case GTK_PAGE_ORIENTATION_REVERSE_PORTRAIT:
+ layout = (layout + 3 - 2 * (layout % 2)) % 4 + 4 * (layout / 4);
+ break;
+ case GTK_PAGE_ORIENTATION_REVERSE_LANDSCAPE:
+ if (layout < 4)
+ layout = layout + 2 + 4 * (1 - layout / 2);
+ else
+ layout = layout - 3 - 2 * (layout % 2);
+ break;
+ }
+
+ enum_class = g_type_class_ref (GTK_TYPE_NUMBER_UP_LAYOUT);
+ 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);
+ }
+
print_job->rotate_to_orientation = TRUE;
}
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;
}
projects / ~andy / gtk / blobdiff