Show/hide matchbox-keyboard rather than onboard

Author: Phil Wise

CMakeLists.txt

@@ -16,19 +16,30 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Werror")
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5WebKitWidgets REQUIRED)
 find_package(Qt5DBus REQUIRED)
+find_package(X11)
 
 qt5_wrap_ui(UI_MAINWINDOW mainwindow.ui)
 
 set_source_files_properties(softwareloadingmanager.xml
     PROPERTIES INCLUDE softwareloadingmanagerdbus.h)
-qt5_add_dbus_interfaces(DBUS_FILES onboard.xml softwareloadingmanager.xml)
+qt5_add_dbus_interfaces(DBUS_FILES softwareloadingmanager.xml)
 qt5_add_resources(RCC_FILES resources/resources.qrc)
 
+# Generate config.h from config.h.in
+configure_file(config.h.in config.h)
+include_directories(${CMAKE_CURRENT_BINARY_DIR})
+
 add_executable(openivi-html5
         main.cc mainwindow.cc webgraphicview.cc softwareloadingmanager.cc
         car.cc installdetail.cc packageid.cc
+        virtualkeyboard.cc
         ${DBUS_FILES} ${RCC_FILES} ${UI_MAINWINDOW})
 
+if (X11_FOUND)
+  target_link_libraries(openivi-html5 ${X11_LIBRARIES})
+  include_directories(${X11_INCLUDE_DIR})
+endif(X11_FOUND)
+
 set_property(TARGET openivi-html5 PROPERTY CXX_STANDARD 11)
 
 qt5_use_modules(openivi-html5 Widgets DBus WebKitWidgets)

config.h.in

@@ -0,0 +1,6 @@
+#ifndef OPENIVI_CONFIGURE_H_
+#define OPENIVI_CONFIGURE_H_
+
+#cmakedefine X11_FOUND
+
+#endif /* OPENIVI_CONFIGURE_H_ */

onboard.xml

@@ -0,0 +1,80 @@
+/*
+    OpenIVI HTML5 environment
+    Copyright (C) 2015 ATS Advanced Telematic Systems GmbH
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+#include <QDebug>
+#include "virtualkeyboard.h"
+#include "config.h"
+
+/* If X11 is not available, for example on Mac OSX builds, use a dummy
+implementation of  VirtualKeyboard */
+
+#ifdef X11_FOUND
+
+#include <X11/Xlib.h>
+
+VirtualKeyboard::VirtualKeyboard() : x11Display_(XOpenDisplay(NULL)) {
+  if (!x11Display_) {
+    qDebug() << "XOpenDisplay failed";
+  }
+}
+
+VirtualKeyboard::~VirtualKeyboard() {
+  if (x11Display_) {
+    XCloseDisplay((Display*)x11Display_);
+  }
+}
+
+void VirtualKeyboard::SendCommand(int command) {
+  if (x11Display_) {
+    Display* dsp = (Display*)x11Display_;
+
+    XEvent event;
+    memset(&event, 0, sizeof(XEvent));
+
+    Atom Atom_MB_IM_INVOKER_COMMAND =
+        XInternAtom(dsp, "_MB_IM_INVOKER_COMMAND", False);
+    event.xclient.type = ClientMessage;
+    event.xclient.window = DefaultRootWindow(dsp);
+    event.xclient.message_type = Atom_MB_IM_INVOKER_COMMAND;
+    event.xclient.format = 32;
+    event.xclient.data.l[0] =
+        command; /* MBKeyboardRemoteShow | MBKeyboardRemoteHide */
+
+    XSendEvent(dsp, DefaultRootWindow(dsp), False,
+               SubstructureRedirectMask | SubstructureNotifyMask, &event);
+
+    XSync(dsp, False);
+  } else {
+    qDebug() << "No xdisplay found. Not showing/hiding keyboard";
+  }
+}
+
+#else /* X11_FOUND */
+
+VirtualKeyboard::VirtualKeyboard() : x11Display_(0) {
+  qDebug() << "X11 not found at build time. VirtualKeyboard disabled";
+}
+
+VirtualKeyboard::~VirtualKeyboard() {}
+
+void VirtualKeyboard::SendCommand(int) {
+  qDebug() << "X11 not found at build time. Not showing/hiding keyboard";
+}
+
+#endif

virtualkeyboard.cc

@@ -0,0 +1,40 @@
+#ifndef OPENIVI_VIRTUALKEYBOARD_H_
+#define OPENIVI_VIRTUALKEYBOARD_H_
+
+/*
+    OpenIVI HTML5 environment
+    Copyright (C) 2015 ATS Advanced Telematic Systems GmbH
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+*/
+
+/**
+ * Interface to control the on screen keyboard, matchbox-keyboard.
+ */
+class VirtualKeyboard {
+ public:
+  VirtualKeyboard();
+  ~VirtualKeyboard();
+  void Show() { SendCommand(1); }
+  void Hide() { SendCommand(2); }
+
+ private:
+  void SendCommand(int);
+  // including <X11/Xlib.h> breaks QT, so use a void* pointer here
+  void *x11Display_;
+};
+
+/* vim: set expandtab tabstop=2 shiftwidth=2: */
+#endif /* OPENIVI_VIRTUALKEYBOARD_H_ */

virtualkeyboard.h

@@ -27,7 +27,6 @@
 #include "softwareloadingmanager.h"
 
 using org::genivi::software_loading_manager;
-using org::onboard::Onboard::Keyboard;
 
 WebGraphicView::WebGraphicView(QWidget *parent)
     : QGraphicsView(parent),
@@ -36,9 +35,6 @@ WebGraphicView::WebGraphicView(QWidget *parent)
       scene_(new QGraphicsScene(this)),
       webInspector_(new QWebInspector),
       softwareLoadingManager_(new SoftwareLoadingManager(this)),
-      onboard_(new Keyboard("org.onboard.Onboard",
-                            QString("/org/onboard/Onboard/Keyboard"),
-                            QDBusConnection::sessionBus(), this)),
       car_(new Car(this)) {
   page_->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
   page_->settings()->setAttribute(QWebSettings::LocalStorageEnabled, true);
@@ -73,11 +69,9 @@ void WebGraphicView::FocusUpdate() {
   bool shouldDisplayKeyboard = r.isValid();
   if (keyboardVisible_ != shouldDisplayKeyboard) {
     if (shouldDisplayKeyboard) {
-      auto r = onboard_->Show();
-      r.waitForFinished();
+      virtualKeyboard_.Show();
     } else {
-      auto r = onboard_->Hide();
-      r.waitForFinished();
+      virtualKeyboard_.Hide();
     }
     keyboardVisible_ = shouldDisplayKeyboard;
   }
@@ -86,7 +80,6 @@ void WebGraphicView::FocusUpdate() {
 void WebGraphicView::AddJavascriptObjectsToWindow() {
   page_->currentFrame()->addToJavaScriptWindowObject("slm",
                                                      softwareLoadingManager_);
-  page_->currentFrame()->addToJavaScriptWindowObject("onboard", onboard_);
 
   page_->currentFrame()->evaluateJavaScript("genivi = {slm:slm}");
 

webgraphicview.cc

@@ -27,8 +27,8 @@
 #include <QWebPage>
 
 #include "softwareloadingmanager.h"
-#include "onboardinterface.h"
 #include "car.h"
+#include "virtualkeyboard.h"
 
 class WebGraphicView : public QGraphicsView {
   Q_OBJECT
@@ -54,7 +54,7 @@ class WebGraphicView : public QGraphicsView {
   QGraphicsScene *scene_;
   QWebInspector *webInspector_;
   SoftwareLoadingManager *softwareLoadingManager_;
-  org::onboard::Onboard::Keyboard *onboard_;
+  VirtualKeyboard virtualKeyboard_;
   Car *car_;
 };