diff options
| author | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-13 03:16:31 +0000 |
|---|---|---|
| committer | Roland Mainz <roland.mainz@nrubsig.org> | 2004-04-13 03:16:31 +0000 |
| commit | 774895603641b2fe102004b3e7cc4e972b16f899 (patch) | |
| tree | 617809fb9f6ebf721753d9092a12f8e216bcc3e2 | |
| parent | 96c027bf18f4a89c2aef56dfaa473c48b95e1022 (diff) | |
Fix for http://xprint.freedesktop.org/cgi-bin/bugzilla/show_bug.cgi?id=462XPRINT
- RFE: Merge xprint.mozdev.org Xprint enhancements into Xorg XPRINT
branch
| -rw-r--r-- | include/X11/XprintAppUtil/xpapputil.h | 3 | ||||
| -rw-r--r-- | src/xpapputil.c | 21 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/X11/XprintAppUtil/xpapputil.h b/include/X11/XprintAppUtil/xpapputil.h index d7159bb..174b71d 100644 --- a/include/X11/XprintAppUtil/xpapputil.h +++ b/include/X11/XprintAppUtil/xpapputil.h @@ -71,8 +71,7 @@ typedef struct void *print_to_filehandle; Screen *pscreen; int pscreennumber; - long document_dpi_x, - document_dpi_y; + long document_dpi; XpuSupportedFlags supported_job_attributes; XpuSupportedFlags supported_doc_attributes; diff --git a/src/xpapputil.c b/src/xpapputil.c index aaf918c..7e86f8e 100644 --- a/src/xpapputil.c +++ b/src/xpapputil.c @@ -40,7 +40,7 @@ XpauContext *XpauGetContext( const char *printername ) if( XpuGetPrinter(printername, &pdpy, &pcontext) != 1 ) return NULL; - if( (context = (XpauContext *)malloc(sizeof(XpauContext))) ) + if( context = (XpauContext *)malloc(sizeof(XpauContext)) ) { memset(context, 0, sizeof(XpauContext)); @@ -131,13 +131,15 @@ XpAuErrorValue XpauParseArg( const char *arg_name, const char *arg_value, XpauCo return XpAuError_success; } else if( !strcasecmp(arg_name, "resolution") ) - { + { + int arg_res = atoi(arg_value); + if( !(context->resolution_list && (context->supported_doc_attributes & XPUATTRIBUTESUPPORTED_DEFAULT_PRINTER_RESOLUTION)) ) return XpAuError_unsupported_resolution; - docvalues->resolution = XpuFindResolutionByName(context->resolution_list, + docvalues->resolution = XpuFindResolution(context->resolution_list, context->resolution_num_list_entries, - arg_value); + arg_res, arg_res); if( !docvalues->resolution ) return XpAuError_unsupported_resolution; @@ -407,7 +409,7 @@ XpAuErrorValue XpauStartJob( XpauContext *context, const char *printerfile ) } /* Get default printer resolution */ - if( XpuGetResolution(context->pdpy, context->pcontext, &context->document_dpi_x, &context->document_dpi_y) != 1 ) + if( XpuGetResolution(context->pdpy, context->pcontext, &context->document_dpi) != 1 ) { result = XpAuError_no_dpi_set; } @@ -438,11 +440,10 @@ XpAuErrorValue XpauEndJob( XpauContext *context ) */ XFlush(context->pdpy); - context->inJob = False; - context->pscreen = NULL; - context->pscreennumber = -1; - context->document_dpi_x = 0L; - context->document_dpi_y = 0L; + context->inJob = False; + context->pscreen = NULL; + context->pscreennumber = -1; + context->document_dpi = 0L; if( context->print_to_filehandle ) { |