i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set page_offset to -1 like BeOS R5 did.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24535 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer
2008-03-23 17:46:00 +00:00
parent 3498280968
commit 242605b930
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/os/interface/PrintJob.h
+2 -2
View File
@@ -101,7 +101,7 @@ virtual void _ReservedPrintJob4();
char * fPrintJobName; char * fPrintJobName;
int32 fPageNumber; int32 fPageNumber;
BFile * fSpoolFile; BFile * fSpoolFile;
print_file_header fCurrentHeader; print_file_header fCurrentHeader;
BRect fPaperSize; BRect fPaperSize;
BRect fUsableSize; BRect fUsableSize;
status_t fError; status_t fError;
@@ -113,7 +113,7 @@ virtual void _ReservedPrintJob4();
int32 fLastPage; int32 fLastPage;
short fXResolution; short fXResolution;
short fYResolution; short fYResolution;
_page_header_ * fCurrentPageHeader; _page_header_ * fCurrentPageHeader;
off_t fCurrentPageHeaderOffset; off_t fCurrentPageHeaderOffset;
uint32 _reserved[2]; uint32 _reserved[2];
}; };
src/kits/interface/PrintJob.cpp
+7 -1
View File
@@ -38,9 +38,12 @@ static const char *kNoPagesToPrintText = "No Pages to print!";
// Summery of spool file format: // Summery of spool file format:
// See articel "How to Write a BeOS R5 Printer Driver" for description // See articel "How to Write a BeOS R5 Printer Driver" for description
// of spool file format: http://haiku-os.org/node/82 // of spool file format:
// http://haiku-os.org/documents/dev/how_to_write_a_printer_driver
// print_file_header header // print_file_header header
// On BeOS R5 header.version is 1 << 16 and
// header.first_page is -1.
// BMessage job_settings // BMessage job_settings
// _page_header_ page_header // _page_header_ page_header
// followed by number_of_pictures: // followed by number_of_pictures:
@@ -397,6 +400,9 @@ BPrintJob::BeginJob()
// page_count is updated in CommitJob() // page_count is updated in CommitJob()
fCurrentHeader.version = 1 << 16; fCurrentHeader.version = 1 << 16;
fCurrentHeader.page_count = 0; fCurrentHeader.page_count = 0;
// on BeOS R5 the offset to the first page
// was always -1.
fCurrentHeader.first_page = (off_t)-1;
if (fSpoolFile->Write(&fCurrentHeader, sizeof(fCurrentHeader)) != sizeof(fCurrentHeader)) { if (fSpoolFile->Write(&fCurrentHeader, sizeof(fCurrentHeader)) != sizeof(fCurrentHeader)) {
CancelJob(); CancelJob();