1
=== modified file 'include/client/mir_toolkit/mir_surface.h'
2
--- include/client/mir_toolkit/mir_surface.h	2016-06-09 00:38:26 +0000
3
+++ include/client/mir_toolkit/mir_surface.h	2016-07-20 09:00:59 +0000
4
@@ -440,6 +440,20 @@
5
440
                                               MirEdgeAttachment edge);
440
                                               MirEdgeAttachment edge);
6
441
441
7
442
/**
442
/**
8
443
 * Request that the surface be placed.
9
444
 *
10
445
 * If (mode&mir_place_mode_edge_attachment) then the hint is interpreted as an attachment
11
446
 * rectangle relative to the parent surface and (mode&0xFF) as a MirEdgeAttachment.
12
447
 * Otherwise the call has no effect.
13
448
 *
14
449
 * \param [in] spec             Specification to mutate
15
450
 * \param [in] mode             The placement mode.
16
451
 * \param [in] hint             A hint region for placement.
17
452
 *
18
453
 */
19
454
void mir_surface_spec_set_placement(MirSurfaceSpec* spec, MirPlacement mode, MirRectangle* hint);
20
455
21
456
/**
22
443
 * Set the requested state.
457
 * Set the requested state.
23
444
 * \param [in] spec    Specification to mutate
458
 * \param [in] spec    Specification to mutate
24
445
 * \param [in] mode    Requested state
459
 * \param [in] mode    Requested state
25
446
460
26
=== modified file 'include/common/mir_toolkit/common.h'
27
--- include/common/mir_toolkit/common.h	2016-06-08 21:16:46 +0000
28
+++ include/common/mir_toolkit/common.h	2016-07-20 09:00:59 +0000
29
@@ -199,6 +199,18 @@
30
199
                              mir_edge_attachment_horizontal
199
                              mir_edge_attachment_horizontal
31
200
} MirEdgeAttachment;
200
} MirEdgeAttachment;
32
201
201
33
202
// bits 24+ reserved for placement style
34
203
// bits 0-15 reserved for placement options
35
204
// bits 16-23 reserved for future
36
205
typedef enum MirPlacement
37
206
{
38
207
    mir_place_mode_edge_attachment = 1 << 24,
39
208
40
209
    mir_place_edge_attachment_vertical  = mir_place_mode_edge_attachment|mir_edge_attachment_vertical,
41
210
    mir_place_edge_attachment_horizontal= mir_place_mode_edge_attachment|mir_edge_attachment_horizontal,
42
211
    mir_place_edge_attachment_any       = mir_place_mode_edge_attachment|mir_edge_attachment_any,
43
212
} MirPlacement;
44
213
45
202
/**
214
/**
46
203
 * Form factor associated with a physical output
215
 * Form factor associated with a physical output
47
204
 */
216
 */
48
205
217
49
=== modified file 'src/client/mir_surface_api.cpp'
50
--- src/client/mir_surface_api.cpp	2016-06-08 13:49:11 +0000
51
+++ src/client/mir_surface_api.cpp	2016-07-20 09:00:59 +0000
52
@@ -760,6 +760,16 @@
53
760
    return true;
760
    return true;
54
761
}
761
}
55
762
762
56
763
void mir_surface_spec_set_placement(MirSurfaceSpec* spec, MirPlacement mode, MirRectangle* hint)
57
764
{
58
765
    if (mode & mir_place_mode_edge_attachment)
59
766
    {
60
767
        mir::require(hint != nullptr);
61
768
        spec->aux_rect = *hint;
62
769
        spec->edge_attachment = MirEdgeAttachment(mode&0xFF);
63
770
    }
64
771
}
65
772
66
763
char const* mir_persistent_id_as_string(MirPersistentId *id)
773
char const* mir_persistent_id_as_string(MirPersistentId *id)
67
764
{
774
{
68
765
    return id->as_string().c_str();
775
    return id->as_string().c_str();
69
766
776
70
=== modified file 'src/client/symbols.map'
71
--- src/client/symbols.map	2016-07-07 09:54:02 +0000
72
+++ src/client/symbols.map	2016-07-20 09:00:59 +0000
73
@@ -415,3 +415,9 @@
74
415
    mir_input_device_state_event_device_pointer_buttons;
415
    mir_input_device_state_event_device_pointer_buttons;
75
416
    mir_surface_spec_set_pointer_confinement;
416
    mir_surface_spec_set_pointer_confinement;
76
417
} MIR_CLIENT_0.22;
417
} MIR_CLIENT_0.22;
77
418
78
419
MIR_CLIENT_0.25 {  # New functions in Mir 0.25
79
420
  global:
80
421
    mir_surface_spec_set_placement;
81
422
} MIR_CLIENT_0.24;
82
423
83
418
424
84
=== modified file 'tests/acceptance-tests/test_client_surfaces.cpp'
85
--- tests/acceptance-tests/test_client_surfaces.cpp	2016-05-03 06:55:25 +0000
86
+++ tests/acceptance-tests/test_client_surfaces.cpp	2016-07-20 09:00:59 +0000
87
@@ -28,6 +28,7 @@
88
28
#include "mir_test_framework/any_surface.h"
28
#include "mir_test_framework/any_surface.h"
89
29
#include "mir/test/validity_matchers.h"
29
#include "mir/test/validity_matchers.h"
90
30
#include "mir/test/fake_shared.h"
30
#include "mir/test/fake_shared.h"
91
31
#include "mir/test/signal.h"
92
31
32
93
32
#include <gmock/gmock.h>
33
#include <gmock/gmock.h>
94
33
#include <gtest/gtest.h>
34
#include <gtest/gtest.h>
95
@@ -42,6 +43,8 @@
96
42
namespace mt = mir::test;
43
namespace mt = mir::test;
97
43
namespace mg = mir::geometry;
44
namespace mg = mir::geometry;
98
44
45
99
46
using namespace testing;
100
47
101
45
namespace
48
namespace
102
46
{
49
{
103
47
struct SurfaceSync
50
struct SurfaceSync
104
@@ -263,6 +266,36 @@
105
263
    mir_surface_release_sync(tooltip);
266
    mir_surface_release_sync(tooltip);
106
264
}
267
}
107
265
268
108
269
TEST_F(ClientSurfaces, when_client_places_tooltip_then_window_manager_sees_corresponding_request)
109
270
{
110
271
    auto parent = mtf::make_any_surface(connection);
111
272
    MirRectangle zone_rect{100, 200, 100, 100};
112
273
113
274
    auto spec = mir_connection_create_spec_for_tooltip(connection, 640, 480,
114
275
                                                       mir_pixel_format_abgr_8888, parent, &zone_rect);
115
276
    auto tooltip = mir_surface_create_sync(spec);
116
277
    mir_surface_spec_release(spec);
117
278
118
279
    spec = mir_connection_create_spec_for_changes(connection);
119
280
    mir_surface_spec_set_placement(spec, mir_place_edge_attachment_vertical, &zone_rect);
120
281
121
282
    mt::Signal signal;
122
283
    EXPECT_CALL(window_manager, modify_surface(_, _, _)).
123
284
        WillOnce(WithArg<2>(Invoke([&](msh::SurfaceSpecification const& specification)
124
285
        {
125
286
            EXPECT_TRUE(specification.aux_rect.is_set());
126
287
            EXPECT_TRUE(specification.edge_attachment.is_set());
127
288
            signal.raise();
128
289
        })));
129
290
130
291
    mir_surface_apply_spec(tooltip, spec);
131
292
    mir_surface_spec_release(spec);
132
293
133
294
    signal.wait_for(std::chrono::seconds(10));
134
295
    mir_surface_release_sync(tooltip);
135
296
    mir_surface_release_sync(parent);
136
297
}
137
298
138
266
TEST_F(ClientSurfaces, can_be_dialogs)
299
TEST_F(ClientSurfaces, can_be_dialogs)
139
267
{
300
{
140
268
    auto spec = mir_connection_create_spec_for_dialog(connection, 640, 480,
301
    auto spec = mir_connection_create_spec_for_dialog(connection, 640, 480,
Status:	Work in progress
Proposed branch:	lp:~alan-griffiths/mir/add-mir_surface_spec_attach
Merge into:	lp:mir
Diff against target:	140 lines (+75/-0) 5 files modified include/client/mir_toolkit/mir_surface.h (+14/-0) include/common/mir_toolkit/common.h (+12/-0) src/client/mir_surface_api.cpp (+10/-0) src/client/symbols.map (+6/-0) tests/acceptance-tests/test_client_surfaces.cpp (+33/-0)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/add-mir_surface_spec_attach
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Needs Fixing on 2016-07-22
Daniel van Vugt		2016-07-15	Needs Fixing on 2016-07-22
Kevin DuBois (community)			Approve on 2016-07-21
Alan Griffiths			Needs Information on 2016-07-21
Cemil Azizoglu (community)			Approve on 2016-07-20
Review via email: mp+300202@code.launchpad.net