1
=== modified file 'examples/server_example_canonical_window_manager.cpp'
2
--- examples/server_example_canonical_window_manager.cpp	2017-01-18 02:29:37 +0000
3
+++ examples/server_example_canonical_window_manager.cpp	2017-02-09 16:12:25 +0000
4
@@ -421,26 +421,6 @@
5
421
    {
421
    {
6
422
        surface->set_confine_pointer_state(modifications.confine_pointer.value());
422
        surface->set_confine_pointer_state(modifications.confine_pointer.value());
7
423
    }
423
    }
8
424
9
425
    if (modifications.cursor_image.is_set())
10
426
    {
11
427
        surface->set_cursor_image(modifications.cursor_image.value());        
12
428
    }
13
429
14
430
    if (modifications.stream_cursor.is_set())
15
431
    {
16
432
        auto stream_id = modifications.stream_cursor.value().stream_id;
17
433
        if (stream_id != mir::frontend::BufferStreamId{-1})
18
434
        {
19
435
            auto hotspot = modifications.stream_cursor.value().hotspot;
20
436
            auto stream = session->get_buffer_stream(modifications.stream_cursor.value().stream_id);
21
437
            surface->set_cursor_stream(stream, hotspot);
22
438
        }
23
439
        else
24
440
        {
25
441
            surface->set_cursor_image({});
26
442
        }
27
443
    }
28
444
}
424
}
29
445
425
30
446
void me::CanonicalWindowManagerPolicyCopy::handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
426
void me::CanonicalWindowManagerPolicyCopy::handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
31
447
427
32
=== modified file 'src/server/shell/abstract_shell.cpp'
33
--- src/server/shell/abstract_shell.cpp	2017-01-30 05:18:36 +0000
34
+++ src/server/shell/abstract_shell.cpp	2017-02-09 16:12:25 +0000
35
@@ -161,6 +161,26 @@
36
161
        window_manager->modify_surface(session, surface, wm_relevant_mods);
161
        window_manager->modify_surface(session, surface, wm_relevant_mods);
37
162
    }
162
    }
38
163
163
39
164
    if (modifications.cursor_image.is_set())
40
165
    {
41
166
        surface->set_cursor_image(modifications.cursor_image.value());
42
167
    }
43
168
44
169
    if (modifications.stream_cursor.is_set())
45
170
    {
46
171
        auto stream_id = modifications.stream_cursor.value().stream_id;
47
172
        if (stream_id != mir::frontend::BufferStreamId{-1})
48
173
        {
49
174
            auto hotspot = modifications.stream_cursor.value().hotspot;
50
175
            auto stream = session->get_buffer_stream(modifications.stream_cursor.value().stream_id);
51
176
            surface->set_cursor_stream(stream, hotspot);
52
177
        }
53
178
        else
54
179
        {
55
180
            surface->set_cursor_image({});
56
181
        }
57
182
    }
58
183
59
164
    if (modifications.confine_pointer.is_set() && focused_surface() == surface)
184
    if (modifications.confine_pointer.is_set() && focused_surface() == surface)
60
165
    {
185
    {
61
166
        if (surface->confine_pointer_state() == mir_pointer_confined_to_window)
186
        if (surface->confine_pointer_state() == mir_pointer_confined_to_window)
62
167
187
63
=== modified file 'src/server/shell/canonical_window_manager.cpp'
64
--- src/server/shell/canonical_window_manager.cpp	2017-01-20 12:32:45 +0000
65
+++ src/server/shell/canonical_window_manager.cpp	2017-02-09 16:12:25 +0000
66
@@ -413,26 +413,6 @@
67
413
    {
413
    {
68
414
        surface->set_confine_pointer_state(modifications.confine_pointer.value());
414
        surface->set_confine_pointer_state(modifications.confine_pointer.value());
69
415
    }
415
    }
70
416
71
417
    if (modifications.cursor_image.is_set())
72
418
    {
73
419
        surface->set_cursor_image(modifications.cursor_image.value());        
74
420
    }
75
421
76
422
    if (modifications.stream_cursor.is_set())
77
423
    {
78
424
        auto stream_id = modifications.stream_cursor.value().stream_id;
79
425
        if (stream_id != mir::frontend::BufferStreamId{-1})
80
426
        {
81
427
            auto hotspot = modifications.stream_cursor.value().hotspot;
82
428
            auto stream = session->get_buffer_stream(modifications.stream_cursor.value().stream_id);
83
429
            surface->set_cursor_stream(stream, hotspot);
84
430
        }
85
431
        else
86
432
        {
87
433
            surface->set_cursor_image({});
88
434
        }
89
435
    }
90
436
}
416
}
91
437
417
92
438
void msh::CanonicalWindowManagerPolicy::handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
418
void msh::CanonicalWindowManagerPolicy::handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-02-10
Daniel van Vugt			Approve on 2017-02-10
Kevin DuBois (community)			Approve on 2017-02-09
Cemil Azizoglu (community)		2017-02-09	Approve on 2017-02-09
Review via email: mp+316866@code.launchpad.net