remove modifiers present on hw keyboard

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index e40015f..364d20b 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -17,16 +17,18 @@ MainWindow::MainWindow(QString url, int quality):
        setWindowTitle("Presence VNC");
 //     swipe_start = QPoint(0,0);
        setAttribute(Qt::WA_Maemo5StackedWindow);
+       QSettings settings;
 
        //set up toolbar
        toolbar = new QToolBar(0);
-       toolbar->addAction("Mod"); //TODO
+       toolbar->addAction("Mod", this, SLOT(showModifierMenu()));
        toolbar->addAction("Tab", this, SLOT(sendTab()));
        toolbar->addAction("Esc", this, SLOT(sendEsc()));
        toolbar->addAction("PgUp", this, SLOT(sendPgUp()));
        toolbar->addAction("PgDn", this, SLOT(sendPgDn()));
        toolbar->addAction(QIcon("/usr/share/icons/hicolor/48x48/hildon/general_fullsize.png"), "", this, SLOT(toggleFullscreen()));
        addToolBar(toolbar);
+       toolbar->setVisible(settings.value("show_toolbar", true).toBool());
 
        //set up menu
        QMenuBar *menu = new QMenuBar(this);
@@ -36,11 +38,11 @@ MainWindow::MainWindow(QString url, int quality):
        menu->addAction(disconnect_action);
        scaling = new QAction("Rescale Remote Screen", this);
        scaling->setCheckable(true);
-       scaling->setChecked(true);
+       scaling->setChecked(settings.value("rescale", true).toBool());
        menu->addAction(scaling);
        QAction *show_toolbar = new QAction("Show Toolbar", this);
        show_toolbar->setCheckable(true);
-       show_toolbar->setChecked(true);
+       show_toolbar->setChecked(settings.value("show_toolbar", true).toBool());
        menu->addAction(show_toolbar);
        QAction *about_action = new QAction("About", this);
        menu->addAction(about_action);
@@ -76,12 +78,11 @@ MainWindow::MainWindow(QString url, int quality):
                vnc_view = new VncView(0, url, RemoteView::Quality(quality));
                connect(scaling, SIGNAL(toggled(bool)),
                        vnc_view, SLOT(enableScaling(bool)));
-               connect(scaling, SIGNAL(toggled(bool)),
-                       scroll_area, SLOT(setWidgetResizable(bool)));
                connect(vnc_view, SIGNAL(statusChanged(RemoteView::RemoteStatus)),
                        this, SLOT(statusChanged(RemoteView::RemoteStatus)));
                scroll_area->setWidget(vnc_view);
                vnc_view->start();
+               vnc_view->enableScaling(scaling->isChecked());
        }
 }
 
@@ -98,14 +99,21 @@ void MainWindow::grabZoomKeys(bool grab)
 }
 
 void MainWindow::closeEvent(QCloseEvent*) {
-       hide();
        grabZoomKeys(false);
+
+       QSettings settings;
+       settings.setValue("show_toolbar", toolbar->isVisible());
+       settings.setValue("rescale", scaling->isChecked());
+       settings.sync();
+
+       hide();
+
        disconnectFromHost();
 }
 
 void MainWindow::about() {
        QMessageBox::about(this, tr("About Presence VNC"),
-               tr("<center><h1>Presence VNC 0.1 alpha</h1>\
+               tr("<center><h1>Presence VNC 0.1 beta</h1>\
 A touch screen friendly VNC client\
 <small><p>&copy;2010 Christian Pulvermacher &lt;pulvermacher@gmx.de&gt</p>\
 <p>Based on KRDC, &copy; 2007-2008 Urs Wolfer</small></center>\
@@ -156,11 +164,10 @@ void MainWindow::connectDialog()
 
        connect(scaling, SIGNAL(toggled(bool)),
                vnc_view, SLOT(enableScaling(bool)));
-       connect(scaling, SIGNAL(toggled(bool)),
-               scroll_area, SLOT(setWidgetResizable(bool)));
        connect(vnc_view, SIGNAL(statusChanged(RemoteView::RemoteStatus)),
                this, SLOT(statusChanged(RemoteView::RemoteStatus)));
        vnc_view->start();
+       vnc_view->enableScaling(scaling->isChecked());
        disconnect_action->setEnabled(true);
        toolbar->setEnabled(true);
 }
@@ -225,3 +232,24 @@ void MainWindow::toggleFullscreen()
        setWindowState(windowState() ^ Qt::WindowFullScreen); 
        forceResizeDelayed();
 }
+
+void MainWindow::showModifierMenu()
+{
+       static QMenu *mod_menu = new QMenu(tr("Modifiers"), this);
+       static QAction *win = mod_menu->addAction(tr("Win"));
+       static QAction *alt = mod_menu->addAction(tr("Alt"));
+       win->setCheckable(true);
+       alt->setCheckable(true);
+
+       //show menu at top-left corner of toolbar
+       QAction *chosen = mod_menu->exec(toolbar->mapToGlobal(QPoint(0,0)));
+       if(!chosen) {
+               return;
+       } else if(chosen == alt) {
+               vnc_view->sendKey(Qt::Key_Alt);
+       } else if(chosen == win) {
+               vnc_view->sendKey(Qt::Key_Meta);
+       } else {
+               std::cout << "unhandled action?\n";
+       }
+}

diff --git a/src/mainwindow.h b/src/mainwindow.h
index 588feb5..edfe2b8 100644 (file)
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -20,6 +20,7 @@ public slots:
        void sendEsc() { vnc_view->sendKey(Qt::Key_Escape); }
        void sendPgUp() { vnc_view->sendKey(Qt::Key_PageUp); }
        void sendPgDn() { vnc_view->sendKey(Qt::Key_PageDown); }
+       void showModifierMenu();
        void statusChanged(RemoteView::RemoteStatus status);
        void toggleFullscreen();
 protected:

diff --git a/src/vncview.cpp b/src/vncview.cpp
index 6d63cf0..154a98f 100644 (file)
--- a/src/vncview.cpp
+++ b/src/vncview.cpp
@@ -655,13 +655,29 @@ void VncView::sendKey(Qt::Key key)
        case Qt::Key_PageDown:
                k = 0xff56;
                break;
+       case Qt::Key_Meta: //TODO: test this.
+               k = XK_Super_L;
+               break;
+       case Qt::Key_Alt:
+               k = XK_Alt_L;
+               break;
        default:
                kDebug(5011) << "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);
+       }
 }
 
 #include "moc_vncview.cpp"