Unity 8

Merge lp:~mterry/unity8/new-input-proxies into lp:unity8

new-input-proxies
Merge into trunk

Proposed by Michael Terry on 2016-02-08

Status:

Superseded

Proposed branch:

lp:~mterry/unity8/new-input-proxies

Merge into:

lp:unity8

Diff against target:

375 lines (+204/-5)

9 files modified

plugins/AccountsService/AccountsService.cpp (+54/-2)
plugins/AccountsService/AccountsService.h (+4/-1)
tests/plugins/AccountsService/CMakeLists.txt (+3/-0)
tests/plugins/AccountsService/PropertiesServer.cpp (+1/-2)
tests/plugins/AccountsService/UscServer.cpp (+28/-0)
tests/plugins/AccountsService/UscServer.h (+39/-0)
tests/plugins/AccountsService/client.cpp (+55/-0)
tests/plugins/AccountsService/interfaces.xml (+10/-0)
tests/plugins/AccountsService/server.cpp (+10/-0)

To merge this branch:

bzr merge lp:~mterry/unity8/new-input-proxies

High

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Michał Sawicz			Abstain on 2016-02-22
Unity8 CI Bot	continuous-integration		Needs Fixing on 2016-02-17
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2016-02-17
Lukáš Tinkl (community)		2016-02-08	Approve on 2016-02-09
Review via email: mp+285364@code.launchpad.net

This proposal has been superseded by a proposal from 2016-02-25.

Commit message

Proxy more mouse and touchpad properties to USC (LP: #1540398)

Description of the change

Mostly simple, but I added a converter capacity to our AccountsService proxy relay. And added some tests for proxy support in general (I realized it had been missed!) and specifically the converter support.

Note that MouseDoubleClickSpeed and TouchpadDoubleClickSpeed are not supported on the USC side yet. The properties exist in AccountsService, but USC/Mir haven't caught up. I added them anyway, so that there's one less thing to do to support them. It won't hurt us any to try and fail to proxy them until USC adds support.

= Checklist =

* Are there any related MPs required for this MP to build/function as expected? Please list.
Yes, just the pre-requisite.

* Did you perform an exploratory manual test run of your code change and any related functionality?
No, it's just adding properties.

* Did you make sure that your branch does not contain spurious tags?
Yes

* If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
NA

* If you changed the UI, has there been a design review?
NA

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-08:

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/292/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-08:

FAILED: Continuous integration, rev:2142
http://jenkins.qa.ubuntu.com/job/unity8-ci/7234/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/6381
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-xenial-touch/649/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/1939
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-qmluitest-xenial-amd64/642/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/1834
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/1834
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-amd64-ci/641/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity8-xenial-i386-ci/640/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-touch/4893
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6392
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/6392/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/27391
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-xenial-armhf/647/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7234/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-02-08:

Some minor stuff in inline comments, otherwise looks great

review: Needs Fixing (code-review)

Revision history for this message

Michael Terry (mterry) wrote on 2016-02-09:

Commented, updated.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-09:

FAILED: Continuous integration, rev:2144
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/302/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/423/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/446
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/464
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/464
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/460/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/460/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/460/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/460/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/460/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/460/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/302/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Lukáš Tinkl (lukas-kde) wrote on 2016-02-09:

Cool, I like it

* Did you perform an exploratory manual test run of the code change and any related functionality?

Yes

* Did CI run pass? If not, please explain why.

No, missing explicit dependency on https://code.launchpad.net/~unity-team/unity-api/surfaceItemSizeHints/+merge/284890 in the chain

* Did you make sure that the branch does not contain spurious tags?

Yes

review: Approve

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-09:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7242/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-12:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7283/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michael Terry (mterry) wrote on 2016-02-16:

I had to muck with the bzr history due to some pre-req shenanigans. But the diff is the same.

Revision history for this message

Michał Sawicz (saviq) wrote on 2016-02-17:

CMake Error at tests/plugins/AccountsService/CMakeLists.txt:28 (add_executable):
Cannot find source file:

UscServer.cpp

review: Needs Fixing

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-17:

FAILED: Continuous integration, rev:2145
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/399/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/537/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/560
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/578
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/578
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/574/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/574/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/574/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/574/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/574/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/574/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/399/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

PS Jenkins bot (ps-jenkins) wrote on 2016-02-17:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/7336/rebuild

review: Needs Fixing (continuous-integration)

lp:~mterry/unity8/new-input-proxies updated on 2016-02-17

2146. By Michael Terry on 2016-02-17: Whoops, add missing files

Revision history for this message

Michael Terry (mterry) wrote on 2016-02-17:

Whoops, forgot to bzr add UscServer.{cpp,h} when I was rebasing this branch. Those files were included in the original MP and review. I just dropped them when futzing with bzr history. :-/

Fixed now.

Revision history for this message

Unity8 CI Bot (unity8-ci-bot) wrote on 2016-02-17:

FAILED: Continuous integration, rev:2146
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/400/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/539/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/562
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/580
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/580
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/576/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/576/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/576/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/576/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/576/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/576/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-1-ci/400/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Michał Sawicz (saviq) on 2016-02-22:

review: Abstain

Unmerged revisions

2146. By Michael Terry on 2016-02-17: Whoops, add missing files
2145. By Michael Terry on 2016-02-16: Proxy more input settings to USC
2144. By Michael Terry on 2016-02-16: Merge kbdLayout branch

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:

Michael Terry

Mohammad Rakibul Hasan

Unity Team

 === modified file 'plugins/AccountsService/AccountsService.cpp'
 --- plugins/AccountsService/AccountsService.cpp	2016-02-17 13:47:43 +0000
 +++ plugins/AccountsService/AccountsService.cpp	2016-02-17 13:47:43 +0000
@@ -41,9 +41,32 @@
  #define PROP_LICENSE_ACCEPTED                  QStringLiteral("LicenseAccepted")
  #define PROP_LICENSE_BASE_PATH                 QStringLiteral("LicenseBasePath")
  #define PROP_MOUSE_CURSOR_SPEED                QStringLiteral("MouseCursorSpeed")
++#define PROP_MOUSE_DOUBLE_CLICK_SPEED          QStringLiteral("MouseDoubleClickSpeed")
++#define PROP_MOUSE_PRIMARY_BUTTON              QStringLiteral("MousePrimaryButton")
++#define PROP_MOUSE_SCROLL_SPEED                QStringLiteral("MouseScrollSpeed")
  #define PROP_PASSWORD_DISPLAY_HINT             QStringLiteral("PasswordDisplayHint")
  #define PROP_STATS_WELCOME_SCREEN              QStringLiteral("StatsWelcomeScreen")
  #define PROP_TOUCHPAD_CURSOR_SPEED             QStringLiteral("TouchpadCursorSpeed")
++#define PROP_TOUCHPAD_DISABLE_WHILE_TYPING     QStringLiteral("TouchpadDisableWhileTyping")
++#define PROP_TOUCHPAD_DISABLE_WITH_MOUSE       QStringLiteral("TouchpadDisableWithMouse")
++#define PROP_TOUCHPAD_DOUBLE_CLICK_SPEED       QStringLiteral("TouchpadDoubleClickSpeed")
++#define PROP_TOUCHPAD_PRIMARY_BUTTON           QStringLiteral("TouchpadPrimaryButton")
++#define PROP_TOUCHPAD_SCROLL_SPEED             QStringLiteral("TouchpadScrollSpeed")
++#define PROP_TOUCHPAD_TAP_TO_CLICK             QStringLiteral("TouchpadTapToClick")
++#define PROP_TOUCHPAD_TWO_FINGER_SCROLL        QStringLiteral("TouchpadTwoFingerScroll")
++
++
++QVariant primaryButtonConverter(const QVariant &value)
++{
++    QString stringValue = value.toString();
++    if (stringValue == "left") {
++        return QVariant::fromValue(0);
++    } else if (stringValue == "right") {
++        return QVariant::fromValue(1); // Mir is less clear on this -- any non-zero value is the same
++    } else {
++        return QVariant::fromValue(0); // default to left
++    }
++}
  using StringMap = QMap<QString,QString>;
  using StringMapList = QList<StringMap>;
@@ -74,8 +97,30 @@
      registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_CURSOR_SPEED,
                    m_unityInput, QStringLiteral("setMouseCursorSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_DOUBLE_CLICK_SPEED,
++                  m_unityInput, QStringLiteral("setMouseDoubleClickSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_PRIMARY_BUTTON,
++                  m_unityInput, QStringLiteral("setMousePrimaryButton"),
++                  primaryButtonConverter);
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_MOUSE_SCROLL_SPEED,
++                  m_unityInput, QStringLiteral("setMouseScrollSpeed"));
      registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_CURSOR_SPEED,
                    m_unityInput, QStringLiteral("setTouchpadCursorSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_SCROLL_SPEED,
++                  m_unityInput, QStringLiteral("setTouchpadScrollSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DISABLE_WHILE_TYPING,
++                  m_unityInput, QStringLiteral("setTouchpadDisableWhileTyping"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DISABLE_WITH_MOUSE,
++                  m_unityInput, QStringLiteral("setTouchpadDisableWithMouse"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_DOUBLE_CLICK_SPEED,
++                  m_unityInput, QStringLiteral("setTouchpadDoubleClickSpeed"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_PRIMARY_BUTTON,
++                  m_unityInput, QStringLiteral("setTouchpadPrimaryButton"),
++                  primaryButtonConverter);
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_TAP_TO_CLICK,
++                  m_unityInput, QStringLiteral("setTouchpadTapToClick"));
++    registerProxy(IFACE_UBUNTU_INPUT, PROP_TOUCHPAD_TWO_FINGER_SCROLL,
++                  m_unityInput, QStringLiteral("setTouchpadTwoFingerScroll"));
      setUser(!user.isEmpty() ? user : QString::fromUtf8(qgetenv("USER")));
+ }
@@ -226,7 +271,13 @@
      PropertyInfo &info = m_properties[interface][property];
      if (info.proxyInterface) {
--        info.proxyInterface->asyncCall(info.proxyMethod, value);
++        QVariant finalValue;
++        if (info.proxyConverter) {
++            finalValue = info.proxyConverter(value);
++        } else {
++            finalValue = value;
++        }
++        info.proxyInterface->asyncCall(info.proxyMethod, finalValue);
          return; // don't bother saving a copy
+     }
@@ -285,12 +336,13 @@
+     }
+ }
--void AccountsService::registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method)
++void AccountsService::registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method, ProxyConverter converter)
+ {
      registerProperty(interface, property, nullptr);
      m_properties[interface][property].proxyInterface = iface;
      m_properties[interface][property].proxyMethod = method;
++    m_properties[interface][property].proxyConverter = converter;
+ }
  void AccountsService::registerProperty(const QString &interface, const QString &property, const QString &signal)
 === modified file 'plugins/AccountsService/AccountsService.h'
 --- plugins/AccountsService/AccountsService.h	2016-02-17 13:47:43 +0000
 +++ plugins/AccountsService/AccountsService.h	2016-02-17 13:47:43 +0000
@@ -117,9 +117,11 @@
      void onMaybeChanged(const QString &user);
  private:
++    typedef QVariant (*ProxyConverter)(const QVariant &);
++
      void refresh(bool async);
      void registerProperty(const QString &interface, const QString &property, const QString &signal);
--    void registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method);
++    void registerProxy(const QString &interface, const QString &property, QDBusInterface *iface, const QString &method, ProxyConverter converter = nullptr);
      void updateAllProperties(const QString &interface, bool async);
      void updateProperty(const QString &interface, const QString &property);
@@ -135,6 +137,7 @@
          QString signal{};
          QDBusInterface *proxyInterface{};
          QString proxyMethod{};
++        ProxyConverter proxyConverter{};
      };
      typedef QHash< QString, QHash<QString, PropertyInfo> > PropertyHash;
      PropertyHash m_properties;
 === modified file 'tests/plugins/AccountsService/CMakeLists.txt'
 --- tests/plugins/AccountsService/CMakeLists.txt	2016-02-17 13:47:43 +0000
 +++ tests/plugins/AccountsService/CMakeLists.txt	2016-02-17 13:47:43 +0000
@@ -16,6 +16,7 @@
  make_dbus_class(Location com.ubuntu.location.providers.here.AccountsService)
  make_dbus_class(AccountsUser org.freedesktop.Accounts.User)
  make_dbus_class(AccountsPrivate com.canonical.unity.AccountsService.Private)
++make_dbus_class(UscInput com.canonical.Unity.Input)
  include_directories(
      ${CMAKE_CURRENT_BINARY_DIR}
@@ -32,9 +33,11 @@
      ${CMAKE_CURRENT_BINARY_DIR}/PropertiesAdaptor.cpp
      ${CMAKE_CURRENT_BINARY_DIR}/LocationAdaptor.cpp
      ${CMAKE_CURRENT_BINARY_DIR}/SecurityPrivacyAdaptor.cpp
++    ${CMAKE_CURRENT_BINARY_DIR}/UscInputAdaptor.cpp
      server.cpp
      AccountsServer.cpp
      PropertiesServer.cpp
++    UscServer.cpp
+     )
  qt5_use_modules(mock-server Core DBus)
 === modified file 'tests/plugins/AccountsService/PropertiesServer.cpp'
 --- tests/plugins/AccountsService/PropertiesServer.cpp	2016-02-17 13:47:43 +0000
 +++ tests/plugins/AccountsService/PropertiesServer.cpp	2016-02-17 13:47:43 +0000
@@ -100,8 +100,7 @@
      m_properties["com.canonical.unity.AccountsService"]["LauncherItems"] = QVariant::fromValue(QList<QVariantMap>());
      m_properties["com.canonical.unity.AccountsService.Private"]["FailedLogins"] = 0;
      m_properties["com.ubuntu.touch.AccountsService.SecurityPrivacy"]["StatsWelcomeScreen"] = true;
--    m_properties["com.ubuntu.AccountsService.Input"]["MouseCursorSpeed"] = 0.5;
--    m_properties["com.ubuntu.AccountsService.Input"]["TouchpadCursorSpeed"] = 0.5;
++    m_properties["com.ubuntu.AccountsService.Input"]["MousePrimaryButton"] = "right";
      m_properties["com.ubuntu.AccountsService.SecurityPrivacy"]["EnableLauncherWhileLocked"] = true;
      m_properties["com.ubuntu.AccountsService.SecurityPrivacy"]["EnableIndicatorsWhileLocked"] = true;
      m_properties["com.ubuntu.AccountsService.SecurityPrivacy"]["PasswordDisplayHint"] = AccountsService::Keyboard;
 === added file 'tests/plugins/AccountsService/UscServer.cpp'
 --- tests/plugins/AccountsService/UscServer.cpp	1970-01-01 00:00:00 +0000
 +++ tests/plugins/AccountsService/UscServer.cpp	2016-02-17 13:47:43 +0000
@@ -0,0 +1,28 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ */
++
++#include "UscServer.h"
++
++UscServer::UscServer(QObject *parent)
++    : QObject(parent)
++{
++}
++
++void UscServer::setMousePrimaryButton(int button)
++{
++    Q_EMIT setMousePrimaryButtonCalled(button);
++}
 === added file 'tests/plugins/AccountsService/UscServer.h'
 --- tests/plugins/AccountsService/UscServer.h	1970-01-01 00:00:00 +0000
 +++ tests/plugins/AccountsService/UscServer.h	2016-02-17 13:47:43 +0000
@@ -0,0 +1,39 @@
++/*
++ * Copyright 2016 Canonical Ltd.
++ *
++ * This program is free software: you can redistribute it and/or modify it
++ * under the terms of the GNU General Public License version 3, as published
++ * by the  Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranties of
++ * MERCHANTABILITY, SATISFACTORY QUALITY 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
++ * version 3 along with this program.  If not, see
++ * <http://www.gnu.org/licenses/>
++ */
++
++#ifndef UNITY_USCSERVER_H
++#define UNITY_USCSERVER_H
++
++#include <QDBusContext>
++#include <QObject>
++
++class UscServer: public QObject, protected QDBusContext
++{
++    Q_OBJECT
++
++public:
++    explicit UscServer(QObject *parent = nullptr);
++
++public Q_SLOTS:
++    void setMousePrimaryButton(int button);
++
++Q_SIGNALS:
++    // mock only.
++    void setMousePrimaryButtonCalled(int button);
++};
++
++#endif
 === modified file 'tests/plugins/AccountsService/client.cpp'
 --- tests/plugins/AccountsService/client.cpp	2016-02-17 13:47:43 +0000
 +++ tests/plugins/AccountsService/client.cpp	2016-02-17 13:47:43 +0000
@@ -47,9 +47,19 @@
          : QObject(parent)
          , m_userInterface(nullptr)
          , m_spy(this, &AccountsServiceTest::propertiesChanged)
++        , m_mousePrimaryButtonSpy(this, &AccountsServiceTest::setMousePrimaryButtonCalled)
+     {
          qDBusRegisterMetaType<StringMap>();
          qDBusRegisterMetaType<StringMapList>();
++
++        m_uscInputInterface = new QDBusInterface("com.canonical.Unity.Input",
++                                                 "/com/canonical/Unity/Input",
++                                                 "com.canonical.Unity.Input",
++                                                 QDBusConnection::sessionBus(),
++                                                 this);
++
++        QObject::connect(m_uscInputInterface, SIGNAL(setMousePrimaryButtonCalled(int)),
++                         this, SIGNAL(setMousePrimaryButtonCalled(int)));
+     }
  private Q_SLOTS:
@@ -78,6 +88,7 @@
          delete m_userInterface;
          m_spy.clear();
++        m_mousePrimaryButtonSpy.clear();
+     }
      void testInvalids()
@@ -244,12 +255,56 @@
          QTRY_COMPARE(session.keymaps(), result);
+     }
++    void testProxyOnStartup()
++    {
++        AccountsService session(this, QTest::currentTestFunction());
++
++        QTRY_COMPARE(m_mousePrimaryButtonSpy.count(), 1);
++        QList<QVariant> arguments = m_mousePrimaryButtonSpy.takeFirst();
++        QCOMPARE(arguments.at(0).toInt(), 1);
++    }
++
++    void testProxyOnChange()
++    {
++        AccountsService session(this, QTest::currentTestFunction());
++        QTRY_COMPARE(m_mousePrimaryButtonSpy.count(), 1);
++        m_mousePrimaryButtonSpy.clear();
++
++        ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
++                                                    "com.ubuntu.AccountsService.Input",
++                                                    "MousePrimaryButton",
++                                                    dbusVariant("left")));
++
++        QTRY_COMPARE(m_mousePrimaryButtonSpy.count(), 1);
++        QList<QVariant> arguments = m_mousePrimaryButtonSpy.takeFirst();
++        QCOMPARE(arguments.at(0).toInt(), 0);
++    }
++
++    void testInvalidPrimaryButton()
++    {
++        AccountsService session(this, QTest::currentTestFunction());
++        QTRY_COMPARE(m_mousePrimaryButtonSpy.count(), 1);
++        m_mousePrimaryButtonSpy.clear();
++
++        ASSERT_DBUS_CALL(m_userInterface->asyncCall("Set",
++                                                    "com.ubuntu.AccountsService.Input",
++                                                    "MousePrimaryButton",
++                                                    dbusVariant("NOPE")));
++
++        QTRY_COMPARE(m_mousePrimaryButtonSpy.count(), 1);
++        QList<QVariant> arguments = m_mousePrimaryButtonSpy.takeFirst();
++        QCOMPARE(arguments.at(0).toInt(), 0);
++    }
++
  Q_SIGNALS:
      void propertiesChanged(const QString &interface, const QVariantMap &changed, const QStringList &invalid);
++    void setMousePrimaryButtonCalled(int button);
  private:
++    QDBusInterface* m_uscInputInterface;
      QDBusInterface* m_userInterface;
      QSignalSpy m_spy;
++    QSignalSpy m_mousePrimaryButtonSpy;
  };
  QTEST_MAIN(AccountsServiceTest)
 === modified file 'tests/plugins/AccountsService/interfaces.xml'
 --- tests/plugins/AccountsService/interfaces.xml	2016-02-17 13:47:43 +0000
 +++ tests/plugins/AccountsService/interfaces.xml	2016-02-17 13:47:43 +0000
@@ -44,4 +44,14 @@
      <signal name="Changed" />
    </interface>
    <interface name="com.canonical.unity.AccountsService.Private" />
++
++  <interface name="com.canonical.Unity.Input">
++    <method name="setMousePrimaryButton">
++      <arg name="button" type="i" direction="in" />
++    </method>
++    <!-- Just for testing -->
++    <signal name="setMousePrimaryButtonCalled">
++      <arg name="button" type="i" direction="out" />
++    </signal>
++  </interface>
  </node>
 === modified file 'tests/plugins/AccountsService/server.cpp'
 --- tests/plugins/AccountsService/server.cpp	2016-02-17 13:47:43 +0000
 +++ tests/plugins/AccountsService/server.cpp	2016-02-17 13:47:43 +0000
@@ -24,6 +24,8 @@
  #include "SecurityPrivacyAdaptor.h"
  #include "LocationAdaptor.h"
  #include "AccountsPrivateAdaptor.h"
++#include "UscInputAdaptor.h"
++#include "UscServer.h"
  #include <QCoreApplication>
  int main(int argc, char *argv[])
@@ -36,8 +38,16 @@
      new SecurityPrivacyAdaptor(accounts);
      new LocationAdaptor(accounts);
      new AccountsPrivateAdaptor(accounts);
++
++    auto usc = new UscServer(&a);
++    new UscInputAdaptor(usc);
++
      // We use the session bus for testing.  The real plugin uses the system bus
      auto connection = QDBusConnection::sessionBus();
++    if (!connection.registerObject("/com/canonical/Unity/Input", usc))
++        return 1;
++    if (!connection.registerService("com.canonical.Unity.Input"))
++        return 1;
      if (!connection.registerObject("/org/freedesktop/Accounts", accounts))
          return 1;
      if (!connection.registerService("org.freedesktop.Accounts"))