update - sorry it took so long. hope this works correctly

1 files changed, 216 insertions, 48 deletions

diff --git a/noncore/apps/opie-reader/CDrawBuffer.cpp b/noncore/apps/opie-reader/CDrawBuffer.cpp
index 892456f..ca220e6 100644
--- a/noncore/apps/opie-reader/CDrawBuffer.cpp
+++ b/noncore/apps/opie-reader/CDrawBuffer.cpp
@@ -1,2 +1 @@
-
 #include "CDrawBuffer.h"
@@ -5,2 +4,9 @@
 #include <qpainter.h>
+#include <qpixmap.h>
+#include "opie.h"
+
+CDrawBuffer::~CDrawBuffer()
+{
+    while (!segs.isEmpty()) segs.erase(0);
+}
 
@@ -9,9 +15,9 @@ void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
   int i;
-//  qDebug("Trying 1:%d:%s", f, (const char*)toQString(rhs.data()));
   len = rhs.len;
-  m_maxstyle = rhs.m_maxstyle;
-  m_ascent = rhs.m_ascent;
-  m_descent = rhs.m_descent;
-  m_lineSpacing = rhs.m_lineSpacing;
-  while (!segs.isEmpty()) segs.erase(0);
+  fc = rhs.fc;
+  m_maxstyle = m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
+  while (!segs.isEmpty())
+  {
+      segs.erase(0);
+  }
   for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); )
@@ -24,2 +30,5 @@ void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
           if (st < 0) st = 0;
+
+          CStyle _style = next->style;
+
           segs.push_back(textsegment(st,next->style));
@@ -30,3 +39,2 @@ void CDrawBuffer::setright(CDrawBuffer& rhs, int f)
   len = i;
-//  qDebug("Tried 1");
 }
@@ -42,3 +50,7 @@ CDrawBuffer& CDrawBuffer::operator=(CDrawBuffer& rhs)
   m_lineSpacing = rhs.m_lineSpacing;
-  while (!segs.isEmpty()) segs.erase(0);
+  m_lineExtraSpacing = rhs.m_lineExtraSpacing;
+  while (!segs.isEmpty())
+  {
+      segs.erase(0);
+  }
   for (CList<textsegment>::iterator iter = rhs.segs.begin(); iter != rhs.segs.end(); iter++)
@@ -57,3 +69,6 @@ CDrawBuffer& CDrawBuffer::operator=(const tchar*sztmp)
   int i;
-  while (!segs.isEmpty()) segs.erase(0);
+  while (!segs.isEmpty())
+  {
+      segs.erase(0);
+  }
   segs.push_back(textsegment(0, CStyle()));
@@ -69,5 +84,9 @@ void CDrawBuffer::empty()
     (*this)[0] = 0;
-    while (!segs.isEmpty()) segs.erase(0);
+    while (!segs.isEmpty())
+    {
+        segs.erase(0);
+    }
     segs.push_back(textsegment(0,CStyle()));
-    m_maxstyle = m_ascent = m_descent = m_lineSpacing = 0;
+    m_maxstyle = m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
+    m_bEof = false;
 }
@@ -78,7 +97,2 @@ void CDrawBuffer::addch(tchar ch, CStyle _style/* = ucFontBase*/)
     {
-        int thissize = fc->getsize(_style);
-        m_maxstyle = thissize;
-        m_ascent = fc->ascent(_style);
-        m_descent = fc->descent(_style);
-        m_lineSpacing = fc->lineSpacing(_style);
         segs.first().start = 0;
@@ -88,10 +102,2 @@ void CDrawBuffer::addch(tchar ch, CStyle _style/* = ucFontBase*/)
     {
-        int thissize = fc->getsize(_style);
-        if (thissize > m_maxstyle)
-        {
-            m_maxstyle = thissize;
-            m_ascent = fc->ascent(_style);
-            m_descent = fc->descent(_style);
-            m_lineSpacing = fc->lineSpacing(_style);
-        }
         segs.push_back(textsegment(len, _style));
@@ -122,6 +128,22 @@ int CDrawBuffer::width(int numchars)
         CStyle currentstyle = textstart->style;
-        QFont f(fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
-        QString str = text.mid(textstart->start, end-textstart->start);
-        QFontMetrics fm(f);
-        currentx += fm.width(str);
+        if (currentstyle.isPicture())
+        {
+            currentx += currentstyle.getPicture()->width();
+        }
+        else
+        {
+            if (currentstyle.isMono() && !fc->hasCourier())
+            {
+                int cw = (7*fc->getsize(currentstyle))/10;
+                currentx += cw*(end-textstart->start);
+            }
+            else
+            {
+                QFont f(currentstyle.isMono() ? QString("courier") : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
+        //    f.setUnderline(currentstyle.isUnderline());
+                QString str = text.mid(textstart->start, end-textstart->start);
+                QFontMetrics fm(f);
+                currentx += fm.width(str);
+            }
+        }
         textstart = textend;
@@ -132,7 +154,44 @@ int CDrawBuffer::width(int numchars)
 
+int CDrawBuffer::leftMargin()
+{
+    return (segs.begin()->style.getLeftMargin()*fc->getsize(segs.begin()->style))/6;
+}
+
+int CDrawBuffer::rightMargin()
+{
+    return (segs.begin()->style.getRightMargin()*fc->getsize(segs.begin()->style))/6;
+}
+
+int CDrawBuffer::offset(int scwidth)
+{
+    int currentx = BORDER;
+    switch(segs.begin()->style.getJustify())
+    {
+        case m_AlignRight:
+        {
+            currentx = scwidth - BORDER - rightMargin() - width();
+        }
+        break;
+        case m_AlignCentre:
+        {
+            currentx = (
+                scwidth +
+                leftMargin() - rightMargin()
+                - width())/2;
+        }
+        break;
+        case m_AlignJustify:
+        case m_AlignLeft:
+            currentx = BORDER + leftMargin();
+            break;
+    }
+    return currentx;
+}
+
 void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int scwidth)
 {
-    int currentx = 0;
+    int currentx = offset(scwidth);
     QString text = toQString(data());
     CList<textsegment>::iterator textstart = segs.begin();
+/*
     StyleType align = textstart->style.getJustify();
@@ -142,4 +201,3 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
         {
-        //    int linelength = width();
-            currentx = scwidth - width();
+            currentx = scwidth - width() - 2*BORDER;
         }
@@ -148,4 +206,3 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
         {
-        //    int linelength = width();
-            currentx = (scwidth - width())/2;
+            currentx = (scwidth - width())/2 - BORDER;
         }
@@ -156,2 +213,3 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
     }
+*/
     CList<textsegment>::iterator textend = textstart;
@@ -162,8 +220,23 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
         CStyle currentstyle = textstart->style;
-        QFont f(fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
+        QFont f((currentstyle.isMono() && fc->hasCourier()) ? QString("courier") : fc->name(), fc->getsize(currentstyle), (currentstyle.isBold()) ? QFont::Bold : QFont::Normal, (currentstyle.isItalic()) );
+        //f.setUnderline(currentstyle.isUnderline());
+        //if (currentstyle.isUnderline()) qDebug("UNDERLINE");
         _p->setFont(f);
         QString str = text.mid(textstart->start, end-textstart->start);
-        _p->setPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()));
+#ifdef OPIE
+        _p->setPen(QPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()), fc->getsize(currentstyle)/100));
+#else
+        _p->setPen(QPen(QColor(currentstyle.Red(), currentstyle.Green(), currentstyle.Blue()), fc->getsize(currentstyle)/10));
+#endif
         if (_bMono)
         {
+            if (currentstyle.isUnderline())
+            {
+                _p->drawLine( currentx, _y, currentx + str.length()*_charWidth, _y);
+            }
+            if (currentstyle.isStrikethru())
+            {
+                int ascent = fc->ascent(currentstyle)/3;
+                _p->drawLine( currentx, _y-ascent, currentx + str.length()*_charWidth, _y-ascent);
+            }
             for (int i = 0; i < str.length(); i++)
@@ -176,5 +249,49 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
         {
-            _p->drawText( currentx, _y, str);
-            QFontMetrics fm(f);
-            currentx += fm.width(str);
+            if (currentstyle.isPicture())
+            {
+                int ascent = fc->ascent(currentstyle)/2;
+                int yoffset = currentstyle.getPicture()->height()/2 + ascent;
+                _p->drawPixmap( currentx, _y-yoffset, *(currentstyle.getPicture()));
+                currentx += currentstyle.getPicture()->width();
+            }
+            else
+            {
+                if (currentstyle.isMono() && !fc->hasCourier())
+                {
+                    int cw = (7*fc->getsize(currentstyle))/10;
+                    int w = cw*(end-textstart->start);
+                    if (currentstyle.isUnderline())
+                    {
+                        _p->drawLine( currentx, _y, currentx + w, _y);
+                    }
+                    if (currentstyle.isStrikethru())
+                    {
+                        int ascent = fc->ascent(currentstyle)/3;
+                        _p->drawLine( currentx, _y-ascent, currentx + w, _y-ascent);
+                    }
+                    QString str = text.mid(textstart->start, end-textstart->start);
+
+                    for (int i = 0; i < str.length(); i++)
+                    {
+                        _p->drawText( currentx, _y, QString(str[i]));
+                        currentx += cw;
+                    }
+                }
+                else
+                {
+                    QFontMetrics fm(f);
+                    int w = fm.width(str);
+                    if (currentstyle.isUnderline())
+                    {
+                        _p->drawLine( currentx, _y, currentx + w, _y);
+                    }
+                    if (currentstyle.isStrikethru())
+                    {
+                        int ascent = fc->ascent(currentstyle)/3;
+                        _p->drawLine( currentx, _y-ascent, currentx + w, _y-ascent);
+                    }
+                    _p->drawText( currentx, _y, str);
+                    currentx += w;
+                }
+            }
         }
@@ -182,3 +299,3 @@ void CDrawBuffer::render(QPainter* _p, int _y, bool _bMono, int _charWidth, int
     }
-    while (textend != segs.end());
+    while (textend != segs.end() && textstart->start < length()-1);
 }
@@ -190,3 +307,3 @@ CStyle CDrawBuffer::laststyle()
 
-bool CDrawBuffer::isLink(int numchars, size_t& tgt)
+linkType CDrawBuffer::getLinkType(int numchars, size_t& tgt)
 {
@@ -200,12 +317,63 @@ bool CDrawBuffer::isLink(int numchars, size_t& tgt)
         end = (textend != segs.end()) ? textend->start : length();
-        if (numchars >= 0 && end > numchars)
-        {
-            end = numchars;
-        }
         currentstyle = textstart->style;
+/*
+        if (currentstyle.isPicture()) qDebug("Passed thru picture");
+        if (currentstyle.getLink()) qDebug("Passed thru link");
+        qDebug("islink:%d - %d", numchars, end);
+*/
         textstart = textend;
     }
-    while (textend != segs.end() && end != numchars);
-    tgt = currentstyle.getData();
-    return currentstyle.getLink();
+    while (textend != segs.end() && end <= numchars);
+//    if (currentstyle.isPicture()) qDebug("Clicked on picture");
+    if (currentstyle.getPictureLink())
+    {
+        tgt = currentstyle.getPictureLinkData();
+        return ePicture;
+    }
+    if (currentstyle.getLink())
+    {
+        tgt = currentstyle.getData();
+        return eLink;
+    }
+    return eNone;
+}
+
+void CDrawBuffer::resize()
+{
+    int i;
+    m_maxstyle = m_ascent = m_descent = m_lineSpacing = m_lineExtraSpacing = 0;
+    for (CList<textsegment>::iterator iter = segs.begin(); iter != segs.end() && iter->start <= length(); )
+    {
+        CList<textsegment>::iterator next = iter;
+        iter++;
+        int st = next->start;
+        if (st < 0) st = 0;
+
+        CStyle _style = next->style;
+
+        int linespacing, ascent, descent, extra;
+
+        ascent = fc->ascent(_style);
+        descent = fc->descent(_style);
+        linespacing = fc->lineSpacing(_style);
+        extra = linespacing - ascent - descent;
+        if (_style.isPicture())
+        {
+            descent = (_style.getPicture()->height()-ascent)/2;
+            ascent = (_style.getPicture()->height()+ascent)/2;
+        }
+/*
+        else if (fc != NULL)
+        {
+            ascent = fc->ascent(_style);
+            descent = fc->descent(_style);
+            linespacing = fc->lineSpacing(_style);
+            extra = linespacing - ascent - descent;
+        }
+*/
+        if (ascent > m_ascent) m_ascent = ascent;
+        if (descent > m_descent) m_descent = descent;
+        if (extra > m_lineExtraSpacing) m_lineExtraSpacing = extra;
+        m_lineSpacing = m_ascent+m_descent+m_lineExtraSpacing;
+    }
 }