Merge lp:~alan-griffiths/mir/fix-1705284 into lp:mir

[Alan Griffiths]

Respect cursor hotspot when hosted on Mir. (LP: #1705284)

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4209
https://mir-jenkins.ubuntu.com/job/mir-ci/3498/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4781
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4954
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4943
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4943
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4943
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4818
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4818/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4818
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4818/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4818
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4818/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4818
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4818/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4818
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4818/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4818
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4818/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4818
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4818/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4818
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4818/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3498/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

yeah that lgtms

review: Approve

=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
--- src/server/graphics/nested/mir_client_host_connection.cpp	2017-06-09 14:16:54 +0000
+++ src/server/graphics/nested/mir_client_host_connection.cpp	2017-07-19 21:27:25 +0000
@@ -193,7 +193,7 @@
             cursor_hotspot = image.hotspot();
 
             auto conf =
-                mir_cursor_configuration_from_render_surface(surface, 0, 0);
+                mir_cursor_configuration_from_render_surface(surface, cursor_hotspot.dx.as_int(), cursor_hotspot.dy.as_int());
 
             mir_window_configure_cursor(mir_surface, conf);
             mir_cursor_configuration_destroy(conf);
@@ -403,7 +403,7 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
     MirBufferUsage usage = (properties.usage == mg::BufferUsage::hardware) ?
-        mir_buffer_usage_hardware : mir_buffer_usage_software; 
+        mir_buffer_usage_hardware : mir_buffer_usage_software;
 
     mir_window_spec_set_pixel_format(spec.get(), properties.format);
     mir_window_spec_set_name(spec.get(), name);
@@ -700,7 +700,7 @@
 
 bool mgn::MirClientHostConnection::supports_passthrough(mg::BufferUsage)
 {
-    return mir_extension_android_buffer_v1(mir_connection) || 
+    return mir_extension_android_buffer_v1(mir_connection) ||
            mir_extension_gbm_buffer_v1(mir_connection);
 }