1
=== modified file 'src/server/graphics/nested/display_buffer.cpp'
2
--- src/server/graphics/nested/display_buffer.cpp	2015-05-19 21:34:34 +0000
3
+++ src/server/graphics/nested/display_buffer.cpp	2015-06-16 14:58:05 +0000
4
@@ -108,18 +108,28 @@
5
108
{
108
{
6
109
    if (mir_event_get_type(&event) != mir_event_type_input)
109
    if (mir_event_get_type(&event) != mir_event_type_input)
7
110
        return;
110
        return;
8
111
    auto iev = mir_event_get_input_event(&event);
9
112
111
10
113
    if (mir_input_event_get_type(iev) == mir_input_event_type_pointer)
11
114
    {
12
115
        auto pev = mir_input_event_get_pointer_event(iev);
13
116
        auto x = mir_pointer_event_axis_value(pev, mir_pointer_axis_x) + area.top_left.x.as_float();
14
117
        auto y = mir_pointer_event_axis_value(pev, mir_pointer_axis_y) + area.top_left.y.as_float();
15
118
        cursor_listener->cursor_moved_to(x, y);
16
119
    }
17
120
    if (event.type == mir_event_type_motion)
112
    if (event.type == mir_event_type_motion)
18
121
    {
113
    {
19
122
        auto my_event = event;
114
        auto my_event = event;
20
115
        auto iev = mir_event_get_input_event(&my_event);
21
116
22
117
        if (mir_input_event_get_type(iev) == mir_input_event_type_pointer)
23
118
        {
24
119
            auto& motion = my_event.motion;
25
120
26
121
            for (size_t i = 0; i != motion.pointer_count; ++i)
27
122
            {
28
123
                motion.pointer_coordinates[i].x += area.top_left.x.as_float();
29
124
                motion.pointer_coordinates[i].y += area.top_left.y.as_float();
30
125
            }
31
126
32
127
            auto pev = mir_input_event_get_pointer_event(iev);
33
128
            auto x = mir_pointer_event_axis_value(pev, mir_pointer_axis_x);
34
129
            auto y = mir_pointer_event_axis_value(pev, mir_pointer_axis_y);
35
130
            cursor_listener->cursor_moved_to(x, y);
36
131
        }
37
132
38
123
        dispatcher->dispatch(my_event);
133
        dispatcher->dispatch(my_event);
39
124
    }
134
    }
40
125
    else
135
    else
Reviewer	Review Type	Date Requested	Status
Cemil Azizoglu (community)			Approve on 2015-06-16
Andreas Pokorny (community)			Approve on 2015-06-16
Alberto Aguirre (community)		2015-06-16	Approve on 2015-06-16
PS Jenkins bot (community)	continuous-integration		Approve on 2015-06-16
Review via email: mp+262101@code.launchpad.net