mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Enable printing with XPrint's raster driver. Bug 127657, patch by 

Roland Mainz <Roland.Mainz@informatik.med.uni-giessen.de>, r=timeless,
sr=attinasi, a=roc+moz
This commit is contained in:
bzbarsky%mit.edu 2002-03-01 23:25:03 +00:00
Родитель 20ef6125fb
Коммит 23edaec45d
8 изменённых файлов: 371 добавлений и 77 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

66
gfx/src/xlibrgb/xlibrgb.c
Просмотреть файл

@ -3898,6 +3898,72 @@ xxlib_draw_indexed_image (XlibRgbHandle *handle, Drawable drawable,
handle->conv_indexed_d, cmap, 0, 0);
}
void
xxlib_draw_xprint_scaled_rgb_image( XlibRgbHandle *handle,
Drawable drawable,
long paper_resolution,
long image_resolution,
GC gc,
int x,
int y,
int width,
int height,
XlibRgbDither dith,
unsigned char *rgb_buf,
int rowstride)
{
long available = ((65536 < handle->max_request_size) ?
(65536 << 2):(handle->max_request_size << 2))
- 512 /* SIZEOF(xPutImageReq) */;
if (image_resolution == 0)
image_resolution = paper_resolution;
if( (rowstride * height) < available )
{
xxlib_draw_rgb_image(handle,
drawable,
gc,
x, y, width, height,
dith,
rgb_buf, rowstride);
}
else
{
int subimageheight = available / rowstride;
double scaling_factor = (double)paper_resolution / (double)image_resolution;
#ifdef DEBUG
printf("xxlib_draw_xprint_scaled_rgb_image: "
"splitting image x=%d, y=%d, width=%d, height=%d, subimageheight=%d, scaling_factor=%g\n",
x, y, width, height, subimageheight, scaling_factor);
#endif /* DEBUG */
if (subimageheight == 0)
subimageheight = 1;
xxlib_draw_xprint_scaled_rgb_image(handle,
drawable,
paper_resolution, image_resolution,
gc,
x, y,
width, subimageheight,
dith,
rgb_buf,
rowstride);
xxlib_draw_xprint_scaled_rgb_image(handle,
drawable,
paper_resolution, image_resolution,
gc,
x, y+(int)((double)subimageheight*scaling_factor),
width, (height-subimageheight),
dith,
(rgb_buf+(subimageheight*rowstride)),
rowstride);
}
}
Bool
xxlib_rgb_ditherable (XlibRgbHandle *handle)
{

16
gfx/src/xlibrgb/xlibrgb.h
Просмотреть файл

@ -72,6 +72,8 @@ _XFUNCPROTOBEGIN
/* prtypes contains definitions for uint32/int32 and uint16/int16 */
#include "prtypes.h"
#include "prcpucfg.h"
#define NS_TO_XXLIB_RGB(ns) (ns & 0xff) << 16 | (ns & 0xff00) | ((ns >> 16) & 0xff)
#else
typedef unsigned int uint32;
typedef int int32;
@ -187,6 +189,20 @@ xxlib_draw_indexed_image (XlibRgbHandle *handle, Drawable drawable,
int rowstride,
XlibRgbCmap *cmap);
void
xxlib_draw_xprint_scaled_rgb_image( XlibRgbHandle *handle,
Drawable drawable,
long paper_resolution,
long image_resolution,
GC gc,
int x,
int y,
int width,
int height,
XlibRgbDither dith,
unsigned char *rgb_buf,
int rowstride);
/* Below are some functions which are primarily useful for debugging
and experimentation. */
Bool

15
gfx/src/xprint/nsDeviceContextXP.cpp
Просмотреть файл

@ -37,6 +37,10 @@
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#define FORCE_PR_LOG /* Allow logging in the release build */
#define PR_LOGGING 1
#include "prlog.h"
/* PostScript/Xprint print modules do not support more than one object
* instance because they use global vars which cannot be shared between
@ -310,6 +314,7 @@ NS_IMETHODIMP nsDeviceContextXp::BeginDocument(PRUnichar * aTitle)
void nsDeviceContextXp::DestroyXPContext()
{
PR_LOG(nsDeviceContextXpLM, PR_LOG_DEBUG, ("nsDeviceContextXp::DestroyXPContext()\n"));
if (mPrintContext != nsnull) {
/* gisburn: mPrintContext cannot be reused between to print
* tasks as the destination print server may be a different one
@ -345,7 +350,15 @@ NS_IMETHODIMP nsDeviceContextXp::EndDocument(void)
*/
NS_IMETHODIMP nsDeviceContextXp::AbortDocument(void)
{
return EndDocument();
PR_LOG(nsDeviceContextXpLM, PR_LOG_DEBUG, ("nsDeviceContextXp::AbortDocument()\n"));
nsresult rv = NS_OK;
if (mPrintContext != nsnull) {
rv = mPrintContext->AbortDocument();
DestroyXPContext();
}
return rv;
}
/** ---------------------------------------------------

276
gfx/src/xprint/nsXPrintContext.cpp
Просмотреть файл

@ -106,6 +106,7 @@ nsXPrintContext::nsXPrintContext() :
mDrawable(None),
mGC(nsnull),
mDepth(0),
mJobStarted(PR_FALSE),
mIsGrayscale(PR_FALSE), /* default is color output */
mIsAPrinter(PR_TRUE), /* default destination is printer */
mPrintFile(nsnull),
@ -126,6 +127,12 @@ nsXPrintContext::~nsXPrintContext()
if (mPDisplay)
{
if (mJobStarted)
{
/* Clean-up if noone else did it yet... */
AbortDocument();
}
if (mGC)
{
mGC->Release();
@ -152,12 +159,10 @@ NS_IMPL_ISUPPORTS1(nsXPrintContext, nsIDrawingSurfaceXlib)
static nsresult
AlertBrokenXprt(Display *pdpy)
{
nsresult rv = NS_OK;
/* Check for broken Xprt
* Xfree86 Xprt is the only known broken version of Xprt (see bug 120211
* for a list of tested&working Xprt servers) ...
* FixMe: We should look at XVendorRelease(), too - but there is no feedback
* XXX: We should look at XVendorRelease(), too - but there is no feedback
* from XFree86.org when this issue will be fixed... ;-(
*/
if (!(strstr(XServerVendor(pdpy), "XFree86") /*&& XVendorRelease(pdpy) < 45000000L*/))
@ -234,6 +239,18 @@ nsXPrintContext::Init(nsDeviceContextXp *dc, nsIDeviceContextSpecXp *aSpec)
xargs.pseudogray = True;
mXlibRgbHandle = xxlib_rgb_create_handle(mPDisplay, mScreen, &xargs);
}
if (!mXlibRgbHandle)
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("trying black/white\n"));
/* Last attempt using StaticGray 1bit (b/w printer) */
xargs.xtemplate.c_class = StaticGray;
xargs.xtemplate.depth = 1;
xargs.xtemplate_mask = VisualClassMask|VisualDepthMask;
xargs.pseudogray = False;
mXlibRgbHandle = xxlib_rgb_create_handle(mPDisplay, mScreen, &xargs);
}
}
}
else
@ -245,10 +262,12 @@ nsXPrintContext::Init(nsDeviceContextXp *dc, nsIDeviceContextSpecXp *aSpec)
mXlibRgbHandle = xxlib_rgb_create_handle(mPDisplay, mScreen, &xargs);
}
/* No XlibRgb handle ? Either we do not have a matching visual or no memory... */
if (!mXlibRgbHandle)
return NS_ERROR_GFX_PRINTER_INVALID_ATTRIBUTE;
return NS_ERROR_GFX_PRINTER_COLORSPACE_NOT_SUPPORTED;
XpGetPageDimensions(mPDisplay, mPContext, &width, &height, &rect);
rv = SetupWindow(rect.x, rect.y, rect.width, rect.height);
if (NS_FAILED(rv))
return rv;
@ -292,8 +311,8 @@ nsXPrintContext::SetupWindow(int x, int y, int width, int height)
mVisual = xxlib_rgb_get_visual(mXlibRgbHandle);
mDepth = xxlib_rgb_get_depth(mXlibRgbHandle);
background = XWhitePixel(mPDisplay, mScreenNumber);
foreground = XBlackPixel(mPDisplay, mScreenNumber);
background = xxlib_rgb_xpixel_from_rgb(mXlibRgbHandle, NS_TO_XXLIB_RGB(NS_RGB(0xFF, 0xFF, 0xFF))); /* white */
foreground = xxlib_rgb_xpixel_from_rgb(mXlibRgbHandle, NS_TO_XXLIB_RGB(NS_RGB(0x00, 0x00, 0x00))); /* black */
parent_win = XRootWindow(mPDisplay, mScreenNumber);
xattributes.background_pixel = background;
@ -328,7 +347,7 @@ nsresult nsXPrintContext::SetPageSize(float page_width_mm, float page_height_mm)
(double)page_width_mm, (double)page_height_mm));
mlist = XpuGetMediumSourceSizeList(mPDisplay, mPContext, &mlist_count);
if( !mlist || mlist_count == 0 )
if( !mlist )
{
return NS_ERROR_GFX_PRINTER_PAPER_SIZE_NOT_SUPPORTED;
}
@ -396,17 +415,28 @@ nsresult nsXPrintContext::SetOrientation(int landscape)
/* Get list of supported orientations */
list = XpuGetOrientationList(mPDisplay, mPContext, &list_count);
if( !list || list_count == 0 )
if( !list )
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("XpuGetOrientationList() failure.\n"));
return NS_ERROR_GFX_PRINTER_ORIENTATION_NOT_SUPPORTED;
}
#ifdef PR_LOGGING
int i;
/* Print orientations for the log... */
for( i = 0 ; i < list_count ; i++ )
{
XpuOrientationRec *curr = &list[i];
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("got orientation='%s'\n", curr->orientation));
}
#endif /* PR_LOGGING */
/* Find requested orientation */
match = XpuFindOrientationByName(list, list_count, orientation );
match = XpuFindOrientationByName(list, list_count, orientation);
if (!match)
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("XpuFindOrientationByName() failure.\n"));
XpuFreeOrientationList(list);
return NS_ERROR_GFX_PRINTER_ORIENTATION_NOT_SUPPORTED;
}
@ -414,8 +444,21 @@ nsresult nsXPrintContext::SetOrientation(int landscape)
if (XpuSetDocOrientation(mPDisplay, mPContext, match) != 1)
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("XpuSetDocOrientation() failure.\n"));
return NS_ERROR_GFX_PRINTER_ORIENTATION_NOT_SUPPORTED;
/* We have a "match" in the list of supported orientations but we are not
* allowed to set it... Well - if this happens and we only have ONE entry
* in this list then we can safely assume that this is the only choice...
* (please correct me if I am wrong)
*/
if (list_count != 1)
{
/* ... otherwise we have a problem... */
XpuFreeOrientationList(list);
return NS_ERROR_GFX_PRINTER_ORIENTATION_NOT_SUPPORTED;
}
}
XpuFreeOrientationList(list);
return NS_OK;
}
@ -473,9 +516,7 @@ nsXPrintContext::SetupPrintContext(nsIDeviceContextSpecXp *aSpec)
*/
PR_SetEnv("XSUNTRANSPORT=xxx");
/* get printer, either by "name" (foobar) or "name@display" (foobar@gaja:5)
* ToDo: report error to user (dialog)
*/
/* Get printer, either by "name" (foobar) or "name@display" (foobar@gaja:5) */
if( XpuGetPrinter(printername, &mPDisplay, &mPContext) != 1 )
return NS_ERROR_GFX_PRINTER_NAME_NOT_FOUND;
@ -498,19 +539,19 @@ nsXPrintContext::SetupPrintContext(nsIDeviceContextSpecXp *aSpec)
PRInt32 page_width_in_twips,
page_height_in_twips;
float page_width_mm,
page_height_mm;
aSpec->GetPageSizeInTwips(&page_width_in_twips, &page_height_in_twips);
page_width_mm = NS_TWIPS_TO_MILLIMETERS(page_width_in_twips);
page_height_mm = NS_TWIPS_TO_MILLIMETERS(page_height_in_twips);
if (NS_FAILED(XPU_TRACE(rv = SetPageSize(page_width_mm, page_height_mm))))
if (NS_FAILED(XPU_TRACE(rv = SetPageSize(NS_TWIPS_TO_MILLIMETERS(page_width_in_twips),
NS_TWIPS_TO_MILLIMETERS(page_height_in_twips)))))
return rv;
if (NS_FAILED(XPU_TRACE(rv = SetOrientation(landscape))))
return rv;
if (NS_FAILED(XPU_TRACE(rv = SetResolution())))
return rv;
if (XPU_TRACE(XpuSetDocumentCopies(mPDisplay, mPContext, num_copies)) != 1)
return NS_ERROR_GFX_PRINTER_TOO_MANY_COPIES;
@ -526,10 +567,8 @@ nsXPrintContext::SetupPrintContext(nsIDeviceContextSpecXp *aSpec)
dumpXpAttributes(mPDisplay, mPContext);
#endif /* XPRINT_DEBUG_SOMETIMES_USEFULL */
/* get default printer resolution. May fail if Xprt is misconfigured.
* ToDo: Report error to user (dialog)
*/
if( XpuGetResolution(mPDisplay, mPContext, &mPrintResolution) == False )
/* Get default printer resolution. May fail if Xprt is misconfigured.*/
if( XpuGetResolution(mPDisplay, mPContext, &mPrintResolution) != 1 )
return NS_ERROR_GFX_PRINTER_DRIVER_CONFIGURATION_ERROR;
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("print resolution %ld\n", (long)mPrintResolution));
@ -538,47 +577,112 @@ nsXPrintContext::SetupPrintContext(nsIDeviceContextSpecXp *aSpec)
XpSelectInput(mPDisplay, mPContext, XPPrintMask);
return NS_OK;
}
/* MyConvertUCS2ToLocalEncoding:
* Note that this function is _only_ a _hack_ until RFE 73446
* (http://bugzilla.mozilla.org/show_bug.cgi?id=73446 - "RFE:
* Need NS_ConvertUCS2ToLocalEncoding() and
* NS_ConvertLocalEncodingToUCS2()") gets implemented...
* Below we need COMPOUNT_TEXT which usually is the same as the Xserver's
* local encoding - this hack should at least work for C/POSIX
* and *.UTF-8 locales...
*/
static
char *MyConvertUCS2ToLocalEncoding( PRUnichar *str )
}
NS_IMETHODIMP
nsXPrintContext::SetResolution( void )
{
/* Use strdup() to avoid any silly effects...
*/
return PL_strdup(NS_ConvertUCS2toUTF8(str).get());
}
XpuResolutionList list;
int list_count;
XpuResolutionRec *match;
int i;
long default_resolution;
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("nsXPrintContext::SetResolution().\n"));
list = XpuGetResolutionList(mPDisplay, mPContext, &list_count);
if( !list )
return NS_ERROR_GFX_PRINTER_DRIVER_CONFIGURATION_ERROR;
#ifdef PR_LOGGING
/* Print resolutions for the log... */
for( i = 0 ; i < list_count ; i++ )
{
XpuResolutionRec *curr = &list[i];
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("got resolution=%ld\n", (long)curr->dpi));
}
#endif /* PR_LOGGING */
/* We rely on printer default resolution if we have one... */
if( XpuGetResolution(mPDisplay, mPContext, &default_resolution) == 1 )
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("using printers default resolution=%ld.\n", default_resolution));
XpuFreeResolutionList(list);
return NS_OK;
}
/* XXX: Hardcoded resolution values... */
match = XpuFindResolution(list, list_count, 300, 300);
if (!match)
{
/* Find a match between 300-600, lower resolution is better */
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("searching between 300-600, lower resolution is better...\n"));
match = XpuFindResolution(list, list_count, 300, 600);
if (!match)
{
/* Find a match between 150-300, higher resolution is better */
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("searching between 150-300, higher resolution is better...\n"));
match = XpuFindResolution(list, list_count, 300, 150);
if (!match)
{
/* If there is still no match then use the first one from the matches we
* obtained...*/
match = &list[0];
}
}
}
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("setting resolution to %ld DPI.\n", match->dpi));
if (XpuSetDocResolution(mPDisplay, mPContext, match) != 1)
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("XpuSetDocResolution() failure.\n"));
/* We have a "match" in the list of supported resolutions but we are not
* allowed to set it... Well - if this happens and we only have ONE entry
* in this list then we can safely assume that this is the only choice...
* (please correct me if I am wrong)
*/
if (list_count != 1)
{
/* ... otherwise we have a problem... */
XpuFreeResolutionList(list);
return NS_ERROR_GFX_PRINTER_DRIVER_CONFIGURATION_ERROR;
}
}
XpuFreeResolutionList(list);
return NS_OK;
}
NS_IMETHODIMP
nsXPrintContext::BeginDocument( PRUnichar *aTitle )
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("nsXPrintContext::BeginDocument()\n"));
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("nsXPrintContext::BeginDocument(aTitle='%s')\n", ((aTitle)?(NS_ConvertUCS2toUTF8(aTitle).get()):("<NULL>"))));
char *s = nsnull,
*job_title;
nsXPIDLCString job_title;
if( aTitle != nsnull )
job_title = s = MyConvertUCS2ToLocalEncoding(aTitle);
if (aTitle)
{
/* Note that this is _only_ a _hack_ until bug 73446
* ("RFE: Need NS_ConvertUCS2ToLocalEncoding() and
* NS_ConvertLocalEncodingToUCS2()") is implemented...
* Below we need COMPOUNT_TEXT which usually is the same as the Xserver's
* local encoding - this hack should at least work for C/POSIX
* and *.UTF-8 locales...
*/
job_title.Assign(NS_ConvertUCS2toUTF8(aTitle));
}
else
job_title = (char *)"Mozilla document without title";
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("nsXPrintContext::BeginDocument: document title: '%s'\n", XPU_NULLXSTR(job_title)));
{
job_title.Assign(NS_LITERAL_CSTRING("Mozilla document without title"));
}
/* Set the Job Attributes */
XpuSetJobTitle(mPDisplay, mPContext, job_title);
if( s != nsnull )
PL_strfree(s);
// Check the output type
if(mIsAPrinter)
{
@ -598,6 +702,7 @@ nsXPrintContext::BeginDocument( PRUnichar *aTitle )
XPU_TRACE(XpuWaitForPrintNotify(mPDisplay, mXpEventBase, XPStartJobNotify));
mJobStarted = PR_TRUE;
return NS_OK;
}
@ -605,9 +710,8 @@ nsXPrintContext::BeginDocument( PRUnichar *aTitle )
NS_IMETHODIMP
nsXPrintContext::BeginPage()
{
// Move the print window according to the given margin
// XMoveWindow(mPDisplay, mDrawable, 100, 100);
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("nsXPrintContext::BeginPage()\n"));
XPU_TRACE(XpStartPage(mPDisplay, mDrawable));
XPU_TRACE(XpuWaitForPrintNotify(mPDisplay, mXpEventBase, XPStartPageNotify));
@ -617,6 +721,8 @@ nsXPrintContext::BeginPage()
NS_IMETHODIMP
nsXPrintContext::EndPage()
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("nsXPrintContext::EndPage()\n"));
XPU_TRACE(XpEndPage(mPDisplay));
XPU_TRACE(XpuWaitForPrintNotify(mPDisplay, mXpEventBase, XPEndPageNotify));
@ -626,6 +732,8 @@ nsXPrintContext::EndPage()
NS_IMETHODIMP
nsXPrintContext::EndDocument()
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("nsXPrintContext::EndDocument()\n"));
XPU_TRACE(XpEndJob(mPDisplay));
XPU_TRACE(XpuWaitForPrintNotify(mPDisplay, mXpEventBase, XPEndJobNotify));
@ -638,8 +746,49 @@ nsXPrintContext::EndDocument()
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("XpuWaitForPrintFileChild returned success.\n"));
}
}
else
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("XpuWaitForPrintFileChild returned failure.\n"));
}
mXpuPrintToFileHandle = nsnull;
}
mJobStarted = PR_FALSE;
return NS_OK;
}
NS_IMETHODIMP
nsXPrintContext::AbortDocument()
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("nsXPrintContext::AbortDocument()\n"));
if( mJobStarted )
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("canceling...\n"));
XPU_TRACE(XpCancelJob(mPDisplay, True));
}
/* Are we printing to a file ? */
if( !mIsAPrinter && mXpuPrintToFileHandle )
{
if( XPU_TRACE(XpuWaitForPrintFileChild(mXpuPrintToFileHandle)) == XPGetDocFinished )
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("XpuWaitForPrintFileChild returned success.\n"));
}
else
{
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("XpuWaitForPrintFileChild returned failure.\n"));
}
mXpuPrintToFileHandle = nsnull;
}
mJobStarted = PR_FALSE;
PR_LOG(nsXPrintContextLM, PR_LOG_DEBUG, ("print job aborted.\n"));
return NS_OK;
}
@ -959,7 +1108,7 @@ nsXPrintContext::DrawImage(xGC *xgc, nsIImage *aImage,
return rv;
}
// Draw the bitmap, this draw just has destination coordinates
nsresult
nsXPrintContext::DrawImageBits(xGC *xgc,
@ -1056,12 +1205,13 @@ nsXPrintContext::DrawImageBits(xGC *xgc,
}
xxlib_draw_rgb_image(mXlibRgbHandle,
mDrawable,
image_gc,
aX, aY, aWidth, aHeight,
NS_XPRINT_RGB_DITHER,
image_bits, row_bytes);
xxlib_draw_xprint_scaled_rgb_image(mXlibRgbHandle,
mDrawable,
mPrintResolution, XpGetImageResolution(mPDisplay, mPContext),
image_gc,
aX, aY, aWidth, aHeight,
NS_XPRINT_RGB_DITHER,
image_bits, row_bytes);
if( alpha_pixmap != None )
{

4
gfx/src/xprint/nsXPrintContext.h
Просмотреть файл

@ -76,6 +76,7 @@ public:
NS_IMETHOD EndPage();
NS_IMETHOD BeginDocument(PRUnichar *aTitle);
NS_IMETHOD EndDocument();
NS_IMETHOD AbortDocument();
int GetHeight() { return mHeight; }
@ -120,6 +121,7 @@ private:
int mWidth;
int mHeight;
XPContext mPContext;
PRBool mJobStarted; /* |PR_TRUE| when being between XpStartJob() and XpEndJob() */
PRBool mIsGrayscale; /* color or grayscale ? */
PRBool mIsAPrinter; /* destination: printer or file ? */
const char *mPrintFile; /* file to "print" to */
@ -131,7 +133,7 @@ private:
nsresult SetupPrintContext(nsIDeviceContextSpecXp *aSpec);
nsresult SetPageSize(float page_width_mm, float page_height_mm);
nsresult SetOrientation(int landscape);
nsresult SetResolution(void);
};

59
gfx/src/xprint/xprintutil.c
Просмотреть файл

@ -884,13 +884,7 @@ int XpuSetDocumentCopies( Display *pdpy, XPContext pcontext, long num_copies )
else
{
XPU_DEBUG_ONLY(printf("XpuSetContentOrientation: XpuCheckSupported failed for 'copy-count'\n"));
/* We may safely assume that the device prints at least one copy if
* |copy-count| is not supported for this printer device.
*/
if (num_copies == 1)
return(1);
/* Failure... */
return(0);
}
@ -932,8 +926,8 @@ XpuMediumSourceSizeList XpuGetMediumSourceSizeList( Display *pdpy, XPContext pco
for( status = XpuEnumerateMediumSourceSizes(pdpy, pcontext, &tray_name, &medium_name, &mbool,
&ma1, &ma2, &ma3, &ma4, &tok_lasts) ;
status != False ;
status = XpuEnumerateMediumSourceSizes(NULL, NULL, &tray_name, &medium_name, &mbool,
&ma1, &ma2, &ma3, &ma4, &tok_lasts) )
status = XpuEnumerateMediumSourceSizes(NULL, None, &tray_name, &medium_name, &mbool,
&ma1, &ma2, &ma3, &ma4, &tok_lasts) )
{
rec_count++;
list = (XpuMediumSourceSizeRec *)realloc(list, sizeof(XpuMediumSourceSizeRec)*rec_count);
@ -1211,9 +1205,54 @@ void XpuFreeResolutionList( XpuResolutionList list )
}
}
/* Find resolution in resolution list.
* Lower resolutions are preferred over larger resolution if |dpi_a| <= |dpi_b|,
* otherwise larger resolutions are preferred over small resolutions
*/
XpuResolutionRec *XpuFindResolution( XpuResolutionList list, int list_count, long dpi_a, long dpi_b )
{
XpuResolutionRec *match = NULL;
int i;
if( dpi_a <= dpi_b )
{
/* Search list, lower resolutions are better... */
for( i = 0 ; i < list_count ; i++ )
{
XpuResolutionRec *curr = &list[i];
if( curr->dpi >= dpi_a && curr->dpi <= dpi_b )
{
if( !match || (curr->dpi < match->dpi) )
{
match = curr;
}
}
}
}
else
{
/* Search list, higher resolutions are better... */
for( i = 0 ; i < list_count ; i++ )
{
XpuResolutionRec *curr = &list[i];
if( curr->dpi >= dpi_b && curr->dpi <= dpi_a )
{
if( !match || (curr->dpi > match->dpi) )
{
match = curr;
}
}
}
}
return(match);
}
/* Get default page (if defined) or document resolution
* this function may fail in the following conditions:
* - Xprt misconfiguration
* - No default resolution set yet
* - X DPI != Y DPI (not yet implemented in Xprt)
*/
Bool XpuGetResolution( Display *pdpy, XPContext pcontext, long *dpi_ptr )

4
gfx/src/xprint/xprintutil.h
Просмотреть файл

@ -84,7 +84,8 @@ typedef struct {
/*
* Struct for XpuGetResolutionList(), XpuFreeResolutionList(),
* XpuGetResolution(), XpuSetPageResolution(), XpuSetDocResolution()
* XpuGetResolution(), XpuSetPageResolution(), XpuSetDocResolution(),
* XpuFindResolution()
*/
typedef struct {
long dpi;
@ -158,6 +159,7 @@ void XpuFreeResolutionList( XpuResolutionList list );
Bool XpuGetResolution( Display *pdpy, XPContext pcontext, long *dpi );
Bool XpuSetPageResolution( Display *pdpy, XPContext pcontext, XpuResolutionRec * );
Bool XpuSetDocResolution( Display *pdpy, XPContext pcontext, XpuResolutionRec * );
XpuResolutionRec *XpuFindResolution( XpuResolutionList list, int list_count, long min_dpi, long max_dpi );
/* Get/Set orientation */
XpuOrientationList XpuGetOrientationList( Display *pdpy, XPContext pcontext, int *numEntriesPtr );

8
gfx/src/xprint/xprintutil_printtofile.c
Просмотреть файл

@ -78,7 +78,13 @@ void *XpuStartJobToFile( Display *pdpy, XPContext pcontext, const char *filename
XpStartJob(pdpy, XPGetData);
handle = XpuPrintToFile(pdpy, pcontext, filename);
if (!handle)
{
/* Cancel the print job and discard all events... */
XpCancelJob(pdpy, True);
}
return(handle);
}