Merge ~santoshbit2007/oxide:GetShellMode_Implementation into oxide:master

[Santosh]

Implement shell mode change detection based on
scanning of input devices.

[Santosh (santoshbit2007)]

Just to note, QtSystemInfo is not yet in ubuntu image, but silo to include it in image is in testing phase, so we might get it with ubuntu Image.

For images, QtsystemInfo is not available, user need install package libqt5systeminfo5

May be we should use declare some #define to check availability for package and write code within that check. Any suggestion is welcomed.
 e.g all the code below should put within
#if defined QT5_SYSTEM_INFO
  // code
#endif

[Chris Coulson (chrisccoulson)]

Thanks, I've left a few comments inline.

This does also need to be optional at build time - I don't mind if this is a build option or an automatic check (there are some CMake macros that could help here, eg https://cmake.org/cmake/help/v3.0/module/CheckCXXSymbolExists.html)

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

Thanks, I've left some comments inline

review: Needs Fixing

[Chris Coulson (chrisccoulson)]

review: Approve

diff --git a/build/cmake/ChromiumBuildShim.cmake b/build/cmake/ChromiumBuildShim.cmake
index b6fe9ba..30a2288 100644
--- a/build/cmake/ChromiumBuildShim.cmake
+++ b/build/cmake/ChromiumBuildShim.cmake
@@ -267,6 +267,19 @@ function(run_generate_ninja)
     list(APPEND MAKE_GN_ARGS_CMD -Dqt_moc_executable=${QT_MOC_EXECUTABLE})
   endif()
 
+
+  find_package(Qt5SystemInfo QUIET)
+  if(Qt5SystemInfo_FOUND)
+    set(CMAKE_REQUIRED_FLAGS "-fPIC")
+    set(CMAKE_REQUIRED_INCLUDES ${Qt5SystemInfo_INCLUDE_DIRS})
+    CHECK_INCLUDE_FILE_CXX("QInputDevice" HAVE_QINPUTDEVICE)
+    if (HAVE_QINPUTDEVICE EQUAL 1)
+      list(APPEND MAKE_GN_ARGS_CMD -Duse_qinputdevice=true)
+    endif()
+  else()
+    list(APPEND MAKE_GN_ARGS_CMD -Duse_qinputdevice=false)
+  endif()
+
   if(BOOTSTRAP_GN)
     list(APPEND MAKE_GN_ARGS_CMD -Denable_gn_build=true)
   else()
diff --git a/build/config/Qt5/BUILD.gn b/build/config/Qt5/BUILD.gn
index 677df5d..e38c131 100644
--- a/build/config/Qt5/BUILD.gn
+++ b/build/config/Qt5/BUILD.gn
@@ -16,6 +16,8 @@
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
+import("//oxide/build/config/build_flags.gni")
+
 assert(is_linux)
 
 group("Core") {
@@ -45,3 +47,9 @@ group("Network") {
 group("Positioning") {
   public_configs = [ "//oxide/build/config/linux/qt:Qt5Positioning" ]
 }
+
+group("SystemInfo") {
+  if (use_qinputdevice) {
+    public_configs = [ "//oxide/build/config/linux/qt:Qt5SystemInfo" ]
+  }
+}
diff --git a/build/config/Qt5/moc.gni b/build/config/Qt5/moc.gni
index e981bf5..2bf2fa2 100644
--- a/build/config/Qt5/moc.gni
+++ b/build/config/Qt5/moc.gni
@@ -34,9 +34,15 @@ template("moc_action_foreach") {
     output = "${root_gen_dir}/{{source_root_relative_dir}}/${invoker.output_prefix}{{source_name_part}}.${invoker.output_extension}"
     outputs = [ output ]
 
-    args = [
-      "-m", "$qt_moc_executable", "{{source}}", rebase_path("$output", "", ".")
-    ]
+    args = [ "-m", "$qt_moc_executable" ]
+    if (defined(invoker.defines)) {
+      define_flags = ""
+      foreach(define, invoker.defines) {
+        define_flags += "-D" + define + " "
+      }
+      args += [ "-f", "$define_flags" ]
+    }
+    args += [ "{{source}}", rebase_path("$output", "", ".") ]
   }
 }
 
@@ -60,6 +66,9 @@ template("qtmoc") {
   }
 
   targets = []
+  if (defined(invoker.defines)) {
+    defines = invoker.defines
+  }
 
   if (defined(sources_cc)) {
     name = "${target_name}_cc"
diff --git a/build/config/Qt5/moc.py b/build/config/Qt5/moc.py
index af0ed8d..abbb113 100644
--- a/build/config/Qt5/moc.py
+++ b/build/config/Qt5/moc.py
@@ -27,6 +27,7 @@ import sys
 def main(argv):
   parser = OptionParser(usage="usage: %prog [options] input output")
   parser.add_option("-m", dest="moc")
+  parser.add_option("-f", dest="defs")
 
   (options, args) = parser.parse_args(argv)
 
@@ -44,7 +45,11 @@ def main(argv):
     print("moc is not executable", file=sys.stderr)
     return 1
 
-  subprocess.check_call([moc, "-o", args[1], args[0]])
+  cmd_line = [moc, "-o", args[1], args[0]]
+  if options.defs != None:
+    cmd_line += options.defs.strip().split();
+
+  subprocess.check_call(cmd_line)
 
 if __name__ == "__main__":
   sys.exit(main(sys.argv[1:]))
diff --git a/build/config/build_flags.gni b/build/config/build_flags.gni
index 0474b7d..487e4b0 100644
--- a/build/config/build_flags.gni
+++ b/build/config/build_flags.gni
@@ -23,6 +23,8 @@ declare_args() {
 
   enable_mediahub = false
 
+  use_qinputdevice = false
+
   oxide_gettext_domain = false
 
   oxide_libexec_subdir = ""
diff --git a/build/config/linux/qt/BUILD.gn b/build/config/linux/qt/BUILD.gn
index a413d69..c96ce0e 100644
--- a/build/config/linux/qt/BUILD.gn
+++ b/build/config/linux/qt/BUILD.gn
@@ -17,6 +17,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 import("//build/config/linux/pkg_config.gni")
+import("//oxide/build/config/build_flags.gni")
 
 template("qt_private_includes") {
   module = invoker.module
@@ -88,3 +89,9 @@ pkg_config("Qt5Positioning") {
   visibility = [ "//oxide/build/config/Qt5:Positioning" ]
   packages = [ "Qt5Positioning" ]
 }
+
+if (use_qinputdevice) {
+  pkg_config("Qt5SystemInfo") {
+    packages = [ "Qt5SystemInfo" ]
+  }
+}
diff --git a/qt/core/BUILD.gn b/qt/core/BUILD.gn
index 06d58d2..08eac79 100644
--- a/qt/core/BUILD.gn
+++ b/qt/core/BUILD.gn
@@ -38,6 +38,10 @@ config("core_api_include_dir") {
 }
 
 qtmoc("core_moc_gen") {
+  if (use_qinputdevice) {
+    defines = [ "USE_QINPUTDEVICE" ]
+  }
+
   sources = [
     "api/oxideqcertificateerror.h",
     "api/oxideqdownloadrequest.h",
@@ -118,6 +122,11 @@ source_set("core_sources") {
     "//url"
   ]
 
+  if (use_qinputdevice) {
+    deps += [ "//oxide/build/config/Qt5:SystemInfo" ]
+    defines += [ "USE_QINPUTDEVICE" ]
+  }
+
   sources = [
     "$target_gen_dir/api/moc_oxideqcertificateerror.cc",
     "$target_gen_dir/api/moc_oxideqdownloadrequest.cc",
@@ -386,6 +395,11 @@ test_executable("core_screen_unittests") {
     "//ui/display",
   ]
 
+  if (use_qinputdevice) {
+    deps += [ "//oxide/build/config/Qt5:SystemInfo" ]
+    defines += [ "USE_QINPUTDEVICE" ]
+  }
+
   sources = [
     "browser/qt_screen_unittest.cc",
     "test/run_all_unittests.cc",
diff --git a/qt/core/browser/qt_screen.cc b/qt/core/browser/qt_screen.cc
index 8273885..fa9f3ba 100644
--- a/qt/core/browser/qt_screen.cc
+++ b/qt/core/browser/qt_screen.cc
@@ -31,6 +31,7 @@
 
 #include "shared/browser/display_form_factor.h"
 #include "shared/browser/hybris_utils.h"
+#include "shared/browser/shell_mode.h"
 
 #include "oxide_qt_dpi_utils.h"
 #include "oxide_qt_screen_utils.h"
@@ -192,6 +193,83 @@ void Screen::OnPrimaryScreenChanged(QScreen* screen) {
   NotifyPrimaryDisplayChanged();
 }
 
+#if defined(USE_QINPUTDEVICE)
+void Screen::OnInputDeviceAdded(QInputDevice* device) {
+  DCHECK(input_device_manager_.count() > 0);
+  VLOG(1) << "Input Device ADDED : " << device->name().toStdString();
+  ShellMode mode = GetShellMode();
+  if (mode != current_shell_mode_) {
+    current_shell_mode_ = mode;
+    NotifyShellModeChanged();
+  }
+}
+
+void Screen::OnInputDeviceRemoved(const QString& deviceid) {
+  VLOG(1) << "Input Device REMOVED : " << deviceid.toStdString();
+  ShellMode mode = GetShellMode();
+  if (mode != current_shell_mode_) {
+    current_shell_mode_ = mode;
+    NotifyShellModeChanged();
+  }
+}
+
+void Screen::OnInputDevicesReady() {
+  VLOG(2) << "Input Devices READY";
+  current_shell_mode_ = GetShellMode();
+  NotifyShellModeChanged();
+}
+
+bool Screen::GetShellModeFromInputDevices(ShellMode* mode) {
+  QMap<QString, QInputDevice*> device_map;
+  device_map = input_device_manager_.deviceMap();
+  bool mouse = false, keyboard = false, touchpad = false, touchscreen = false;
+  for (auto i = device_map.begin(); i != device_map.end(); ++i) {
+    const QInputDevice::InputTypeFlags type = i.value()->types();
+    if (type & QInputDevice::InputType::Mouse) {
+      mouse = true;
+    }
+    if (type & QInputDevice::InputType::Keyboard) {
+      keyboard = true;
+    }
+    if (type & QInputDevice::InputType::TouchPad) {
+      touchpad = true;
+    }
+    if (type & QInputDevice::InputType::TouchScreen) {
+      touchscreen = true;
+    }
+  }
+  if (mouse || keyboard || touchpad) {
+    *mode = ShellMode::Windowed;
+    return true;
+  }
+  if (touchscreen) {
+    *mode = ShellMode::NonWindowed;
+    return true;
+  }
+
+  return false;
+}
+#endif
+
+ShellMode Screen::GetShellMode() {
+  ShellMode mode;
+  // Qt input devices state heuristics to detect mode.
+  bool ret = false;
+#if defined(USE_QINPUTDEVICE)
+  ret = GetShellModeFromInputDevices(&mode);
+#endif
+
+  if (!ret) {
+    // oxide heuristics to detect mode form factor, hybris.
+    mode = oxide::Screen::GetShellMode();
+  }
+
+  // other heuristics to determine like connecting
+  // device to Monitor.
+  // mode = .....
+  return mode;
+}
+
 void Screen::OnPlatformScreenPropertyChanged(QPlatformScreen* screen,
                                              const QString& property_name) {
   if (property_name == QStringLiteral("scale") ||
@@ -261,6 +339,18 @@ Screen::Screen() {
             SLOT(OnPrimaryScreenChanged(QScreen*)));
   }
 #endif
+#if defined(USE_QINPUTDEVICE)
+  input_device_manager_.setFilter(QInputDevice::InputType::Mouse |
+      QInputDevice::InputType::Keyboard |
+      QInputDevice::InputType::TouchPad |
+      QInputDevice::InputType::TouchScreen);
+  connect(&input_device_manager_, SIGNAL(ready()),
+          SLOT(OnInputDevicesReady()));
+  connect(&input_device_manager_, SIGNAL(deviceAdded(QInputDevice*)),
+          SLOT(OnInputDeviceAdded(QInputDevice*)));
+  connect(&input_device_manager_, SIGNAL(deviceRemoved(const QString&)),
+          SLOT(OnInputDeviceRemoved(const QString&)));
+#endif
 
   QString platform = QGuiApplication::platformName();
   if ((platform.startsWith("ubuntu") || platform == "mirserver" ||
diff --git a/qt/core/browser/qt_screen.h b/qt/core/browser/qt_screen.h
index 2e68d30..a67c798 100644
--- a/qt/core/browser/qt_screen.h
+++ b/qt/core/browser/qt_screen.h
@@ -22,6 +22,9 @@
 
 #include <QObject>
 #include <QtGlobal>
+#if defined(USE_QINPUTDEVICE)
+#include <QInputDevice>
+#endif
 
 #include "base/macros.h"
 
@@ -57,20 +60,35 @@ class OXIDE_QT_EXPORT Screen : public QObject,
 
   static void SetEnableQtUbuntuIntegrationForTesting(bool enable);
 
+ protected :
+  ShellMode GetShellMode() override;
+
  private Q_SLOTS:
   void OnScreenAdded(QScreen* screen);
   void OnScreenRemoved(QScreen* screen);
   void OnPrimaryScreenChanged(QScreen* screen);
+#if defined(USE_QINPUTDEVICE)
+  void OnInputDeviceAdded(QInputDevice* device);
+  void OnInputDeviceRemoved(const QString& deviceId);
+  void OnInputDevicesReady();
+#endif
   void OnPlatformScreenPropertyChanged(QPlatformScreen* screen,
                                        const QString& property_name);
 
  private:
   QScreen* QScreenFromDisplay(const display::Display& display) const;
   void UpdateDisplayForScreen(QScreen* screen);
+#if defined(USE_QINPUTDEVICE)
+  bool GetShellModeFromInputDevices(ShellMode* mode);
+#endif
 
 #if QT_VERSION >= QT_VERSION_CHECK(5, 4, 0)
   std::map<QScreen*, display::Display> displays_;
 #endif
+#if defined(USE_QINPUTDEVICE)
+  QInputInfoManager input_device_manager_;
+#endif
+  oxide::ShellMode current_shell_mode_;
 };
 
 } // namespace qt
diff --git a/shared/browser/oxide_content_browser_client.cc b/shared/browser/oxide_content_browser_client.cc
index f588268..eeef6ab 100644
--- a/shared/browser/oxide_content_browser_client.cc
+++ b/shared/browser/oxide_content_browser_client.cc
@@ -299,7 +299,7 @@ void ContentBrowserClient::OverrideWebkitPrefs(
       break;
   };
 
-  if (Screen::GetShellMode() == ShellMode::NonWindowed) {
+  if (Screen::GetInstance()->GetShellMode() == ShellMode::NonWindowed) {
     prefs->shrinks_viewport_contents_to_fit = true;
     prefs->viewport_enabled = true;
     prefs->main_frame_resizes_are_orientation_changes = true;
diff --git a/shared/browser/screen.h b/shared/browser/screen.h
index 61307fb..514f65b 100644
--- a/shared/browser/screen.h
+++ b/shared/browser/screen.h
@@ -51,7 +51,7 @@ class OXIDE_SHARED_EXPORT Screen {
   virtual DisplayFormFactor GetDisplayFormFactor(
       const display::Display& display);
 
-  static ShellMode GetShellMode();
+  virtual ShellMode GetShellMode();
 
  protected:
   Screen();
diff --git a/shared/browser/screen_observer.h b/shared/browser/screen_observer.h
index c887942..f730eda 100644
--- a/shared/browser/screen_observer.h
+++ b/shared/browser/screen_observer.h
@@ -27,6 +27,7 @@ class Display;
 namespace oxide {
 
 class Screen;
+enum class ShellMode;
 
 class OXIDE_SHARED_EXPORT ScreenObserver {
  public:
diff --git a/shared/browser/screen_unittest.cc b/shared/browser/screen_unittest.cc
index 552c1ba..9782c17 100644
--- a/shared/browser/screen_unittest.cc
+++ b/shared/browser/screen_unittest.cc
@@ -195,15 +195,15 @@ TEST_F(ScreenTest, GetShellMode) {
 #if defined(ENABLE_HYBRIS)
   {
     FakeHybrisUtils hybris_utils(false);
-    EXPECT_EQ(ShellMode::Windowed, Screen::GetShellMode());
+    EXPECT_EQ(ShellMode::Windowed, Screen::GetInstance()->GetShellMode());
   }
 
   {
     FakeHybrisUtils hybris_utils(true);
-    EXPECT_EQ(ShellMode::NonWindowed, Screen::GetShellMode());
+    EXPECT_EQ(ShellMode::NonWindowed, Screen::GetInstance()->GetShellMode());
   }
 #else
-  EXPECT_EQ(ShellMode::Windowed, Screen::GetShellMode());
+  EXPECT_EQ(ShellMode::Windowed, Screen::GetInstance()->GetShellMode());
 #endif
 }