1
=== modified file 'examples/miral-shell/miral-app.sh'
2
--- examples/miral-shell/miral-app.sh	2017-09-15 16:34:13 +0000
3
+++ examples/miral-shell/miral-app.sh	2017-09-25 22:34:34 +0000
4
@@ -43,7 +43,7 @@
5
43
if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
43
if [ "${bindir}" != "" ]; then bindir="${bindir}/"; fi
6
44
44
7
45
if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
45
if [ -e "${socket}" ]; then echo "Error: session endpoint '${socket}' already exists"; exit 1 ;fi
9
46
if [ -e "${wayland_display}" ]; then echo "Error: wayland endpoint '${wayland_display}' already exists"; exit 1 ;fi
46
if [ -e "${XDG_RUNTIME_DIR}/${wayland_display}" ]; then echo "Error: wayland endpoint '${wayland_display}' already exists"; exit 1 ;fi
10
47
47
11
48
qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
48
qtubuntu_desktop_installed=$(apt list qtubuntu-desktop 2>/dev/null | grep installed | wc -l)
12
49
if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
49
if [ "${qtubuntu_desktop_installed}" == "0" ]; then echo "Need qtubuntu-desktop - run \"sudo apt install qtubuntu-desktop\""; exit 1 ;fi
13
50
50
14
=== modified file 'include/core/mir/geometry/size.h'
15
--- include/core/mir/geometry/size.h	2017-07-28 17:00:43 +0000
16
+++ include/core/mir/geometry/size.h	2017-09-25 22:34:34 +0000
17
@@ -29,12 +29,12 @@
18
29
29
19
30
struct Size
30
struct Size
20
31
{
31
{
24
32
    constexpr Size() {}
32
    constexpr Size() noexcept {}
25
33
    constexpr Size(Size const&) = default;
33
    constexpr Size(Size const&) noexcept = default;
26
34
    Size& operator=(Size const&) = default;
34
    Size& operator=(Size const&) noexcept = default;
27
35
35
28
36
    template<typename WidthType, typename HeightType>
36
    template<typename WidthType, typename HeightType>
30
37
    constexpr Size(WidthType&& width, HeightType&& height) : width(width), height(height) {}
37
    constexpr Size(WidthType&& width, HeightType&& height) noexcept : width(width), height(height) {}
31
38
38
32
39
    Width width;
39
    Width width;
33
40
    Height height;
40
    Height height;
34
41
41
35
=== modified file 'src/server/CMakeLists.txt'
36
--- src/server/CMakeLists.txt	2017-08-25 08:20:02 +0000
37
+++ src/server/CMakeLists.txt	2017-09-25 22:34:34 +0000
38
@@ -122,6 +122,7 @@
39
122
  ${GLIB_LDFLAGS} ${GLIB_LIBRARIES}
122
  ${GLIB_LDFLAGS} ${GLIB_LIBRARIES}
40
123
  ${UUID_LDFLAGS} ${UUID_LIBRARIES}
123
  ${UUID_LDFLAGS} ${UUID_LIBRARIES}
41
124
  ${WAYLAND_SERVER_LDFLAGS} ${WAYLAND_SERVER_LIBRARIES}
124
  ${WAYLAND_SERVER_LDFLAGS} ${WAYLAND_SERVER_LIBRARIES}
42
125
  atomic
43
125
)
126
)
44
126
127
45
127
install(TARGETS mirserver
128
install(TARGETS mirserver
46
128
129
47
=== modified file 'src/server/frontend/wayland/wayland_connector.cpp'
48
--- src/server/frontend/wayland/wayland_connector.cpp	2017-09-22 15:49:10 +0000
49
+++ src/server/frontend/wayland/wayland_connector.cpp	2017-09-25 22:34:34 +0000
50
@@ -1190,7 +1190,8 @@
51
1190
        : seat{seat},
1190
        : seat{seat},
52
1191
          client{client},
1191
          client{client},
53
1192
          target{target},
1192
          target{target},
55
1193
          event_sink{event_sink}
1193
          event_sink{event_sink},
56
1194
          window_size{geometry::Size{0,0}}
57
1194
    {
1195
    {
58
1195
    }
1196
    }
59
1196
1197
60
@@ -1206,11 +1207,17 @@
61
1206
    void error_buffer(geometry::Size, MirPixelFormat, std::string const& ) override {}
1207
    void error_buffer(geometry::Size, MirPixelFormat, std::string const& ) override {}
62
1207
    void update_buffer(graphics::Buffer&) override {}
1208
    void update_buffer(graphics::Buffer&) override {}
63
1208
1209
64
1210
    void latest_resize(geometry::Size window_size)
65
1211
    {
66
1212
        this->window_size = window_size;
67
1213
    }
68
1214
69
1209
private:
1215
private:
70
1210
    WlSeat* const seat;
1216
    WlSeat* const seat;
71
1211
    wl_client* const client;
1217
    wl_client* const client;
72
1212
    wl_resource* const target;
1218
    wl_resource* const target;
73
1213
    wl_resource* const event_sink;
1219
    wl_resource* const event_sink;
74
1220
    std::atomic<geometry::Size> window_size;
75
1214
};
1221
};
76
1215
1222
77
1216
void SurfaceEventSink::handle_event(MirEvent const& event)
1223
void SurfaceEventSink::handle_event(MirEvent const& event)
78
@@ -1220,12 +1227,16 @@
79
1220
    case mir_event_type_resize:
1227
    case mir_event_type_resize:
80
1221
    {
1228
    {
81
1222
        auto resize = mir_event_get_resize_event(&event);
1229
        auto resize = mir_event_get_resize_event(&event);
85
1223
        seat->spawn([event_sink=event_sink,
1230
        geometry::Size new_size{mir_resize_event_get_width(resize), mir_resize_event_get_height(resize)};
86
1224
                     width = mir_resize_event_get_width(resize),
1231
        if (window_size != new_size)
84
1225
                     height = mir_resize_event_get_height(resize)]()
87
1226
        {
1232
        {
90
1227
            wl_shell_surface_send_configure(event_sink, WL_SHELL_SURFACE_RESIZE_NONE, width, height);
1233
            seat->spawn([event_sink=event_sink,
91
1228
        });
1234
                         width = mir_resize_event_get_width(resize),
92
1235
                         height = mir_resize_event_get_height(resize)]()
93
1236
                {
94
1237
                    wl_shell_surface_send_configure(event_sink, WL_SHELL_SURFACE_RESIZE_NONE, width, height);
95
1238
                });
96
1239
        }
97
1229
        break;
1240
        break;
98
1230
    }
1241
    }
99
1231
    case mir_event_type_input:
1242
    case mir_event_type_input:
100
@@ -1425,25 +1436,25 @@
101
1425
1436
102
1426
        auto params = ms::SurfaceCreationParameters()
1437
        auto params = ms::SurfaceCreationParameters()
103
1427
            .of_type(mir_window_type_freestyle)
1438
            .of_type(mir_window_type_freestyle)
105
1428
            .of_size(geom::Size{100, 100})
1439
            .of_size(geom::Size{640, 480})
106
1429
            .with_buffer_stream(mir_surface.stream_id);
1440
            .with_buffer_stream(mir_surface.stream_id);
107
1430
1441
112
1431
        surface_id = shell->create_surface(
1442
        auto const sink = std::make_shared<SurfaceEventSink>(&seat, client, surface, resource);
113
1432
            session,
1443
        surface_id = shell->create_surface(session, params, sink);
110
1433
            params,
111
1434
            std::make_shared<SurfaceEventSink>(&seat, client, surface, resource));
114
1435
1444
115
1436
        {
1445
        {
116
1437
            // The shell isn't guaranteed to respect the requested size
1446
            // The shell isn't guaranteed to respect the requested size
117
1438
            auto const window = session->get_surface(surface_id);
1447
            auto const window = session->get_surface(surface_id);
118
1439
            auto const size = window->client_size();
1448
            auto const size = window->client_size();
119
1449
            sink->latest_resize(size);
120
1440
            seat.spawn([resource=resource, height = size.height.as_int(), width = size.width.as_int()]()
1450
            seat.spawn([resource=resource, height = size.height.as_int(), width = size.width.as_int()]()
121
1441
                { wl_shell_surface_send_configure(resource, WL_SHELL_SURFACE_RESIZE_NONE, width, height); });
1451
                { wl_shell_surface_send_configure(resource, WL_SHELL_SURFACE_RESIZE_NONE, width, height); });
122
1442
        }
1452
        }
123
1443
1453
124
1444
        mir_surface.set_resize_handler(
1454
        mir_surface.set_resize_handler(
126
1445
            [shell, session, id = surface_id](geom::Size new_size)
1455
            [shell, session, id = surface_id, sink](geom::Size new_size)
127
1446
            {
1456
            {
128
1457
                sink->latest_resize(new_size);
129
1447
                shell::SurfaceSpecification new_size_spec;
1458
                shell::SurfaceSpecification new_size_spec;
130
1448
                new_size_spec.width = new_size.width;
1459
                new_size_spec.width = new_size.width;
131
1449
                new_size_spec.height = new_size.height;
1460
                new_size_spec.height = new_size.height;
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-09-26
Chris Halse Rogers		2017-09-25	Approve on 2017-09-25
Review via email: mp+331280@code.launchpad.net