1 files changed, 22 insertions, 5 deletions

diff --git a/noncore/apps/opie-reader/CDrawBuffer.h b/noncore/apps/opie-reader/CDrawBuffer.h
index 4d3696e..0d8968c 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.h
+++ b/noncore/apps/opie-reader/CDrawBuffer.h
@@ -9,2 +9,9 @@ class QPainter;
 
+enum linkType
+{
+    eNone,
+    eLink,
+    ePicture
+};
+
 struct textsegment
@@ -13,3 +20,3 @@ struct textsegment
     CStyle style;
-    textsegment(int _start, CStyle _style)
+    textsegment(int _start, const CStyle& _style)
         :
@@ -26,4 +33,12 @@ class CDrawBuffer : public CBuffer
     FontControl* fc;
-    int m_maxstyle, m_ascent, m_descent, m_lineSpacing;
+    int m_maxstyle, m_ascent, m_descent, m_lineSpacing, m_lineExtraSpacing;
+    bool m_bEof;
+    CDrawBuffer(const CDrawBuffer&);
+    CDrawBuffer& operator=(const tchar*sztmp);
  public:
+    int leftMargin();
+    int rightMargin();
+    void setEof() { m_bEof = true; }
+    bool eof() { return m_bEof; }
+    CDrawBuffer& operator=(CDrawBuffer&);
     CDrawBuffer(FontControl* _fs = NULL)
@@ -34,2 +49,3 @@ class CDrawBuffer : public CBuffer
         }
+    ~CDrawBuffer();
 /*
@@ -43,5 +59,4 @@ class CDrawBuffer : public CBuffer
     int width(int numchars = -1);
+    int offset(int);
     void render(QPainter* _p, int _y, bool _bMono, int _charWidth, int scw);
-    CDrawBuffer& operator=(const tchar*sztmp);
-    CDrawBuffer& operator=(CDrawBuffer&);
     void empty();
@@ -54,5 +69,7 @@ class CDrawBuffer : public CBuffer
     int lineSpacing() { return m_lineSpacing; }
+    int lineExtraSpacing() { return m_lineExtraSpacing; }
 
 //    void frig();
-    bool isLink(int numchars, size_t& tgt);
+    linkType getLinkType(int numchars, size_t& tgt);
+    void resize();
 };