Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Assorted fixes to imagewriter.cpp #138

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Assorted fixes to imagewriter.cpp #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
57f005b
Fix possible out-of-bounds array access
colinleroy Oct 18, 2024
bcd06c5
Fix reading switcha
colinleroy Oct 18, 2024
699701d
Make DIP switch 1 handling clearer
colinleroy Oct 18, 2024
436be75
First style/score init
colinleroy Oct 18, 2024
4bc00ba
Fix off-by-one-line at end of page
colinleroy Oct 18, 2024
89d0997
Handle Perforation Skip softswitch
colinleroy Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 44 additions & 14 deletions src/imagewriter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,19 @@ extern "C" char* g_imagewriter_prop_font;
extern "C" int iw_scc_write;
#include "iw_charmaps.h"

#define SWITCHA_CHARSET_MASK 0x07
#define SWITCHA_CHARSET_US 0x00
#define SWITCHA_CHARSET_IT 0x01
#define SWITCHA_CHARSET_DK 0x02
#define SWITCHA_CHARSET_UK 0x03
#define SWITCHA_CHARSET_DE 0x04
#define SWITCHA_CHARSET_SE 0x05
#define SWITCHA_CHARSET_FR 0x06
#define SWITCHA_CHARSET_ES 0x07

#define SWITCHA_PERFORATIONSKIP 0x10
#define SWITCHA_LFAFTERCR 0x80

#ifdef HAVE_SDL
void Imagewriter::FillPalette(Bit8u redmax, Bit8u greenmax, Bit8u bluemax, Bit8u colorID, SDL_Palette* pal)
{
Expand Down Expand Up @@ -109,6 +122,11 @@ Imagewriter::Imagewriter(Bit16u dpi, Bit16u paperSize, Bit16u bannerSize, char*
}
else
{
if (paperSize >= N_PAPER_SIZES)
{
printf("Printer: unsupported paper size %d\n", paperSize);
paperSize = 0;
}
defaultPageWidth = ((Real64)paperSizes[paperSize][0]/(Real64)72);
defaultPageHeight = ((Real64)paperSizes[paperSize][1]/(Real64)72);
}
Expand Down Expand Up @@ -252,10 +270,10 @@ void Imagewriter::resetPrinter()
lineSpacing = (Real64)1/6;
cpi = 12.0;
printRes = 2;
style &= (0xffff - STYLE_PROP);
definedUnit = 96;
curCharTable = 1;
style = 0;
style = STYLE_BASE;
score = SCORE_NONE;
extraIntraSpace = 0.0;
printUpperContr = true;
bitGraph.remBytes = 0;
Expand All @@ -269,7 +287,7 @@ void Imagewriter::resetPrinter()
multiPointSize = 0.0;
multicpi = 0.0;
hmi = -1.0;
switcha = 0;
switcha = SWITCHA_CHARSET_US;
switchb = ' ';
numPrintAsChar = 0;
LQtypeFace = fixed;
Expand Down Expand Up @@ -415,7 +433,7 @@ void Imagewriter::updateFont()
void Imagewriter::updateSwitch()
{
//Set international character mappping (Switches A-1 to A3)
int charmap = switcha &= 7;
int charmap = (switcha & SWITCHA_CHARSET_MASK);
curMap[0x23] = intCharSets[charmap][0];
curMap[0x40] = intCharSets[charmap][1];
curMap[0x5b] = intCharSets[charmap][2];
Expand All @@ -426,8 +444,20 @@ void Imagewriter::updateSwitch()
curMap[0x7c] = intCharSets[charmap][7];
curMap[0x7d] = intCharSets[charmap][8];
curMap[0x7e] = intCharSets[charmap][9];

if (switcha & SWITCHA_PERFORATIONSKIP)
{
topMargin = 0.25;
bottomMargin = pageHeight - 0.25;
}
else
{
topMargin = 0.0;
bottomMargin = pageHeight - 0.0;
}

//MSB control (Switch B-6)
if (!(switchb&32))
if (!(switchb & 32))
{
msb = 255;
}
Expand Down Expand Up @@ -824,8 +854,8 @@ bool Imagewriter::processCommandChar(Bit8u ch)
x++;
}
pageHeight = (Real64)PARAM4(0)/144;
bottomMargin = pageHeight;
topMargin = 0.0;
// trigger margins computation
updateSwitch();
break;
}
case 0x21: // Select bold font (ESC !) IW
Expand Down Expand Up @@ -1047,7 +1077,7 @@ bool Imagewriter::processCommandChar(Bit8u ch)
while (x < paramc(0))
{
curY += lineSpacing;
if (curY > bottomMargin)
if (curY > bottomMargin - lineSpacing)
newPage(true,false);
x++;
}
Expand Down Expand Up @@ -1101,7 +1131,7 @@ bool Imagewriter::processCommandChar(Bit8u ch)
{
curX = leftMargin;
curY += lineSpacing;
if (curY > bottomMargin)
if (curY > bottomMargin - lineSpacing)
newPage(true,false);
}
else
Expand All @@ -1113,7 +1143,7 @@ bool Imagewriter::processCommandChar(Bit8u ch)
moveTo = verttabs[i];

// Nothing found => Act like FF
if (moveTo > bottomMargin || moveTo < 0)
if (moveTo > bottomMargin - lineSpacing || moveTo < 0)
newPage(true,false);
else
curY = moveTo;
Expand All @@ -1124,13 +1154,13 @@ bool Imagewriter::processCommandChar(Bit8u ch)
return true;
case 0x0d: // Carriage Return (CR)
curX = leftMargin;
if ((switcha&=128)) curY += lineSpacing; // If switch A-8 is set, send a LF after CR
if ((switcha & SWITCHA_LFAFTERCR)) curY += lineSpacing; // If switch A-8 is set, send a LF after CR
if (!autoFeed)
return true;
case 0x0a: // Line feed
//curX = leftMargin;
curY += lineSpacing;
if (curY > bottomMargin)
if (curY > bottomMargin - lineSpacing)
newPage(true,false);
return true;
case 0x0e: //Select double width printing (SO) IW
Expand Down Expand Up @@ -1275,7 +1305,7 @@ void Imagewriter::printChar(Bit8u ch)
// For line printing
Bit16u lineStart = PIXX;
// Print a slashed zero if the softswitch B-1 is set
if(switchb&1 && ch=='0') slashzero(penX,penY);
if(switchb & 1 && ch=='0') slashzero(penX,penY);
// advance the cursor to the right
Real64 x_advance;
if (style & STYLE_PROP)
Expand Down Expand Up @@ -1306,7 +1336,7 @@ void Imagewriter::printChar(Bit8u ch)
if((curX + x_advance) > rightMargin) {
curX = leftMargin;
curY += lineSpacing;
if (curY > bottomMargin) newPage(true,false);
if (curY > bottomMargin - lineSpacing) newPage(true,false);
}
#endif // HAVE_SDL
}
Expand Down
1 change: 1 addition & 0 deletions src/imagewriter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
#include <winspool.h>
#endif

#define STYLE_BASE 0x00
#define STYLE_PROP 0x01
#define STYLE_CONDENSED 0x02
#define STYLE_BOLD 0x04
Expand Down
3 changes: 2 additions & 1 deletion src/iw_charmaps.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,13 @@ static const Bit16u intCharSets[8][10] =
{0x00a3, 0x00a7, 0x00a1, 0x00d1, 0x00bf, 0x0060, 0x00b0, 0x00f1, 0x00e7, 0x007e}, // Spanish
};

#define N_PAPER_SIZES 7
/*
Paper size definitions. Units are Postscript points (1/72in).
This list is based on the options available in the GS/OS
Imagewriter LQ driver.
*/
static const Bit16u paperSizes[7][2] =
static const Bit16u paperSizes[N_PAPER_SIZES][2] =
{
{612, 792}, //US Letter 8.5 x 11in
{612, 1008}, //US Legal 8.5 x 14in
Expand Down