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

Set protocol class in PCL6 header correctly (untested; hopefully this does not break anything).

Browse Source 
Rewrote description of protocol classes.
Set 300 DPI as default resolution.
Uncommented protocol class 3.0 as driver does not support any new features of it.
Removed second enumeration ProtocolClass from PCL6Cap.h; it is already declared in PCL6Writer.h.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16318 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Pfeiffer
2006-02-09 21:22:15 +00:00
parent 2e84c057c0
commit ee47c06033
5 changed files with 502 additions and 493 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/print/drivers/pcl6/PCL6.cpp
+3 -2
View File
@@ -212,7 +212,8 @@ void PCL6Driver::jobStart()
{ {
// PCL6 begin // PCL6 begin
fWriter = new PCL6Writer(this); fWriter = new PCL6Writer(this);
fWriter->PJLHeader(PCL6Writer::kProtocolClass1_1, getJobData()->getXres(), "Copyright (c) 2003, 2004 Haiku"); PCL6Writer::ProtocolClass pc = (PCL6Writer::ProtocolClass)getProtocolClass();
fWriter->PJLHeader(pc, getJobData()->getXres(), "Copyright (c) 2003, 2004 Haiku");
fWriter->BeginSession(getJobData()->getXres(), getJobData()->getYres(), PCL6Writer::kInch, PCL6Writer::kBackChAndErrPage); fWriter->BeginSession(getJobData()->getXres(), getJobData()->getYres(), PCL6Writer::kInch, PCL6Writer::kBackChAndErrPage);
fWriter->OpenDataSource(); fWriter->OpenDataSource();
fMediaSide = PCL6Writer::kFrontMediaSide; fMediaSide = PCL6Writer::kFrontMediaSide;
@@ -353,7 +354,7 @@ void PCL6Driver::move(int x, int y)
bool bool
PCL6Driver::supportsDeltaRowCompression() PCL6Driver::supportsDeltaRowCompression()
{ {
return getProtocolClass() >= kProtocolClass2_1; return getProtocolClass() >= PCL6Writer::kProtocolClass2_1;
} }
PCL6Writer::MediaSize PCL6Driver::mediaSize(JobData::Paper paper) PCL6Writer::MediaSize PCL6Driver::mediaSize(JobData::Paper paper)
src/add-ons/print/drivers/pcl6/PCL6.h
+1
View File
@@ -9,6 +9,7 @@
#include "GraphicsDriver.h" #include "GraphicsDriver.h"
#include "PCL6Cap.h"
#include "PCL6Writer.h" #include "PCL6Writer.h"
class Halftone; class Halftone;
src/add-ons/print/drivers/pcl6/PCL6.rsrc
BIN
View File
Binary file not shown.
src/add-ons/print/drivers/pcl6/PCL6Cap.cpp
+36 -22
View File
@@ -6,6 +6,7 @@
#include "PCL6Cap.h" #include "PCL6Cap.h"
#include "PCL6Config.h" #include "PCL6Config.h"
#include "PCL6Writer.h"
#include "PrinterData.h" #include "PrinterData.h"
#define TO72DPI(a) (a * 72.0f / 600.0f) #define TO72DPI(a) (a * 72.0f / 600.0f)
@@ -38,7 +39,7 @@ const PaperCap a4(
// since 1.1 // since 1.1
const PaperCap exec( const PaperCap exec(
"Executive", "Executive",
true, false,
JobData::kA4, JobData::kA4,
BRect(0.0f, 0.0f, TO72DPI(4960.0f), TO72DPI(7014.0f)), BRect(0.0f, 0.0f, TO72DPI(4960.0f), TO72DPI(7014.0f)),
BRect(TO72DPI(120.0f), TO72DPI(120.0f), TO72DPI(4840.0f), TO72DPI(6894.0f))); BRect(TO72DPI(120.0f), TO72DPI(120.0f), TO72DPI(4840.0f), TO72DPI(6894.0f)));
@@ -142,7 +143,7 @@ const PaperSourceCap envelopeTray("Envelope Tray", false, JobData::kCassette2)
// since 2.0: // since 2.0:
const PaperSourceCap thridCassette("Thrid Cassette", false, JobData::kMiddle); const PaperSourceCap thridCassette("Thrid Cassette", false, JobData::kMiddle);
const ResolutionCap dpi150("150dpi", true, 150, 150); const ResolutionCap dpi150("150dpi", false, 150, 150);
const ResolutionCap dpi300("300dpi", true, 300, 300); const ResolutionCap dpi300("300dpi", true, 300, 300);
const ResolutionCap dpi600("600dpi", false, 600, 600); const ResolutionCap dpi600("600dpi", false, 600, 600);
const ResolutionCap dpi1200("1200dpi", false, 1200, 1200); const ResolutionCap dpi1200("1200dpi", false, 1200, 1200);
@@ -150,26 +151,38 @@ const ResolutionCap dpi1200("1200dpi", false, 1200, 1200);
const PrintStyleCap simplex("Simplex", true, JobData::kSimplex); const PrintStyleCap simplex("Simplex", true, JobData::kSimplex);
const PrintStyleCap duplex("Duplex", false, JobData::kDuplex); const PrintStyleCap duplex("Duplex", false, JobData::kDuplex);
const ProtocolClassCap pc1_1("PCL 6 Protocol Class 1.1", true, kProtocolClass1_1, const ProtocolClassCap pc1_1("PCL 6 Protocol Class 1.1", true, PCL6Writer::kProtocolClass1_1,
"Protocol Class 1.1\n" "The printer driver supports the following features of protocol class 1.1:\n"
"* No compression" "* Monochrome and Color Printing.\n"
"* Paper Formats: Letter, Legal, A4, A3, A5 and Japanese Postcard.\n"
"* Paper Sources: Auto, Default, Manual Feed, Multi Purpose Tray, Upper and Lower Cassette and Envelope Tray.\n"
"* Resolutions: 150, 300, 600 and 1200 DPI."
#if ENABLE_RLE_COMPRESSION #if ENABLE_RLE_COMPRESSION
"\n* RLE compression" "\n* Compression Method: RLE."
#else
"\n* Compression Method: None."
#endif #endif
); );
const ProtocolClassCap pc2_0("PCL 6 Protocol Class 2.0", false, kProtocolClass2_0,
"Protocol Class 2.0\n" const ProtocolClassCap pc2_0("PCL 6 Protocol Class 2.0", false, PCL6Writer::kProtocolClass2_0,
"* Additonal Paper Source: Third Cassette\n" "Additionally to features of protocol class 1.1, the printer driver supports the "
"* JPEG compression (not implemented yet)"); "following features of protocol class 2.0:\n"
const ProtocolClassCap pc2_1("PCL 6 Protocol Class 2.1", false, kProtocolClass2_1, "* Additonal Paper Source: Third Cassette."
"Protocol Class 2.1\n" // "\n* JPEG compression (not implemented yet)"
"* Additional Paper Format: B5\n" );
const ProtocolClassCap pc2_1("PCL 6 Protocol Class 2.1", false, PCL6Writer::kProtocolClass2_1,
"Additionally to features of previous protocol classes, the printer driver supports the "
"following features of protocol class 2.1:\n"
"* Additional Paper Format: B5."
#if ENABLE_DELTA_ROW_COMPRESSION #if ENABLE_DELTA_ROW_COMPRESSION
"* Delta Row Compression" "\n* Additional Compression Method: Delta Row Compression."
#endif #endif
); );
const ProtocolClassCap pc3_0("PCL 6 Protocol Class 3.0", false, kProtocolClass3_0,
"Protocol Class 3.0"); // Disable until driver supports new features of protocol class 3.0
//const ProtocolClassCap pc3_0("PCL 6 Protocol Class 3.0", false, PCL6Writer::kProtocolClass3_0,
//"Protocol Class 3.0");
const PaperCap *papers1_1[] = { const PaperCap *papers1_1[] = {
&letter, &letter,
@@ -228,8 +241,9 @@ const PrintStyleCap *printStyles[] = {
const ProtocolClassCap *protocolClasses[] = { const ProtocolClassCap *protocolClasses[] = {
&pc1_1, &pc1_1,
&pc2_0, &pc2_0,
&pc2_1, &pc2_1
&pc3_0 // Disabled until driver supports features of protocol class 3.0
// &pc3_0
}; };
const ColorCap color("Color", false, JobData::kColor); const ColorCap color("Color", false, JobData::kColor);
@@ -249,12 +263,12 @@ int PCL6Cap::countCap(CapID capid) const
{ {
switch (capid) { switch (capid) {
case kPaper: case kPaper:
if (getProtocolClass() >= kProtocolClass2_1) { if (getProtocolClass() >= PCL6Writer::kProtocolClass2_1) {
return sizeof(papers2_1) / sizeof(papers2_1[0]); return sizeof(papers2_1) / sizeof(papers2_1[0]);
} }
return sizeof(papers1_1) / sizeof(papers1_1[0]); return sizeof(papers1_1) / sizeof(papers1_1[0]);
case kPaperSource: case kPaperSource:
if (getProtocolClass() >= kProtocolClass2_0) { if (getProtocolClass() >= PCL6Writer::kProtocolClass2_0) {
return sizeof(paperSources2_0) / sizeof(paperSources2_0[0]); return sizeof(paperSources2_0) / sizeof(paperSources2_0[0]);
} }
return sizeof(paperSources1_1) / sizeof(paperSources1_1[0]); return sizeof(paperSources1_1) / sizeof(paperSources1_1[0]);
@@ -275,12 +289,12 @@ const BaseCap **PCL6Cap::enumCap(CapID capid) const
{ {
switch (capid) { switch (capid) {
case kPaper: case kPaper:
if (getProtocolClass() >= kProtocolClass2_1) { if (getProtocolClass() >= PCL6Writer::kProtocolClass2_1) {
return (const BaseCap **)papers2_1; return (const BaseCap **)papers2_1;
} }
return (const BaseCap **)papers1_1; return (const BaseCap **)papers1_1;
case kPaperSource: case kPaperSource:
if (getProtocolClass() >= kProtocolClass2_0) { if (getProtocolClass() >= PCL6Writer::kProtocolClass2_0) {
return (const BaseCap **)paperSources2_0; return (const BaseCap **)paperSources2_0;
} }
return (const BaseCap **)paperSources1_1; return (const BaseCap **)paperSources1_1;
src/add-ons/print/drivers/pcl6/PCL6Cap.h
-7
View File
@@ -8,13 +8,6 @@
#include "PrinterCap.h" #include "PrinterCap.h"
enum ProtocolClass {
kProtocolClass1_1,
kProtocolClass2_0,
kProtocolClass2_1,
kProtocolClass3_0,
};
class PCL6Cap : public PrinterCap { class PCL6Cap : public PrinterCap {
public: public:
PCL6Cap(const PrinterData *printer_data); PCL6Cap(const PrinterData *printer_data);