AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-17 23:50:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
Print dialog, CUPS: Check unknown option values whether they are actually custom settings

See merge request GNOME/gtk!434
This commit is contained in:
Marek Kašík 2019-04-04 16:39:18 +00:00
commit cf6f9ad4cf
1 changed files with 76 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
modules/printbackends/gtkprintbackendcups.c
View File

@ -586,9 +586,14 @@ cups_print_cb (GtkPrintBackendCups *print_backend,
typedef struct { typedef struct {
GtkCupsRequest *request; GtkCupsRequest *request;
GtkPageSetup *page_setup;
GtkPrinterCups *printer; GtkPrinterCups *printer;
} CupsOptionsData; } CupsOptionsData;
#define UNSIGNED_FLOAT_REGEX "([0-9]+([.,][0-9]*)?|[.,][0-9]+)([e][+-]?[0-9]+)?"
#define SIGNED_FLOAT_REGEX "[+-]?"UNSIGNED_FLOAT_REGEX
#define SIGNED_INTEGER_REGEX "[+-]?([0-9]+)"
static void static void
add_cups_options (const gchar *key, add_cups_options (const gchar *key,
const gchar *value, const gchar *value,
@ -612,7 +617,7 @@ add_cups_options (const gchar *key,
key = key + strlen ("cups-"); key = key + strlen ("cups-");
if (printer && printer->ppd_file) if (printer && printer->ppd_file && !g_str_has_prefix (value, "Custom."))
{ {
ppd_coption_t *coption; ppd_coption_t *coption;
gboolean found = FALSE; gboolean found = FALSE;
@ -633,14 +638,74 @@ add_cups_options (const gchar *key,
} }
if (custom_values_enabled && !found) if (custom_values_enabled && !found)
custom_value = TRUE; {
/* Check syntax of the invalid choice to see whether
it could be a custom value */
if (g_str_equal (key, "PageSize") ||
g_str_equal (key, "PageRegion"))
{
/* Handle custom page sizes... */
if (g_regex_match_simple ("^" UNSIGNED_FLOAT_REGEX "x" UNSIGNED_FLOAT_REGEX "(cm|mm|m|in|ft|pt)?$", value, G_REGEX_CASELESS, 0))
custom_value = TRUE;
else
{
if (data->page_setup != NULL)
{
custom_value = TRUE;
new_value =
g_strdup_printf ("Custom.%.2fx%.2fmm",
gtk_paper_size_get_width (gtk_page_setup_get_paper_size (data->page_setup), GTK_UNIT_MM),
gtk_paper_size_get_height (gtk_page_setup_get_paper_size (data->page_setup), GTK_UNIT_MM));
}
}
}
else
{
/* Handle other custom options... */
ppd_cparam_t *cparam;
cparam = (ppd_cparam_t *) cupsArrayFirst (coption->params);
if (cparam != NULL)
{
switch (cparam->type)
{
case PPD_CUSTOM_CURVE :
case PPD_CUSTOM_INVCURVE :
case PPD_CUSTOM_REAL :
if (g_regex_match_simple ("^" SIGNED_FLOAT_REGEX "$", value, G_REGEX_CASELESS, 0))
custom_value = TRUE;
break;
case PPD_CUSTOM_POINTS :
if (g_regex_match_simple ("^" SIGNED_FLOAT_REGEX "(cm|mm|m|in|ft|pt)?$", value, G_REGEX_CASELESS, 0))
custom_value = TRUE;
break;
case PPD_CUSTOM_INT :
if (g_regex_match_simple ("^" SIGNED_INTEGER_REGEX "$", value, G_REGEX_CASELESS, 0))
custom_value = TRUE;
break;
case PPD_CUSTOM_PASSCODE :
case PPD_CUSTOM_PASSWORD :
case PPD_CUSTOM_STRING :
custom_value = TRUE;
break;
default :
custom_value = FALSE;
}
}
}
}
} }
} }
/* Add "Custom." prefix to custom values if not already added. */ /* Add "Custom." prefix to custom values if not already added. */
if (custom_value && !g_str_has_prefix (value, "Custom.")) if (custom_value)
{ {
new_value = g_strdup_printf ("Custom.%s", value); if (new_value == NULL)
new_value = g_strdup_printf ("Custom.%s", value);
gtk_cups_request_encode_option (request, key, new_value); gtk_cups_request_encode_option (request, key, new_value);
g_free (new_value); g_free (new_value);
} }
@ -659,6 +724,7 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend *print_backend,
GtkPrinterCups *cups_printer; GtkPrinterCups *cups_printer;
CupsPrintStreamData *ps; CupsPrintStreamData *ps;
CupsOptionsData *options_data; CupsOptionsData *options_data;
GtkPageSetup *page_setup;
GtkCupsRequest *request = NULL; GtkCupsRequest *request = NULL;
GtkPrintSettings *settings; GtkPrintSettings *settings;
const gchar *title; const gchar *title;
@ -764,10 +830,16 @@ gtk_print_backend_cups_print_stream (GtkPrintBackend *print_backend,
g_free (title_truncated); g_free (title_truncated);
} }
g_object_get (job,
"page-setup", &page_setup,
NULL);
options_data = g_new0 (CupsOptionsData, 1); options_data = g_new0 (CupsOptionsData, 1);
options_data->request = request; options_data->request = request;
options_data->printer = cups_printer; options_data->printer = cups_printer;
options_data->page_setup = page_setup;
gtk_print_settings_foreach (settings, add_cups_options, options_data); gtk_print_settings_foreach (settings, add_cups_options, options_data);
g_clear_object (&page_setup);
g_free (options_data); g_free (options_data);
ps = g_new0 (CupsPrintStreamData, 1); ps = g_new0 (CupsPrintStreamData, 1);