Added selections copy and paste!

2025-02-21 20:39:00 +00:00 · 2014-04-16 19:18:14 +02:00 · 2014-04-16 19:18:14 +02:00 · 5d6040e45d
commit 5d6040e45d
parent 883520a9c6
7 changed files with 973 additions and 903 deletions
--- a/app/Terminal.qml
+++ b/app/Terminal.qml
@ -20,6 +20,7 @@

 import QtQuick 2.0
 import QtGraphicalEffects 1.0
+import QtQuick.Controls 1.0

 import org.kde.konsole 0.1

@ -82,11 +83,63 @@ Item{
            }
        }
    }
+    Menu{
+        id: contextmenu
+        MenuItem{
+            text: qsTr("Copy")
+            onTriggered: kterminal.item.copyClipboard()
+        }
+        MenuItem{
+            text: qsTr("Paste")
+            onTriggered: kterminal.item.pasteClipboard()
+        }
+    }
    MouseArea{
-        acceptedButtons: Qt.NoButton
+
+        acceptedButtons: Qt.LeftButton | Qt.MiddleButton | Qt.RightButton
        anchors.fill: parent
        onWheel:
            wheel.angleDelta.y > 0 ? kterminal.item.scrollUp() : kterminal.item.scrollDown()
+        onClicked: {
+            console.log(correctDistortion(0,0))
+            if (mouse.button == Qt.RightButton){
+                contextmenu.popup();
+            } else if (mouse.button == Qt.MiddleButton){
+                kterminal.item.pasteSelection();
+            }
+        }
+        onDoubleClicked: {
+            if (mouse.button == Qt.LeftButton){
+                var coord = correctDistortion(mouse.x, mouse.y);
+                kterminal.item.mouseDoubleClick(coord.width, coord.height);
+            }
+        }
+        onPositionChanged: {
+            var coord = correctDistortion(mouse.x, mouse.y);
+            kterminal.item.mouseMove(coord.width, coord.height);
+        }
+        onPressed: {
+            if (mouse.button == Qt.LeftButton){
+                var coord = correctDistortion(mouse.x, mouse.y);
+                kterminal.item.mousePress(coord.width, coord.height);
+            }
+        }
+        onReleased: {
+            if (mouse.button == Qt.LeftButton){
+                kterminal.item.mouseRelease(mouse.x, mouse.y);
+            }
+        }
+
+        function correctDistortion(x, y){
+            x = x / width;
+            y = y / height;
+
+            var cc = Qt.size(0.5 - x, 0.5 - y);
+            var distortion = (cc.height * cc.height + cc.width * cc.width) * shadersettings.screen_distortion;
+
+            return Qt.size((x - cc.width  * (1+distortion) * distortion) * width,
+                           (y - cc.height * (1+distortion) * distortion) * height)
+        }
    }
    ShaderEffectSource{
        id: source
--- a/app/app.qmlproject.user
+++ b/app/app.qmlproject.user
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.0.1, 2014-04-06T17:39:45. -->
+<!-- Written by QtCreator 3.0.1, 2014-04-16T10:55:04. -->
 <qtcreator>
 <data>
  <variable>ProjectExplorer.Project.ActiveTarget</variable>
@ -73,40 +73,6 @@
   <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
   <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
-    <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
-    <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
-    <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
-    <value type="int" key="Analyzer.Valgrind.LeakCheckOnFinish">1</value>
-    <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
-    <value type="int" key="Analyzer.Valgrind.SelfModifyingCodeDetection">1</value>
-    <value type="bool" key="Analyzer.Valgrind.Settings.UseGlobalSettings">true</value>
-    <value type="bool" key="Analyzer.Valgrind.ShowReachable">false</value>
-    <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
-    <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
-    <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
-     <value type="int">0</value>
-     <value type="int">1</value>
-     <value type="int">2</value>
-     <value type="int">3</value>
-     <value type="int">4</value>
-     <value type="int">5</value>
-     <value type="int">6</value>
-     <value type="int">7</value>
-     <value type="int">8</value>
-     <value type="int">9</value>
-     <value type="int">10</value>
-     <value type="int">11</value>
-     <value type="int">12</value>
-     <value type="int">13</value>
-     <value type="int">14</value>
-    </valuelist>
    <value type="int" key="PE.EnvironmentAspect.Base">0</value>
    <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
    <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
--- a/app/main.qml
+++ b/app/main.qml
@ -106,8 +106,11 @@ ApplicationWindow{
        }
        Terminal{
            id: terminal
-            width: parent.width * shadersettings.terminal_scaling
-            height: parent.height * shadersettings.terminal_scaling
+            anchors.centerIn: parent
+            property int frameOffsetX: frame.item.addedWidth - frame.item.borderLeft - frame.item.borderRight
+            property int frameOffsetY: frame.item.addedHeight -frame.item.borderTop - frame.item.borderBottom
+            width: (parent.width + frameOffsetX) * shadersettings.terminal_scaling
+            height: (parent.height + frameOffsetY) * shadersettings.terminal_scaling
        }
        ShaderEffectSource{
            id: theSource
--- a/konsole-qml-plugin/Makefile
+++ b/konsole-qml-plugin/Makefile
@ -5484,35 +5484,35 @@ compiler_clean: compiler_moc_header_clean
 ####### Install

 install_target: first FORCE
-	@test -d $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole || mkdir -p $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole
-	-$(INSTALL_PROGRAM) "$(TARGET)" "$(INSTALL_ROOT)/tmp/cool/imports/org/kde/konsole/$(TARGET)"
-	-$(STRIP) --strip-unneeded "$(INSTALL_ROOT)/tmp/cool/imports/org/kde/konsole/$(TARGET)"
+	@test -d $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole || mkdir -p $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole
+	-$(INSTALL_PROGRAM) "$(TARGET)" "$(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/imports/org/kde/konsole/$(TARGET)"
+	-$(STRIP) --strip-unneeded "$(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/imports/org/kde/konsole/$(TARGET)"

 uninstall_target: FORCE
-	-$(DEL_FILE) "$(INSTALL_ROOT)/tmp/cool/imports/org/kde/konsole/$(TARGET)"
-	-$(DEL_DIR) $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/ 
+	-$(DEL_FILE) "$(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/imports/org/kde/konsole/$(TARGET)"
+	-$(DEL_DIR) $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/ 


 install_qmldir: first FORCE
-	@test -d $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole || mkdir -p $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole
-	-$(INSTALL_FILE) /tmp/cool/konsole-qml-plugin/src/qmldir $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/
-	-$(INSTALL_FILE) /tmp/cool/konsole-qml-plugin/src/plugins.qmltypes $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/
+	@test -d $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole || mkdir -p $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole
+	-$(INSTALL_FILE) /home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/src/qmldir $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/
+	-$(INSTALL_FILE) /home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/src/plugins.qmltypes $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/

 uninstall_qmldir: FORCE
-	-$(DEL_FILE) -r $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/plugins.qmltypes
-	-$(DEL_FILE) -r $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/qmldir
-	-$(DEL_DIR) $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/ 
+	-$(DEL_FILE) -r $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/plugins.qmltypes
+	-$(DEL_FILE) -r $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/qmldir
+	-$(DEL_DIR) $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/ 


 install_assets: first FORCE
-	@test -d $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole || mkdir -p $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole
-	-$(INSTALL_DIR) /tmp/cool/konsole-qml-plugin/assets/color-schemes $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/
-	-$(INSTALL_DIR) /tmp/cool/konsole-qml-plugin/assets/kb-layouts $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/
+	@test -d $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole || mkdir -p $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole
+	-$(INSTALL_DIR) /home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/assets/color-schemes $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/
+	-$(INSTALL_DIR) /home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/assets/kb-layouts $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/

 uninstall_assets: FORCE
-	-$(DEL_FILE) -r $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/kb-layouts
-	-$(DEL_FILE) -r $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/color-schemes
-	-$(DEL_DIR) $(INSTALL_ROOT)/tmp/cool/konsole-qml-plugin/../imports/org/kde/konsole/ 
+	-$(DEL_FILE) -r $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/kb-layouts
+	-$(DEL_FILE) -r $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/color-schemes
+	-$(DEL_DIR) $(INSTALL_ROOT)/home/swordfish/workspaces/qt5/cool-old-term/konsole-qml-plugin/../imports/org/kde/konsole/ 


 install:  install_target install_qmldir install_assets  FORCE
--- a/konsole-qml-plugin/src/TerminalDisplay.cpp
+++ b/konsole-qml-plugin/src/TerminalDisplay.cpp
@ -65,9 +65,9 @@
    "0123456789./+@"

 const ColorEntry base_color_table[TABLE_COLORS] =
-// The following are almost IBM standard color codes, with some slight
-// gamma correction for the dim colors to compensate for bright X screens.
-// It contains the 8 ansiterm/xterm colors in 2 intensities.
+        // The following are almost IBM standard color codes, with some slight
+        // gamma correction for the dim colors to compensate for bright X screens.
+        // It contains the 8 ansiterm/xterm colors in 2 intensities.
 {
        // Fixme: could add faint colors here, also.
        // normal
@ -82,7 +82,7 @@ const ColorEntry base_color_table[TABLE_COLORS] =
        ColorEntry(QColor(0x54,0xFF,0x54), 0), ColorEntry( QColor(0xFF,0xFF,0x54), 0),
        ColorEntry(QColor(0x54,0x54,0xFF), 0), ColorEntry( QColor(0xFF,0x54,0xFF), 0),
        ColorEntry(QColor(0x54,0xFF,0xFF), 0), ColorEntry( QColor(0xFF,0xFF,0xFF), 0)
-};
+        };

 // scroll increment used when dragging selection at top/bottom of window.

@ -194,7 +194,7 @@ KTerminalDisplay::KTerminalDisplay(QQuickItem *parent) :

    setColorTable(base_color_table);

-    new AutoScrollHandler(this);
+    //new AutoScrollHandler(this);

    setAcceptedMouseButtons(Qt::LeftButton);
    setFlags(ItemHasContents | ItemAcceptsInputMethod);
@ -280,8 +280,8 @@ void KTerminalDisplay::setScreenWindow(ScreenWindow* window)
    if ( window )
    {

-// TODO: Determine if this is an issue.
-//#warning "The order here is not specified - does it matter whether updateImage or updateLineProperties comes first?"
+        // TODO: Determine if this is an issue.
+        //#warning "The order here is not specified - does it matter whether updateImage or updateLineProperties comes first?"
        connect( _screenWindow , SIGNAL(outputChanged()) , this , SLOT(updateLineProperties()) );
        connect( _screenWindow , SIGNAL(outputChanged()) , this , SLOT(updateImage()) );
        window->setWindowLines(_lines);
@ -295,9 +295,9 @@ const ColorEntry* KTerminalDisplay::colorTable() const
 void KTerminalDisplay::setBackgroundColor(const QColor& color)
 {
    _colorTable[DEFAULT_BACK_COLOR].color = color;
-//    QPalette p = m_palette;
-//    p.setColor( backgroundRole(), color );
-//    setPalette( p );
+    //    QPalette p = m_palette;
+    //    p.setColor( backgroundRole(), color );
+    //    setPalette( p );

    update();
 }
@ -452,10 +452,41 @@ QStringList KTerminalDisplay::availableColorSchemes()
    return ret;
 }

-void KTerminalDisplay::click(qreal x, qreal y)
-{
-    QMouseEvent me(QEvent::MouseButtonPress, QPointF(x,y), Qt::RightButton, Qt::RightButton, Qt::NoModifier);
-    mousePressEvent(&me);
+void KTerminalDisplay::mousePress(qreal x, qreal y){
+    if (m_focusOnClick) forcedFocus();
+    if (m_showVKBonClick) ShowVKB(true);
+
+    emit clicked();
+
+    int charLine;
+    int charColumn;
+    getCharacterPosition(QPoint(x,y), charLine, charColumn);
+
+    QPoint pos = QPoint(charColumn, charLine);
+
+    _wordSelectionMode = false;
+    _lineSelectionMode = false;
+
+    _screenWindow->clearSelection();
+    _iPntSel = _pntSel = pos;
+    _actSel = 1; // left mouse button pressed but nothing selected yet.
+}
+
+void KTerminalDisplay::mouseMove(qreal x, qreal y){
+    QPoint pos(x, y);
+    extendSelection(pos);
+}
+
+void KTerminalDisplay::mouseDoubleClick(qreal x, qreal y){
+    _wordSelectionMode = true;
+    QPoint pos(x, y);
+    extendSelection(pos);
+}
+
+void KTerminalDisplay::mouseRelease(qreal x, qreal y){
+    Q_UNUSED(x);
+    Q_UNUSED(y);
+    _actSel = 0;
 }

 void KTerminalDisplay::setAutoFocus(bool au)
@ -1333,7 +1364,16 @@ void KTerminalDisplay::pasteClipboard()

 void KTerminalDisplay::pasteSelection()
 {
-  emitSelection(true,false);
+    if (!_screenWindow)
+        return;
+
+    QString text = _screenWindow->selectedText(_preserveLineBreaks);
+    if (text.isEmpty())
+        return;
+
+    text.replace('\n', '\r');
+    QKeyEvent e(QEvent::KeyPress, 0, Qt::NoModifier, text);
+    emit keyPressedSignal(&e); // expose as a big fat keypress event
 }

 /* ------------------------------------------------------------------------- */
@ -1348,8 +1388,8 @@ void KTerminalDisplay::setFlowControlWarningEnabled( bool enable )

    // if the dialog is currently visible and the flow control warning has
    // been disabled then hide the dialog
-//    if (!enable)
-//        outputSuspended(false);
+    //    if (!enable)
+    //        outputSuspended(false);
 }

 void KTerminalDisplay::inputMethodEvent( QInputMethodEvent* event )
@ -1506,15 +1546,6 @@ QRect KTerminalDisplay::geometryRound(const QRectF &r) const
    return rect;
 }

-void KTerminalDisplay::mousePressEvent(QMouseEvent *ev)
-{
-    if (m_focusOnClick) forcedFocus();
-    if (m_showVKBonClick) ShowVKB(true);
-
-    emit clicked();
-    QQuickPaintedItem::mouseMoveEvent(ev);
-}
-
 void KTerminalDisplay::setBellMode(int mode)
 {
    _bellMode=mode;
@ -2004,8 +2035,8 @@ void KTerminalDisplay::getCharacterPosition(const QPointF &widgetPoint, int& lin
    //contentsBoundingRect()
    QRectF rect = m_widgetRect;

-    column = qRound((widgetPoint.x() + _fontWidth/2 - rect.left()-_leftMargin) / _fontWidth);
-    line   = qRound((widgetPoint.y() - rect.top()-_topMargin) / _fontHeight);
+    column = qFloor((widgetPoint.x() + _fontWidth/2 - rect.left()-_leftMargin) / _fontWidth);
+    line   = qFloor((widgetPoint.y() - rect.top()-_topMargin) / _fontHeight);

    if ( line < 0 )
        line = 0;
@ -2123,62 +2154,62 @@ void KTerminalDisplay::keyPressEvent(QKeyEvent *event)
 /////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////

-AutoScrollHandler::AutoScrollHandler(QQuickItem* parent)
-: QObject(parent)
-, _timerId(0)
-{
-    parent->installEventFilter(this);
-}
-void AutoScrollHandler::timerEvent(QTimerEvent* event)
-{
-    if (event->timerId() != _timerId)
-        return;
+//AutoScrollHandler::AutoScrollHandler(QQuickItem* parent)
+//: QObject(parent)
+//, _timerId(0)
+//{
+//    parent->installEventFilter(this);
+//}
+//void AutoScrollHandler::timerEvent(QTimerEvent* event)
+//{
+//    if (event->timerId() != _timerId)
+//        return;

-    QMouseEvent mouseEvent(    QEvent::MouseMove,
-                              widget()->mapFromScene(QCursor::pos()),
-                              Qt::NoButton,
-                              Qt::LeftButton,
-                              Qt::NoModifier);
+//    QMouseEvent mouseEvent(    QEvent::MouseMove,
+//                              widget()->mapFromScene(QCursor::pos()),
+//                              Qt::NoButton,
+//                              Qt::LeftButton,
+//                              Qt::NoModifier);

-    QGuiApplication::sendEvent(widget(),&mouseEvent);
-}
-bool AutoScrollHandler::eventFilter(QObject* watched,QEvent* event)
-{
-    Q_ASSERT( watched == parent() );
-    Q_UNUSED( watched );
+//    QGuiApplication::sendEvent(widget(),&mouseEvent);
+//}
+//bool AutoScrollHandler::eventFilter(QObject* watched,QEvent* event)
+//{
+//    Q_ASSERT( watched == parent() );
+//    Q_UNUSED( watched );

-    QMouseEvent* mouseEvent = (QMouseEvent*)event;
-    switch (event->type())
-    {
-        case QEvent::MouseMove:
-        {
-            bool mouseInWidget = false; //widget()->rect().contains(mouseEvent->pos());
+//    QMouseEvent* mouseEvent = (QMouseEvent*)event;
+//    switch (event->type())
+//    {
+//        case QEvent::MouseMove:
+//        {
+//            bool mouseInWidget = false; //widget()->rect().contains(mouseEvent->pos());

-            if (mouseInWidget)
-            {
-                if (_timerId)
-                    killTimer(_timerId);
-                _timerId = 0;
-            }
-            else
-            {
-                if (!_timerId && (mouseEvent->buttons() & Qt::LeftButton))
-                    _timerId = startTimer(100);
-            }
-                break;
-        }
-        case QEvent::MouseButtonRelease:
-            if (_timerId && (mouseEvent->buttons() & ~Qt::LeftButton))
-            {
-                killTimer(_timerId);
-                _timerId = 0;
-            }
-        break;
-        default:
-        break;
-    };
+//            if (mouseInWidget)
+//            {
+//                if (_timerId)
+//                    killTimer(_timerId);
+//                _timerId = 0;
+//            }
+//            else
+//            {
+//                if (!_timerId && (mouseEvent->buttons() & Qt::LeftButton))
+//                    _timerId = startTimer(100);
+//            }
+//                break;
+//        }
+//        case QEvent::MouseButtonRelease:
+//            if (_timerId && (mouseEvent->buttons() & ~Qt::LeftButton))
+//            {
+//                killTimer(_timerId);
+//                _timerId = 0;
+//            }
+//        break;
+//        default:
+//        break;
+//    };

-    return false;
-}
+//    return false;
+//}

 //#include "TerminalDisplay.moc"
--- a/konsole-qml-plugin/src/TerminalDisplay.h
+++ b/konsole-qml-plugin/src/TerminalDisplay.h
@ -304,7 +304,10 @@ public slots:
    void setColorScheme(const QString &name);
    QStringList availableColorSchemes();

-    void click(qreal x, qreal y);
+    void mousePress(qreal x, qreal y);
+    void mouseMove(qreal x, qreal y);
+    void mouseDoubleClick(qreal x, qreal y);
+    void mouseRelease(qreal x, qreal y);

    bool autoFocus() { return m_focusOnClick; }
    void setAutoFocus(bool au);
@ -456,9 +459,9 @@ protected:
    void geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry);
    QRect geometryRound(const QRectF &r) const;

-    void mousePressEvent(QMouseEvent*ev);
-//    void mouseReleaseEvent( QMouseEvent* );
-//    void mouseMoveEvent( QMouseEvent* );
+    //void mousePressEvent(QMouseEvent*ev);
+    //void mouseReleaseEvent( QMouseEvent* );
+    //void mouseMoveEvent( QMouseEvent* );

    void focusInEvent(QFocusEvent* event);
    void focusOutEvent(QFocusEvent* event);
@ -677,7 +680,6 @@ private:
    // color of the character under the cursor is used
    QColor _cursorColor;

-
    struct InputMethodData
    {
        QString preeditString;
@ -701,20 +703,20 @@ public:
    }
 };

-class AutoScrollHandler : public QObject
-{
-    Q_OBJECT
+//class AutoScrollHandler : public QObject
+//{
+//    Q_OBJECT

-public:
-    AutoScrollHandler(QQuickItem* parent);
+//public:
+//    AutoScrollHandler(QQuickItem* parent);

-protected:
-    virtual void timerEvent(QTimerEvent* event);
-    virtual bool eventFilter(QObject* watched,QEvent* event);
+//protected:
+//    virtual void timerEvent(QTimerEvent* event);
+//    virtual bool eventFilter(QObject* watched,QEvent* event);

-private:
-    QQuickItem* widget() const { return static_cast<QQuickItem*>(parent()); }
-    int _timerId;
-};
+//private:
+//    QQuickItem* widget() const { return static_cast<QQuickItem*>(parent()); }
+//    int _timerId;
+//};

 #endif // TERMINALDISPLAY_H
--- a/konsole-qml-plugin/src/plugins.qmltypes
+++ b/konsole-qml-plugin/src/plugins.qmltypes
@ -118,7 +118,22 @@ Module {
        }
        Method { name: "availableColorSchemes"; type: "QStringList" }
        Method {
-            name: "click"
+            name: "mousePress"
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+        Method {
+            name: "mouseMove"
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+        Method {
+            name: "mouseRelease"
+            Parameter { name: "x"; type: "double" }
+            Parameter { name: "y"; type: "double" }
+        }
+        Method {
+            name: "mouseDoubleClick"
            Parameter { name: "x"; type: "double" }
            Parameter { name: "y"; type: "double" }
        }