1
=== modified file 'examples/render_surfaces.cpp'
2
--- examples/render_surfaces.cpp	2014-04-15 10:19:19 +0000
3
+++ examples/render_surfaces.cpp	2014-04-28 23:16:18 +0000
4
@@ -26,7 +26,6 @@
5
26
#include "mir/geometry/size.h"
26
#include "mir/geometry/size.h"
6
27
#include "mir/geometry/rectangles.h"
27
#include "mir/geometry/rectangles.h"
7
28
#include "mir/graphics/buffer_initializer.h"
28
#include "mir/graphics/buffer_initializer.h"
8
29
#include "mir/graphics/cursor.h"
9
30
#include "mir/graphics/display.h"
29
#include "mir/graphics/display.h"
10
31
#include "mir/graphics/display_buffer.h"
30
#include "mir/graphics/display_buffer.h"
11
32
#include "mir/graphics/gl_context.h"
31
#include "mir/graphics/gl_context.h"
12
@@ -89,62 +88,10 @@
13
89
namespace
88
namespace
14
90
{
89
{
15
91
std::atomic<bool> created{false};
90
std::atomic<bool> created{false};
20
92
bool input_is_on = false;
91
17
93
std::weak_ptr<mg::Cursor> cursor;
18
94
static const uint32_t bg_color = 0x00000000;
19
95
static const uint32_t fg_color = 0xffdd4814;
21
96
static const float min_alpha = 0.3f;
92
static const float min_alpha = 0.3f;
22
97
93
23
98
void update_cursor(uint32_t bg_color, uint32_t fg_color)
24
99
{
25
100
    if (auto cursor = ::cursor.lock())
26
101
    {
27
102
        static const int width = 64;
28
103
        static const int height = 64;
29
104
        std::vector<uint32_t> image(height * width, bg_color);
30
105
        for (int i = 0; i != width-1; ++i)
31
106
        {
32
107
            if (i < 16)
33
108
            {
34
109
                image[0 * height + i] = fg_color;
35
110
                image[1 * height + i] = fg_color;
36
111
                image[i * height + 0] = fg_color;
37
112
                image[i * height + 1] = fg_color;
38
113
            }
39
114
            image[i * height + i] = fg_color;
40
115
            image[(i+1) * height + i] = fg_color;
41
116
            image[i * height + i + 1] = fg_color;
42
117
        }
43
118
        cursor->set_image(image.data(), geom::Size{width, height});
44
119
    }
45
120
}
46
121
47
122
void animate_cursor()
48
123
{
49
124
    if (!input_is_on)
50
125
    {
51
126
        if (auto cursor = ::cursor.lock())
52
127
        {
53
128
            static int cursor_pos = 0;
54
129
            if (++cursor_pos == 300)
55
130
            {
56
131
                cursor_pos = 0;
57
132
58
133
                static const uint32_t fg_colors[3] = { fg_color, 0xffffffff, 0x3f000000 };
59
134
                static int fg_color = 0;
60
135
61
136
                if (++fg_color == 3) fg_color = 0;
62
137
63
138
                update_cursor(bg_color, fg_colors[fg_color]);
64
139
            }
65
140
66
141
            cursor->move_to(geom::Point{cursor_pos, cursor_pos});
67
142
        }
68
143
    }
69
144
}
70
145
71
146
char const* const surfaces_to_render = "surfaces-to-render";
94
char const* const surfaces_to_render = "surfaces-to-render";
72
147
char const* const display_cursor     = "display-cursor";
73
148
95
74
149
///\internal [StopWatch_tag]
96
///\internal [StopWatch_tag]
75
150
// tracks elapsed time - for animation.
97
// tracks elapsed time - for animation.
76
@@ -278,9 +225,7 @@
77
278
225
78
279
            result->add_options()
226
            result->add_options()
79
280
                (surfaces_to_render, po::value<int>()->default_value(5),
227
                (surfaces_to_render, po::value<int>()->default_value(5),
83
281
                    "Number of surfaces to render")
228
                    "Number of surfaces to render");
81
282
                (display_cursor, po::value<bool>()->default_value(false),
82
283
                    "Display test cursor. (If input is disabled it gets animated.)");
84
284
229
85
285
            return result;
230
            return result;
86
286
        }())
231
        }())
87
@@ -382,7 +327,6 @@
88
382
            bool composite()
327
            bool composite()
89
383
            {
328
            {
90
384
                while (!created) std::this_thread::yield();
329
                while (!created) std::this_thread::yield();
91
385
                animate_cursor();
92
386
                stop_watch.stop();
330
                stop_watch.stop();
93
387
                if (stop_watch.elapsed_seconds_since_last_restart() >= 1)
331
                if (stop_watch.elapsed_seconds_since_last_restart() >= 1)
94
388
                {
332
                {
95
@@ -501,23 +445,6 @@
96
501
        created = true;
445
        created = true;
97
502
    }
446
    }
98
503
447
99
504
    bool input_is_on()
100
505
    {
101
506
        return the_options()->get<bool>(mo::enable_input_opt);
102
507
    }
103
508
104
509
    std::weak_ptr<mg::Cursor> the_cursor()
105
510
    {
106
511
        if (the_options()->get<bool>(display_cursor))
107
512
        {
108
513
            return the_display()->the_cursor();
109
514
        }
110
515
        else
111
516
        {
112
517
            return {};
113
518
        }
114
519
    }
115
520
116
521
private:
448
private:
117
522
    std::vector<Moveable> moveables;
449
    std::vector<Moveable> moveables;
118
523
};
450
};
119
@@ -532,9 +459,6 @@
120
532
459
121
533
    mir::run_mir(conf, [&](mir::DisplayServer&)
460
    mir::run_mir(conf, [&](mir::DisplayServer&)
122
534
    {
461
    {
123
535
        cursor = conf.the_cursor();
124
536
125
537
        input_is_on = conf.input_is_on();
126
538
    });
462
    });
127
539
    ///\internal [main_tag]
463
    ///\internal [main_tag]
128
540
464
129
541
465
130
=== modified file 'include/platform/mir/graphics/cursor.h'
131
--- include/platform/mir/graphics/cursor.h	2013-08-28 03:41:48 +0000
132
+++ include/platform/mir/graphics/cursor.h	2014-04-28 23:16:18 +0000
133
@@ -23,14 +23,17 @@
134
23
#include "mir/geometry/size.h"
23
#include "mir/geometry/size.h"
135
24
#include "mir/geometry/point.h"
24
#include "mir/geometry/point.h"
136
25
25
137
26
#include <memory>
138
27
139
26
namespace mir
28
namespace mir
140
27
{
29
{
141
28
namespace graphics
30
namespace graphics
142
29
{
31
{
143
32
class CursorImage;
144
30
class Cursor
33
class Cursor
145
31
{
34
{
146
32
public:
35
public:
148
33
    virtual void set_image(void const* raw_argb, geometry::Size size) = 0;
36
    virtual void set_image(std::shared_ptr<CursorImage const> const& cursor_image) = 0;
149
34
    virtual void move_to(geometry::Point position) = 0;
37
    virtual void move_to(geometry::Point position) = 0;
150
35
38
151
36
protected:
39
protected:
152
37
40
153
=== added file 'include/platform/mir/graphics/cursor_image.h'
154
--- include/platform/mir/graphics/cursor_image.h	1970-01-01 00:00:00 +0000
155
+++ include/platform/mir/graphics/cursor_image.h	2014-04-28 23:16:18 +0000
156
@@ -0,0 +1,46 @@
157
1
/*
158
2
 * Copyright © 2014 Canonical Ltd.
159
3
 *
160
4
 * This program is free software: you can redistribute it and/or modify it
161
5
 * under the terms of the GNU Lesser General Public License version 3,
162
6
 * as published by the Free Software Foundation.
163
7
 *
164
8
 * This program is distributed in the hope that it will be useful,
165
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
166
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
167
11
 * GNU Lesser General Public License for more details.
168
12
 *
169
13
 * You should have received a copy of the GNU Lesser General Public License
170
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
171
15
 *
172
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
173
17
 */
174
18
175
19
176
20
#ifndef MIR_GRAPHICS_CURSOR_IMAGE_H_
177
21
#define MIR_GRAPHICS_CURSOR_IMAGE_H_
178
22
179
23
#include "mir/geometry/size.h"
180
24
181
25
namespace mir
182
26
{
183
27
namespace graphics
184
28
{
185
29
class CursorImage
186
30
{
187
31
public:
188
32
    virtual ~CursorImage() = default;
189
33
190
34
    virtual void const* as_argb_8888() const = 0;
191
35
    virtual geometry::Size size() const = 0;
192
36
193
37
protected:
194
38
    CursorImage() = default;
195
39
    CursorImage(CursorImage const&) = delete;
196
40
    CursorImage& operator=(CursorImage const&) = delete;
197
41
};
198
42
}
199
43
}
200
44
201
45
202
46
#endif /* MIR_GRAPHICS_CURSOR_IMAGE_H_ */
203
0
47
204
=== modified file 'include/platform/mir/graphics/display.h'
205
--- include/platform/mir/graphics/display.h	2014-01-31 07:48:24 +0000
206
+++ include/platform/mir/graphics/display.h	2014-04-28 23:16:18 +0000
207
@@ -31,6 +31,7 @@
208
31
class DisplayBuffer;
31
class DisplayBuffer;
209
32
class DisplayConfiguration;
32
class DisplayConfiguration;
210
33
class Cursor;
33
class Cursor;
211
34
class CursorImage;
212
34
class GLContext;
35
class GLContext;
213
35
class EventHandlerRegister;
36
class EventHandlerRegister;
214
36
37
215
@@ -97,9 +98,9 @@
216
97
    virtual void resume() = 0;
98
    virtual void resume() = 0;
217
98
99
218
99
    /**
100
    /**
220
100
     * Gets the hardware cursor object.
101
     * Create a hardware cursor object.
221
101
     */
102
     */
223
102
    virtual std::weak_ptr<Cursor> the_cursor() = 0;
103
    virtual std::shared_ptr<Cursor> create_hardware_cursor(std::shared_ptr<CursorImage> const& initial_image) = 0;
224
103
104
225
104
    /**
105
    /**
226
105
     * Creates a GLContext object that shares resources with the Display's GL context.
106
     * Creates a GLContext object that shares resources with the Display's GL context.
227
106
107
228
=== modified file 'include/server/mir/default_server_configuration.h'
229
--- include/server/mir/default_server_configuration.h	2014-04-25 14:38:31 +0000
230
+++ include/server/mir/default_server_configuration.h	2014-04-28 23:16:18 +0000
231
@@ -91,6 +91,9 @@
232
91
class BufferInitializer;
91
class BufferInitializer;
233
92
class DisplayReport;
92
class DisplayReport;
234
93
class GraphicBufferAllocator;
93
class GraphicBufferAllocator;
235
94
class Cursor;
236
95
class CursorImage;
237
96
class CursorImages;
238
94
class GLConfig;
97
class GLConfig;
239
95
class GLProgramFactory;
98
class GLProgramFactory;
240
96
namespace nested { class HostConnection; }
99
namespace nested { class HostConnection; }
241
@@ -159,6 +162,10 @@
242
159
     * dependencies of graphics on the rest of the Mir
162
     * dependencies of graphics on the rest of the Mir
243
160
     *  @{ */
163
     *  @{ */
244
161
    virtual std::shared_ptr<graphics::DisplayReport> the_display_report();
164
    virtual std::shared_ptr<graphics::DisplayReport> the_display_report();
245
165
    virtual std::shared_ptr<graphics::Cursor> the_cursor();
246
166
    virtual std::shared_ptr<graphics::CursorImage> the_default_cursor_image();
247
167
    virtual std::shared_ptr<graphics::CursorImages> the_cursor_images();
248
168
249
162
    /** @} */
169
    /** @} */
250
163
170
251
164
    /** @name compositor configuration - customization
171
    /** @name compositor configuration - customization
252
@@ -270,6 +277,9 @@
253
270
    CachedPtr<graphics::BufferInitializer> buffer_initializer;
277
    CachedPtr<graphics::BufferInitializer> buffer_initializer;
254
271
    CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
278
    CachedPtr<graphics::GraphicBufferAllocator> buffer_allocator;
255
272
    CachedPtr<graphics::Display>      display;
279
    CachedPtr<graphics::Display>      display;
256
280
    CachedPtr<graphics::Cursor>       cursor;
257
281
    CachedPtr<graphics::CursorImage>  default_cursor_image;
258
282
    CachedPtr<graphics::CursorImages> cursor_images;
259
273
283
260
274
    CachedPtr<frontend::ConnectorReport>   connector_report;
284
    CachedPtr<frontend::ConnectorReport>   connector_report;
261
275
    CachedPtr<frontend::ProtobufIpcFactory>  ipc_factory;
285
    CachedPtr<frontend::ProtobufIpcFactory>  ipc_factory;
262
276
286
263
=== added file 'include/server/mir/graphics/cursor_images.h'
264
--- include/server/mir/graphics/cursor_images.h	1970-01-01 00:00:00 +0000
265
+++ include/server/mir/graphics/cursor_images.h	2014-04-28 23:16:18 +0000
266
@@ -0,0 +1,53 @@
267
1
/*
268
2
 * Copyright © 2014 Canonical Ltd.
269
3
 *
270
4
 * This program is free software: you can redistribute it and/or modify it
271
5
 * under the terms of the GNU General Public License version 3,
272
6
 * as published by the Free Software Foundation.
273
7
 *
274
8
 * This program is distributed in the hope that it will be useful,
275
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
276
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
277
11
 * GNU General Public License for more details.
278
12
 *
279
13
 * You should have received a copy of the GNU General Public License
280
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
281
15
 *
282
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
283
17
 */
284
18
285
19
286
20
#ifndef MIR_GRAPHICS_CURSOR_LOADER_H_
287
21
#define MIR_GRAPHICS_CURSOR_LOADER_H_
288
22
289
23
#include "mir/geometry/size.h"
290
24
291
25
#include <memory>
292
26
#include <string>
293
27
294
28
namespace mir
295
29
{
296
30
namespace graphics
297
31
{
298
32
class CursorImage;
299
33
300
34
/// CursorImages is used to lookup cursor images.
301
35
class CursorImages
302
36
{
303
37
public:
304
38
    virtual ~CursorImages() = default;
305
39
306
40
    /// Looks up the image for a named cursor. Cursor names
307
41
    /// follow the XCursor naming conventions.
308
42
    virtual std::shared_ptr<CursorImage> image(std::string const& cursor_name,
309
43
        geometry::Size const& size) = 0;
310
44
311
45
protected:
312
46
    CursorImages() = default;
313
47
    CursorImages(CursorImages const&) = delete;
314
48
    CursorImages& operator=(CursorImages const&) = delete;
315
49
};
316
50
}
317
51
}
318
52
319
53
#endif /* MIR_GRAPHICS_CURSOR_LOADER_H_ */
320
0
54
321
=== modified file 'include/test/mir_test_doubles/mock_display.h'
322
--- include/test/mir_test_doubles/mock_display.h	2014-01-31 07:48:24 +0000
323
+++ include/test/mir_test_doubles/mock_display.h	2014-04-28 23:16:18 +0000
324
@@ -46,7 +46,7 @@
325
46
                                                      graphics::DisplayResumeHandler const&));
46
                                                      graphics::DisplayResumeHandler const&));
326
47
    MOCK_METHOD0(pause, void());
47
    MOCK_METHOD0(pause, void());
327
48
    MOCK_METHOD0(resume, void());
48
    MOCK_METHOD0(resume, void());
329
49
    MOCK_METHOD0(the_cursor, std::weak_ptr<graphics::Cursor>());
49
    MOCK_METHOD1(create_hardware_cursor, std::shared_ptr<graphics::Cursor>(std::shared_ptr<graphics::CursorImage> const&));
330
50
    MOCK_METHOD0(create_gl_context, std::unique_ptr<graphics::GLContext>());
50
    MOCK_METHOD0(create_gl_context, std::unique_ptr<graphics::GLContext>());
331
51
};
51
};
332
52
52
333
53
53
334
=== modified file 'include/test/mir_test_doubles/null_display.h'
335
--- include/test/mir_test_doubles/null_display.h	2014-01-31 07:48:24 +0000
336
+++ include/test/mir_test_doubles/null_display.h	2014-04-28 23:16:18 +0000
337
@@ -58,7 +58,10 @@
338
58
    }
58
    }
339
59
    void pause() {}
59
    void pause() {}
340
60
    void resume() {}
60
    void resume() {}
342
61
    std::weak_ptr<graphics::Cursor> the_cursor() { return {}; }
61
    std::shared_ptr<graphics::Cursor> create_hardware_cursor(std::shared_ptr<graphics::CursorImage> const& /* initial_image */)
343
62
    {
344
63
         return {}; 
345
64
    }
346
62
    std::unique_ptr<graphics::GLContext> create_gl_context()
65
    std::unique_ptr<graphics::GLContext> create_gl_context()
347
63
    {
66
    {
348
64
        return std::unique_ptr<NullGLContext>{new NullGLContext()};
67
        return std::unique_ptr<NullGLContext>{new NullGLContext()};
349
65
68
350
=== modified file 'src/platform/graphics/android/android_display.cpp'
351
--- src/platform/graphics/android/android_display.cpp	2014-04-16 17:07:02 +0000
352
+++ src/platform/graphics/android/android_display.cpp	2014-04-28 23:16:18 +0000
353
@@ -101,9 +101,9 @@
354
101
{
101
{
355
102
}
102
}
356
103
103
358
104
auto mga::AndroidDisplay::the_cursor() -> std::weak_ptr<Cursor>
104
auto mga::AndroidDisplay::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /* initial_image */) -> std::shared_ptr<Cursor>
359
105
{
105
{
361
106
    return std::weak_ptr<Cursor>();
106
    return std::shared_ptr<Cursor>();
362
107
}
107
}
363
108
108
364
109
std::unique_ptr<mg::GLContext> mga::AndroidDisplay::create_gl_context()
109
std::unique_ptr<mg::GLContext> mga::AndroidDisplay::create_gl_context()
365
110
110
366
=== modified file 'src/platform/graphics/android/android_display.h'
367
--- src/platform/graphics/android/android_display.h	2014-04-16 17:07:02 +0000
368
+++ src/platform/graphics/android/android_display.h	2014-04-28 23:16:18 +0000
369
@@ -65,7 +65,7 @@
370
65
    void pause();
65
    void pause();
371
66
    void resume();
66
    void resume();
372
67
67
374
68
    std::weak_ptr<Cursor> the_cursor();
68
    std::shared_ptr<Cursor> create_hardware_cursor(std::shared_ptr<CursorImage> const& initial_image);
375
69
    std::unique_ptr<graphics::GLContext> create_gl_context();
69
    std::unique_ptr<graphics::GLContext> create_gl_context();
376
70
70
377
71
private:
71
private:
378
72
72
379
=== modified file 'src/platform/graphics/mesa/cursor.cpp'
380
--- src/platform/graphics/mesa/cursor.cpp	2014-03-06 06:05:17 +0000
381
+++ src/platform/graphics/mesa/cursor.cpp	2014-04-28 23:16:18 +0000
382
@@ -22,20 +22,21 @@
383
22
#include "kms_output_container.h"
22
#include "kms_output_container.h"
384
23
#include "kms_display_configuration.h"
23
#include "kms_display_configuration.h"
385
24
#include "mir/geometry/rectangle.h"
24
#include "mir/geometry/rectangle.h"
386
25
#include "mir/graphics/cursor_image.h"
387
25
26
388
26
#include <boost/exception/errinfo_errno.hpp>
27
#include <boost/exception/errinfo_errno.hpp>
389
27
28
390
28
#include <stdexcept>
29
#include <stdexcept>
391
29
#include <vector>
30
#include <vector>
392
30
31
394
31
namespace mgm = mir::graphics::mesa;
32
namespace mg = mir::graphics;
395
33
namespace mgm = mg::mesa;
396
32
namespace geom = mir::geometry;
34
namespace geom = mir::geometry;
397
33
35
398
34
namespace
36
namespace
399
35
{
37
{
403
36
#include "black_arrow.c"
38
int const width = 64;
404
37
int const width = black_arrow.width;
39
int const height = 64;
402
38
int const height = black_arrow.height;
405
39
40
406
40
// Transforms a relative position within the display bounds described by \a rect which is rotated with \a orientation
41
// Transforms a relative position within the display bounds described by \a rect which is rotated with \a orientation
407
41
geom::Displacement transform(geom::Rectangle const& rect, geom::Displacement const& vector, MirOrientation orientation)
42
geom::Displacement transform(geom::Rectangle const& rect, geom::Displacement const& vector, MirOrientation orientation)
408
@@ -72,13 +73,14 @@
409
72
mgm::Cursor::Cursor(
73
mgm::Cursor::Cursor(
410
73
    gbm_device* gbm,
74
    gbm_device* gbm,
411
74
    KMSOutputContainer& output_container,
75
    KMSOutputContainer& output_container,
413
75
    std::shared_ptr<CurrentConfiguration> const& current_configuration) :
76
    std::shared_ptr<CurrentConfiguration> const& current_configuration,
414
77
    std::shared_ptr<mg::CursorImage> const& initial_image) :
415
76
        output_container(output_container),
78
        output_container(output_container),
416
77
        current_position(),
79
        current_position(),
417
78
        buffer(gbm),
80
        buffer(gbm),
418
79
        current_configuration(current_configuration)
81
        current_configuration(current_configuration)
419
80
{
82
{
421
81
    set_image(black_arrow.pixel_data, geometry::Size{width, height});
83
    set_image(initial_image);
422
82
84
423
83
    show_at_last_known_position();
85
    show_at_last_known_position();
424
84
}
86
}
425
@@ -88,14 +90,16 @@
426
88
    hide();
90
    hide();
427
89
}
91
}
428
90
92
430
91
void mgm::Cursor::set_image(const void* raw_argb, geometry::Size size)
93
void mgm::Cursor::set_image(std::shared_ptr<CursorImage const> const& cursor_image)
431
92
{
94
{
432
95
    auto const& size = cursor_image->size();
433
96
434
93
    if (size != geometry::Size{width, height})
97
    if (size != geometry::Size{width, height})
435
94
        BOOST_THROW_EXCEPTION(std::logic_error("No support for cursors that aren't 64x64"));
98
        BOOST_THROW_EXCEPTION(std::logic_error("No support for cursors that aren't 64x64"));
436
95
99
437
96
    auto const count = size.width.as_uint32_t() * size.height.as_uint32_t() * sizeof(uint32_t);
100
    auto const count = size.width.as_uint32_t() * size.height.as_uint32_t() * sizeof(uint32_t);
438
97
101
440
98
    if (auto result = gbm_bo_write(buffer, raw_argb, count))
102
    if (auto result = gbm_bo_write(buffer, cursor_image->as_argb_8888(), count))
441
99
    {
103
    {
442
100
        BOOST_THROW_EXCEPTION(
104
        BOOST_THROW_EXCEPTION(
443
101
            ::boost::enable_error_info(std::runtime_error("failed to initialize gbm buffer"))
105
            ::boost::enable_error_info(std::runtime_error("failed to initialize gbm buffer"))
444
102
106
445
=== modified file 'src/platform/graphics/mesa/cursor.h'
446
--- src/platform/graphics/mesa/cursor.h	2014-03-06 06:05:17 +0000
447
+++ src/platform/graphics/mesa/cursor.h	2014-04-28 23:16:18 +0000
448
@@ -34,6 +34,8 @@
449
34
}
34
}
450
35
namespace graphics
35
namespace graphics
451
36
{
36
{
452
37
class CursorImage;
453
38
454
37
namespace mesa
39
namespace mesa
455
38
{
40
{
456
39
class KMSOutputContainer;
41
class KMSOutputContainer;
457
@@ -61,11 +63,12 @@
458
61
    Cursor(
63
    Cursor(
459
62
        gbm_device* device,
64
        gbm_device* device,
460
63
        KMSOutputContainer& output_container,
65
        KMSOutputContainer& output_container,
462
64
        std::shared_ptr<CurrentConfiguration> const& current_configuration);
66
        std::shared_ptr<CurrentConfiguration> const& current_configuration,
463
67
        std::shared_ptr<CursorImage> const& cursor_image);
464
65
68
465
66
    ~Cursor() noexcept;
69
    ~Cursor() noexcept;
466
67
70
468
68
    void set_image(const void* raw_argb, geometry::Size size);
71
    void set_image(std::shared_ptr<CursorImage const> const& cursor_image);
469
69
72
470
70
    void move_to(geometry::Point position);
73
    void move_to(geometry::Point position);
471
71
74
472
72
75
473
=== modified file 'src/platform/graphics/mesa/display.cpp'
474
--- src/platform/graphics/mesa/display.cpp	2014-04-15 05:31:19 +0000
475
+++ src/platform/graphics/mesa/display.cpp	2014-04-28 23:16:18 +0000
476
@@ -224,7 +224,7 @@
477
224
        clear_connected_unused_outputs();
224
        clear_connected_unused_outputs();
478
225
    }
225
    }
479
226
226
481
227
    if (cursor) cursor->show_at_last_known_position();
227
    if (auto c = cursor.lock()) c->show_at_last_known_position();
482
228
}
228
}
483
229
229
484
230
void mgm::Display::register_configuration_change_handler(
230
void mgm::Display::register_configuration_change_handler(
485
@@ -255,7 +255,7 @@
486
255
{
255
{
487
256
    try
256
    try
488
257
    {
257
    {
490
258
        if (cursor) cursor->hide();
258
        if (auto c = cursor.lock()) c->hide();
491
259
        platform->drm.drop_master();
259
        platform->drm.drop_master();
492
260
    }
260
    }
493
261
    catch(std::runtime_error const& e)
261
    catch(std::runtime_error const& e)
494
@@ -291,12 +291,16 @@
495
291
        clear_connected_unused_outputs();
291
        clear_connected_unused_outputs();
496
292
    }
292
    }
497
293
293
499
294
    if (cursor) cursor->show_at_last_known_position();
294
    if (auto c = cursor.lock()) c->show_at_last_known_position();
500
295
}
295
}
501
296
296
503
297
auto mgm::Display::the_cursor() -> std::weak_ptr<graphics::Cursor>
297
auto mgm::Display::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& initial_image) -> std::shared_ptr<graphics::Cursor>
504
298
{
298
{
506
299
    if (!cursor)
299
    // There is only one hardware cursor. We do not keep a strong reference to it in the display though,
507
300
    // if no other component of Mir is interested (i.e. the input stack does not keep a reference to send
508
301
    // position updates) we must be configured not to use a cursor and thusly let it deallocate.
509
302
    std::shared_ptr<mgm::Cursor> locked_cursor = cursor.lock();
510
303
    if (!locked_cursor)
511
300
    {
304
    {
512
301
        class KMSCurrentConfiguration : public CurrentConfiguration
305
        class KMSCurrentConfiguration : public CurrentConfiguration
513
302
        {
306
        {
514
@@ -317,11 +321,12 @@
515
317
            Display& display;
321
            Display& display;
516
318
        };
322
        };
517
319
323
520
320
        cursor = std::make_shared<Cursor>(platform->gbm.device, output_container,
324
        cursor = locked_cursor = std::make_shared<Cursor>(platform->gbm.device, output_container,
521
321
                                          std::make_shared<KMSCurrentConfiguration>(*this));
325
            std::make_shared<KMSCurrentConfiguration>(*this),
522
326
            initial_image);
523
322
    }
327
    }
524
323
328
526
324
    return cursor;
329
    return locked_cursor;
527
325
}
330
}
528
326
331
529
327
std::unique_ptr<mg::GLContext> mgm::Display::create_gl_context()
332
std::unique_ptr<mg::GLContext> mgm::Display::create_gl_context()
530
328
333
531
=== modified file 'src/platform/graphics/mesa/display.h'
532
--- src/platform/graphics/mesa/display.h	2014-03-27 09:46:09 +0000
533
+++ src/platform/graphics/mesa/display.h	2014-04-28 23:16:18 +0000
534
@@ -79,7 +79,7 @@
535
79
    void pause();
79
    void pause();
536
80
    void resume();
80
    void resume();
537
81
81
539
82
    std::weak_ptr<graphics::Cursor> the_cursor();
82
    std::shared_ptr<graphics::Cursor> create_hardware_cursor(std::shared_ptr<CursorImage> const& initial_image);
540
83
    std::unique_ptr<GLContext> create_gl_context();
83
    std::unique_ptr<GLContext> create_gl_context();
541
84
84
542
85
private:
85
private:
543
@@ -93,7 +93,8 @@
544
93
    std::vector<std::unique_ptr<DisplayBuffer>> display_buffers;
93
    std::vector<std::unique_ptr<DisplayBuffer>> display_buffers;
545
94
    RealKMSOutputContainer output_container;
94
    RealKMSOutputContainer output_container;
546
95
    mutable RealKMSDisplayConfiguration current_display_configuration;
95
    mutable RealKMSDisplayConfiguration current_display_configuration;
548
96
    std::shared_ptr<Cursor> cursor;
96
    
549
97
    std::weak_ptr<Cursor> cursor;
550
97
    std::shared_ptr<GLConfig> const gl_config;
98
    std::shared_ptr<GLConfig> const gl_config;
551
98
};
99
};
552
99
100
553
100
101
554
=== modified file 'src/server/default_server_configuration.cpp'
555
--- src/server/default_server_configuration.cpp	2014-04-28 12:55:28 +0000
556
+++ src/server/default_server_configuration.cpp	2014-04-28 23:16:18 +0000
557
@@ -92,25 +92,22 @@
558
92
{
92
{
559
93
    struct DefaultCursorListener : mi::CursorListener
93
    struct DefaultCursorListener : mi::CursorListener
560
94
    {
94
    {
562
95
        DefaultCursorListener(std::weak_ptr<mg::Cursor> const& cursor) :
95
        DefaultCursorListener(std::shared_ptr<mg::Cursor> const& cursor) :
563
96
            cursor(cursor)
96
            cursor(cursor)
564
97
        {
97
        {
565
98
        }
98
        }
566
99
99
567
100
        void cursor_moved_to(float abs_x, float abs_y)
100
        void cursor_moved_to(float abs_x, float abs_y)
568
101
        {
101
        {
573
102
            if (auto c = cursor.lock())
102
            cursor->move_to(geom::Point{abs_x, abs_y});
570
103
            {
571
104
                c->move_to(geom::Point{abs_x, abs_y});
572
105
            }
574
106
        }
103
        }
575
107
104
577
108
        std::weak_ptr<mg::Cursor> const cursor;
105
        std::shared_ptr<mg::Cursor> const cursor;
578
109
    };
106
    };
579
110
    return cursor_listener(
107
    return cursor_listener(
580
111
        [this]() -> std::shared_ptr<mi::CursorListener>
108
        [this]() -> std::shared_ptr<mi::CursorListener>
581
112
        {
109
        {
583
113
            return std::make_shared<DefaultCursorListener>(the_display()->the_cursor());
110
            return std::make_shared<DefaultCursorListener>(the_cursor());
584
114
        });
111
        });
585
115
}
112
}
586
116
113
587
117
114
588
=== modified file 'src/server/graphics/CMakeLists.txt'
589
--- src/server/graphics/CMakeLists.txt	2014-04-24 08:42:12 +0000
590
+++ src/server/graphics/CMakeLists.txt	2014-04-28 23:16:18 +0000
591
@@ -9,6 +9,7 @@
592
9
  gl_program.cpp
9
  gl_program.cpp
593
10
  program_factory.cpp
10
  program_factory.cpp
594
11
  surfaceless_egl_context.cpp
11
  surfaceless_egl_context.cpp
595
12
  builtin_cursor_images.cpp
596
12
)
13
)
597
13
14
598
14
add_subdirectory(nested/)
15
add_subdirectory(nested/)
599
15
16
600
=== renamed file 'src/platform/graphics/mesa/black_arrow.c' => 'src/server/graphics/black_arrow.c'
601
=== renamed file 'src/platform/graphics/mesa/black_arrow.xcf' => 'src/server/graphics/black_arrow.xcf'
602
=== added file 'src/server/graphics/builtin_cursor_images.cpp'
603
--- src/server/graphics/builtin_cursor_images.cpp	1970-01-01 00:00:00 +0000
604
+++ src/server/graphics/builtin_cursor_images.cpp	2014-04-28 23:16:18 +0000
605
@@ -0,0 +1,52 @@
606
1
/*
607
2
 * Copyright © 2014 Canonical Ltd.
608
3
 *
609
4
 * This program is free software: you can redistribute it and/or modify it
610
5
 * under the terms of the GNU General Public License version 3,
611
6
 * as published by the Free Software Foundation.
612
7
 *
613
8
 * This program is distributed in the hope that it will be useful,
614
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
615
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
616
11
 * GNU General Public License for more details.
617
12
 *
618
13
 * You should have received a copy of the GNU General Public License
619
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
620
15
 *
621
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
622
17
 */
623
18
624
19
#include "black_arrow.c"
625
20
#include "builtin_cursor_images.h"
626
21
627
22
#include "mir/graphics/cursor_image.h"
628
23
629
24
namespace mg = mir::graphics;
630
25
namespace geom = mir::geometry;
631
26
632
27
namespace
633
28
{
634
29
struct BlackArrowCursorImage : public mg::CursorImage
635
30
{
636
31
    void const* as_argb_8888() const
637
32
    {
638
33
        return black_arrow.pixel_data;
639
34
    }
640
35
    geom::Size size() const
641
36
    {
642
37
        return { black_arrow.width, black_arrow.height };
643
38
    }
644
39
};
645
40
}
646
41
647
42
mg::BuiltinCursorImages::BuiltinCursorImages()
648
43
    : builtin_image(std::make_shared<BlackArrowCursorImage>())
649
44
{
650
45
}
651
46
652
47
std::shared_ptr<mg::CursorImage> mg::BuiltinCursorImages::image(std::string const& /* cursor_name */,
653
48
    geom::Size const& /* size */)
654
49
{
655
50
    // Builtin repository only has one cursor at a single size.
656
51
    return builtin_image;
657
52
}
658
0
53
659
=== added file 'src/server/graphics/builtin_cursor_images.h'
660
--- src/server/graphics/builtin_cursor_images.h	1970-01-01 00:00:00 +0000
661
+++ src/server/graphics/builtin_cursor_images.h	2014-04-28 23:16:18 +0000
662
@@ -0,0 +1,51 @@
663
1
/*
664
2
 * Copyright © 2014 Canonical Ltd.
665
3
 *
666
4
 * This program is free software: you can redistribute it and/or modify it
667
5
 * under the terms of the GNU General Public License version 3,
668
6
 * as published by the Free Software Foundation.
669
7
 *
670
8
 * This program is distributed in the hope that it will be useful,
671
9
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
672
10
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
673
11
 * GNU General Public License for more details.
674
12
 *
675
13
 * You should have received a copy of the GNU General Public License
676
14
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
677
15
 *
678
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
679
17
 */
680
18
681
19
682
20
#ifndef MIR_GRAPHICS_BUILTIN_CURSOR_LOADER_H_
683
21
#define MIR_GRAPHICS_BUILTIN_CURSOR_LOADER_H_
684
22
685
23
#include "mir/graphics/cursor_images.h"
686
24
687
25
namespace mir
688
26
{
689
27
namespace graphics
690
28
{
691
29
class CursorImage;
692
30
693
31
class BuiltinCursorImages : public CursorImages
694
32
{
695
33
public:
696
34
    BuiltinCursorImages();
697
35
    virtual ~BuiltinCursorImages() = default;
698
36
699
37
    std::shared_ptr<CursorImage> image(std::string const& cursor_name,
700
38
        geometry::Size const& size);
701
39
702
40
protected:
703
41
    BuiltinCursorImages(BuiltinCursorImages const&) = delete;
704
42
    BuiltinCursorImages& operator=(BuiltinCursorImages const&) = delete;
705
43
706
44
private:
707
45
    std::shared_ptr<CursorImage> const builtin_image;
708
46
};
709
47
}
710
48
}
711
49
712
50
713
51
#endif /* MIR_GRAPHICS_BUILTIN_CURSOR_LOADER_H_ */
714
0
52
715
=== modified file 'src/server/graphics/default_configuration.cpp'
716
--- src/server/graphics/default_configuration.cpp	2014-04-25 12:35:50 +0000
717
+++ src/server/graphics/default_configuration.cpp	2014-04-28 23:16:18 +0000
718
@@ -35,6 +35,8 @@
719
35
35
720
36
#include <boost/throw_exception.hpp>
36
#include <boost/throw_exception.hpp>
721
37
37
722
38
#include "builtin_cursor_images.h"
723
39
724
38
#include <map>
40
#include <map>
725
39
41
726
40
namespace mg = mir::graphics;
42
namespace mg = mir::graphics;
727
@@ -116,6 +118,39 @@
728
116
        });
118
        });
729
117
}
119
}
730
118
120
731
121
std::shared_ptr<mg::Cursor>
732
122
mir::DefaultServerConfiguration::the_cursor()
733
123
{
734
124
    return cursor(
735
125
        [this]() -> std::shared_ptr<mg::Cursor>
736
126
        {
737
127
            // For now we only support a hardware cursor.
738
128
            return the_display()->create_hardware_cursor(the_default_cursor_image());
739
129
        });
740
130
}
741
131
742
132
std::shared_ptr<mg::CursorImage>
743
133
mir::DefaultServerConfiguration::the_default_cursor_image()
744
134
{
745
135
    static geometry::Size const default_cursor_size = {geometry::Width{64},
746
136
                                                       geometry::Height{64}};
747
137
    return default_cursor_image(
748
138
        [this]()
749
139
        {
750
140
            return the_cursor_images()->image("arrow", default_cursor_size);
751
141
        });
752
142
}
753
143
754
144
std::shared_ptr<mg::CursorImages>
755
145
mir::DefaultServerConfiguration::the_cursor_images()
756
146
{
757
147
    return cursor_images(
758
148
        [this]()
759
149
        {
760
150
            return std::make_shared<mg::BuiltinCursorImages>();
761
151
        });
762
152
}
763
153
764
119
auto mir::DefaultServerConfiguration::the_host_connection()
154
auto mir::DefaultServerConfiguration::the_host_connection()
765
120
-> std::shared_ptr<graphics::nested::HostConnection>
155
-> std::shared_ptr<graphics::nested::HostConnection>
766
121
{
156
{
767
122
157
768
=== modified file 'src/server/graphics/nested/nested_display.cpp'
769
--- src/server/graphics/nested/nested_display.cpp	2014-04-24 08:42:12 +0000
770
+++ src/server/graphics/nested/nested_display.cpp	2014-04-28 23:16:18 +0000
771
@@ -259,10 +259,10 @@
772
259
    // TODO If we "own" the cursor then we need to restore it
259
    // TODO If we "own" the cursor then we need to restore it
773
260
}
260
}
774
261
261
776
262
auto mgn::NestedDisplay::the_cursor()->std::weak_ptr<Cursor>
262
auto mgn::NestedDisplay::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /* initial image */)->std::shared_ptr<Cursor>
777
263
{
263
{
778
264
    // TODO Do we "own" the cursor or does the host mir?
264
    // TODO Do we "own" the cursor or does the host mir?
780
265
    return std::weak_ptr<Cursor>();
265
    return std::shared_ptr<Cursor>();
781
266
}
266
}
782
267
267
783
268
std::unique_ptr<mg::GLContext> mgn::NestedDisplay::create_gl_context()
268
std::unique_ptr<mg::GLContext> mgn::NestedDisplay::create_gl_context()
784
269
269
785
=== modified file 'src/server/graphics/nested/nested_display.h'
786
--- src/server/graphics/nested/nested_display.h	2014-04-24 08:42:12 +0000
787
+++ src/server/graphics/nested/nested_display.h	2014-04-28 23:16:18 +0000
788
@@ -120,7 +120,7 @@
789
120
    void pause() override;
120
    void pause() override;
790
121
    void resume() override;
121
    void resume() override;
791
122
122
793
123
    std::weak_ptr<Cursor> the_cursor() override;
123
    std::shared_ptr<Cursor> create_hardware_cursor(std::shared_ptr<CursorImage> const& initial_image) override;
794
124
    std::unique_ptr<graphics::GLContext> create_gl_context() override;
124
    std::unique_ptr<graphics::GLContext> create_gl_context() override;
795
125
125
796
126
private:
126
private:
797
127
127
798
=== modified file 'src/server/graphics/offscreen/display.cpp'
799
--- src/server/graphics/offscreen/display.cpp	2014-03-26 05:48:59 +0000
800
+++ src/server/graphics/offscreen/display.cpp	2014-04-28 23:16:18 +0000
801
@@ -163,7 +163,7 @@
802
163
{
163
{
803
164
}
164
}
804
165
165
806
166
std::weak_ptr<mg::Cursor> mgo::Display::the_cursor()
166
std::shared_ptr<mg::Cursor> mgo::Display::create_hardware_cursor(std::shared_ptr<mg::CursorImage> const& /* initial_image */)
807
167
{
167
{
808
168
    return {};
168
    return {};
809
169
}
169
}
810
170
170
811
=== modified file 'src/server/graphics/offscreen/display.h'
812
--- src/server/graphics/offscreen/display.h	2014-01-31 07:48:24 +0000
813
+++ src/server/graphics/offscreen/display.h	2014-04-28 23:16:18 +0000
814
@@ -86,7 +86,7 @@
815
86
    void pause();
86
    void pause();
816
87
    void resume();
87
    void resume();
817
88
88
819
89
    std::weak_ptr<Cursor> the_cursor();
89
    std::shared_ptr<Cursor> create_hardware_cursor(std::shared_ptr<CursorImage> const& initial_image);
820
90
    std::unique_ptr<GLContext> create_gl_context();
90
    std::unique_ptr<GLContext> create_gl_context();
821
91
91
822
92
private:
92
private:
823
93
93
824
=== modified file 'tests/unit-tests/graphics/mesa/test_cursor.cpp'
825
--- tests/unit-tests/graphics/mesa/test_cursor.cpp	2014-03-26 05:48:59 +0000
826
+++ tests/unit-tests/graphics/mesa/test_cursor.cpp	2014-04-28 23:16:18 +0000
827
@@ -21,6 +21,8 @@
828
21
#include "src/platform/graphics/mesa/kms_output_container.h"
21
#include "src/platform/graphics/mesa/kms_output_container.h"
829
22
#include "src/platform/graphics/mesa/kms_display_configuration.h"
22
#include "src/platform/graphics/mesa/kms_display_configuration.h"
830
23
23
831
24
#include "mir/graphics/cursor_image.h"
832
25
833
24
#include "mir_test_doubles/mock_gbm.h"
26
#include "mir_test_doubles/mock_gbm.h"
834
25
#include "mir_test/fake_shared.h"
27
#include "mir_test/fake_shared.h"
835
26
#include "mock_kms_output.h"
28
#include "mock_kms_output.h"
836
@@ -31,11 +33,14 @@
837
31
#include <unordered_map>
33
#include <unordered_map>
838
32
#include <algorithm>
34
#include <algorithm>
839
33
35
840
36
#include <string.h>
841
37
842
34
namespace mg = mir::graphics;
38
namespace mg = mir::graphics;
843
35
namespace mgm = mir::graphics::mesa;
39
namespace mgm = mir::graphics::mesa;
844
36
namespace geom = mir::geometry;
40
namespace geom = mir::geometry;
847
37
namespace mtd = mir::test::doubles;
41
namespace mt = mir::test;
848
38
using mir::test::MockKMSOutput;
42
namespace mtd = mt::doubles;
849
43
using mt::MockKMSOutput;
850
39
44
851
40
namespace
45
namespace
852
41
{
46
{
853
@@ -196,15 +201,31 @@
854
196
    StubKMSDisplayConfiguration conf;
201
    StubKMSDisplayConfiguration conf;
855
197
};
202
};
856
198
203
857
204
struct StubCursorImage : public mg::CursorImage
858
205
{
859
206
    void const* as_argb_8888() const
860
207
    {
861
208
        return image_data;
862
209
    }
863
210
    geom::Size size() const
864
211
    {
865
212
        return geom::Size{geom::Width{64}, geom::Height{64}};
866
213
    }
867
214
    static void const* image_data;
868
215
};
869
216
void const* StubCursorImage::image_data = reinterpret_cast<void*>(&StubCursorImage::image_data);
870
217
871
199
struct MesaCursorTest : public ::testing::Test
218
struct MesaCursorTest : public ::testing::Test
872
200
{
219
{
873
201
    MesaCursorTest()
220
    MesaCursorTest()
874
202
        : cursor{mock_gbm.fake_gbm.device, output_container,
221
        : cursor{mock_gbm.fake_gbm.device, output_container,
876
203
            mir::test::fake_shared(current_configuration)}
222
            mt::fake_shared(current_configuration),
877
223
            mt::fake_shared(stub_image)}
878
204
    {
224
    {
879
205
    }
225
    }
880
206
226
881
207
    StubCurrentConfiguration current_configuration;
227
    StubCurrentConfiguration current_configuration;
882
228
    StubCursorImage stub_image;
883
208
    testing::NiceMock<mtd::MockGBM> mock_gbm;
229
    testing::NiceMock<mtd::MockGBM> mock_gbm;
884
209
    StubKMSOutputContainer output_container;
230
    StubKMSOutputContainer output_container;
885
210
    mgm::Cursor cursor;
231
    mgm::Cursor cursor;
886
@@ -221,33 +242,40 @@
887
221
                                        GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE));
242
                                        GBM_BO_USE_CURSOR_64X64 | GBM_BO_USE_WRITE));
888
222
243
889
223
    mgm::Cursor cursor_tmp{mock_gbm.fake_gbm.device, output_container,
244
    mgm::Cursor cursor_tmp{mock_gbm.fake_gbm.device, output_container,
891
224
                              std::make_shared<StubCurrentConfiguration>()};
245
        std::make_shared<StubCurrentConfiguration>(),
892
246
        std::make_shared<StubCursorImage>()};
893
225
}
247
}
894
226
248
895
227
TEST_F(MesaCursorTest, set_cursor_writes_to_bo)
249
TEST_F(MesaCursorTest, set_cursor_writes_to_bo)
896
228
{
250
{
897
229
    using namespace testing;
251
    using namespace testing;
898
230
252
900
231
    void* const image{reinterpret_cast<void*>(0x5678)};
253
    StubCursorImage image;
901
232
    size_t const cursor_side{64};
254
    size_t const cursor_side{64};
902
233
    geom::Size const cursor_size{cursor_side, cursor_side};
255
    geom::Size const cursor_size{cursor_side, cursor_side};
903
234
    size_t const cursor_size_bytes{cursor_side * cursor_side * sizeof(uint32_t)};
256
    size_t const cursor_size_bytes{cursor_side * cursor_side * sizeof(uint32_t)};
904
235
257
906
236
    EXPECT_CALL(mock_gbm, gbm_bo_write(mock_gbm.fake_gbm.bo, image, cursor_size_bytes));
258
    EXPECT_CALL(mock_gbm, gbm_bo_write(mock_gbm.fake_gbm.bo, StubCursorImage::image_data, cursor_size_bytes));
907
237
259
909
238
    cursor.set_image(image, cursor_size);
260
    cursor.set_image(mt::fake_shared(image));
910
239
}
261
}
911
240
262
912
241
TEST_F(MesaCursorTest, set_cursor_throws_on_incorrect_size)
263
TEST_F(MesaCursorTest, set_cursor_throws_on_incorrect_size)
913
242
{
264
{
914
243
    using namespace testing;
265
    using namespace testing;
915
244
266
919
245
    void* const image{reinterpret_cast<void*>(0x5678)};
267
    struct InvalidlySizedCursorImage : public StubCursorImage
920
246
    size_t const cursor_side{48};
268
    {
921
247
    geom::Size const cursor_size{cursor_side, cursor_side};
269
        geom::Size size() const
922
270
        {
923
271
            return invalid_cursor_size;
924
272
        }
925
273
        size_t const cursor_side{48};
926
274
        geom::Size const invalid_cursor_size{cursor_side, cursor_side};
927
275
    };
928
248
276
929
249
    EXPECT_THROW(
277
    EXPECT_THROW(
931
250
        cursor.set_image(image, cursor_size);
278
        cursor.set_image(std::make_shared<InvalidlySizedCursorImage>());
932
251
    , std::logic_error);
279
    , std::logic_error);
933
252
}
280
}
934
253
281
935
@@ -266,7 +294,8 @@
936
266
    EXPECT_CALL(*output_container.outputs[12], has_cursor()).Times(0);
294
    EXPECT_CALL(*output_container.outputs[12], has_cursor()).Times(0);
937
267
295
938
268
    mgm::Cursor cursor_tmp{mock_gbm.fake_gbm.device, output_container,
296
    mgm::Cursor cursor_tmp{mock_gbm.fake_gbm.device, output_container,
940
269
                              std::make_shared<StubCurrentConfiguration>()};
297
       std::make_shared<StubCurrentConfiguration>(),
941
298
       std::make_shared<StubCursorImage>()};
942
270
299
943
271
    output_container.verify_and_clear_expectations();
300
    output_container.verify_and_clear_expectations();
944
272
}
301
}
Status:	Merged
Approved by:	Robert Carr on 2014-04-29
Approved revision:	no longer in the source branch.
Merged at revision:	1584
Proposed branch:	lp:~mir-team/mir/cursor-spike-phase-1-resubmit-resubmit-resubmit-hello-out-there
Merge into:	lp:mir
Diff against target:	944 lines (+348/-130) 24 files modified examples/render_surfaces.cpp (+2/-78) include/platform/mir/graphics/cursor.h (+4/-1) include/platform/mir/graphics/cursor_image.h (+46/-0) include/platform/mir/graphics/display.h (+3/-2) include/server/mir/default_server_configuration.h (+10/-0) include/server/mir/graphics/cursor_images.h (+53/-0) include/test/mir_test_doubles/mock_display.h (+1/-1) include/test/mir_test_doubles/null_display.h (+4/-1) src/platform/graphics/android/android_display.cpp (+2/-2) src/platform/graphics/android/android_display.h (+1/-1) src/platform/graphics/mesa/cursor.cpp (+12/-8) src/platform/graphics/mesa/cursor.h (+5/-2) src/platform/graphics/mesa/display.cpp (+13/-8) src/platform/graphics/mesa/display.h (+3/-2) src/server/default_server_configuration.cpp (+4/-7) src/server/graphics/CMakeLists.txt (+1/-0) src/server/graphics/builtin_cursor_images.cpp (+52/-0) src/server/graphics/builtin_cursor_images.h (+51/-0) src/server/graphics/default_configuration.cpp (+35/-0) src/server/graphics/nested/nested_display.cpp (+2/-2) src/server/graphics/nested/nested_display.h (+1/-1) src/server/graphics/offscreen/display.cpp (+1/-1) src/server/graphics/offscreen/display.h (+1/-1) tests/unit-tests/graphics/mesa/test_cursor.cpp (+41/-12)
To merge this branch:	bzr merge lp:~mir-team/mir/cursor-spike-phase-1-resubmit-resubmit-resubmit-hello-out-there
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration	2014-04-23	Approve on 2014-04-29
Alan Griffiths		2014-04-23	Abstain on 2014-04-28
Daniel van Vugt		2014-04-23	Abstain on 2014-04-28
Kevin DuBois (community)		2014-04-23	Abstain on 2014-04-24
Alberto Aguirre (community)		2014-04-23	Approve on 2014-04-24
Chris Halse Rogers		2014-04-23	Approve on 2014-04-23
Review via email: mp+216961@code.launchpad.net