Libertine

Merge lp:~townsend/libertine/fix-pasted-xmir-rootless into lp:libertine

fix-pasted-xmir-rootless
Merge into devel

Proposed by Christopher Townsend on 2017-03-09

Status:

Merged

Approved by:

Larry Price on 2017-03-20

Approved revision:

441

Merged at revision:

444

Proposed branch:

lp:~townsend/libertine/fix-pasted-xmir-rootless

Merge into:

lp:libertine

Diff against target:

248 lines (+90/-53)

2 files modified

pasted/pasted.cpp (+77/-48)
pasted/pasted.h (+13/-5)

To merge this branch:

bzr merge lp:~townsend/libertine/fix-pasted-xmir-rootless

High

Fix Committed

Link a bug report

Reviewer	Review Type	Date Requested	Status
Libertine CI Bot	continuous-integration		Approve on 2017-03-20
Larry Price		2017-03-09	Approve on 2017-03-20
Review via email: mp+319507@code.launchpad.net

Commit message

Fix pasted to work with rootless Xmir.

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-03-10:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/458/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-03-10:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/461/rebuild

review: Approve (continuous-integration)

Revision history for this message

Larry Price (larryprice) wrote on 2017-03-10:

left some inline presents for you

review: Needs Information

lp:~townsend/libertine/fix-pasted-xmir-rootless updated on 2017-03-10

435. By Christopher Townsend on 2017-03-10: Some cleanup based on review.
436. By Christopher Townsend on 2017-03-10: Merge lp:libertine.

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-03-10:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/462/rebuild

review: Approve (continuous-integration)

lp:~townsend/libertine/fix-pasted-xmir-rootless updated on 2017-03-10

437. By Christopher Townsend on 2017-03-10: Another bit of cleanup.

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-03-10:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/463/rebuild

review: Approve (continuous-integration)

Revision history for this message

Larry Price (larryprice) wrote on 2017-03-10:

Whoops, guess I'm going to leave this open until ChrisTownsend returns...

This works for internal copy/paste, but does not work between apps. Is that expected for now and can you link the relevant bugs to this one when you get back?

review: Needs Information

lp:~townsend/libertine/fix-pasted-xmir-rootless updated on 2017-03-20

438. By Christopher Townsend on 2017-03-20: Merge lp:libertine.
439. By Christopher Townsend on 2017-03-20: Merge lp:libertine.
440. By Christopher Townsend on 2017-03-20: Revert libertine.pot.

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-03-20:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/478/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-03-20:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/479/rebuild

review: Approve (continuous-integration)

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-03-20:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/480/rebuild

review: Approve (continuous-integration)

lp:~townsend/libertine/fix-pasted-xmir-rootless updated on 2017-03-20

441. By Christopher Townsend on 2017-03-20: Add closing the disaply in the XEventWorker dtor.

Revision history for this message

Larry Price (larryprice) wrote on 2017-03-20:

lgtm

review: Approve

Revision history for this message

Libertine CI Bot (libertine-ci-bot) wrote on 2017-03-20:

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/483/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Christopher Townsend

Libertine Developers

 === modified file 'pasted/pasted.cpp'
 --- pasted/pasted.cpp	2017-03-20 19:22:25 +0000
 +++ pasted/pasted.cpp	2017-03-20 20:42:05 +0000
@@ -36,9 +36,8 @@
  constexpr auto UNITY_FOCUSINFO_METHOD = "isSurfaceFocused";
--static QString getPersistentSurfaceId()
++static QString getPersistentSurfaceId(Display *dpy, const Window& id)
+ {
--  Display *dpy  = XOpenDisplay(NULL);
    Atom prop = XInternAtom(dpy, MIR_WM_PERSISTENT_ID, 0),
         type; // unused
    int form, // unused
@@ -48,7 +47,7 @@
    unsigned char *data = nullptr;
    QString persistentSurfaceId;
--  status = XGetWindowProperty(dpy, XDefaultRootWindow(dpy), prop, 0, 1024, 0,
++  status = XGetWindowProperty(dpy, id, prop, 0, 1024, 0,
                                XA_STRING, &type, &form, &len, &remain, &data);
    if (status)
@@ -60,14 +59,13 @@
      persistentSurfaceId = (const char *)data;
+   }
--  XCloseDisplay(dpy);
    XFree(data);
    return persistentSurfaceId;
+ }
--void checkXServer()
++Display *checkXServer()
+ {
    char *display = getenv("DISPLAY");
@@ -84,55 +82,86 @@
      exit(-1);
+   }
--  XCloseDisplay(dpy);
--
--  return;
++  return dpy;
+ }
  } //anonymous namespace
++XEventWorker::
++XEventWorker(Display *dpy)
++: dpy_(dpy)
++{
++  unityFocus_ = new QDBusInterface(UNITY_FOCUSINFO_SERVICE,
++                                   UNITY_FOCUSINFO_PATH,
++                                   UNITY_FOCUSINFO_INTERFACE,
++                                   QDBusConnection::sessionBus(),
++                                   this);
++}
++
++
++XEventWorker::
++~XEventWorker()
++{
++  XCloseDisplay(dpy_);
++}
++
++
++bool XEventWorker::
++isSurfaceFocused(const Window& focus_window)
++{
++  surfaceId_ = getPersistentSurfaceId(dpy_, focus_window);
++
++  QDBusReply<bool> isFocused = unityFocus_->call(UNITY_FOCUSINFO_METHOD, surfaceId_);
++
++  return isFocused;
++}
++
++
  void XEventWorker::
  checkForAppFocus()
+ {
    bool hasFocus = false;
++  int focus_state;
++  Window focus_window;
++
++  XGetInputFocus(dpy_, &focus_window, &focus_state);
++
++  if (focus_window > PointerRoot)
++  {
++    if (isSurfaceFocused(focus_window))
++    {
++      focusChanged(surfaceId_);
++      hasFocus = true;
++    }
++  }
++
++  XSelectInput(dpy_, XDefaultRootWindow(dpy_), FocusChangeMask);
++
++  bool focused = 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;
++    XNextEvent(dpy_, &event);
++
++    XGetInputFocus(dpy_, &focus_window, &focus_state);
++
++    if (focus_window > PointerRoot)
++    {
++      focused = isSurfaceFocused(focus_window);
++
++      if (hasFocus == false && focused == true)
++      {
++        qDebug() << "Surface is focused";
++        focusChanged(surfaceId_);
++        hasFocus = true;
++      }
++      else if (hasFocus == true && focused == false)
++      {
++        qDebug() << "Surface lost focus";
++        hasFocus = false;
++      }
+     }
+   }
+ }
@@ -253,19 +282,19 @@
  void Pasted::
--setPersistentSurfaceId()
++setPersistentSurfaceId(const QString& surfaceId)
+ {
--  if (persistentSurfaceId_.isEmpty())
++  if (persistentSurfaceId_ != surfaceId)
+   {
--    persistentSurfaceId_ = getPersistentSurfaceId();
++    persistentSurfaceId_ = surfaceId;
+   }
+ }
  void Pasted::
--appFocused()
++appFocused(const QString& surfaceId)
+ {
--  setPersistentSurfaceId();
++  setPersistentSurfaceId(surfaceId);
    handleContentHubPasteboard();
+ }
@@ -275,12 +304,12 @@
+ {
    qSetMessagePattern(QString("%{appname}: %{message}"));
--  checkXServer();
++  Display *dpy = checkXServer();
    Pasted pasted(argc, argv);
    QThread t;
--  XEventWorker worker;
++  XEventWorker worker(dpy);
    worker.moveToThread(&t);
 === modified file 'pasted/pasted.h'
 --- pasted/pasted.h	2016-09-12 17:59:56 +0000
 +++ pasted/pasted.h	2017-03-20 20:42:05 +0000
@@ -39,14 +39,22 @@
    Q_OBJECT
    public:
--    XEventWorker() = default;
--    virtual ~XEventWorker() = default;
++    XEventWorker(Display *dpy);
++    virtual ~XEventWorker();
++
++  private:
++    bool isSurfaceFocused(const Window& focus_window);
    signals:
--    void focusChanged();
++    void focusChanged(const QString& surfaceId);
    public slots:
      void checkForAppFocus();
++
++  private:
++    Display *dpy_;
++    QDBusInterface *unityFocus_;
++    QString surfaceId_;
  };
@@ -60,13 +68,13 @@
      virtual ~Pasted() = default;
    public slots:
--    void appFocused();
++    void appFocused(const QString& surfaceId);
    private:
      void updateLastMimeData(const QMimeData *source);
      void updateXMimeData(const QMimeData *source);
      void handleContentHubPasteboard();
--    void setPersistentSurfaceId();
++    void setPersistentSurfaceId(const QString& surfaceId);
      static bool compareMimeData(const QMimeData *a, const QMimeData *b);
      static void copyMimeData(QMimeData& target, const QMimeData *source);

Libertine

Merge lp:~townsend/libertine/fix-pasted-xmir-rootless into lp:libertine

Commit message

Description of the change

Preview Diff

Subscribers