1 files changed, 109 insertions, 42 deletions
diff --git a/src/lib/Pict1Parser.h b/src/lib/Pict1Parser.h
index ddadc5d..5475cd9 100644
--- a/src/lib/Pict1Parser.h
+++ b/src/lib/Pict1Parser.h
@@ -41,50 +41,117 @@ public:
 	bool parse();
 
 private:
-	void handleStartPict();
-	void handleEndPict();
-
-	void handleFillAttributes();
-	void handleLineAttributes();
-	void handleColormap();
+	void handleNOP();
+	void handleClipRgn();
+	void handleBkPat();
+	void handleTxFont();
+	void handleTxFace();
+	void handleTxMode();
+	void handleSpExtra();
+	void handlePnSize();
+	void handlePnMode();
+	void handlePnPat();
+	void handleThePat();
+	void handleOwSize();
+	void handleOrigin();
+	void handleTxSize();
+	void handleFgColor();
+	void handleBkColor();
+	void handleTxRatio();
+	void handlePicVersion();
 
 	void handleLine();
-	void handlePolyline();
-	void handleRectangle();
-	void handlePolygon();
-	void handleEllipse();
-	
-	void handleCurvedPolyline();
-
-	void decodeRLE(std::vector<unsigned char>& buffer, unsigned width, unsigned height, unsigned depth);
-	void fillPixels(libpict::PictBitmap& bitmap, const unsigned char* buffer, unsigned width, unsigned height, unsigned depth);
-	void handleBitmapTypeOne();
-	void handleBitmapTypeTwo();
-	void handlePostscriptTypeOne();
-	void handlePostscriptTypeTwo();
-	
-	void handleGraphicsTextAttributes();
-	void handleGraphicsTextTypeOne();
-	void handleGraphicsTextTypeTwo();
-	void handleGraphicsTextTypeThree();
-
-	void resetPalette();
-
-	// parsing context
-	int m_recordLength;
-	long m_recordEnd;
-	bool m_success;
-	bool m_exit;
-	bool m_graphicsStarted;
-	int m_width;
-	int m_height;
-	::WPXPropertyList m_style;
-	libpict::PictColor m_penForeColor;
-	libpict::PictColor m_penBackColor;
-	libpict::PictColor m_brushForeColor;
-	libpict::PictColor m_brushBackColor;
-	libpict::PictDashArray m_dashArray;
-	::WPXPropertyListVector m_gradient;
+	void handleLineFrom();
+	void handleShortLine();
+	void handleShortLineFrom();
+
+	void handleLongText();
+	void handleDHText();
+	void handleDVText();
+	void handleDHDVText();
+
+	void handleFrameRect();
+	void handlePaintRect();
+	void handleEraseRect();
+	void handleInvertRect();
+	void handleFillRect();
+
+	void handleFrameSameRect();
+	void handlePaintSameRect();
+	void handleEraseSameRect();
+	void handleInvertSameRect();
+	void handleFillSameRect();
+
+	void handleFrameRRect();
+	void handlePaintRRect();
+	void handleEraseRRect();
+	void handleInvertRRect();
+	void handleFillRRect();
+
+	void handleFrameSameRRect();
+	void handlePaintSameRRect();
+	void handleEraseSameRRect();
+	void handleInvertSameRRect();
+	void handleFillSameRRect();
+
+	void handleFrameOval();
+	void handlePaintOval();
+	void handleEraseOval();
+	void handleInsertOval();
+	void handleFillOval();
+
+	void handleFrameSameOval();
+	void handlePaintSameOval();
+	void handleEraseSameOval();
+	void handleInsertSameOval();
+	void handleFillSameOval();
+
+	void handleFrameArc();
+	void handlePaintArc();
+	void handleEraseArc();
+	void handleInsertArc();
+	void handleFillArc();
+
+	void handleFrameSameArc();
+	void handlePaintSameArc();
+	void handleEraseSameArc();
+	void handleInsertSameArc();
+	void handleFillSameArc();
+
+	void handleFramePoly();
+	void handlePaintPoly();
+	void handleErasePoly();
+	void handleInvertPoly();
+	void handleFillPoly();
+
+	void handleFrameSamePoly();
+	void handlePaintSamePoly();
+	void handleEraseSamePoly();
+	void handleInvertSamePoly();
+	void handleFillSamePoly();
+
+	void handleFrameRgn();
+	void handlePaintRgn();
+	void handleEraseRgn();
+	void handleInvertRgn();
+	void handleFillRgn();
+
+	void handleFrameSameRgn();
+	void handlePaintSameRgn();
+	void handleEraseSameRgn();
+	void handleInvertSameRgn();
+	void handleFillSameRgn();
+
+	void handleBitsRect();
+	void handleBitsRgn();
+
+	void handlePackBitsRect();
+	void handlePackBitsRgn();
+
+	void handleShortComment();
+	void handleLongComment();
+
+	void handleEndOfPicture();
 };
 
 #endif // __PICT1PARSER_H__