X-Git-Url: http://git.maemo.org/git/?p=presencevnc;a=blobdiff_plain;f=src%2Fvncview.cpp;h=85027481e8d2ce3ac9cce7b3af7a8555aa40bc40;hp=ccbae253550b93864ed7ebc3093f6a2eb58fb553;hb=f3262a352123422b5641b7dbaf8275b8c4f6b349;hpb=176eaefb1342526e63f64a672cd8d4ce46a9f35d diff --git a/src/vncview.cpp b/src/vncview.cpp index ccbae25..8502748 100644 --- a/src/vncview.cpp +++ b/src/vncview.cpp @@ -23,26 +23,10 @@ #include "vncview.h" -#include -#include -#define KMessageBox QMessageBox -#define error(parent, message, caption) \ -critical(parent, caption, message) - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +//for mouse button masks +#include "rfb/rfbproto.h" + +#include // Definition of key modifier mask constants @@ -55,37 +39,41 @@ critical(parent, caption, message) //local cursor width/height in px, should be an odd number const int CURSOR_SIZE = 7; +//in miliseconds const int TAP_PRESS_TIME = 180; const int DOUBLE_TAP_UP_TIME = 500; VncView::VncView(QWidget *parent, const KUrl &url, RemoteView::Quality quality, int listen_port) - : RemoteView(parent), - m_initDone(false), - m_buttonMask(0), - cursor_x(0), - cursor_y(0), - m_repaint(false), - m_quitFlag(false), - m_firstPasswordTry(true), - m_dontSendClipboard(false), - m_horizontalFactor(1.0), - m_verticalFactor(1.0), - m_forceLocalCursor(false), - force_full_repaint(false), - quality(quality), - listen_port(listen_port) + : RemoteView(parent), + m_initDone(false), + m_buttonMask(0), + cursor_x(0), + cursor_y(0), + m_quitFlag(false), + m_firstPasswordTry(true), + m_dontSendClipboard(false), + m_horizontalFactor(1.0), + m_verticalFactor(1.0), + m_forceLocalCursor(false), + quality(quality), + listen_port(listen_port), + transformation_mode(Qt::FastTransformation), + display_off(false) { m_url = url; m_host = url.host(); m_port = url.port(); - //BlockingQueuedConnection can cause deadlocks when exiting, handled in startQuitting() + //BlockingQueuedConnection can cause deadlocks when exiting, handled in startQuitting() connect(&vncThread, SIGNAL(imageUpdated(int, int, int, int)), this, SLOT(updateImage(int, int, int, int)), Qt::BlockingQueuedConnection); connect(&vncThread, SIGNAL(gotCut(const QString&)), this, SLOT(setCut(const QString&)), Qt::BlockingQueuedConnection); connect(&vncThread, SIGNAL(passwordRequest()), this, SLOT(requestPassword()), Qt::BlockingQueuedConnection); connect(&vncThread, SIGNAL(outputErrorMessage(QString)), this, SLOT(outputErrorMessage(QString))); + //don't miss early connection failures + connect(&vncThread, SIGNAL(finished()), this, SLOT(startQuitting())); + m_clipboard = QApplication::clipboard(); connect(m_clipboard, SIGNAL(selectionChanged()), this, SLOT(clipboardSelectionChanged())); connect(m_clipboard, SIGNAL(dataChanged()), this, SLOT(clipboardDataChanged())); @@ -103,12 +91,6 @@ VncView::~VncView() startQuitting(); } -void VncView::forceFullRepaint() -{ - force_full_repaint = true; - repaint(); -} - bool VncView::eventFilter(QObject *obj, QEvent *event) { if (m_viewOnly) { @@ -118,13 +100,17 @@ bool VncView::eventFilter(QObject *obj, QEvent *event) event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::Wheel || - event->type() == QEvent::MouseMove) + event->type() == QEvent::MouseMove) { + + event->ignore(); return true; + } } + return RemoteView::eventFilter(obj, event); } -QSize VncView::framebufferSize() +QSize VncView::framebufferSize() const { return m_frame.size(); } @@ -141,30 +127,30 @@ QSize VncView::minimumSizeHint() const void VncView::startQuitting() { - kDebug(5011) << "about to quit"; + if(isQuitting()) + return; - //const bool connected = status() == RemoteView::Connected; + kDebug(5011) << "about to quit"; setStatus(Disconnecting); m_quitFlag = true; - //if(connected) //remove if things work without it - vncThread.stop(); + vncThread.stop(); const bool quitSuccess = vncThread.wait(700); - if(!quitSuccess) { - //happens when vncThread wants to call a slot via BlockingQueuedConnection, - //needs an event loop in this thread so execution continues after 'emit' - QEventLoop loop; - if(!loop.processEvents()) - kDebug(5011) << "BUG: deadlocked, but no events to deliver?"; - vncThread.wait(700); - } + if(!quitSuccess) { + //happens when vncThread wants to call a slot via BlockingQueuedConnection, + //needs an event loop in this thread so execution continues after 'emit' + QEventLoop loop; + if(!loop.processEvents()) + kDebug(5011) << "BUG: deadlocked, but no events to deliver?"; + vncThread.wait(700); + } setStatus(Disconnected); } -bool VncView::isQuitting() +bool VncView::isQuitting() const { return m_quitFlag; } @@ -173,7 +159,7 @@ bool VncView::start() { vncThread.setHost(m_host); vncThread.setPort(m_port); - vncThread.setListenPort(listen_port); //if port is != 0, thread will listen for connections + vncThread.setListenPort(listen_port); //if port is != 0, thread will listen for connections vncThread.setQuality(quality); // set local cursor on by default because low quality mostly means slow internet connection @@ -208,55 +194,56 @@ void VncView::requestPassword() return; } - QSettings settings; - settings.beginGroup("hosts"); - QString password = settings.value(QString("%1/password").arg(m_host), "").toString(); - //check for saved password - if(m_firstPasswordTry and !password.isEmpty()) { - kDebug(5011) << "Trying saved password"; - m_firstPasswordTry = false; - vncThread.setPassword(password); - return; - } - m_firstPasswordTry = false; - - //build dialog - QDialog dialog(this); - dialog.setWindowTitle(tr("Password required")); - - QLineEdit passwordbox; - passwordbox.setEchoMode(QLineEdit::Password); - passwordbox.setText(password); - QCheckBox save_password(tr("Save Password")); - save_password.setChecked(!password.isEmpty()); //offer to overwrite saved password - QPushButton ok_button(tr("Done")); - ok_button.setMaximumWidth(100); - connect(&ok_button, SIGNAL(clicked()), - &dialog, SLOT(accept())); - - QHBoxLayout layout1; - QVBoxLayout layout2; - layout2.addWidget(&passwordbox); - if(!m_host.isEmpty()) //don't save incomming connections - layout2.addWidget(&save_password); - layout1.addLayout(&layout2); - layout1.addWidget(&ok_button); - dialog.setLayout(&layout1); - - if(dialog.exec()) { //dialog accepted - password = passwordbox.text(); - - if(!m_host.isEmpty() and save_password.isChecked()) { - kDebug(5011) << "Saving password for host '" << m_host << "'"; - - settings.setValue(QString("%1/password").arg(m_host), password); - settings.sync(); - } - - vncThread.setPassword(password); - } else { - startQuitting(); - } + QSettings settings; + settings.beginGroup("hosts"); + + //check for saved password + QString password = settings.value(QString("%1/password").arg(m_host), "").toString(); + if(m_firstPasswordTry and !password.isEmpty()) { + kDebug(5011) << "Trying saved password"; + m_firstPasswordTry = false; + vncThread.setPassword(password); + return; + } + m_firstPasswordTry = false; + + //build dialog + QDialog dialog(this); + dialog.setWindowTitle(tr("Password required")); + + QLineEdit passwordbox; + passwordbox.setEchoMode(QLineEdit::Password); + passwordbox.setText(password); + QCheckBox save_password(tr("Save Password")); + save_password.setChecked(!password.isEmpty()); //offer to overwrite saved password + QPushButton ok_button(tr("Done")); + ok_button.setMaximumWidth(100); + connect(&ok_button, SIGNAL(clicked()), + &dialog, SLOT(accept())); + + QHBoxLayout layout1; + QVBoxLayout layout2; + layout2.addWidget(&passwordbox); + if(!m_host.isEmpty()) //don't save incoming connections + layout2.addWidget(&save_password); + layout1.addLayout(&layout2); + layout1.addWidget(&ok_button); + dialog.setLayout(&layout1); + + if(dialog.exec()) { //dialog accepted + password = passwordbox.text(); + + if(!m_host.isEmpty() and save_password.isChecked()) { + kDebug(5011) << "Saving password for host '" << m_host << "'"; + + settings.setValue(QString("%1/password").arg(m_host), password); + settings.sync(); + } + + vncThread.setPassword(password); + } else { + vncThread.setPassword(QString()); //null string to exit + } } void VncView::outputErrorMessage(const QString &message) @@ -267,18 +254,21 @@ void VncView::outputErrorMessage(const QString &message) return; } - startQuitting(); - emit errorMessage(i18n("VNC failure"), message); + + startQuitting(); } void VncView::updateImage(int x, int y, int w, int h) { - if(!QApplication::focusWidget()) { //no focus, we're probably minimized - return; - } +#ifdef Q_WS_MAEMO_5 + //don't update if window is out of focus / display is off + if(!QApplication::focusWidget() || display_off) { + return; + } +#endif - //kDebug(5011) << "got update" << width() << height(); + //kDebug(5011) << "got update" << width() << height(); m_x = x; m_y = y; @@ -298,9 +288,8 @@ void VncView::updateImage(int x, int y, int w, int h) m_frame = vncThread.image(); - if (!m_initDone) { - setAttribute(Qt::WA_StaticContents); - setAttribute(Qt::WA_OpaquePaintEvent); + if (!m_initDone) { //TODO this seems an odd place for initialization + setAttribute(Qt::WA_NoSystemBackground); installEventFilter(this); setCursor(((m_dotCursorState == CursorOn) || m_forceLocalCursor) ? localDotCursor() : Qt::BlankCursor); @@ -308,26 +297,24 @@ void VncView::updateImage(int x, int y, int w, int h) setMouseTracking(true); // get mouse events even when there is no mousebutton pressed setFocusPolicy(Qt::WheelFocus); setStatus(Connected); -// emit framebufferSizeChanged(m_frame.width(), m_frame.height()); emit connected(); - - resize(width(), height()); - - m_initDone = true; + resize(width(), height()); + + m_initDone = true; } - static QSize old_frame_size = QSize(); + static QSize old_frame_size = QSize(); if ((y == 0 && x == 0) && (m_frame.size() != old_frame_size)) { - old_frame_size = m_frame.size(); + old_frame_size = m_frame.size(); kDebug(5011) << "Updating framebuffer size"; - setZoomLevel(); + setZoomLevel(); + useFastTransformations(false); + emit framebufferSizeChanged(m_frame.width(), m_frame.height()); } - m_repaint = true; - repaint(qRound(m_x * m_horizontalFactor), qRound(m_y * m_verticalFactor), qRound(m_w * m_horizontalFactor), qRound(m_h * m_verticalFactor)); - m_repaint = false; + update(qRound(m_x * m_horizontalFactor), qRound(m_y * m_verticalFactor), qRound(m_w * m_horizontalFactor), qRound(m_h * m_verticalFactor)); } void VncView::setViewOnly(bool viewOnly) @@ -336,10 +323,12 @@ void VncView::setViewOnly(bool viewOnly) m_dontSendClipboard = viewOnly; - if (viewOnly) + if (viewOnly) { + showDotCursor(CursorOff); setCursor(Qt::ArrowCursor); - else + } else { setCursor(m_dotCursorState == CursorOn ? localDotCursor() : Qt::BlankCursor); + } } void VncView::showDotCursor(DotCursorState state) @@ -352,33 +341,33 @@ void VncView::showDotCursor(DotCursorState state) //level should be in [0, 100] void VncView::setZoomLevel(int level) { - Q_ASSERT(parentWidget() != 0); + Q_ASSERT(parentWidget() != 0); + + if(level == -1) { //handle resize + resize(m_frame.width()*m_horizontalFactor, m_frame.height()*m_verticalFactor); + return; + } - if(level == -1) { //handle resize - resize(m_frame.width()*m_horizontalFactor, m_frame.height()*m_verticalFactor); - return; - } + double magnification; + if(level == 100) { + magnification = 2.0; + } else if(level >= 90) { + magnification = 1.0; + } else { + const double min_horiz_magnification = double(parentWidget()->width())/m_frame.width(); + const double min_vert_magnification = double(parentWidget()->height())/m_frame.height(); + const double fit_screen_magnification = qMin(min_horiz_magnification, min_vert_magnification); - double magnification; - if(level == 100) { - magnification = 2.0; - } else if(level >= 90) { - magnification = 1.0; - } else { - const double min_horiz_magnification = double(parentWidget()->width())/m_frame.width(); - const double min_vert_magnification = double(parentWidget()->height())/m_frame.height(); - const double fit_screen_magnification = qMin(min_horiz_magnification, min_vert_magnification); + //level=90 => magnification=1.0, level=0 => magnification=fit_screen_magnification + magnification = (level)/90.0*(1.0 - fit_screen_magnification) + fit_screen_magnification; + } - //level=90 => magnification=1.0, level=0 => magnification=fit_screen_magnification - magnification = (level)/90.0*(1.0 - fit_screen_magnification) + fit_screen_magnification; - } + //remote display smaller than local (or NAN)? + if(magnification < 0 or magnification != magnification) + magnification = 1.0; - if(magnification < 0 //remote display smaller than local? - or magnification != magnification) //nan - magnification = 1.0; - - m_verticalFactor = m_horizontalFactor = magnification; - resize(m_frame.width()*magnification, m_frame.height()*magnification); + m_verticalFactor = m_horizontalFactor = magnification; + resize(m_frame.width()*magnification, m_frame.height()*magnification); } void VncView::setCut(const QString &text) @@ -391,57 +380,47 @@ void VncView::setCut(const QString &text) void VncView::paintEvent(QPaintEvent *event) { - //kDebug(5011) << "paint event: x: " << m_x << ", y: " << m_y << ", w: " << m_w << ", h: " << m_h; if (m_frame.isNull() || m_frame.format() == QImage::Format_Invalid) { - kDebug(5011) << "no valid image to paint"; + //no valid image to paint RemoteView::paintEvent(event); return; } event->accept(); + //split update region into smaller non-intersecting rectangles and only paint those QPainter painter(this); - - Qt::TransformationMode transformation_mode = Qt::SmoothTransformation; - if( m_horizontalFactor >= 1.0 ) - transformation_mode = Qt::FastTransformation; - - if (m_repaint and !force_full_repaint) { -// kDebug(5011) << "normal repaint"; - painter.drawImage(QRect(qRound(m_x*m_horizontalFactor), qRound(m_y*m_verticalFactor), - qRound(m_w*m_horizontalFactor), qRound(m_h*m_verticalFactor)), - m_frame.copy(m_x, m_y, m_w, m_h).scaled(qRound(m_w*m_horizontalFactor), - qRound(m_h*m_verticalFactor), - Qt::IgnoreAspectRatio, transformation_mode)); - } else { - //kDebug(5011) << "resize repaint"; - QRect rect = event->rect(); - if (!force_full_repaint and (rect.width() != width() || rect.height() != height())) { - // kDebug(5011) << "Partial repaint"; - const int sx = rect.x()/m_horizontalFactor; - const int sy = rect.y()/m_verticalFactor; - const int sw = rect.width()/m_horizontalFactor; - const int sh = rect.height()/m_verticalFactor; - painter.drawImage(rect, - m_frame.copy(sx, sy, sw, sh).scaled(rect.width(), rect.height(), - Qt::IgnoreAspectRatio, transformation_mode)); - } else { - kDebug(5011) << "Full repaint" << width() << height() << m_frame.width() << m_frame.height(); - painter.drawImage(QRect(0, 0, width(), height()), - m_frame.scaled(m_frame.width() * m_horizontalFactor, m_frame.height() * m_verticalFactor, - Qt::IgnoreAspectRatio, transformation_mode)); - force_full_repaint = false; + foreach(QRect update_rect, event->region().rects()) { + if(m_horizontalFactor == 2.0 and m_verticalFactor == 2.0) { + //grow client side updates to multiples of 2 to avoid artifacts + update_rect.adjust( + -update_rect.x()%2, + -update_rect.y()%2, + 0, 0); + update_rect.adjust(0, 0, + (update_rect.x()+update_rect.width())%2, + (update_rect.y()+update_rect.height())%2); } + const int sx = qRound(update_rect.x()/m_horizontalFactor); + const int sy = qRound(update_rect.y()/m_verticalFactor); + const int sw = qRound(update_rect.width()/m_horizontalFactor); + const int sh = qRound(update_rect.height()/m_verticalFactor); + + //kDebug(5011) << "Partial repaint, widget x,y,w,h:" << update_rect.x() << update_rect.y() << update_rect.width() << update_rect.height() << "orig: " << sx << sy << sw << sh; + + painter.drawImage(update_rect, + m_frame.copy(sx, sy, sw, sh) + .scaled(update_rect.size(), Qt::IgnoreAspectRatio, transformation_mode)); } - //draw local cursor ourselves, normal mouse pointer doesn't deal with scrolling - if((m_dotCursorState == CursorOn) || m_forceLocalCursor) { + //draw local cursor ourselves, normal mouse pointer doesn't deal with scrolling + if((m_dotCursorState == CursorOn) || m_forceLocalCursor) { #if QT_VERSION >= 0x040500 - painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination); + painter.setCompositionMode(QPainter::RasterOp_SourceXorDestination); #endif - //rectangle size includes 1px pen width - painter.drawRect(cursor_x*m_horizontalFactor - CURSOR_SIZE/2, cursor_y*m_verticalFactor - CURSOR_SIZE/2, CURSOR_SIZE-1, CURSOR_SIZE-1); - } + //rectangle size includes 1px pen width + painter.drawRect(cursor_x*m_horizontalFactor - CURSOR_SIZE/2, cursor_y*m_verticalFactor - CURSOR_SIZE/2, CURSOR_SIZE-1, CURSOR_SIZE-1); + } RemoteView::paintEvent(event); } @@ -457,26 +436,23 @@ bool VncView::event(QEvent *event) switch (event->type()) { case QEvent::KeyPress: case QEvent::KeyRelease: -// kDebug(5011) << "keyEvent"; keyEventHandler(static_cast(event)); return true; - break; + case QEvent::MouseButtonDblClick: case QEvent::MouseButtonPress: case QEvent::MouseButtonRelease: case QEvent::MouseMove: -// kDebug(5011) << "mouseEvent"; mouseEventHandler(static_cast(event)); return true; - break; + case QEvent::Wheel: -// kDebug(5011) << "wheelEvent"; wheelEventHandler(static_cast(event)); return true; - break; + case QEvent::WindowActivate: //input panel may have been closed, prevent IM from interfering with hardware keyboard - setAttribute(Qt::WA_InputMethodEnabled, false); - //fall through + setAttribute(Qt::WA_InputMethodEnabled, false); + //fall through default: return RemoteView::event(event); } @@ -485,111 +461,113 @@ bool VncView::event(QEvent *event) //call with e == 0 to flush held events void VncView::mouseEventHandler(QMouseEvent *e) { - static bool tap_detected = false; - static bool double_tap_detected = false; - static bool tap_drag_detected = false; - static QTime press_time; - static QTime up_time; //used for double clicks/tap&drag, for time after first tap - - if(!e) { //flush held taps - if(tap_detected) { - m_buttonMask |= 0x01; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - m_buttonMask &= 0xfe; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - tap_detected = false; - } else if(double_tap_detected and press_time.elapsed() > TAP_PRESS_TIME) { //got tap + another press -> tap & drag - m_buttonMask |= 0x01; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - double_tap_detected = false; - tap_drag_detected = true; - } - - return; - } - - if(e->x() < 0 or e->y() < 0) { //QScrollArea tends to send invalid events sometimes... - e->ignore(); - return; - } - - cursor_x = qRound(e->x()/m_horizontalFactor); - cursor_y = qRound(e->y()/m_verticalFactor); - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); // plain move event - - if(!disable_tapping and e->button() == Qt::LeftButton) { //implement touchpad-like input for left button - if(e->type() == QEvent::MouseButtonPress or e->type() == QEvent::MouseButtonDblClick) { - press_time.start(); - if(tap_detected and up_time.elapsed() < DOUBLE_TAP_UP_TIME) { - tap_detected = false; - double_tap_detected = true; - - QTimer::singleShot(TAP_PRESS_TIME, this, SLOT(mouseEventHandler())); - } - } else if(e->type() == QEvent::MouseButtonRelease) { - if(tap_drag_detected) { - m_buttonMask &= 0xfe; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - tap_drag_detected = false; - } else if(double_tap_detected) { //double click - double_tap_detected = false; - - m_buttonMask |= 0x01; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - m_buttonMask &= 0xfe; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - m_buttonMask |= 0x01; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - m_buttonMask &= 0xfe; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - } else if(press_time.elapsed() < TAP_PRESS_TIME) { //tap - up_time.start(); - tap_detected = true; - QTimer::singleShot(DOUBLE_TAP_UP_TIME, this, SLOT(mouseEventHandler())); - } - - } - } else { //middle or right button, send directly - if ((e->type() == QEvent::MouseButtonPress)) { - if (e->button() & Qt::MidButton) - m_buttonMask |= 0x02; - if (e->button() & Qt::RightButton) - m_buttonMask |= 0x04; - } else if (e->type() == QEvent::MouseButtonRelease) { - if (e->button() & Qt::MidButton) - m_buttonMask &= 0xfd; - if (e->button() & Qt::RightButton) - m_buttonMask &= 0xfb; - } - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - } - - //prevent local cursor artifacts - static int old_cursor_x = cursor_x; - static int old_cursor_y = cursor_y; - if(((m_dotCursorState == CursorOn) || m_forceLocalCursor) - and (cursor_x != old_cursor_x or cursor_y != old_cursor_y)) { - //clear last position - repaint(old_cursor_x*m_horizontalFactor - CURSOR_SIZE/2, old_cursor_y*m_verticalFactor - CURSOR_SIZE/2, CURSOR_SIZE, CURSOR_SIZE); - //and refresh new one - repaint(cursor_x*m_horizontalFactor - CURSOR_SIZE/2, cursor_y*m_verticalFactor - CURSOR_SIZE/2, CURSOR_SIZE, CURSOR_SIZE); - - old_cursor_x = cursor_x; old_cursor_y = cursor_y; - } + static bool tap_detected = false; + static bool double_tap_detected = false; + static bool tap_drag_detected = false; + static QTime press_time; + static QTime up_time; //used for double clicks/tap&drag, for time after first tap + + + if(!e) { //flush held taps + if(tap_detected) { + m_buttonMask |= rfbButton1Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + m_buttonMask &= ~rfbButton1Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + tap_detected = false; + } else if(double_tap_detected and press_time.elapsed() > TAP_PRESS_TIME) { //got tap + another press -> tap & drag + m_buttonMask |= rfbButton1Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + double_tap_detected = false; + tap_drag_detected = true; + } + + return; + } + + if(e->x() < 0 or e->y() < 0) { //QScrollArea tends to send invalid events sometimes... + e->ignore(); + return; + } + + cursor_x = qRound(e->x()/m_horizontalFactor); + cursor_y = qRound(e->y()/m_verticalFactor); + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); // plain move event + + if(!disable_tapping and e->button() == Qt::LeftButton) { //implement touchpad-like input for left button + if(e->type() == QEvent::MouseButtonPress or e->type() == QEvent::MouseButtonDblClick) { + press_time.start(); + if(tap_detected and up_time.elapsed() < DOUBLE_TAP_UP_TIME) { + tap_detected = false; + double_tap_detected = true; + + QTimer::singleShot(TAP_PRESS_TIME, this, SLOT(mouseEventHandler())); + } + } else if(e->type() == QEvent::MouseButtonRelease) { + if(tap_drag_detected) { //end tap & drag + m_buttonMask &= ~rfbButton1Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + tap_drag_detected = false; + } else if(double_tap_detected) { //double click + double_tap_detected = false; + + m_buttonMask |= rfbButton1Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + m_buttonMask &= ~rfbButton1Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + m_buttonMask |= rfbButton1Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + m_buttonMask &= ~rfbButton1Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + } else if(press_time.elapsed() < TAP_PRESS_TIME) { //tap + up_time.start(); + tap_detected = true; + QTimer::singleShot(DOUBLE_TAP_UP_TIME, this, SLOT(mouseEventHandler())); + } + + } + } else { //middle or right button, send directly + if ((e->type() == QEvent::MouseButtonPress)) { + if (e->button() & Qt::MidButton) + m_buttonMask |= rfbButton2Mask; + if (e->button() & Qt::RightButton) + m_buttonMask |= rfbButton3Mask; + } else if (e->type() == QEvent::MouseButtonRelease) { + if (e->button() & Qt::MidButton) + m_buttonMask &= ~rfbButton2Mask; + if (e->button() & Qt::RightButton) + m_buttonMask &= ~rfbButton3Mask; + } + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + } + + //prevent local cursor artifacts + static int old_cursor_x = cursor_x; + static int old_cursor_y = cursor_y; + if(((m_dotCursorState == CursorOn) || m_forceLocalCursor) + and (cursor_x != old_cursor_x or cursor_y != old_cursor_y)) { + //clear last position + update(old_cursor_x*m_horizontalFactor - CURSOR_SIZE/2, old_cursor_y*m_verticalFactor - CURSOR_SIZE/2, CURSOR_SIZE, CURSOR_SIZE); + //and refresh new one + update(cursor_x*m_horizontalFactor - CURSOR_SIZE/2, cursor_y*m_verticalFactor - CURSOR_SIZE/2, CURSOR_SIZE, CURSOR_SIZE); + + old_cursor_x = cursor_x; + old_cursor_y = cursor_y; + } } void VncView::wheelEventHandler(QWheelEvent *event) { int eb = 0; if (event->delta() < 0) - eb |= 0x10; + eb |= rfbWheelDownMask; else - eb |= 0x8; + eb |= rfbWheelUpMask; const int x = qRound(event->x() / m_horizontalFactor); const int y = qRound(event->y() / m_verticalFactor); - vncThread.mouseEvent(x, y, eb | m_buttonMask); + vncThread.mouseEvent(x, y, m_buttonMask | eb); vncThread.mouseEvent(x, y, m_buttonMask); } @@ -600,9 +578,10 @@ void VncView::keyEventHandler(QKeyEvent *e) return; } -// parts of this code are based on http://italc.sourcearchive.com/documentation/1.0.9.1/vncview_8cpp-source.html + // parts of this code are based on http://italc.sourcearchive.com/documentation/1.0.9.1/vncview_8cpp-source.html rfbKeySym k = e->nativeVirtualKey(); + // we do not handle Key_Backtab separately as the Shift-modifier // is already enabled if (e->key() == Qt::Key_Backtab) { @@ -615,9 +594,9 @@ void VncView::keyEventHandler(QKeyEvent *e) //don't send ISO_Level3_Shift (would break things like Win+0-9) //also enable IM so symbol key works if(k == 0xfe03) { - setAttribute(Qt::WA_InputMethodEnabled, pressed); - e->ignore(); - return; + setAttribute(Qt::WA_InputMethodEnabled, pressed); + e->ignore(); + return; } #endif @@ -633,54 +612,52 @@ void VncView::keyEventHandler(QKeyEvent *e) } - int current_zoom = -1; - if(e->key() == Qt::Key_F8) - current_zoom = left_zoom; - else if(e->key() == Qt::Key_F7) - current_zoom = right_zoom; - else if (k) { - // kDebug(5011) << "got '" << e->text() << "'."; - vncThread.keyEvent(k, pressed); - } else { - kDebug(5011) << "nativeVirtualKey() for '" << e->text() << "' failed."; - return; - } - - if(current_zoom == -1) - return; - - //handle zoom buttons - if(current_zoom == 0) { //left click - if(pressed) - m_buttonMask |= 0x01; - else - m_buttonMask &= 0xfe; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - } else if(current_zoom == 1) { //right click - if(pressed) - m_buttonMask |= 0x04; - else - m_buttonMask &= 0xfb; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - } else if(current_zoom == 2) { //middle click - if(pressed) - m_buttonMask |= 0x02; - else - m_buttonMask &= 0xfd; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - } else if(current_zoom == 3 and pressed) { //wheel up - int eb = 0x8; - vncThread.mouseEvent(cursor_x, cursor_y, eb | m_buttonMask); - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - } else if(current_zoom == 4 and pressed) { //wheel down - int eb = 0x10; - vncThread.mouseEvent(cursor_x, cursor_y, eb | m_buttonMask); - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - } else if(current_zoom == 5) { //page up - vncThread.keyEvent(0xff55, pressed); - } else if(current_zoom == 6) { //page down - vncThread.keyEvent(0xff56, pressed); - } + int current_zoom = -1; + if(e->key() == Qt::Key_F8) + current_zoom = left_zoom; + else if(e->key() == Qt::Key_F7) + current_zoom = right_zoom; + else if (k) { + //kDebug(5011) << "got '" << e->text() << "', nativeVirtualKey: " << k; + vncThread.keyEvent(k, pressed); + } else { + kDebug(5011) << "nativeVirtualKey() for '" << e->text() << "' failed."; + return; + } + + if(current_zoom == -1) + return; + + //handle zoom buttons + if(current_zoom == 0) { //left click + if(pressed) + m_buttonMask |= rfbButton1Mask; + else + m_buttonMask &= ~rfbButton1Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + } else if(current_zoom == 1) { //right click + if(pressed) + m_buttonMask |= rfbButton3Mask; + else + m_buttonMask &= ~rfbButton3Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + } else if(current_zoom == 2) { //middle click + if(pressed) + m_buttonMask |= rfbButton2Mask; + else + m_buttonMask &= ~rfbButton2Mask; + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + } else if(current_zoom == 3 and pressed) { //wheel up + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask | rfbWheelUpMask); + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + } else if(current_zoom == 4 and pressed) { //wheel down + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask | rfbWheelDownMask); + vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); + } else if(current_zoom == 5) { //page up + vncThread.keyEvent(0xff55, pressed); + } else if(current_zoom == 6) { //page down + vncThread.keyEvent(0xff56, pressed); + } } void VncView::unpressModifiers() @@ -723,159 +700,162 @@ void VncView::clipboardDataChanged() //fake key events void VncView::sendKey(Qt::Key key) { - //convert Qt::Key into x11 keysym - int k = 0; - switch(key) { - case Qt::Key_Escape: - k = 0xff1b; - break; - case Qt::Key_Tab: - k = 0xff09; - break; - case Qt::Key_PageUp: - k = 0xff55; - break; - case Qt::Key_PageDown: - k = 0xff56; - break; - case Qt::Key_Return: - k = 0xff0d; - break; - case Qt::Key_Insert: - k = 0xff63; - break; - case Qt::Key_Delete: - k = 0xffff; - break; - case Qt::Key_Home: - k = 0xff50; - break; - case Qt::Key_End: - k = 0xff57; - break; - case Qt::Key_Backspace: - k = 0xff08; - break; - case Qt::Key_F1: - case Qt::Key_F2: - case Qt::Key_F3: - case Qt::Key_F4: - case Qt::Key_F5: - case Qt::Key_F6: - case Qt::Key_F7: - case Qt::Key_F8: - case Qt::Key_F9: - case Qt::Key_F10: - case Qt::Key_F11: - case Qt::Key_F12: - k = 0xffbe + int(key - Qt::Key_F1); - break; - case Qt::Key_Pause: - k = 0xff13; - break; - case Qt::Key_Print: - k = 0xff61; - break; - case Qt::Key_Menu: - k = 0xff67; - break; - case Qt::Key_Meta: - case Qt::MetaModifier: - k = XK_Super_L; - break; - case Qt::Key_Alt: - case Qt::AltModifier: - k = XK_Alt_L; - break; - case Qt::Key_Control: - case Qt::ControlModifier: - k = XK_Control_L; - break; - default: - kDebug(5011) << "sendKey(): Unhandled Qt::Key value " << key; - return; - } - - if (k == XK_Shift_L || k == XK_Control_L || k == XK_Meta_L || k == XK_Alt_L || k == XK_Super_L) { - if (m_mods.contains(k)) { //release - m_mods.remove(k); - vncThread.keyEvent(k, false); - } else { //press - m_mods[k] = true; - vncThread.keyEvent(k, true); - } - } else { //normal key - vncThread.keyEvent(k, true); - vncThread.keyEvent(k, false); - } + //convert Qt::Key into x11 keysym + int k = 0; + switch(key) { + case Qt::Key_Escape: + k = 0xff1b; + break; + case Qt::Key_Tab: + k = 0xff09; + break; + case Qt::Key_PageUp: + k = 0xff55; + break; + case Qt::Key_PageDown: + k = 0xff56; + break; + case Qt::Key_Return: + k = 0xff0d; + break; + case Qt::Key_Insert: + k = 0xff63; + break; + case Qt::Key_Delete: + k = 0xffff; + break; + case Qt::Key_Home: + k = 0xff50; + break; + case Qt::Key_End: + k = 0xff57; + break; + case Qt::Key_Backspace: + k = 0xff08; + break; + case Qt::Key_F1: + case Qt::Key_F2: + case Qt::Key_F3: + case Qt::Key_F4: + case Qt::Key_F5: + case Qt::Key_F6: + case Qt::Key_F7: + case Qt::Key_F8: + case Qt::Key_F9: + case Qt::Key_F10: + case Qt::Key_F11: + case Qt::Key_F12: + k = 0xffbe + int(key - Qt::Key_F1); + break; + case Qt::Key_Pause: + k = 0xff13; + break; + case Qt::Key_Print: + k = 0xff61; + break; + case Qt::Key_Menu: + k = 0xff67; + break; + case Qt::Key_Meta: + k = XK_Super_L; + break; + case Qt::Key_Alt: + k = XK_Alt_L; + break; + case Qt::Key_Control: + k = XK_Control_L; + break; + default: + kDebug(5011) << "sendKey(): Unhandled Qt::Key value " << key; + return; + } + + if (k == XK_Shift_L || k == XK_Control_L || k == XK_Meta_L || k == XK_Alt_L || k == XK_Super_L) { + if (m_mods.contains(k)) { //release + m_mods.remove(k); + vncThread.keyEvent(k, false); + } else { //press + m_mods[k] = true; + vncThread.keyEvent(k, true); + } + } else { //normal key + vncThread.keyEvent(k, true); + vncThread.keyEvent(k, false); + } } void VncView::sendKeySequence(QKeySequence keys) { - Q_ASSERT(keys.count() <= 1); //we can only handle a single combination - - //to get at individual key presses, we split 'keys' into its components - QList key_list; - int pos = 0; - while(true) { - QString k = keys.toString().section('+', pos, pos); - if(k.isEmpty()) - break; - - //kDebug(5011) << "found key: " << k; - if(k == "Alt") { - key_list.append(Qt::Key_Alt); - } else if(k == "Ctrl") { - key_list.append(Qt::Key_Control); - } else if(k == "Meta") { - key_list.append(Qt::Key_Meta); - } else { - key_list.append(QKeySequence(k)[0]); - } - - pos++; - } - - for(int i = 0; i < key_list.count(); i++) - sendKey(Qt::Key(key_list.at(i))); - - //release modifiers (everything before final key) - for(int i = key_list.count()-2; i >= 0; i--) - sendKey(Qt::Key(key_list.at(i))); + Q_ASSERT(keys.count() <= 1); //we can only handle a single combination + + //to get at individual key presses, we split 'keys' into its components + QList key_list; + int pos = 0; + while(true) { + QString k = keys.toString().section('+', pos, pos); + if(k.isEmpty()) + break; + + //kDebug(5011) << "found key: " << k; + if(k == "Alt") { + key_list.append(Qt::Key_Alt); + } else if(k == "Ctrl") { + key_list.append(Qt::Key_Control); + } else if(k == "Meta") { + key_list.append(Qt::Key_Meta); + } else { + key_list.append((Qt::Key)QKeySequence(k)[0]); + } + + pos++; + } + + for(int i = 0; i < key_list.count(); i++) + sendKey(key_list.at(i)); + + //release modifiers (everything before final key) + for(int i = key_list.count()-2; i >= 0; i--) + sendKey(key_list.at(i)); } void VncView::reloadSettings() { - QSettings settings; - left_zoom = settings.value("left_zoom", 0).toInt(); - right_zoom = settings.value("right_zoom", 1).toInt(); - disable_tapping = settings.value("disable_tapping", false).toBool(); + QSettings settings; + left_zoom = settings.value("left_zoom", 0).toInt(); + right_zoom = settings.value("right_zoom", 1).toInt(); + disable_tapping = settings.value("disable_tapping", false).toBool(); - bool always_show_local_cursor = settings.value("always_show_local_cursor", false).toBool(); - if(always_show_local_cursor) - showDotCursor(CursorOn); + bool always_show_local_cursor = settings.value("always_show_local_cursor", false).toBool(); + showDotCursor(always_show_local_cursor?CursorOn:CursorOff); - enableScaling(true); + enableScaling(true); } //convert commitString into keyevents void VncView::inputMethodEvent(QInputMethodEvent *event) { - //TODO handle replacements - //NOTE for the return key to work Qt needs to enable multiline input, which only works for Q(Plain)TextEdit + //TODO handle replacements + //NOTE for the return key to work Qt needs to enable multiline input, which only works for Q(Plain)TextEdit - //kDebug(5011) << event->commitString() << "|" << event->preeditString() << "|" << event->replacementLength() << "|" << event->replacementStart(); - QString letters = event->commitString(); - for(int i = 0; i < letters.length(); i++) { - char k = letters.at(i).toLatin1(); //works with all 'normal' keys, not umlauts. - if(!k) { - kDebug(5011) << "unhandled key"; - continue; - } - vncThread.keyEvent(k, true); - vncThread.keyEvent(k, false); - } + //kDebug(5011) << event->commitString() << "|" << event->preeditString() << "|" << event->replacementLength() << "|" << event->replacementStart(); + QString letters = event->commitString(); + for(int i = 0; i < letters.length(); i++) { + char k = letters.at(i).toLatin1(); + if(!k) { + kDebug(5011) << "unhandled key"; + continue; + } + vncThread.keyEvent(k, true); + vncThread.keyEvent(k, false); + } } - -#include "moc_vncview.cpp" +void VncView::useFastTransformations(bool enabled) +{ + if(enabled or zoomFactor() >= 1.0) { + transformation_mode = Qt::FastTransformation; + } else { + transformation_mode = Qt::SmoothTransformation; + update(); + } +}