Merge lp:~townsend/libertine/fix-pasted-trunk into lp:libertine/trunk

[Christopher Townsend]

Fix pasted such that the 400 ms polling timer is replaced with a threaded XNextEvent model.
Also, check whether the actual Mir surface has focus instead of relying on what X tells us.

This is a cherry pick of lp:libertine rev. 300 for fixing pasted before OTA13 goes out.

[Stephen M. Webb (bregma)]

Code is just pulled from development branch, OK as is.

review: Approve

[Brandon Schaefer (brandontschaefer)]

lgtm

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-19 20:07:22 +0000
+++ CMakeLists.txt	2016-09-08 19:50:48 +0000
@@ -20,7 +20,6 @@
 find_package(Qt5Gui       REQUIRED)
 find_package(Qt5Quick     REQUIRED)
 find_package(Qt5Widgets   REQUIRED)
-find_package(Qt5X11Extras REQUIRED)
 find_package(Gettext      REQUIRED)
 find_package(Intltool     REQUIRED)
 find_package(X11          REQUIRED)

=== modified file 'debian/control'
--- debian/control	2016-08-19 20:09:36 +0000
+++ debian/control	2016-09-08 19:50:48 +0000
@@ -13,7 +13,6 @@
                libgirepository1.0-dev,
                libglib2.0-dev,
                libgtest-dev,
-               libqt5x11extras5-dev,
                libx11-dev,
                lsb-release,
                python3-apt,

=== modified file 'pasted/CMakeLists.txt'
--- pasted/CMakeLists.txt	2016-08-10 12:23:31 +0000
+++ pasted/CMakeLists.txt	2016-09-08 19:50:48 +0000
@@ -6,5 +6,5 @@
 
 qt5_use_modules(pasted DBus)
 
-target_link_libraries(pasted Qt5::Core Qt5::Gui Qt5::Widgets Qt5::X11Extras content-hub X11)
+target_link_libraries(pasted Qt5::Core Qt5::Gui Qt5::Widgets content-hub X11)
 install(TARGETS pasted RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})

=== modified file 'pasted/pasted.cpp'
--- pasted/pasted.cpp	2016-09-01 20:01:52 +0000
+++ pasted/pasted.cpp	2016-09-08 19:50:48 +0000
@@ -19,12 +19,102 @@
 
 #include "pasted.h"
 
+#include <QDBusInterface>
 #include <QDebug>
+#include <QThread>
 
-#include <QX11Info>
 #include <X11/Xatom.h>
 
 
+namespace
+{
+
+constexpr auto MIR_WM_PERSISTENT_ID = "_MIR_WM_PERSISTENT_ID";
+constexpr auto UNITY_FOCUSINFO_SERVICE = "com.canonical.Unity.FocusInfo";
+constexpr auto UNITY_FOCUSINFO_PATH = "/com/canonical/Unity/FocusInfo";
+constexpr auto UNITY_FOCUSINFO_INTERFACE = "com.canonical.Unity.FocusInfo";
+constexpr auto UNITY_FOCUSINFO_METHOD = "isSurfaceFocused";
+
+
+static QString getPersistentSurfaceId()
+{
+  Display *dpy  = XOpenDisplay(NULL);
+  Atom prop = XInternAtom(dpy, MIR_WM_PERSISTENT_ID, 0),
+       type; // unused
+  int form, // unused
+      status;
+  unsigned long remain, // unused
+                len;    // unused
+  unsigned char *data = nullptr;
+  QString persistentSurfaceId;
+
+  status = XGetWindowProperty(dpy, XDefaultRootWindow(dpy), prop, 0, 1024, 0,
+                              XA_STRING, &type, &form, &len, &remain, &data);
+
+  if (status)
+  {
+    qDebug() << "Failure retrieving the persistentSurfaceID!";
+  }
+  else
+  {
+    persistentSurfaceId = (const char *)data;
+  }
+
+  XCloseDisplay(dpy);
+  XFree(data);
+
+  return persistentSurfaceId;
+}
+
+} //anonymous namespace
+
+
+void XEventWorker::
+checkForAppFocus()
+{
+  bool hasFocus = false;
+  XEvent event;
+
+  QDBusInterface *unityFocus = new QDBusInterface(UNITY_FOCUSINFO_SERVICE,
+                                                  UNITY_FOCUSINFO_PATH,
+                                                  UNITY_FOCUSINFO_INTERFACE,
+                                                  QDBusConnection::sessionBus(),
+                                                  this);
+
+  QString surfaceId = getPersistentSurfaceId();
+
+  QDBusReply<bool> isFocused = unityFocus->call(UNITY_FOCUSINFO_METHOD, surfaceId);
+
+  if (isFocused == true)
+  {
+    focusChanged();
+    hasFocus = true;
+  }
+
+  Display *dpy = XOpenDisplay(NULL);
+  XSelectInput(dpy, XDefaultRootWindow(dpy), FocusChangeMask);
+  
+  while (1)
+  {
+    XNextEvent(dpy, &event);
+
+    isFocused = unityFocus->call(UNITY_FOCUSINFO_METHOD, surfaceId);
+
+    if (hasFocus == false && isFocused == true)
+    {
+      qDebug() << "Surface is focused";
+      focusChanged();
+      hasFocus = true;
+    }
+    else if (hasFocus == true && isFocused == false)
+    {
+      qDebug() << "Surface lost focus";
+      hasFocus = false;
+    }
+  }
+}
+
+
 Pasted::
 Pasted(int argc, char** argv)
 : QApplication(argc, argv)
@@ -32,15 +122,9 @@
 , content_hub_(cuc::Hub::Client::instance())
 , mimeDataX_(new QMimeData)
 , lastMimeData_()
-, rootWindowHasFocus_(false)
-, firstSeenWindow_(None)
 {
   setApplicationName("pasted");
 
-  QTimer *timer = new QTimer(this);
-  connect(timer, &QTimer::timeout, this, &Pasted::checkForAppFocus);
-  timer->start(400);
-
   connect(clipboard_, &QClipboard::dataChanged, this, &Pasted::handleXClipboard);
 }
 
@@ -81,36 +165,6 @@
 }
 
 
-void Pasted::
-checkForAppFocus()
-{
-  Window w;
-  int revert_to; // unused
-
-  XGetInputFocus(QX11Info::display(), &w, &revert_to);
-
-  if (firstSeenWindow_ == None && w != None)
-  {
-    firstSeenWindow_ = w;
-  }
-
-  if (w == None && rootWindowHasFocus_ == true)
-  {
-    qDebug() << "Xmir lost focus";
-    rootWindowHasFocus_ = false;
-  }
-  else if ((w == PointerRoot ||
-           (w && firstSeenWindow_ == PointerRoot))
-           && rootWindowHasFocus_ == false)
-  {
-    qDebug() << "Xmir gained focus";
-    rootWindowHasFocus_ = true;
-    setPersistentSurfaceId();
-    handleContentHubPasteboard();
-  }
-}
-
-
 bool Pasted::
 compareMimeData(const QMimeData *a, const QMimeData *b)
 {
@@ -180,29 +234,19 @@
 {
   if (persistentSurfaceId_.isEmpty())
   {
-    Atom prop = XInternAtom(QX11Info::display(), "_MIR_WM_PERSISTENT_ID", 0),
-         type; // unused
-    int form, // unused
-        status;
-    unsigned long remain, // unused
-                  len;    // unused
-    unsigned char *data;
-    status = XGetWindowProperty(QX11Info::display(), XDefaultRootWindow(QX11Info::display()), prop,
-                                0, 1024, 0, XA_STRING, &type, &form, &len, &remain, &data);
-
-    if (status)
-    {
-      qDebug() << "Failure retrieving the persistentSurfaceID!";
-    }
-    else
-    {
-      qDebug() << "Setting persistentSurfaceId";
-      persistentSurfaceId_ = (const char *)data;
-    }
+    persistentSurfaceId_ = getPersistentSurfaceId();
   }
 }
 
 
+void Pasted::
+appFocused()
+{
+  setPersistentSurfaceId();
+  handleContentHubPasteboard();
+}
+
+
 int
 main(int argc, char* argv[])
 {
@@ -210,5 +254,15 @@
 
   Pasted pasted(argc, argv);
 
-  pasted.exec();
+  QThread t;
+  XEventWorker worker;
+
+  worker.moveToThread(&t);
+
+  QObject::connect(&worker, &XEventWorker::focusChanged, &pasted, &Pasted::appFocused);
+  QObject::connect(&t, &QThread::started, &worker, &XEventWorker::checkForAppFocus);
+
+  t.start();
+  
+  return pasted.exec();
 }

=== modified file 'pasted/pasted.h'
--- pasted/pasted.h	2016-08-29 15:33:05 +0000
+++ pasted/pasted.h	2016-09-08 19:50:48 +0000
@@ -33,6 +33,23 @@
 namespace cuc = com::ubuntu::content;
 
 
+class XEventWorker
+: public QObject
+{
+  Q_OBJECT
+
+  public:
+    XEventWorker() = default;
+    virtual ~XEventWorker() = default;
+
+  signals:
+    void focusChanged();
+
+  public slots:
+    void checkForAppFocus();
+};
+
+
 class Pasted
 : public QApplication
 {
@@ -42,6 +59,9 @@
     Pasted(int argc, char** argv);
     virtual ~Pasted() = default;
 
+  public slots:
+    void appFocused();
+
   private:
     void updateLastMimeData(const QMimeData *source);
     void updateXMimeData(const QMimeData *source);
@@ -53,15 +73,12 @@
 
   private slots:
     void handleXClipboard();
-    void checkForAppFocus();
 
   private:
     QClipboard *clipboard_;
     cuc::Hub *content_hub_;
     QMimeData *mimeDataX_;
     std::unique_ptr<QMimeData> lastMimeData_;
-    bool rootWindowHasFocus_;
-    Window firstSeenWindow_;
     QString persistentSurfaceId_;
 };