Mir

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

Proposed by Alan Griffiths on 2017-07-19
Status: Merged
Approved by: Brandon Schaefer on 2017-07-20
Approved revision: 4209
Merged at revision: 4209
Proposed branch: lp:~alan-griffiths/mir/fix-1705284
Merge into: lp:mir
Diff against target: 29 lines (+3/-3)
1 file modified
src/server/graphics/nested/mir_client_host_connection.cpp (+3/-3)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1705284
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2017-07-19 Approve on 2017-07-20
Mir CI Bot continuous-integration Approve on 2017-07-19
Review via email: mp+327748@code.launchpad.net

Commit message

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

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

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) wrote :

yeah that lgtms

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/server/graphics/nested/mir_client_host_connection.cpp'
2--- src/server/graphics/nested/mir_client_host_connection.cpp 2017-06-09 14:16:54 +0000
3+++ src/server/graphics/nested/mir_client_host_connection.cpp 2017-07-19 21:27:25 +0000
4@@ -193,7 +193,7 @@
5 cursor_hotspot = image.hotspot();
6
7 auto conf =
8- mir_cursor_configuration_from_render_surface(surface, 0, 0);
9+ mir_cursor_configuration_from_render_surface(surface, cursor_hotspot.dx.as_int(), cursor_hotspot.dy.as_int());
10
11 mir_window_configure_cursor(mir_surface, conf);
12 mir_cursor_configuration_destroy(conf);
13@@ -403,7 +403,7 @@
14 #pragma GCC diagnostic push
15 #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
16 MirBufferUsage usage = (properties.usage == mg::BufferUsage::hardware) ?
17- mir_buffer_usage_hardware : mir_buffer_usage_software;
18+ mir_buffer_usage_hardware : mir_buffer_usage_software;
19
20 mir_window_spec_set_pixel_format(spec.get(), properties.format);
21 mir_window_spec_set_name(spec.get(), name);
22@@ -700,7 +700,7 @@
23
24 bool mgn::MirClientHostConnection::supports_passthrough(mg::BufferUsage)
25 {
26- return mir_extension_android_buffer_v1(mir_connection) ||
27+ return mir_extension_android_buffer_v1(mir_connection) ||
28 mir_extension_gbm_buffer_v1(mir_connection);
29 }
30

Subscribers

People subscribed via source and target branches