X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fvncview.cpp;h=ccbae253550b93864ed7ebc3093f6a2eb58fb553;hb=176eaefb1342526e63f64a672cd8d4ce46a9f35d;hp=fddc7ff42a84d0b07d4717794d0197ac750f841a;hpb=57aa217e8eff5aa6a15cfd4aafe514ec62d57acd;p=presencevnc diff --git a/src/vncview.cpp b/src/vncview.cpp index fddc7ff..ccbae25 100644 --- a/src/vncview.cpp +++ b/src/vncview.cpp @@ -30,13 +30,21 @@ critical(parent, caption, message) #include +#include +#include +#include #include +#include +#include #include #include +#include #include +#include #include #include + // Definition of key modifier mask constants #define KMOD_Alt_R 0x01 #define KMOD_Alt_L 0x02 @@ -44,7 +52,14 @@ critical(parent, caption, message) #define KMOD_Control_L 0x08 #define KMOD_Shift_L 0x10 -VncView::VncView(QWidget *parent, const KUrl &url, RemoteView::Quality quality) +//local cursor width/height in px, should be an odd number +const int CURSOR_SIZE = 7; + +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), @@ -53,18 +68,19 @@ VncView::VncView(QWidget *parent, const KUrl &url, RemoteView::Quality quality) m_repaint(false), m_quitFlag(false), m_firstPasswordTry(true), - m_authenticaionCanceled(false), m_dontSendClipboard(false), m_horizontalFactor(1.0), m_verticalFactor(1.0), m_forceLocalCursor(false), force_full_repaint(false), - quality(quality) + quality(quality), + listen_port(listen_port) { m_url = url; m_host = url.host(); m_port = url.port(); + //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); @@ -73,6 +89,8 @@ VncView::VncView(QWidget *parent, const KUrl &url, RemoteView::Quality quality) m_clipboard = QApplication::clipboard(); connect(m_clipboard, SIGNAL(selectionChanged()), this, SLOT(clipboardSelectionChanged())); connect(m_clipboard, SIGNAL(dataChanged()), this, SLOT(clipboardDataChanged())); + + reloadSettings(); } VncView::~VncView() @@ -80,10 +98,7 @@ VncView::~VncView() unpressModifiers(); // Disconnect all signals so that we don't get any more callbacks from the client thread - disconnect(&vncThread, SIGNAL(imageUpdated(int, int, int, int)), this, SLOT(updateImage(int, int, int, int))); - disconnect(&vncThread, SIGNAL(gotCut(const QString&)), this, SLOT(setCut(const QString&))); - disconnect(&vncThread, SIGNAL(passwordRequest()), this, SLOT(requestPassword())); - disconnect(&vncThread, SIGNAL(outputErrorMessage(QString)), this, SLOT(outputErrorMessage(QString))); + vncThread.disconnect(); startQuitting(); } @@ -124,58 +139,28 @@ QSize VncView::minimumSizeHint() const return size(); } -void VncView::scaleResize(int w, int h) -{ - RemoteView::scaleResize(w, h); - - kDebug(5011) << "scaleResize(): " <width(), parentWidget()->height()); - else - scaleResize(width(), height()); -} - void VncView::startQuitting() { kDebug(5011) << "about to quit"; - const bool connected = status() == RemoteView::Connected; + //const bool connected = status() == RemoteView::Connected; setStatus(Disconnecting); m_quitFlag = true; - if (connected) { - vncThread.stop(); - } - - vncThread.quit(); - - const bool quitSuccess = vncThread.wait(500); - - kDebug(5011) << "Quit VNC thread success:" << quitSuccess; - + //if(connected) //remove if things work without it + 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); + } setStatus(Disconnected); } @@ -188,7 +173,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.setQuality(quality); // set local cursor on by default because low quality mostly means slow internet connection @@ -216,11 +201,6 @@ void VncView::requestPassword() { kDebug(5011) << "request password"; - if (m_authenticaionCanceled) { - startQuitting(); - return; - } - setStatus(Authenticating); if (!m_url.password().isNull()) { @@ -228,22 +208,59 @@ void VncView::requestPassword() return; } - bool ok; - QString password = QInputDialog::getText(this, //krazy:exclude=qclasses - tr("Password required"), - tr("Please enter the password for the remote desktop:"), - QLineEdit::Password, QString(), &ok); - m_firstPasswordTry = false; - if (ok) - vncThread.setPassword(password); - else - m_authenticaionCanceled = true; + 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(); + } } void VncView::outputErrorMessage(const QString &message) { - kDebug(5011) << message; - if (message == "INTERNAL:APPLE_VNC_COMPATIBILTY") { setCursor(localDotCursor()); m_forceLocalCursor = true; @@ -257,7 +274,11 @@ void VncView::outputErrorMessage(const QString &message) void VncView::updateImage(int x, int y, int w, int h) { -// kDebug(5011) << "got update" << width() << height(); + if(!QApplication::focusWidget()) { //no focus, we're probably minimized + return; + } + + //kDebug(5011) << "got update" << width() << height(); m_x = x; m_y = y; @@ -266,10 +287,13 @@ void VncView::updateImage(int x, int y, int w, int h) if (m_horizontalFactor != 1.0 || m_verticalFactor != 1.0) { // If the view is scaled, grow the update rectangle to avoid artifacts - m_x-=1; - m_y-=1; - m_w+=2; - m_h+=2; + int x_extrapixels = 1.0/m_horizontalFactor + 1; + int y_extrapixels = 1.0/m_verticalFactor + 1; + + m_x-=x_extrapixels; + m_y-=y_extrapixels; + m_w+=2*x_extrapixels; + m_h+=2*y_extrapixels; } m_frame = vncThread.image(); @@ -287,12 +311,7 @@ void VncView::updateImage(int x, int y, int w, int h) // emit framebufferSizeChanged(m_frame.width(), m_frame.height()); emit connected(); - if (m_scale) { - if (parentWidget()) - scaleResize(parentWidget()->width(), parentWidget()->height()); - else - scaleResize(width(), height()); - } + resize(width(), height()); m_initDone = true; @@ -302,16 +321,7 @@ void VncView::updateImage(int x, int y, int w, int h) if ((y == 0 && x == 0) && (m_frame.size() != old_frame_size)) { old_frame_size = m_frame.size(); kDebug(5011) << "Updating framebuffer size"; - if (m_scale) { - //setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)); - if (parentWidget()) - scaleResize(parentWidget()->width(), parentWidget()->height()); - } else { - kDebug(5011) << "Resizing: " << m_frame.width() << m_frame.height(); - resize(m_frame.width(), m_frame.height()); - //setMaximumSize(m_frame.width(), m_frame.height()); //This is a hack to force Qt to center the view in the scroll area - //setMinimumSize(m_frame.width(), m_frame.height()); - } + setZoomLevel(); emit framebufferSizeChanged(m_frame.width(), m_frame.height()); } @@ -339,25 +349,36 @@ void VncView::showDotCursor(DotCursorState state) setCursor(state == CursorOn ? localDotCursor() : Qt::BlankCursor); } -void VncView::enableScaling(bool scale) +//level should be in [0, 100] +void VncView::setZoomLevel(int level) { - RemoteView::enableScaling(scale); + Q_ASSERT(parentWidget() != 0); - if (scale) { - //setMaximumSize(QSize(QWIDGETSIZE_MAX, QWIDGETSIZE_MAX)); - //setMinimumSize(1, 1); - if (parentWidget()) - scaleResize(parentWidget()->width(), parentWidget()->height()); - else - scaleResize(width(), height()); - } else { - m_verticalFactor = 1.0; - m_horizontalFactor = 1.0; + if(level == -1) { //handle resize + resize(m_frame.width()*m_horizontalFactor, m_frame.height()*m_verticalFactor); + return; + } - //setMaximumSize(m_frame.width(), m_frame.height()); //This is a hack to force Qt to center the view in the scroll area - //setMinimumSize(m_frame.width(), m_frame.height()); - resize(m_frame.width(), m_frame.height()); - } + 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; + } + + 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); } void VncView::setCut(const QString &text) @@ -370,7 +391,7 @@ 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; + //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"; RemoteView::paintEvent(event); @@ -381,42 +402,54 @@ void VncView::paintEvent(QPaintEvent *event) QPainter painter(this); - if (m_repaint) { + 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, Qt::SmoothTransformation)); + Qt::IgnoreAspectRatio, transformation_mode)); } else { - kDebug(5011) << "resize repaint"; + //kDebug(5011) << "resize repaint"; QRect rect = event->rect(); if (!force_full_repaint and (rect.width() != width() || rect.height() != height())) { - kDebug(5011) << "Partial repaint"; + // 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, Qt::SmoothTransformation)); + 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, Qt::SmoothTransformation)); - force_full_repaint = false; + Qt::IgnoreAspectRatio, transformation_mode)); + force_full_repaint = false; } } + //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); +#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); + } + RemoteView::paintEvent(event); } void VncView::resizeEvent(QResizeEvent *event) { RemoteView::resizeEvent(event); - scaleResize(event->size().width(), event->size().height()); - forceFullRepaint(); + update(); } bool VncView::event(QEvent *event) @@ -441,12 +474,15 @@ bool VncView::event(QEvent *event) 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 default: return RemoteView::event(event); } } - +//call with e == 0 to flush held events void VncView::mouseEventHandler(QMouseEvent *e) { static bool tap_detected = false; @@ -454,7 +490,6 @@ void VncView::mouseEventHandler(QMouseEvent *e) 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 -static QTime foo; if(!e) { //flush held taps if(tap_detected) { @@ -463,10 +498,9 @@ static QTime foo; m_buttonMask &= 0xfe; vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); tap_detected = false; - } else if(double_tap_detected and press_time.elapsed() > 200) { //got tap + another press -> tap & drag + } 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); - foo.start(); double_tap_detected = false; tap_drag_detected = true; } @@ -483,55 +517,65 @@ static QTime foo; cursor_y = qRound(e->y()/m_verticalFactor); vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); // plain move event - if(e->type() == QEvent::MouseButtonPress or e->type() == QEvent::MouseButtonDblClick) { - press_time.start(); - if(tap_detected and up_time.elapsed() < 500) { - tap_detected = false; - double_tap_detected = true; + 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())); + } - QTimer::singleShot(200, 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() < 200) { //tap - up_time.start(); - tap_detected = true; - QTimer::singleShot(500, 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); } -/* for reference: - if (e->type() != QEvent::MouseMove) { - if ((e->type() == QEvent::MouseButtonPress)) { - if (e->button() & Qt::LeftButton) - m_buttonMask |= 0x01; - 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::LeftButton) - m_buttonMask &= 0xfe; - if (e->button() & Qt::MidButton) - m_buttonMask &= 0xfd; - if (e->button() & Qt::RightButton) - m_buttonMask &= 0xfb; - */ + //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; + } } void VncView::wheelEventHandler(QWheelEvent *event) @@ -545,7 +589,6 @@ void VncView::wheelEventHandler(QWheelEvent *event) const int x = qRound(event->x() / m_horizontalFactor); const int y = qRound(event->y() / m_verticalFactor); - kDebug(5011) << "Wheelevent"; vncThread.mouseEvent(x, y, eb | m_buttonMask); vncThread.mouseEvent(x, y, m_buttonMask); } @@ -553,8 +596,9 @@ void VncView::wheelEventHandler(QWheelEvent *event) void VncView::keyEventHandler(QKeyEvent *e) { // strip away autorepeating KeyRelease; see bug #206598 - if (e->isAutoRepeat() && (e->type() == QEvent::KeyRelease)) + if (e->isAutoRepeat() && (e->type() == QEvent::KeyRelease)) { return; + } // parts of this code are based on http://italc.sourcearchive.com/documentation/1.0.9.1/vncview_8cpp-source.html rfbKeySym k = e->nativeVirtualKey(); @@ -567,6 +611,16 @@ void VncView::keyEventHandler(QKeyEvent *e) const bool pressed = (e->type() == QEvent::KeyPress); +#ifdef Q_WS_MAEMO_5 + //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; + } +#endif + // handle modifiers if (k == XK_Shift_L || k == XK_Control_L || k == XK_Meta_L || k == XK_Alt_L) { if (pressed) { @@ -579,22 +633,54 @@ void VncView::keyEventHandler(QKeyEvent *e) } - //handle clicks via zoom buttons - if(e->key() == Qt::Key_F8) { - if(pressed) - m_buttonMask |= 0x01; - else - m_buttonMask &= 0xfe; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - } else if(e->key() == Qt::Key_F7) { - if(pressed) - m_buttonMask |= 0x04; - else - m_buttonMask &= 0xfb; - vncThread.mouseEvent(cursor_x, cursor_y, m_buttonMask); - } else if (k) { - vncThread.keyEvent(k, 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() << "'."; + 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); + } } void VncView::unpressModifiers() @@ -610,8 +696,6 @@ void VncView::unpressModifiers() void VncView::clipboardSelectionChanged() { - kDebug(5011); - if (m_status != Connected) return; @@ -625,8 +709,6 @@ void VncView::clipboardSelectionChanged() void VncView::clipboardDataChanged() { - kDebug(5011); - if (m_status != Connected) return; @@ -641,8 +723,8 @@ void VncView::clipboardDataChanged() //fake key events void VncView::sendKey(Qt::Key key) { - rfbKeySym k = 0; - if(key == Qt::Key_Escape) + //convert Qt::Key into x11 keysym + int k = 0; switch(key) { case Qt::Key_Escape: k = 0xff1b; @@ -650,13 +732,150 @@ void VncView::sendKey(Qt::Key key) 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) << "unhandled Qt::Key value " << key; + kDebug(5011) << "sendKey(): Unhandled Qt::Key value " << key; return; } - vncThread.keyEvent(k, true); - vncThread.keyEvent(k, false); + 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))); +} + +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(); + + bool always_show_local_cursor = settings.value("always_show_local_cursor", false).toBool(); + if(always_show_local_cursor) + showDotCursor(CursorOn); + + 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 + + //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); + } +} + + #include "moc_vncview.cpp"