1
=== modified file 'include/server/mir/frontend/buffer_stream.h'
2
--- include/server/mir/frontend/buffer_stream.h	2017-09-01 05:03:55 +0000
3
+++ include/server/mir/frontend/buffer_stream.h	2017-09-22 11:48:21 +0000
4
@@ -21,6 +21,7 @@
5
21
21
6
22
#include <mir_toolkit/common.h>
22
#include <mir_toolkit/common.h>
7
23
#include "mir/graphics/buffer_id.h"
23
#include "mir/graphics/buffer_id.h"
8
24
#include "mir/geometry/size.h"
9
24
#include <functional>
25
#include <functional>
10
25
#include <memory>
26
#include <memory>
11
26
27
12
27
28
13
=== modified file 'src/server/frontend/wayland/wayland_connector.cpp'
14
--- src/server/frontend/wayland/wayland_connector.cpp	2017-09-21 11:30:51 +0000
15
+++ src/server/frontend/wayland/wayland_connector.cpp	2017-09-22 11:48:21 +0000
16
@@ -21,6 +21,7 @@
17
21
#include "core_generated_interfaces.h"
21
#include "core_generated_interfaces.h"
18
22
22
19
23
#include "mir/frontend/shell.h"
23
#include "mir/frontend/shell.h"
20
24
#include "mir/frontend/surface.h"
21
24
25
22
25
#include "mir/compositor/buffer_stream.h"
26
#include "mir/compositor/buffer_stream.h"
23
26
27
24
@@ -1028,6 +1029,11 @@
25
1028
    InputCtx<WlKeyboard> const& acquire_keyboard_reference(wl_client* client) const;
1029
    InputCtx<WlKeyboard> const& acquire_keyboard_reference(wl_client* client) const;
26
1029
    InputCtx<WlTouch> const& acquire_touch_reference(wl_client* client) const;
1030
    InputCtx<WlTouch> const& acquire_touch_reference(wl_client* client) const;
27
1030
1031
28
1032
    void spawn(std::function<void()>&& work)
29
1033
    {
30
1034
        executor->spawn(std::move(work));
31
1035
    }
32
1036
33
1031
private:
1037
private:
34
1032
    std::unordered_map<wl_client*, InputCtx<WlPointer>> mutable pointer;
1038
    std::unordered_map<wl_client*, InputCtx<WlPointer>> mutable pointer;
35
1033
    std::unordered_map<wl_client*, InputCtx<WlKeyboard>> mutable keyboard;
1039
    std::unordered_map<wl_client*, InputCtx<WlKeyboard>> mutable keyboard;
36
@@ -1146,13 +1152,14 @@
37
1146
{
1152
{
38
1147
}
1153
}
39
1148
1154
41
1149
class SurfaceInputSink : public mf::EventSink
1155
class SurfaceEventSink : public mf::EventSink
42
1150
{
1156
{
43
1151
public:
1157
public:
45
1152
    SurfaceInputSink(WlSeat* seat, wl_client* client, wl_resource* target)
1158
    SurfaceEventSink(WlSeat* seat, wl_client* client, wl_resource* target, wl_resource* event_sink)
46
1153
        : seat{seat},
1159
        : seat{seat},
47
1154
          client{client},
1160
          client{client},
49
1155
          target{target}
1161
          target{target},
50
1162
          event_sink{event_sink}
51
1156
    {
1163
    {
52
1157
    }
1164
    }
53
1158
1165
54
@@ -1172,12 +1179,24 @@
55
1172
    WlSeat* const seat;
1179
    WlSeat* const seat;
56
1173
    wl_client* const client;
1180
    wl_client* const client;
57
1174
    wl_resource* const target;
1181
    wl_resource* const target;
58
1182
    wl_resource* const event_sink;
59
1175
};
1183
};
60
1176
1184
62
1177
void SurfaceInputSink::handle_event(MirEvent const& event)
1185
void SurfaceEventSink::handle_event(MirEvent const& event)
63
1178
{
1186
{
64
1179
    switch (mir_event_get_type(&event))
1187
    switch (mir_event_get_type(&event))
65
1180
    {
1188
    {
66
1189
    case mir_event_type_resize:
67
1190
    {
68
1191
        auto resize = mir_event_get_resize_event(&event);
69
1192
        seat->spawn([event_sink=event_sink,
70
1193
                     width = mir_resize_event_get_width(resize),
71
1194
                     height = mir_resize_event_get_height(resize)]()
72
1195
        {
73
1196
            wl_shell_surface_send_configure(event_sink, WL_SHELL_SURFACE_RESIZE_NONE, width, height);
74
1197
        });
75
1198
        break;
76
1199
    }
77
1181
    case mir_event_type_input:
1200
    case mir_event_type_input:
78
1182
    {
1201
    {
79
1183
        auto input_event = mir_event_get_input_event(&event);
1202
        auto input_event = mir_event_get_input_event(&event);
80
@@ -1362,7 +1381,7 @@
81
1362
          shell{shell}
1381
          shell{shell}
82
1363
    {
1382
    {
83
1364
        auto* tmp = wl_resource_get_user_data(surface);
1383
        auto* tmp = wl_resource_get_user_data(surface);
85
1365
        auto& mir_surface = *static_cast<WlSurface*>(reinterpret_cast<wayland::Surface*>(tmp));
1384
        auto& mir_surface = *static_cast<WlSurface*>(tmp);
86
1366
1385
87
1367
        auto const session = session_for_client(client);
1386
        auto const session = session_for_client(client);
88
1368
1387
89
@@ -1374,7 +1393,15 @@
90
1374
        surface_id = shell->create_surface(
1393
        surface_id = shell->create_surface(
91
1375
            session,
1394
            session,
92
1376
            params,
1395
            params,
94
1377
            std::make_shared<SurfaceInputSink>(&seat, client, surface));
1396
            std::make_shared<SurfaceEventSink>(&seat, client, surface, resource));
95
1397
96
1398
        {
97
1399
            // The shell isn't guaranteed to respect the requested size
98
1400
            auto const window = session->get_surface(surface_id);
99
1401
            auto const size = window->client_size();
100
1402
            seat.spawn([resource=resource, height = size.height.as_int(), width = size.width.as_int()]()
101
1403
                { wl_shell_surface_send_configure(resource, WL_SHELL_SURFACE_RESIZE_NONE, width, height); });
102
1404
        }
103
1378
1405
104
1379
        mir_surface.set_resize_handler(
1406
        mir_surface.set_resize_handler(
105
1380
            [shell, session, id = surface_id](geom::Size new_size)
1407
            [shell, session, id = surface_id](geom::Size new_size)
106
@@ -1429,8 +1456,18 @@
107
1429
    void set_fullscreen(
1456
    void set_fullscreen(
108
1430
        uint32_t /*method*/,
1457
        uint32_t /*method*/,
109
1431
        uint32_t /*framerate*/,
1458
        uint32_t /*framerate*/,
111
1432
        std::experimental::optional<struct wl_resource*> const& /*output*/) override
1459
        std::experimental::optional<struct wl_resource*> const& output) override
112
1433
    {
1460
    {
113
1461
        mir::shell::SurfaceSpecification mods;
114
1462
        mods.state = mir_window_state_fullscreen;
115
1463
        if (output)
116
1464
        {
117
1465
            // TODO{alan_g} mods.output_id = DisplayConfigurationOutputId_from(output)
118
1466
        }
119
1467
120
1468
        auto const session = session_for_client(client);
121
1469
        shell->modify_surface(session, surface_id, mods);
122
1470
123
1434
    }
1471
    }
124
1435
1472
125
1436
    void set_popup(
1473
    void set_popup(
126
@@ -1443,8 +1480,16 @@
127
1443
    {
1480
    {
128
1444
    }
1481
    }
129
1445
1482
131
1446
    void set_maximized(std::experimental::optional<struct wl_resource*> const& /*output*/) override
1483
    void set_maximized(std::experimental::optional<struct wl_resource*> const& output) override
132
1447
    {
1484
    {
133
1485
        mir::shell::SurfaceSpecification mods;
134
1486
        mods.state = mir_window_state_maximized;
135
1487
        if (output)
136
1488
        {
137
1489
            // TODO{alan_g} mods.output_id = DisplayConfigurationOutputId_from(output)
138
1490
        }
139
1491
        auto const session = session_for_client(client);
140
1492
        shell->modify_surface(session, surface_id, mods);
141
1448
    }
1493
    }
142
1449
1494
143
1450
    void set_title(std::string const& /*title*/) override
1495
    void set_title(std::string const& /*title*/) override
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-09-22
Gerry Boland (community)		2017-09-19	Approve on 2017-09-22
Review via email: mp+330992@code.launchpad.net