1
=== modified file 'src/server/frontend/wayland/wayland_connector.cpp'
2
--- src/server/frontend/wayland/wayland_connector.cpp	2017-09-26 21:34:45 +0000
3
+++ src/server/frontend/wayland/wayland_connector.cpp	2017-09-26 21:34:45 +0000
4
@@ -1055,7 +1055,8 @@
5
1055
        std::shared_ptr<mir::Executor> const& executor)
1055
        std::shared_ptr<mir::Executor> const& executor)
6
1056
        : Touch(client, parent, id),
1056
        : Touch(client, parent, id),
7
1057
          executor{executor},
1057
          executor{executor},
9
1058
          on_destroy{on_destroy}
1058
          on_destroy{on_destroy},
10
1059
          destroyed{std::make_shared<bool>(false)}
11
1059
    {
1060
    {
12
1060
    }
1061
    }
13
1061
1062
14
@@ -1065,8 +1066,81 @@
15
1065
        *destroyed = true;
1066
        *destroyed = true;
16
1066
    }
1067
    }
17
1067
1068
19
1068
    void handle_event(MirInputEvent const* /*event*/, wl_resource* /*target*/)
1069
    void handle_event(MirInputEvent const* event, wl_resource* target)
20
1069
    {
1070
    {
21
1071
        executor->spawn(run_unless(
22
1072
            destroyed,
23
1073
            [ev = mcl::Event{mir_input_event_get_event(event)}, target = target, this]()
24
1074
            {
25
1075
                auto const input_ev = mir_event_get_input_event(ev);
26
1076
                auto const touch_ev = mir_input_event_get_touch_event(input_ev);
27
1077
28
1078
                for (auto i = 0u; i < mir_touch_event_point_count(touch_ev); ++i)
29
1079
                {
30
1080
                    auto const touch_id = mir_touch_event_id(touch_ev, i);
31
1081
                    auto const action = mir_touch_event_action(touch_ev, i);
32
1082
                    auto const x = mir_touch_event_axis_value(
33
1083
                        touch_ev,
34
1084
                        i,
35
1085
                        mir_touch_axis_x);
36
1086
                    auto const y = mir_touch_event_axis_value(
37
1087
                        touch_ev,
38
1088
                        i,
39
1089
                        mir_touch_axis_y);
40
1090
41
1091
                    switch (action)
42
1092
                    {
43
1093
                    case mir_touch_action_down:
44
1094
                        wl_touch_send_down(
45
1095
                            resource,
46
1096
                            wl_display_get_serial(wl_client_get_display(client)),
47
1097
                            mir_input_event_get_event_time(input_ev) / 1000,
48
1098
                            target,
49
1099
                            touch_id,
50
1100
                            wl_fixed_from_double(x),
51
1101
                            wl_fixed_from_double(y));
52
1102
                        break;
53
1103
                    case mir_touch_action_up:
54
1104
                        wl_touch_send_up(
55
1105
                            resource,
56
1106
                            wl_display_get_serial(wl_client_get_display(client)),
57
1107
                            mir_input_event_get_event_time(input_ev) / 1000,
58
1108
                            touch_id);
59
1109
                        break;
60
1110
                    case mir_touch_action_change:
61
1111
                        wl_touch_send_motion(
62
1112
                            resource,
63
1113
                            mir_input_event_get_event_time(input_ev) / 1000,
64
1114
                            touch_id,
65
1115
                            wl_fixed_from_double(x),
66
1116
                            wl_fixed_from_double(y));
67
1117
                        break;
68
1118
                    case mir_touch_actions:
69
1119
                        /*
70
1120
                         * We should never receive an event with this action set;
71
1121
                         * the only way would be if a *new* action has been added
72
1122
                         * to the enum, and this hasn't been updated.
73
1123
                         *
74
1124
                         * There's nothing to do here, but don't use default: so
75
1125
                         * that the compiler will warn if a new enum value is added.
76
1126
                         */
77
1127
                        break;
78
1128
                    }
79
1129
                }
80
1130
81
1131
                if (mir_touch_event_point_count(touch_ev) > 0)
82
1132
                {
83
1133
                    /*
84
1134
                     * This is mostly paranoia; I assume we won't actually be called
85
1135
                     * with an empty touch event.
86
1136
                     *
87
1137
                     * Regardless, the Wayland protocol requires that there be at least
88
1138
                     * one event sent before we send the ending frame, so make that explicit.
89
1139
                     */
90
1140
                    wl_touch_send_frame(resource);
91
1141
                }
92
1142
            }
93
1143
            ));
94
1070
    }
1144
    }
95
1071
1145
96
1072
    // Touch interface
1146
    // Touch interface
97
@@ -1189,7 +1263,8 @@
98
1189
        wl_seat_send_capabilities(
1263
        wl_seat_send_capabilities(
99
1190
            resource,
1264
            resource,
100
1191
            WL_SEAT_CAPABILITY_POINTER |
1265
            WL_SEAT_CAPABILITY_POINTER |
102
1192
            WL_SEAT_CAPABILITY_KEYBOARD);
1266
            WL_SEAT_CAPABILITY_KEYBOARD |
103
1267
            WL_SEAT_CAPABILITY_TOUCH);
104
1193
        wl_seat_send_name(
1268
        wl_seat_send_name(
105
1194
            resource,
1269
            resource,
106
1195
            "seat0");
1270
            "seat0");
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2017-09-27
Alan Griffiths		2017-09-26	Approve on 2017-09-26
Review via email: mp+331368@code.launchpad.net