Merge lp:~mir-team/unity-system-compositor/touchspot-toggling into lp:unity-system-compositor

[Robert Carr]

Implement DBus interface for toggling touch visualization as required by autopilot.

Implement DBus interface for toggling touch visualization as required by autopilot.

Depends on:
https://code.launchpad.net/~mir-team/mir/touchspot-renderable/+merge/228775

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:173
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/150/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/46/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/150/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

Looks good to me.

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

I guess we'll land this on utopic in the same silo as Mir 0.8. Robert, I'd appreciate a reminder please.

review: Approve

[lp:~mir-team/unity-system-compositor/touchspot-toggling]

174. By Robert Carr on 2014-09-22

Merge upstream

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:174
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/154/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/50/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/50/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/154/rebuild

review: Needs Fixing (continuous-integration)

[Cemil Azizoglu (cemil-azizoglu)]

Instead of devel-mir-next, I'll just use this branch. Can you please bump the server ABI dependency in this MP in addition to addressing the jenkins failure?

review: Needs Fixing

[lp:~mir-team/unity-system-compositor/touchspot-toggling]

175. By Robert Carr on 2014-09-29

Bump mir dependency

[Robert Carr (robertcarr)]

Jenkins failure is just the lack of latest server ABI. Bumped dependency, should be good.

[lp:~mir-team/unity-system-compositor/touchspot-toggling]

176. By Robert Carr on 2014-09-29

No need to bump client version dep

[Cemil Azizoglu (cemil-azizoglu)]

LG.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:176
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/155/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-amd64-ci/51/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-utopic-armhf-ci/51/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-system-compositor-ci/155/rebuild

review: Needs Fixing (continuous-integration)

[Robert Carr (robertcarr)]

Jenkins failure is the version bump working.

=== modified file 'debian/control'
--- debian/control	2014-07-23 17:54:25 +0000
+++ debian/control	2014-09-29 20:23:42 +0000
@@ -18,7 +18,7 @@
                libglib2.0-dev,
                libgles2-mesa-dev,
                libmirclient-dev (>= 0.6.0),
-               libmirserver-dev (>= 0.6.0),
+               libmirserver-dev (>= 0.8.0),
                libprotobuf-dev,
                pkg-config,
                python:any (>= 2.7),

=== modified file 'src/dbus_screen.cpp'
--- src/dbus_screen.cpp	2014-09-16 15:03:49 +0000
+++ src/dbus_screen.cpp	2014-09-29 20:23:42 +0000
@@ -206,3 +206,8 @@
 {
     observer->set_inactivity_timeouts(poweroff_timeout, dimmer_timeout);
 }
+
+void DBusScreen::setTouchVisualizationEnabled(bool enabled)
+{
+    observer->set_touch_visualization_enabled(enabled);
+}

=== modified file 'src/dbus_screen.h'
--- src/dbus_screen.h	2014-09-16 00:20:05 +0000
+++ src/dbus_screen.h	2014-09-29 20:23:42 +0000
@@ -57,6 +57,8 @@
     void userAutobrightnessEnable(bool enable);
 
     void setInactivityTimeouts(int poweroff_timeout, int dimmer_timeout);
+    
+    void setTouchVisualizationEnabled(bool enabled);
 
 private Q_SLOTS:
     void remove_display_on_requestor(QString const& requestor);

=== modified file 'src/dbus_screen_observer.h'
--- src/dbus_screen_observer.h	2014-08-14 16:06:33 +0000
+++ src/dbus_screen_observer.h	2014-09-29 20:23:42 +0000
@@ -29,6 +29,7 @@
     virtual void set_brightness(int brightness) = 0;
     virtual void enable_auto_brightness(bool enable) = 0;
     virtual void set_inactivity_timeouts(int poweroff_timeout, int dimmer_timeout) = 0;
+    virtual void set_touch_visualization_enabled(bool enabled) = 0;
 
 protected:
     DBusScreenObserver() = default;

=== modified file 'src/screen_state_handler.cpp'
--- src/screen_state_handler.cpp	2014-09-05 18:11:43 +0000
+++ src/screen_state_handler.cpp	2014-09-29 20:23:42 +0000
@@ -22,6 +22,7 @@
 #include <mir/default_server_configuration.h>
 #include <mir/graphics/display.h>
 #include <mir/graphics/display_configuration.h>
+#include <mir/input/touch_visualizer.h>
 
 #include <cstdio>
 #include "dbus_screen.h"
@@ -223,3 +224,14 @@
     std::lock_guard<std::mutex> lock{guard};
     powerd_mediator->set_dim_backlight();
 }
+
+void ScreenStateHandler::set_touch_visualization_enabled(bool enabled)
+{
+    std::lock_guard<std::mutex> lock{guard};
+    
+    auto visualizer = config->the_touch_visualizer();
+    if (enabled)
+        visualizer->enable();
+    else
+        visualizer->disable();
+}

=== modified file 'src/screen_state_handler.h'
--- src/screen_state_handler.h	2014-08-14 18:40:25 +0000
+++ src/screen_state_handler.h	2014-09-29 20:23:42 +0000
@@ -57,6 +57,8 @@
     void set_brightness(int brightness) override;
     void enable_auto_brightness(bool enable) override;
     void set_inactivity_timeouts(int power_off_timeout, int dimmer_timeout) override;
+    
+    void set_touch_visualization_enabled(bool enabled) override;
 
 private:
     void set_screen_power_mode_l(MirPowerMode mode, PowerStateChangeReason reason);