[QTerm-cvs] SF.net SVN: qterm:[1241] trunk/qterm-qt4/src

[<si...@us...>]

Revision: 1241
          http://qterm.svn.sourceforge.net/qterm/?rev=1241&view=rev
Author:   sidos
Date:     2010-08-13 07:12:27 +0000 (Fri, 13 Aug 2010)

Log Message:
-----------
because of QTermWindow rebased on QMdiSubWindow, the mouse event are
properly handled by QTermWindow not necessary to be delegated by
QTermScreen.

Modified Paths:
--------------
    trunk/qterm-qt4/src/qtermscreen.cpp
    trunk/qterm-qt4/src/qtermscreen.h
    trunk/qterm-qt4/src/qtermwindow.cpp

Modified: trunk/qterm-qt4/src/qtermscreen.cpp
===================================================================
--- trunk/qterm-qt4/src/qtermscreen.cpp	2010-08-10 01:22:12 UTC (rev 1240)
+++ trunk/qterm-qt4/src/qtermscreen.cpp	2010-08-13 07:12:27 UTC (rev 1241)
@@ -216,10 +216,6 @@
     }
 }
 
-void Screen::moveEvent(QMoveEvent *)
-{
-// setBgPxm( m_pxmBg, m_nPxmType );
-}
 void Screen::resizeEvent(QResizeEvent *)
 {
     updateScrollBar();
@@ -246,58 +242,6 @@
 
 /* ------------------------------------------------------------------------ */
 /*                                                                         */
-/*                           Mouse                                          */
-/*                                                                          */
-/* ------------------------------------------------------------------------ */
-void Screen::enterEvent(QEvent * e)
-{
-    QApplication::sendEvent(m_pWindow, e);
-}
-
-void Screen::leaveEvent(QEvent * e)
-{
-    QApplication::sendEvent(m_pWindow, e);
-}
-
-void Screen::mousePressEvent(QMouseEvent * me)
-{
-    setFocus();
-
-    m_pWindow->mousePressEvent(me);
-    //QApplication::sendEvent(m_pWindow, me);
-
-}
-void Screen::mouseMoveEvent(QMouseEvent * me)
-{
-#ifdef Q_OS_MACX
-    m_pWindow->mouseMoveEvent(me);
-#else
-    m_pWindow->mouseMoveEvent(me);
-    //QApplication::sendEvent(m_pWindow, me);
-#endif
-}
-
-void Screen::mouseReleaseEvent(QMouseEvent * me)
-{
-    m_pWindow->mouseReleaseEvent(me);
-    //QApplication::sendEvent(m_pWindow, me);
-}
-
-void Screen::wheelEvent(QWheelEvent * we)
-{
-    if (Global::instance()->m_pref.bWheel)
-        QApplication::sendEvent(m_pWindow, we);
-    else {
-        int old_value = m_scrollBar->value();
-        int step = m_scrollBar->singleStep()*we->delta()/8/15;
-        m_scrollBar->setValue(old_value-step);
-        we->accept();
-    }
-}
-
-
-/* ------------------------------------------------------------------------ */
-/*                                                                         */
 /*                                  Font                                    */
 /*                                                                          */
 /* ------------------------------------------------------------------------ */
@@ -512,29 +456,24 @@
 void Screen::prevPage()
 {
     scrollLine(-m_pBuffer->line());
-    m_ePaintState = NewData;
-    update();
 }
 
 void Screen::nextPage()
 {
     scrollLine(m_pBuffer->line());
-    m_ePaintState = NewData;
-    update();
+
 }
 
 void Screen::prevLine()
 {
     scrollLine(-1);
-    m_ePaintState = NewData;
-    update();
+
 }
 
 void Screen::nextLine()
 {
     scrollLine(1);
-    m_ePaintState = NewData;
-    update();
+
 }
 
 void Screen::scrollLine(int delta)
@@ -559,6 +498,8 @@
     for (int i = m_nStart; i <= m_nEnd; i++)
         m_pBuffer->at(i)->setChanged(-1, -1);
 
+    m_ePaintState = NewData;
+    update();
 }
 void Screen::scrollChanged(int value)
 {

Modified: trunk/qterm-qt4/src/qtermscreen.h
===================================================================
--- trunk/qterm-qt4/src/qtermscreen.h	2010-08-10 01:22:12 UTC (rev 1240)
+++ trunk/qterm-qt4/src/qtermscreen.h	2010-08-13 07:12:27 UTC (rev 1241)
@@ -104,7 +104,6 @@
 protected:
     void initFontMetrics();
 
-    void moveEvent(QMoveEvent *);
     void resizeEvent(QResizeEvent *);
     void focusInEvent(QFocusEvent *);
     void focusOutEvent(QFocusEvent *);
@@ -113,14 +112,6 @@
 
     void paintEvent(QPaintEvent *);
 
-    // mouse
-    void enterEvent(QEvent *);
-    void leaveEvent(QEvent *);
-    void mousePressEvent(QMouseEvent *);
-    void mouseMoveEvent(QMouseEvent*);
-    void mouseReleaseEvent(QMouseEvent*);
-    void wheelEvent(QWheelEvent *);
-
     // display
     void eraseRect(QPainter& , int, int, int, int, short);
     void drawStr(QPainter&, const QString&, int, int, int, short, bool, CharFlags);

Modified: trunk/qterm-qt4/src/qtermwindow.cpp
===================================================================
--- trunk/qterm-qt4/src/qtermwindow.cpp	2010-08-10 01:22:12 UTC (rev 1240)
+++ trunk/qterm-qt4/src/qtermwindow.cpp	2010-08-13 07:12:27 UTC (rev 1241)
@@ -296,7 +296,6 @@
     m_bCheckIP = m_pIPLocation->haveFile();
     m_pSound = NULL;
 
-    setFocusProxy(m_pScreen);
     setWidget(m_pScreen);
 
     connect(m_pFrame, SIGNAL(scrollChanged()), m_pScreen, SLOT(updateScrollBar()));
@@ -781,12 +780,16 @@
         }
     }
 #endif
-    int j = we->delta() > 0 ? 4 : 5;
-    if (!(we->modifiers())) {
-        if (Global::instance()->m_pref.bWheel && m_bConnected)
-            m_pTelnet->write(direction[j], sizeof(direction[j]));
-        return;
-    }
+        if (Global::instance()->m_pref.bWheel) {
+            int j = we->delta() > 0 ? 4 : 5;
+            if (!(we->modifiers())) {
+                if (Global::instance()->m_pref.bWheel && m_bConnected)
+                    m_pTelnet->write(direction[j], sizeof(direction[j]));
+            }
+        }
+        else {
+            m_pScreen->scrollLine(-we->delta()/8/15);
+        }
 }
 
 //keyboard input event


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.