1
=== modified file 'examples/demo-shell/CMakeLists.txt'
2
--- examples/demo-shell/CMakeLists.txt	2013-05-22 14:21:16 +0000
3
+++ examples/demo-shell/CMakeLists.txt	2013-06-10 06:32:24 +0000
4
@@ -1,7 +1,7 @@
5
1
add_executable(mir_demo_server_shell
1
add_executable(mir_demo_server_shell
6
2
  demo_shell.cpp
2
  demo_shell.cpp
7
3
  fullscreen_placement_strategy.cpp
3
  fullscreen_placement_strategy.cpp
9
4
  application_switcher.cpp
4
  window_manager.cpp
10
5
)
5
)
11
6
6
12
7
target_link_libraries(mir_demo_server_shell
7
target_link_libraries(mir_demo_server_shell
13
8
8
14
=== modified file 'examples/demo-shell/demo_shell.cpp'
15
--- examples/demo-shell/demo_shell.cpp	2013-04-29 17:39:12 +0000
16
+++ examples/demo-shell/demo_shell.cpp	2013-06-10 06:32:24 +0000
17
@@ -18,7 +18,7 @@
18
18
18
19
19
/// \example demo_shell.cpp A simple mir shell
19
/// \example demo_shell.cpp A simple mir shell
20
20
20
22
21
#include "application_switcher.h"
21
#include "window_manager.h"
23
22
#include "fullscreen_placement_strategy.h"
22
#include "fullscreen_placement_strategy.h"
24
23
23
25
24
#include "mir/run_mir.h"
24
#include "mir/run_mir.h"
26
@@ -76,14 +76,15 @@
27
76
int main(int argc, char const* argv[])
76
int main(int argc, char const* argv[])
28
77
try
77
try
29
78
{
78
{
34
79
    auto app_switcher = std::make_shared<me::ApplicationSwitcher>();
79
    auto wm = std::make_shared<me::WindowManager>();
35
80
    me::DemoServerConfiguration config(argc, argv, {app_switcher});
80
    me::DemoServerConfiguration config(argc, argv, {wm});
36
81
    
81
37
82
    mir::run_mir(config, [&config, &app_switcher](mir::DisplayServer&)
82
    mir::run_mir(config, [&config, &wm](mir::DisplayServer&)
38
83
        {
83
        {
39
84
            // We use this strange two stage initialization to avoid a circular dependency between the EventFilters
84
            // We use this strange two stage initialization to avoid a circular dependency between the EventFilters
40
85
            // and the SessionStore
85
            // and the SessionStore
42
86
            app_switcher->set_focus_controller(config.the_focus_controller());
86
            wm->set_focus_controller(config.the_focus_controller());
43
87
            wm->set_session_manager(config.the_session_manager());
44
87
        });
88
        });
45
88
    return 0;
89
    return 0;
46
89
}
90
}
47
90
91
48
=== renamed file 'examples/demo-shell/application_switcher.cpp' => 'examples/demo-shell/window_manager.cpp'
49
--- examples/demo-shell/application_switcher.cpp	2013-06-06 10:03:12 +0000
50
+++ examples/demo-shell/window_manager.cpp	2013-06-10 06:32:24 +0000
51
@@ -16,9 +16,12 @@
52
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
53
17
 */
17
 */
54
18
18
56
19
#include "application_switcher.h"
19
#include "window_manager.h"
57
20
20
58
21
#include "mir/shell/focus_controller.h"
21
#include "mir/shell/focus_controller.h"
59
22
#include "mir/shell/session_manager.h"
60
23
#include "mir/shell/session.h"
61
24
#include "mir/shell/surface.h"
62
22
25
63
23
#include <linux/input.h>
26
#include <linux/input.h>
64
24
27
65
@@ -27,16 +30,22 @@
66
27
namespace me = mir::examples;
30
namespace me = mir::examples;
67
28
namespace msh = mir::shell;
31
namespace msh = mir::shell;
68
29
32
70
30
me::ApplicationSwitcher::ApplicationSwitcher()
33
me::WindowManager::WindowManager()
71
31
{
34
{
72
32
}
35
}
73
33
36
75
34
void me::ApplicationSwitcher::set_focus_controller(std::shared_ptr<msh::FocusController> const& controller)
37
void me::WindowManager::set_focus_controller(std::shared_ptr<msh::FocusController> const& controller)
76
35
{
38
{
77
36
    focus_controller = controller;
39
    focus_controller = controller;
78
37
}
40
}
79
38
41
81
39
bool me::ApplicationSwitcher::handle(MirEvent const& event)
42
void me::WindowManager::set_session_manager(
82
43
    std::shared_ptr<msh::SessionManager> const& sm)
83
44
{
84
45
    session_manager = sm;
85
46
}
86
47
87
48
bool me::WindowManager::handle(MirEvent const& event)
88
40
{
49
{
89
41
    assert(focus_controller);
50
    assert(focus_controller);
90
42
51
91
@@ -48,5 +57,37 @@
92
48
        focus_controller->focus_next();
57
        focus_controller->focus_next();
93
49
        return true;
58
        return true;
94
50
    }
59
    }
95
60
    else if (event.type == mir_event_type_motion &&
96
61
             session_manager)
97
62
    {
98
63
        std::shared_ptr<msh::Session> app =
99
64
            session_manager->focussed_application().lock();
100
65
101
66
        if (app)
102
67
        {
103
68
            // FIXME: We need to be able to select individual surfaces in
104
69
            //        future and not just the "default" one.
105
70
            std::shared_ptr<msh::Surface> surf = app->default_surface();
106
71
107
72
            if (surf &&
108
73
                event.motion.modifiers & mir_key_modifier_alt)
109
74
            {
110
75
                geometry::Point cursor{
111
76
                    geometry::X{event.motion.pointer_coordinates[0].x},
112
77
                    geometry::Y{event.motion.pointer_coordinates[0].y}};
113
78
114
79
                if (event.motion.button_state == 0)
115
80
                {
116
81
                    relative_click = cursor - surf->top_left();
117
82
                }
118
83
                else if (event.motion.button_state & mir_motion_button_primary)
119
84
                {
120
85
                    geometry::Point abs = cursor - relative_click;
121
86
                    surf->move_to(abs);
122
87
                    return true;
123
88
                }
124
89
            }
125
90
        }
126
91
    }
127
51
    return false;
92
    return false;
128
52
}
93
}
129
53
94
130
=== renamed file 'examples/demo-shell/application_switcher.h' => 'examples/demo-shell/window_manager.h'
131
--- examples/demo-shell/application_switcher.h	2013-06-06 10:03:12 +0000
132
+++ examples/demo-shell/window_manager.h	2013-06-10 06:32:24 +0000
133
@@ -16,10 +16,11 @@
134
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
16
 * Authored by: Robert Carr <robert.carr@canonical.com>
135
17
 */
17
 */
136
18
18
139
19
#ifndef MIR_EXAMPLES_APPLICATION_SWITCHER_H_
19
#ifndef MIR_EXAMPLES_WINDOW_MANAGER_H_
140
20
#define MIR_EXAMPLES_APPLICATION_SWITCHER_H_
20
#define MIR_EXAMPLES_WINDOW_MANAGER_H_
141
21
21
142
22
#include "mir/input/event_filter.h"
22
#include "mir/input/event_filter.h"
143
23
#include "mir/geometry/displacement.h"
144
23
24
145
24
#include <memory>
25
#include <memory>
146
25
26
147
@@ -28,29 +29,33 @@
148
28
namespace shell
29
namespace shell
149
29
{
30
{
150
30
class FocusController;
31
class FocusController;
151
32
class SessionManager;
152
31
}
33
}
153
32
namespace examples
34
namespace examples
154
33
{
35
{
155
34
36
157
35
class ApplicationSwitcher : public input::EventFilter
37
class WindowManager : public input::EventFilter
158
36
{
38
{
159
37
public: 
39
public: 
162
38
    ApplicationSwitcher();
40
    WindowManager();
163
39
    ~ApplicationSwitcher() = default;
41
    ~WindowManager() = default;
164
40
42
165
41
    void set_focus_controller(std::shared_ptr<shell::FocusController> const& focus_controller);
43
    void set_focus_controller(std::shared_ptr<shell::FocusController> const& focus_controller);
166
44
    void set_session_manager(std::shared_ptr<shell::SessionManager> const& sm);
167
42
    
45
    
168
43
    bool handle(MirEvent const& event) override;
46
    bool handle(MirEvent const& event) override;
169
44
47
170
45
protected:
48
protected:
173
46
    ApplicationSwitcher(const ApplicationSwitcher&) = delete;
49
    WindowManager(const WindowManager&) = delete;
174
47
    ApplicationSwitcher& operator=(const ApplicationSwitcher&) = delete;
50
    WindowManager& operator=(const WindowManager&) = delete;
175
48
51
176
49
private:
52
private:
177
50
    std::shared_ptr<shell::FocusController> focus_controller;
53
    std::shared_ptr<shell::FocusController> focus_controller;
178
54
    std::shared_ptr<shell::SessionManager> session_manager;
179
55
    geometry::Displacement relative_click;  // Click location in window space
180
51
};
56
};
181
52
57
182
53
}
58
}
183
54
} // namespace mir
59
} // namespace mir
184
55
60
186
56
#endif // MIR_EXAMPLES_APPLICATION_SWITCHER_H_
61
#endif // MIR_EXAMPLES_WINDOW_MANAGER_H_
187
57
62
188
=== modified file 'include/server/mir/shell/session_manager.h'
189
--- include/server/mir/shell/session_manager.h	2013-05-28 14:34:35 +0000
190
+++ include/server/mir/shell/session_manager.h	2013-06-10 06:32:24 +0000
191
@@ -59,6 +59,7 @@
192
59
                                 SurfaceCreationParameters const& params);
59
                                 SurfaceCreationParameters const& params);
193
60
60
194
61
    void focus_next();
61
    void focus_next();
195
62
    std::weak_ptr<Session> focussed_application() const;
196
62
63
197
63
protected:
64
protected:
198
64
    SessionManager(const SessionManager&) = delete;
65
    SessionManager(const SessionManager&) = delete;
199
65
66
200
=== modified file 'include/server/mir/shell/surface.h'
201
--- include/server/mir/shell/surface.h	2013-05-28 15:44:18 +0000
202
+++ include/server/mir/shell/surface.h	2013-06-10 06:32:24 +0000
203
@@ -66,6 +66,8 @@
204
66
66
205
67
    virtual std::string name() const;
67
    virtual std::string name() const;
206
68
68
207
69
    virtual void move_to(geometry::Point const& top_left);
208
70
209
69
    virtual geometry::Size size() const;
71
    virtual geometry::Size size() const;
210
70
    virtual geometry::Point top_left() const;
72
    virtual geometry::Point top_left() const;
211
71
73
212
72
74
213
=== modified file 'include/shared/mir/geometry/dimensions.h'
214
--- include/shared/mir/geometry/dimensions.h	2013-04-24 05:22:20 +0000
215
+++ include/shared/mir/geometry/dimensions.h	2013-06-10 06:32:24 +0000
216
@@ -38,13 +38,17 @@
217
38
class IntWrapper
38
class IntWrapper
218
39
{
39
{
219
40
public:
40
public:
221
41
    typedef uint32_t ValueType;
41
    typedef int ValueType;
222
42
42
223
43
    IntWrapper() : value(0) {}
43
    IntWrapper() : value(0) {}
224
44
    template<typename AnyInteger>
44
    template<typename AnyInteger>
225
45
    explicit IntWrapper(AnyInteger value) : value(static_cast<ValueType>(value)) {}
45
    explicit IntWrapper(AnyInteger value) : value(static_cast<ValueType>(value)) {}
226
46
46
228
47
    uint32_t as_uint32_t() const
47
    uint32_t as_uint32_t() const  // TODO: Deprecate this later
229
48
    {
230
49
        return (uint32_t)value;
231
50
    }
232
51
    int as_int() const
233
48
    {
52
    {
234
49
        return value;
53
        return value;
235
50
    }
54
    }
236
@@ -60,44 +64,44 @@
237
60
template<DimensionTag Tag>
64
template<DimensionTag Tag>
238
61
std::ostream& operator<<(std::ostream& out, IntWrapper<Tag> const& value)
65
std::ostream& operator<<(std::ostream& out, IntWrapper<Tag> const& value)
239
62
{
66
{
241
63
    out << value.as_uint32_t();
67
    out << value.as_int();
242
64
    return out;
68
    return out;
243
65
}
69
}
244
66
70
245
67
template<DimensionTag Tag>
71
template<DimensionTag Tag>
246
68
inline bool operator == (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
72
inline bool operator == (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
247
69
{
73
{
249
70
    return lhs.as_uint32_t() == rhs.as_uint32_t();
74
    return lhs.as_int() == rhs.as_int();
250
71
}
75
}
251
72
76
252
73
template<DimensionTag Tag>
77
template<DimensionTag Tag>
253
74
inline bool operator != (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
78
inline bool operator != (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
254
75
{
79
{
256
76
    return lhs.as_uint32_t() != rhs.as_uint32_t();
80
    return lhs.as_int() != rhs.as_int();
257
77
}
81
}
258
78
82
259
79
template<DimensionTag Tag>
83
template<DimensionTag Tag>
260
80
inline bool operator <= (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
84
inline bool operator <= (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
261
81
{
85
{
263
82
    return lhs.as_uint32_t() <= rhs.as_uint32_t();
86
    return lhs.as_int() <= rhs.as_int();
264
83
}
87
}
265
84
88
266
85
template<DimensionTag Tag>
89
template<DimensionTag Tag>
267
86
inline bool operator >= (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
90
inline bool operator >= (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
268
87
{
91
{
270
88
    return lhs.as_uint32_t() >= rhs.as_uint32_t();
92
    return lhs.as_int() >= rhs.as_int();
271
89
}
93
}
272
90
94
273
91
template<DimensionTag Tag>
95
template<DimensionTag Tag>
274
92
inline bool operator < (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
96
inline bool operator < (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
275
93
{
97
{
277
94
    return lhs.as_uint32_t() < rhs.as_uint32_t();
98
    return lhs.as_int() < rhs.as_int();
278
95
}
99
}
279
96
100
280
97
template<DimensionTag Tag>
101
template<DimensionTag Tag>
281
98
inline bool operator > (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
102
inline bool operator > (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
282
99
{
103
{
284
100
    return lhs.as_uint32_t() > rhs.as_uint32_t();
104
    return lhs.as_int() > rhs.as_int();
285
101
}
105
}
286
102
} // namespace detail
106
} // namespace detail
287
103
107
288
@@ -111,23 +115,23 @@
289
111
typedef detail::IntWrapper<detail::dy> DeltaY;
115
typedef detail::IntWrapper<detail::dy> DeltaY;
290
112
116
291
113
// Adding deltas is fine
117
// Adding deltas is fine
296
114
inline DeltaX operator+(DeltaX lhs, DeltaX rhs) { return DeltaX(lhs.as_uint32_t() + rhs.as_uint32_t()); }
118
inline DeltaX operator+(DeltaX lhs, DeltaX rhs) { return DeltaX(lhs.as_int() + rhs.as_int()); }
297
115
inline DeltaY operator+(DeltaY lhs, DeltaY rhs) { return DeltaY(lhs.as_uint32_t() + rhs.as_uint32_t()); }
119
inline DeltaY operator+(DeltaY lhs, DeltaY rhs) { return DeltaY(lhs.as_int() + rhs.as_int()); }
298
116
inline DeltaX operator-(DeltaX lhs, DeltaX rhs) { return DeltaX(lhs.as_uint32_t() - rhs.as_uint32_t()); }
120
inline DeltaX operator-(DeltaX lhs, DeltaX rhs) { return DeltaX(lhs.as_int() - rhs.as_int()); }
299
117
inline DeltaY operator-(DeltaY lhs, DeltaY rhs) { return DeltaY(lhs.as_uint32_t() - rhs.as_uint32_t()); }
121
inline DeltaY operator-(DeltaY lhs, DeltaY rhs) { return DeltaY(lhs.as_int() - rhs.as_int()); }
300
118
122
301
119
// Adding deltas to co-ordinates is fine
123
// Adding deltas to co-ordinates is fine
306
120
inline X operator+(X lhs, DeltaX rhs) { return X(lhs.as_uint32_t() + rhs.as_uint32_t()); }
124
inline X operator+(X lhs, DeltaX rhs) { return X(lhs.as_int() + rhs.as_int()); }
307
121
inline Y operator+(Y lhs, DeltaY rhs) { return Y(lhs.as_uint32_t() + rhs.as_uint32_t()); }
125
inline Y operator+(Y lhs, DeltaY rhs) { return Y(lhs.as_int() + rhs.as_int()); }
308
122
inline X operator-(X lhs, DeltaX rhs) { return X(lhs.as_uint32_t() - rhs.as_uint32_t()); }
126
inline X operator-(X lhs, DeltaX rhs) { return X(lhs.as_int() - rhs.as_int()); }
309
123
inline Y operator-(Y lhs, DeltaY rhs) { return Y(lhs.as_uint32_t() - rhs.as_uint32_t()); }
127
inline Y operator-(Y lhs, DeltaY rhs) { return Y(lhs.as_int() - rhs.as_int()); }
310
124
128
311
125
// Subtracting coordinates is fine
129
// Subtracting coordinates is fine
314
126
inline DeltaX operator-(X lhs, X rhs) { return DeltaX(lhs.as_uint32_t() - rhs.as_uint32_t()); }
130
inline DeltaX operator-(X lhs, X rhs) { return DeltaX(lhs.as_int() - rhs.as_int()); }
315
127
inline DeltaY operator-(Y lhs, Y rhs) { return DeltaY(lhs.as_uint32_t() - rhs.as_uint32_t()); }
131
inline DeltaY operator-(Y lhs, Y rhs) { return DeltaY(lhs.as_int() - rhs.as_int()); }
316
128
132
317
129
template<typename Target, typename Source>
133
template<typename Target, typename Source>
319
130
inline Target dim_cast(Source s) { return Target(s.as_uint32_t()); }
134
inline Target dim_cast(Source s) { return Target(s.as_int()); }
320
131
}
135
}
321
132
}
136
}
322
133
137
323
134
138
324
=== modified file 'src/server/shell/session_manager.cpp'
325
--- src/server/shell/session_manager.cpp	2013-05-28 14:34:35 +0000
326
+++ src/server/shell/session_manager.cpp	2013-06-10 06:32:24 +0000
327
@@ -128,6 +128,11 @@
328
128
    set_focus_to_locked(lock, focus);
128
    set_focus_to_locked(lock, focus);
329
129
}
129
}
330
130
130
331
131
std::weak_ptr<msh::Session> msh::SessionManager::focussed_application() const
332
132
{
333
133
    return focus_application;
334
134
}
335
135
336
131
mf::SurfaceId msh::SessionManager::create_surface_for(std::shared_ptr<mf::Session> const& session,
136
mf::SurfaceId msh::SessionManager::create_surface_for(std::shared_ptr<mf::Session> const& session,
337
132
    msh::SurfaceCreationParameters const& params)
137
    msh::SurfaceCreationParameters const& params)
338
133
{
138
{
339
134
139
340
=== modified file 'src/server/shell/surface.cpp'
341
--- src/server/shell/surface.cpp	2013-05-28 15:44:18 +0000
342
+++ src/server/shell/surface.cpp	2013-06-10 06:32:24 +0000
343
@@ -109,6 +109,18 @@
344
109
    }
109
    }
345
110
}
110
}
346
111
111
347
112
void msh::Surface::move_to(geometry::Point const& p)
348
113
{
349
114
    if (auto const& s = surface.lock())
350
115
    {
351
116
        s->move_to(p);
352
117
    }
353
118
    else
354
119
    {
355
120
        BOOST_THROW_EXCEPTION(std::runtime_error("Invalid surface"));
356
121
    }
357
122
}
358
123
359
112
mir::geometry::Point msh::Surface::top_left() const
124
mir::geometry::Point msh::Surface::top_left() const
360
113
{
125
{
361
114
    if (auto const& s = surface.lock())
126
    if (auto const& s = surface.lock())
362
115
127
363
=== modified file 'src/server/surfaces/surface.cpp'
364
--- src/server/surfaces/surface.cpp	2013-05-22 17:36:47 +0000
365
+++ src/server/surfaces/surface.cpp	2013-06-10 06:32:24 +0000
366
@@ -113,8 +113,8 @@
367
113
{
113
{
368
114
    const geom::Size sz = size();
114
    const geom::Size sz = size();
369
115
115
372
116
    const glm::vec3 top_left_vec{top_left_point.x.as_uint32_t(),
116
    const glm::vec3 top_left_vec{top_left_point.x.as_int(),
373
117
                                 top_left_point.y.as_uint32_t(),
117
                                 top_left_point.y.as_int(),
374
118
                                 0.0f};
118
                                 0.0f};
375
119
    const glm::vec3 size_vec{sz.width.as_uint32_t(),
119
    const glm::vec3 size_vec{sz.width.as_uint32_t(),
376
120
                             sz.height.as_uint32_t(),
120
                             sz.height.as_uint32_t(),
377
121
121
378
=== modified file 'tests/unit-tests/geometry/test-dimensions.cpp'
379
--- tests/unit-tests/geometry/test-dimensions.cpp	2012-09-18 09:44:45 +0000
380
+++ tests/unit-tests/geometry/test-dimensions.cpp	2013-06-10 06:32:24 +0000
381
@@ -89,3 +89,47 @@
382
89
    EXPECT_EQ(dx1, dim_cast<DeltaX>(w1));
89
    EXPECT_EQ(dx1, dim_cast<DeltaX>(w1));
383
90
    EXPECT_NE(dx1, dim_cast<DeltaX>(X()));
90
    EXPECT_NE(dx1, dim_cast<DeltaX>(X()));
384
91
}
91
}
385
92
386
93
TEST(geometry, signed_dimensions)
387
94
{
388
95
    using namespace geom;
389
96
390
97
    X const x0{0};
391
98
    X const x2{2};
392
99
    X const xn5{-5};
393
100
    Y const y0{0};
394
101
    Y const y3{3};
395
102
    Y const yn6{-6};
396
103
    Y const yn7{-7};
397
104
398
105
    // Compare against zero to catch regressions of signed->unsigned that
399
106
    // wouldn't be caught using as_*int()...
400
107
    EXPECT_GT(x0, xn5);
401
108
    EXPECT_GT(y0, yn7);
402
109
403
110
    EXPECT_LT(xn5, x0);
404
111
    EXPECT_LT(xn5, x2);
405
112
    EXPECT_LT(yn7, yn6);
406
113
    EXPECT_LT(yn7, y0);
407
114
    EXPECT_LT(yn7, y3);
408
115
409
116
    EXPECT_LE(xn5, x0);
410
117
    EXPECT_LE(xn5, x2);
411
118
    EXPECT_LE(yn7, yn6);
412
119
    EXPECT_LE(yn7, y0);
413
120
    EXPECT_LE(yn7, y3);
414
121
    EXPECT_LE(yn7, yn7);
415
122
416
123
    EXPECT_GT(x0, xn5);
417
124
    EXPECT_GT(x2, xn5);
418
125
    EXPECT_GT(yn6, yn7);
419
126
    EXPECT_GT(y0, yn7);
420
127
    EXPECT_GT(y3, yn7);
421
128
422
129
    EXPECT_GE(x0, xn5);
423
130
    EXPECT_GE(x2, xn5);
424
131
    EXPECT_GE(yn6, yn7);
425
132
    EXPECT_GE(y0, yn7);
426
133
    EXPECT_GE(y3, yn7);
427
134
    EXPECT_GE(yn7, yn7);
428
135
}
429
92
136
430
=== modified file 'tests/unit-tests/geometry/test-displacement.cpp'
431
--- tests/unit-tests/geometry/test-displacement.cpp	2013-03-21 03:32:59 +0000
432
+++ tests/unit-tests/geometry/test-displacement.cpp	2013-06-10 06:32:24 +0000
433
@@ -62,16 +62,23 @@
434
62
    Point const x2y4{X{2}, Y{4}};
62
    Point const x2y4{X{2}, Y{4}};
435
63
    Point const x3y9{X{3}, Y{9}};
63
    Point const x3y9{X{3}, Y{9}};
436
64
    Displacement const dx2dy4{DeltaX{2}, DeltaY{4}};
64
    Displacement const dx2dy4{DeltaX{2}, DeltaY{4}};
437
65
    Displacement const dx7dy11{DeltaX{7}, DeltaY{11}};
438
65
66
439
66
    Point const expected_pd_add{X{5}, Y{13}};
67
    Point const expected_pd_add{X{5}, Y{13}};
440
67
    Point const expected_pd_sub{X{1}, Y{5}};
68
    Point const expected_pd_sub{X{1}, Y{5}};
441
69
    Point const expected_pd_sub2{X{-4}, Y{-2}};
442
68
    Displacement const expected_pp_sub{DeltaX{1}, DeltaY{5}};
70
    Displacement const expected_pp_sub{DeltaX{1}, DeltaY{5}};
443
71
    Displacement const expected_pp_sub2{DeltaX{-1}, DeltaY{-5}};
444
69
72
445
70
    Point const pd_add = x3y9 + dx2dy4;
73
    Point const pd_add = x3y9 + dx2dy4;
446
71
    Point const pd_sub = x3y9 - dx2dy4;
74
    Point const pd_sub = x3y9 - dx2dy4;
447
75
    Point const pd_sub2 = x3y9 - dx7dy11;
448
72
    Displacement const pp_sub = x3y9 - x2y4;
76
    Displacement const pp_sub = x3y9 - x2y4;
449
77
    Displacement const pp_sub2 = x2y4 - x3y9;
450
73
78
451
74
    EXPECT_EQ(expected_pd_add, pd_add);
79
    EXPECT_EQ(expected_pd_add, pd_add);
452
75
    EXPECT_EQ(expected_pd_sub, pd_sub);
80
    EXPECT_EQ(expected_pd_sub, pd_sub);
453
81
    EXPECT_EQ(expected_pd_sub2, pd_sub2);
454
76
    EXPECT_EQ(expected_pp_sub, pp_sub);
82
    EXPECT_EQ(expected_pp_sub, pp_sub);
455
83
    EXPECT_EQ(expected_pp_sub2, pp_sub2);
456
77
}
84
}
Status:	Superseded
Proposed branch:	lp:~vanvugt/mir/move
Merge into:	lp:~mir-team/mir/trunk
Diff against target:	456 lines (+163/-41) 12 files modified examples/demo-shell/CMakeLists.txt (+1/-1) examples/demo-shell/demo_shell.cpp (+7/-6) examples/demo-shell/window_manager.cpp (+45/-4) examples/demo-shell/window_manager.h (+13/-8) include/server/mir/shell/session_manager.h (+1/-0) include/server/mir/shell/surface.h (+2/-0) include/shared/mir/geometry/dimensions.h (+24/-20) src/server/shell/session_manager.cpp (+5/-0) src/server/shell/surface.cpp (+12/-0) src/server/surfaces/surface.cpp (+2/-2) tests/unit-tests/geometry/test-dimensions.cpp (+44/-0) tests/unit-tests/geometry/test-displacement.cpp (+7/-0)
To merge this branch:	bzr merge lp:~vanvugt/mir/move
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Needs Fixing on 2013-06-10
Alan Griffiths		2013-05-03	Approve on 2013-06-10
Robert Ancell		2013-06-06	Approve on 2013-06-06
Review via email: mp+162487@code.launchpad.net