1 files changed, 476 insertions, 240 deletions

diff --git a/noncore/apps/opie-reader/QTReader.cpp b/noncore/apps/opie-reader/QTReader.cpp
index f2ee027..03c8fbe 100644
--- a/noncore/apps/opie-reader/QTReader.cpp
+++ b/noncore/apps/opie-reader/QTReader.cpp
@@ -9,19 +9,25 @@
 *****************************************************************************/
 
+#include "useqpe.h"
 #include <qpainter.h>
+#include <qimage.h>
+#include <qtimer.h>
 #include "config.h"
 #include "QTReader.h"
 #include "QTReaderApp.h"
 #include "CDrawBuffer.h"
+#ifdef USEQPE
 #include <qpe/qpeapplication.h>
+#endif
 #include <math.h>
 #include <ctype.h>
 #include <stdio.h> //for sprintf
+#ifdef USEQPE
 #include <qpe/config.h>
 #include <qpe/applnk.h>
-#include <qfontdatabase.h>
 #include <qpe/global.h>
 #include <qpe/qcopenvelope_qws.h>
-#include "StateData.h"
+#endif
+#include <qfontdatabase.h>
 
 #ifdef _UNICODE
@@ -37,4 +43,8 @@ const char *QTReader::fonts[] = { "Helvetica", "Courier", "Times", 0 };
 //const int   QTReader::fontsizes[] = {1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,0};
 
+tchar QTReader::pluckernextpart[] = { 'C','l','i','c','k',' ','h','e','r','e',' ','f','o','r',' ','t','h','e',' ','n','e','x','t',' ','p','a','r','t',0 };
+tchar QTReader::jplucknextpart[] = { 'N','e','x','t',' ','P','a','r','t',' ','>','>',0 };
+//tchar QTReader::jplucknextpart[] = { 10,'#',10,'N','e','x','t',' ','P','a','r','t',' ','>','>',0 };
+
 QTReader::QTReader( QWidget *parent, const char *name, WFlags f) :
   QWidget(parent, name, f),
@@ -52,11 +62,16 @@ QTReader::QTReader( QWidget *parent, const char *name, WFlags f) :
   m_touchone(true),
   bDoUpdates(false),
-  m_navkeys(true)
+#ifdef _SCROLLPIPE
+  m_pipeout(NULL),
+#endif
+  m_border(2)
 {
     m_overlap = 1;
+    setKeyCompression ( true );
 //  init();
 }
+
 /*
-QTReader::QTReader( const QString& filename, QWidget *parent, const tchar *name, WFlags f ) :
+QTReader::QTReader( const QString& filename, QWidget *parent=0, const tchar *name=0, WFlags f = 0) :
   QWidget(parent, name, f),
   m_textfont(0),
@@ -73,9 +88,18 @@ QTReader::QTReader( const QString& filename, QWidget *parent, const tchar *name,
 {
   init();
-  //  qDebug("Load_file(1)");
+//  //  qDebug("Load_file(1)");
   load_file((const tchar*)filename);
 }
 */
 
+/*
+void QTReader::mouseMoveEvent(QMouseEvent* _e)
+{
+
+    mouseUpOn = !(_e->pos().x() == -1);
+
+    qDebug("MouseMove:[%d, %d]", _e->pos().x(), _e->pos().y());
+}
+*/
 long QTReader::real_delay()
 {
@@ -88,52 +112,101 @@ void QTReader::mousePressEvent( QMouseEvent* _e )
     if (_e->button() == RightButton)
     {
+        //qDebug("MousePress");
         mouseUpOn = false;
-        if (buffdoc.hasnavigation())
+        if (m_swapmouse)
         {
-            if (_e->y() > (2*height())/3)
-            {
-                goDown();
-            }
-            else if (_e->y() < height()/3)
-            {
-                goUp();
-            }
-            else
-            {
-                if (_e->x() < width()/3)
-                {
-                    size_t target = pagelocate();
-                    if (buffdoc.back(target))
-                    {
-                        locate(target);
-                    }
-                }
-                else if (_e->x() > (2*width())/3)
-                {
-                    size_t target = pagelocate();
-                    if (buffdoc.forward(target))
-                    {
-                        locate(target);
-                    }
-                }
-                else
+                int lineno = 0;
+                int ht = textarray[0]->lineSpacing();
+                while ((ht < _e->y()) && (lineno < numlines))
                 {
-                    buffdoc.saveposn(pagelocate());
-                    locate(buffdoc.getHome());
+                    ht += textarray[++lineno]->lineSpacing();
                 }
-            }
+                size_t startpos, startoffset, tgt;
+                getcurrentpos(_e->x(), _e->y(), startpos, startoffset, tgt);
+                processmousewordevent(startpos, startoffset, _e, lineno);
+        }
+        else
+            processmousepositionevent(_e);
+    }
+}
+
+void QTReader::processmousepositionevent( QMouseEvent* _e )
+{
+    if (buffdoc.hasnavigation())
+    {
+        if (_e->y() > (2*height())/3)
+        {
+            goDown();
+        }
+        else if (_e->y() < height()/3)
+        {
+            goUp();
         }
         else
         {
-            if (_e->y() > height()/2)
+            if (_e->x() < width()/3)
             {
-                goDown();
+                goBack();
+            }
+            else if (_e->x() > (2*width())/3)
+            {
+                goForward();
             }
             else
             {
-                goUp();
+                goHome();
             }
         }
     }
+    else
+    {
+        if (_e->y() > height()/2)
+        {
+            goDown();
+        }
+        else
+        {
+            goUp();
+        }
+    }
+}
+
+void QTReader::goHome()
+{
+    if (buffdoc.hasnavigation())
+    {
+         size_t current=pagelocate();
+         size_t home=buffdoc.getHome();
+         if (current!=home)
+        {
+            buffdoc.saveposn(current);
+            locate(home);
+         }
+    }
+}
+
+void QTReader::goBack()
+{
+    if (buffdoc.hasnavigation())
+    {
+        size_t target = pagelocate();
+        buffdoc.writeposn(target);
+        if (buffdoc.back(target))
+        {
+            locate(target);
+        }
+    }
+}
+
+void QTReader::goForward()
+{
+    if (buffdoc.hasnavigation())
+    {
+        size_t target = pagelocate();
+        if (buffdoc.forward(target))
+        {
+            locate(target);
+        }
+    }
 }
 
@@ -149,5 +222,5 @@ linkType QTReader::getcurrentpos(int x, int y, size_t& start, size_t& offset, si
     if (m_bMonoSpaced)
     {
-        offset = x/m_charWidth;
+        offset = (x - textarray[lineno]->offset(width(), m_border))/m_charWidth;
     }
     else
@@ -155,6 +228,6 @@ linkType QTReader::getcurrentpos(int x, int y, size_t& start, size_t& offset, si
         int i;
         CDrawBuffer* t = textarray[lineno];
-        x = x - t->offset(width());
-        for (i = t->length(); i >= 0 && t->width(i) > x; i--);
+        x = x - t->offset(width(), m_border);
+        for (i = t->length(); i >= 0 && t->width(i, true, width(), m_border) > x; i--);
         offset = i;
     }
@@ -162,4 +235,13 @@ linkType QTReader::getcurrentpos(int x, int y, size_t& start, size_t& offset, si
 }
 
+void QTReader::suspend()
+{
+#ifdef OPIE
+    if (memcmp("/mnt/", m_lastfile.latin1(), 5) == 0) buffdoc.suspend();
+#else
+    if (memcmp("/usr/mnt.rom/", m_lastfile.latin1(), 13) == 0) buffdoc.suspend();
+#endif
+}
+
 void QTReader::setTwoTouch(bool _b)
 {
@@ -174,4 +256,88 @@ void QTReader::setContinuous(bool _b)
 }
 
+void QTReader::processmousewordevent(size_t startpos, size_t startoffset, QMouseEvent* _e, int lineno)
+{
+    QString wrd;
+    if (m_twotouch)
+    {
+        if (m_touchone)
+        {
+            m_touchone = false;
+            m_startpos = startpos;
+            m_startoffset = startoffset;
+            setBackgroundColor( lightGray );
+        }
+        else
+        {
+            m_touchone = true;
+            setBackgroundColor( white );
+            size_t endpos, endoffset;
+            endpos = startpos;
+            endoffset = startoffset;
+            size_t currentpos = locate();
+            if (endpos >= m_startpos)
+            {
+                jumpto(m_startpos);
+                for (int i = 0; i < m_startoffset; i++)
+                {
+                    getch();
+                }
+                if (m_startpos == endpos)
+                {
+                    for (int i = m_startoffset; i <= endoffset; i++)
+                    {
+                        wrd += QChar(getch());
+                    }
+                }
+                else
+                {
+                    while (buffdoc.explocate() <= endpos)
+                    {
+                        wrd += QChar(getch());
+                    }
+                    for (int i = 0; i < endoffset; i++)
+                    {
+                        wrd += QChar(getch());
+                    }
+                }
+                jumpto(currentpos);
+            }
+        }
+    }
+    else if (m_bMonoSpaced)
+    {
+        int chno = (_e->x()-textarray[lineno]->offset(width(), m_border))/m_charWidth;
+        if (chno < ustrlen(textarray[lineno]->data()))
+        {
+            wrd[0] = textarray[lineno]->data()[chno];
+        }
+    }
+    else
+    {
+        CDrawBuffer* t = textarray[lineno];
+        int first = 0;
+        int tgt = _e->x() - t->offset(width(), m_border);
+        while (1)
+        {
+            int i = first+1;
+            while (QChar((*t)[i]).isLetter() && (*t)[i] != 0) i++;
+            if (t->width(i, true, width(), m_border) > tgt)
+            {
+                wrd = toQString(t->data()+first, i - first);
+        //                  qDebug("Got %s", (const char *)wrd);
+                break;
+            }
+            while (!QChar((*t)[i]).isLetter() && (*t)[i] != 0) i++;
+            if ((*t)[i] == 0) break;
+            first = i;
+                }       
+    }
+    if (!wrd.isEmpty())
+    {
+        //qDebug("Selected:%s", (const char*)wrd);
+        emit OnWordSelected(wrd, locnarray[lineno], (m_twotouch) ? wrd : toQString(textarray[lineno]->data()));
+    }
+}
+
 void QTReader::mouseReleaseEvent( QMouseEvent* _e )
 {
@@ -181,7 +347,13 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
         if (mouseUpOn)
         {
+        //    qDebug("MouseRelease");
+            if (_e->x() > width() - m_border)
+            {
+                locate(buffdoc.startSection()+((buffdoc.endSection()-buffdoc.startSection())*_e->y()+height()/2)/height());
+                return;
+            }
             if (textarray[0] != NULL)
             {
-                QString wrd, line;
+                QString line;
         //      int lineno = _e->y()/m_linespacing;
                 int lineno = 0;
@@ -197,5 +369,7 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
                     {
                         size_t saveposn = pagelocate();
-                        if (buffdoc.hyperlink(tgt))
+                        QString href;
+                        linkType lt = buffdoc.hyperlink(tgt, href);
+                        if (lt == eLink)
                         {
                             buffdoc.saveposn(saveposn);
@@ -205,4 +379,21 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
                         else
                         {
+                            if (lt == ePicture)
+                            {
+                                QImage* pm = buffdoc.getPicture(tgt);
+                                if (pm != NULL)
+                                {
+                                    emit OnShowPicture(*pm);
+                                    delete pm;
+                                }
+                            }
+                            else
+                            {
+        //                      QString anchortext = textarray[lineno]->getanchortext(startoffset);
+                                if (!href.isEmpty())
+                                {
+                                    emit OnURLSelected(href);
+                                }
+                            }
                             locate(pagelocate());
                         }
@@ -211,6 +402,6 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
                     case ePicture:
                     {
-                        qDebug("Picture:%x", tgt);
-                        QPixmap* pm = buffdoc.getPicture(tgt);
+        //              qDebug("Picture:%x", tgt);
+                        QImage* pm = buffdoc.getPicture(tgt);
                         if (pm != NULL)
                         {
@@ -227,84 +418,11 @@ void QTReader::mouseReleaseEvent( QMouseEvent* _e )
                         break;
                     default:
-                        qDebug("Unknown linktype");
+        //              qDebug("Unknown linktype");
                         return;
                 }
-                if (m_twotouch)
-                {
-                    if (m_touchone)
-                    {
-                        m_touchone = false;
-                        m_startpos = startpos;
-                        m_startoffset = startoffset;
-                        setBackgroundColor( lightGray );
-                    }
-                    else
-                    {
-                        m_touchone = true;
-                        setBackgroundColor( white );
-                        size_t endpos, endoffset;
-                        endpos = startpos;
-                        endoffset = startoffset;
-                        size_t currentpos = locate();
-                        if (endpos >= m_startpos)
-                        {
-                            jumpto(m_startpos);
-                            for (int i = 0; i < m_startoffset; i++)
-                            {
-                                getch();
-                            }
-                            if (m_startpos == endpos)
-                            {
-                                for (int i = m_startoffset; i <= endoffset; i++)
-                                {
-                                    wrd += QChar(getch());
-                                }
-                            }
-                            else
-                            {
-                                while (buffdoc.explocate() <= endpos)
-                                {
-                                    wrd += QChar(getch());
-                                }
-                                for (int i = 0; i < endoffset; i++)
-                                {
-                                    wrd += QChar(getch());
-                                }
-                            }
-                            jumpto(currentpos);
-                        }
-                    }
-                }
-                else if (m_bMonoSpaced)
-                {
-                    int chno = _e->x()/m_charWidth;
-                    if (chno < ustrlen(textarray[lineno]->data()))
-                    {
-                        wrd[0] = textarray[lineno]->data()[chno];
-                    }
-                }
+                if (m_swapmouse)
+                    processmousepositionevent(_e);
                 else
-                {
-                    CDrawBuffer* t = textarray[lineno];
-                    int first = 0;
-                    int tgt = _e->x() - t->offset(width());
-                    while (1)
-                    {
-                        int i = first+1;
-                        while (QChar((*t)[i]).isLetter() && (*t)[i] != 0) i++;
-                        if (t->width(i) > tgt)
-                        {
-                            wrd = toQString(t->data()+first, i - first);
-                            break;
-                        }
-                        while (!QChar((*t)[i]).isLetter() && (*t)[i] != 0) i++;
-                        if ((*t)[i] == 0) break;
-                        first = i;
-                            }   
-                }
-                if (!wrd.isEmpty())
-                {
-                    emit OnWordSelected(wrd, locnarray[lineno], (m_twotouch) ? wrd : toQString(textarray[lineno]->data()));
-                }
+                    processmousewordevent(startpos, startoffset, _e, lineno);
             }
         }
@@ -327,5 +445,5 @@ void QTReader::focusOutEvent(QFocusEvent* e)
     {
         timer->stop();
-        m_scrolldy1 = m_scrolldy2 = 0;
+        //m_scrolldy1 = m_scrolldy2 = 0;
     }
 }
@@ -333,5 +451,7 @@ void QTReader::focusOutEvent(QFocusEvent* e)
 #include <qapplication.h>
 #include <qdrawutil.h>
+#ifndef _WINDOWS
 #include <unistd.h>
+#endif
 
 void QTReader::goDown()
@@ -427,7 +547,60 @@ void QTReader::zoomout()
 }
 
+void QTReader::reduceScroll()
+{
+    if (m_delay < 59049)
+    {
+        m_delay = (3*m_delay)/2;
+        timer->changeInterval(real_delay());
+    }
+    else
+    {
+        m_delay = 59049;
+    }
+}
+
+void QTReader::increaseScroll()
+{
+    if (m_delay > 1024)
+    {
+        m_delay = (2*m_delay)/3;
+        timer->changeInterval(real_delay());
+    }
+    else
+    {
+        m_delay = 1024;
+    }
+}
+
 void QTReader::keyPressEvent(QKeyEvent* e)
 {
     buffdoc.unsuspend();
+    ((QTReaderApp*)parent()->parent())->handlekey(e);
+//    e->ignore();
+    return;
+#ifdef _SCROLLPIPE
+    if (m_isPaused)
+    {
+        m_isPaused = false;
+        if (e->key() != Key_Space)
+        {
+            m_autoScroll = false;
+            if (m_pipeout != NULL)
+            {
+                pclose(m_pipeout);
+                m_pipeout = NULL;
+            }
+            ((QTReaderApp*)parent()->parent())->setScrollState(m_autoScroll);
+            QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
+        }
+        else
+        {
+            timer->start(real_delay(), false);
+        }
+        e->accept();
+        return;
+    }
+#endif
+/*
   switch (e->key())
     {
@@ -474,33 +647,4 @@ void QTReader::keyPressEvent(QKeyEvent* e)
         }
       break;
-      /*
-      case Key_Left:
-        {
-          e->accept();
-          if (m_textfont > 0)
-            {
-              m_textfont--;
-              setfont(NULL);
-              locate(pagelocate());
-              update();
-            }
-        }
-      break;
-      case Key_Right:
-        {
-          e->accept();
-          if (fonts[++m_textfont] == 0)
-            {
-              m_textfont--;
-            }
-          else
-            {
-              setfont(NULL);
-              locate(pagelocate());
-              update();
-            }
-        }
-      break;
-      */
         case Key_Right:
         {
@@ -531,14 +675,8 @@ void QTReader::keyPressEvent(QKeyEvent* e)
         }
         break;
-        case Key_Space:
-        case Key_Return:
-        {
-          e->accept();
-          emit OnActionPressed();
-        }
-        break;
         default:
             e->ignore();
     }
+*/
 }
 
@@ -549,5 +687,14 @@ void QTReader::setautoscroll(bool _sc)
     {
         m_autoScroll = false;
+#ifdef USEQPE
         QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
+#endif
+#ifdef _SCROLLPIPE
+        if (m_pipeout != NULL)
+        {
+            pclose(m_pipeout);
+            m_pipeout = NULL;
+        }
+#endif
      }
     else
@@ -556,6 +703,16 @@ void QTReader::setautoscroll(bool _sc)
         if (reusebuffer == NULL || reusebuffer->eof()) return;
         m_autoScroll = true;
+#ifdef _SCROLLPIPE
+        if (!m_pipetarget.isEmpty())
+        {
+        //    qDebug("Opening pipe to %s", (const char*)m_pipetarget);
+            m_pipeout = popen((const char*)m_pipetarget, "w");
+            m_isPaused = false;
+        }
+#endif
         autoscroll();
+#ifdef USEQPE
         QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Disable; // light is even not dimmed
+#endif
     }
 }
@@ -566,9 +723,9 @@ bool QTReader::getline(CDrawBuffer *buff)
     if (m_bMonoSpaced)
     {
-        return buffdoc.getline(buff ,width(), m_charWidth);
+        return buffdoc.getline(buff ,width(), m_charWidth, m_border);
     }
     else
     {
-        return buffdoc.getline(buff, width());
+        return buffdoc.getline(buff, width(), m_border);
     }
 }
@@ -589,4 +746,23 @@ void QTReader::doscroll()
     if (++m_scrolldy1 == textarray[0]->lineSpacing())
     {
+#ifdef _SCROLLPIPE
+        if (m_pipeout != NULL)
+        {
+            QString outstr = toQString(textarray[0]->data());
+            if (!outstr.isEmpty())
+            {
+                fprintf(m_pipeout, "%s\n", (const char*)outstr);
+                fflush(m_pipeout);
+            }
+            else if (m_pauseAfterEachPara)
+            {
+                m_isPaused = true;
+                timer->stop();
+            }
+        //    write(m_pipeout, (const char*)outstr, outstr.length());
+        //    write(m_pipeout, "\n", 1);
+        //    fputc(10, m_pipeout);
+        }
+#endif
         CDrawBuffer* buff = textarray[0];
         for (int i = 1; i <= numlines; i++)
@@ -610,10 +786,27 @@ void QTReader::doscroll()
         locnarray[numlines] = locate();
         int ch = getline(textarray[numlines]);
-        textarray[numlines-1]->render(&p, height() - textarray[numlines-1]->descent() - 2, m_bMonoSpaced, m_charWidth, width());
+        textarray[numlines-1]->render(&p, height() - textarray[numlines-1]->descent() - 2, m_bMonoSpaced, m_charWidth, width(), m_border);
         mylastpos = locate();
         if (!ch)
         {
             m_autoScroll = false;
+#ifdef _SCROLLPIPE
+            for (int i = 0; i < numlines; i++)
+            {
+                if (m_pipeout != NULL)
+                {
+                    QString outstr = toQString(textarray[i]->data());
+                    if (!outstr.isEmpty())
+                    {
+                        fprintf(m_pipeout, "%s\n", (const char*)outstr);
+                        fflush(m_pipeout);
+                    }
+                }
+            }
+#endif
             ((QTReaderApp*)parent()->parent())->setScrollState(m_autoScroll);
+#ifdef USEQPE
+            QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
+#endif
         }
         emit OnRedraw();
@@ -640,36 +833,38 @@ void QTReader::drawFonts( QPainter *p )
     if (bDoUpdates)
     {
-        qDebug("How refreshing...");
+        //qDebug("How refreshing...");
         if (buffdoc.empty()) return;
         setfont();
         if (m_lastwidth != width())
         {
-            qDebug("Not Optimised %d", m_lastwidth);
+        //    qDebug("Not Optimised %d", m_lastwidth);
             m_lastwidth = width();
             m_lastheight = height();
+            buffdoc.setwidth(m_lastwidth-2*m_border);
             locate(pagelocate());
-            qDebug("Not Optimised %d", m_lastwidth);
+        //    qDebug("Not Optimised %d", m_lastwidth);
         }
         else 
         {
-            if (m_lastheight > height())
+            int newht = height();
+            if (m_lastheight > newht)
             {
-                qDebug("Optimised < %d", numlines);
+        //      qDebug("Optimised < %d %d %d", numlines, m_lastheight, newht);
                 int ypos = 0;
                 for (int i = 0; i < numlines; i++)
                 {
-                    if ((ypos += textarray[i]->lineSpacing()) > height())
+                    if ((ypos += textarray[i]->lineSpacing()) > newht)
                     {
                         numlines = i;
-                        jumpto(locnarray[i+1]);
+                        jumpto(mylastpos = locnarray[i+1]);
                         break;
                     }
                 }
-                qDebug("Optimised < %d", numlines);
-                m_lastheight = height();
+        //      qDebug("Optimised < %d", numlines);
+                m_lastheight = newht;
             }
-            else if (m_lastheight < height())
+            else if (m_lastheight < newht)
             {
-                qDebug("Optimised > %d", numlines);
+        //      qDebug("Optimised > %d", numlines);
                 int ypos = 0;
                 for (int i = 0; i <= numlines; i++)
@@ -677,12 +872,13 @@ void QTReader::drawFonts( QPainter *p )
                     ypos += textarray[i]->lineSpacing();
                 }
-                fillbuffer(numlines+1, ypos);
-                qDebug("Optimised > %d", numlines);
-                m_lastheight = height();
+                fillbuffer(numlines+1, ypos, newht);
+        //      qDebug("Optimised > %d", numlines);
             }
             if (numlines > 0)
             {
                 int ypos = textarray[0]->ascent();
-                textarray[0]->render( p, ypos, m_bMonoSpaced, m_charWidth, width());
+                textarray[0]->render( p, ypos, m_bMonoSpaced, m_charWidth, width(), m_border);
+        //      int last = (m_showlast) ? numlines : numlines-1;
+        //      for (int i = 1; i <= last; i++)
                 for (int i = 1; i < numlines; i++)
                 {
@@ -690,16 +886,28 @@ void QTReader::drawFonts( QPainter *p )
                     ypos += (textarray[i-1]->descent() + textarray[i]->ascent())+
                         (textarray[i-1]->lineExtraSpacing() + textarray[i]->lineExtraSpacing())/2;
-                    textarray[i]->render( p, ypos, m_bMonoSpaced, m_charWidth, width());
+                    textarray[i]->render( p, ypos, m_bMonoSpaced, m_charWidth, width(), m_border);
                 }
 //      mylastpos = locate();
             }
         }
-        m_scrolldy1 = m_scrolldy2 = 0;
+
+        m_scrolldy1 = m_scrolldy2 = m_scrollpart;
+        if (m_border > 5 && !buffdoc.empty())
+        {
+            p->fillRect(width()-2, 0, 2, height(), cyan);
+            int sectionsize = (buffdoc.endSection()-buffdoc.startSection());
+            int mid = (height()*(locnarray[numlines]+locnarray[0]-2*buffdoc.startSection())+sectionsize)/(2*sectionsize);
+            p->fillRect(width()-2, mid-5, 2, 10, yellow);
+            p->fillRect(width()-2, (height()*(locnarray[0]-buffdoc.startSection())+sectionsize/2)/sectionsize, 2, ((locnarray[numlines]-locnarray[0])*height()+sectionsize/2)/sectionsize, magenta);
+        }
+
         emit OnRedraw();
     }
+/*
     else
     {
         qDebug("Not so refreshing...");
     }
+*/
 }
 
@@ -743,4 +951,5 @@ bool QTReader::ChangeFont(int tgt)
 void QTReader::init()
 {
+//    m_showlast = true;
   //    setCaption( "Qt Draw Demo Application" );
 
@@ -772,4 +981,16 @@ void QTReader::init()
 QTReader::~QTReader()
 {
+#ifdef USEQPE
+    if (m_autoScroll)
+    {
+        QCopEnvelope( "QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable;
+    }
+#endif
+#ifdef _SCROLLPIPE
+    if (m_pipeout != NULL)
+    {
+        fclose(m_pipeout);
+    }
+#endif
 }
 
@@ -817,5 +1038,5 @@ void QTReader::paintEvent( QPaintEvent * )
 void QTReader::resizeEvent( QResizeEvent * )
 {
-  //  qDebug("resize:(%u,%u)", width(), height());
+//  //  qDebug("resize:(%u,%u)", width(), height());
   //    bgroup->move( width()-bgroup->width(), 0 );
 }
@@ -842,9 +1063,9 @@ bool QTReader::locate(unsigned long n) {
     buffdoc.unsuspend();
   buffdoc.locate(n);
-  //  qDebug("&buffdoc.located");
+//  //  qDebug("&buffdoc.located");
   fillbuffer();
-  //  qDebug("&Buffer filled");
+//  //  qDebug("&Buffer filled");
   update();
-  //  qDebug("&Located");
+//  //  qDebug("&Located");
   return true;
 }
@@ -857,16 +1078,20 @@ unsigned int QTReader::screenlines()
 };
 
-bool QTReader::fillbuffer(int reuse, int ht)
+bool QTReader::fillbuffer(int reuse, int ht, int newht)
 {
     buffdoc.unsuspend();
     if (buffdoc.empty()) return false;
-    m_scrolldy1 = m_scrolldy2 = 0;
+    if (newht < 0)
+        m_lastheight = height();
+    else
+        m_lastheight = newht;
     int ch;
     bool ret = false;
     unsigned int oldpagepos = locnarray[reuse];
-    int ypos = ht;
+    int lastypos = ht, ypos = ht;
     numlines = reuse;
-    while (ypos < height() || numlines < 2)
+    while (ypos < m_lastheight || numlines < 2)
     {
+        lastypos = ypos;
         if (textarray[numlines] == NULL)
         {
@@ -895,16 +1120,17 @@ bool QTReader::fillbuffer(int reuse, int ht)
     --numlines;
     mylastpos = locate();
+    m_scrolldy1 = m_scrolldy2 = m_scrollpart = m_lastheight - lastypos;
     
     return true;
 }
 
-
 void QTReader::dopagedn()
 {
+//    qDebug("HEIGHT(2):%d", m_lastheight);
     buffdoc.unsuspend();
     int skip = 0, ypos = 0;
     if (locate() != mylastpos)
     {
-        //qDebug("Jumping to %u", mylastpos);
+        ////qDebug("Jumping to %u", mylastpos);
         jumpto(mylastpos);
     }
@@ -939,4 +1165,16 @@ void QTReader::dopageup()
 }
 
+bool QTReader::synch(size_t start, size_t end)
+{
+    jumpto(start);
+    while (start++ < end)
+    {
+        tchar ch = getch();
+        if (ch == 10) return true;
+        if (ch == UEOF) return false;
+    }
+    return false;
+}
+
 void QTReader::dopageup(unsigned int target)
 {
@@ -945,12 +1183,11 @@ void QTReader::dopageup(unsigned int target)
     CBufferFace<size_t> loc;
 
-  size_t delta, guess = 2048;
+  size_t delta, guess = 2*(locate()-pagelocate()), lastdelta = 0;
   bool ch = true;
   int nbfl, ypos = 0;
-
+  if (guess < 128) guess = 128;
   while (1)
   {
       ch = true;
-      nbfl = 0;
       if (target < guess)
       {
@@ -966,20 +1203,22 @@ void QTReader::dopageup(unsigned int target)
       {
           delta = guess;
-          
-          jumpto(target - delta);
-          
-          buff[0] = new CDrawBuffer(&m_fontControl);
-          
-          do
+          if (!synch(target-delta, target-lastdelta))
           {
-              
-              if (!getline(buff[0])) break;
-              
-              if (locate() > target) break;
+              lastdelta = delta;
+              if (guess < 4000)
+              {
+                  guess <<= 1;
+                  continue;
+              }
+              else
+              {
+                  jumpto(target-delta);
+              }
           }
-          while (!buffdoc.iseol());
       }
       
+      nbfl = 0;
       ypos = 0;
+
       while (locate() < target) 
       {
@@ -991,5 +1230,5 @@ void QTReader::dopageup(unsigned int target)
           if (!ch) break;
       }
-      if (ypos < height() && (delta != 0))
+      if (guess < 4000 && ypos < height() && (delta != 0))
       {
           for (int i = 0; i < nbfl; i++)
@@ -1010,4 +1249,5 @@ void QTReader::dopageup(unsigned int target)
       nbfl++;
   }
+/*
   ypos = 0;
   numlines = 0;
@@ -1018,4 +1258,16 @@ void QTReader::dopageup(unsigned int target)
   }
   --numlines;
+*/
+
+  ypos = 0;
+  numlines = 0;
+  while (ypos < height() && numlines+2 <= nbfl)
+  {
+      ypos += buff[nbfl - numlines - 2]->lineSpacing();
+      numlines++;
+  }
+  if (numlines > 0) --numlines;
+  if (numlines == 0 && nbfl > 1) numlines = 1;
+
   int offset = nbfl-1;
   offset -= numlines;
@@ -1028,5 +1280,9 @@ void QTReader::dopageup(unsigned int target)
       ypos += textarray[i]->lineSpacing();
   }
+#ifdef _WINDOWS
+  for (i = 0; i < nbfl - numlines - 1; i++)
+#else
   for (int i = 0; i < nbfl - numlines - 1; i++)
+#endif
   {
       delete buff[i];
@@ -1058,19 +1314,20 @@ bool QTReader::load_file(const char *newfile, unsigned int _lcn)
       lcn = m_lastposn;
     }
-  m_lastfile = newfile;
   //  QMessageBox::information(0, "Opening...", newfile);
   m_lastwidth = width();
   m_lastheight = height();
   if (buffdoc.openfile(this,newfile) == 0)
-    {
+  {
+      m_lastfile = newfile;
+      buffdoc.setwidth(m_lastwidth-2*m_border);
       bRC = true;
       buffdoc.setContinuous(m_continuousDocument);
-      //  qDebug("buffdoc.openfile done");
+//      //  qDebug("buffdoc.openfile done");
       locate(lcn);
-      //  qDebug("buffdoc.locate done");
+//      //  qDebug("buffdoc.locate done");
     }
   setfilter(getfilter());
   update();
-  //  qDebug("Updated");
+//  //  qDebug("Updated");
   return bRC;
 }
@@ -1090,5 +1347,9 @@ void QTReader::lineDown()
     }
     offset = numlines - offset;
+#ifdef _WINDOWS
+    for (i = offset; i <= numlines; i++)
+#else
     for (int i = offset; i <= numlines; i++)
+#endif
     {
         CDrawBuffer* buff = textarray[i-offset];
@@ -1260,5 +1521,9 @@ void QTReader::lineUp()
   int start = numlines;
   int ypos = 0;
-  for (int i = 0; i <= numlines; i++)
+#ifdef _WINDOWS
+  for (i = 0; i <= numlines; i++)
+#else
+        for (int i = 0; i <= numlines; i++)
+#endif
   {
       ypos += textarray[i]->lineSpacing();
@@ -1297,31 +1562,2 @@ MarkupType QTReader::PreferredMarkup()
     return m;
 }
-
-void QTReader::setstate(const statedata& sd)
-{
-    bstripcr = sd.bstripcr;
-    btextfmt = sd.btextfmt;
-    bautofmt = sd.bautofmt;
-    bstriphtml = sd.bstriphtml;
-    bpeanut = sd.bpeanut;
-    bdehyphen = sd.bdehyphen;
-    bonespace = sd.bonespace;
-    bunindent = sd.bunindent;
-    brepara = sd.brepara;
-    bdblspce = sd.bdblspce;
-    m_bpagemode = sd.m_bpagemode;
-    m_navkeys = sd.m_navkeys;
-    m_bMonoSpaced = sd.m_bMonoSpaced;
-    bremap = sd.bremap;
-    bmakebold = sd.bmakebold;
-    m_continuousDocument = sd.Continuous;
-#ifdef REPALM
-    brepalm = sd.brepalm;
-#endif
-    bindenter = sd.bindenter;
-    m_encd = sd.m_charpc;
-    m_fontname = sd.m_fontname;
-    setContinuous(sd.Continuous);
-    ChangeFont(sd.m_textsize);
-    refresh();
-}