Merge lp:~vanvugt/mir/move into lp:~mir-team/mir/trunk

[Daniel van Vugt]

demo-shell: Add support for moving windows/surfaces via Alt+drag.

Only the "default" surface of the focussed app is moved. In future we
should move whichever surface is hit by the pointer.

[Daniel van Vugt (vanvugt)]

I don't like the name "WindowManager" either. But the good alternative is to name it Shell and merge yet more classes into that. So leaving it for now.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:679
http://jenkins.qa.ubuntu.com/job/mir-ci/561/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/650
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/533
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/45
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/45/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/296

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/561/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

166 + void set_session_manager(std::shared_ptr<shell::SessionManager> const& sm);

I don't think we should be making this public - if it needs to be public in DemoServerConfiguration, then that can achieve the same effect with a "using" directive in the Demo code.

The MP as a whole introduces behavior it may be better not to expose to users. Vis: "Don't move things left or up. Surfaces will vanish if they are placed left of or above the screen."

review: Abstain

[Alan Griffiths (alan-griffiths)]

> 166 + void set_session_manager(std::shared_ptr<shell::SessionManager>
> const& sm);
>
> I don't think we should be making this public - if it needs to be public in
> DemoServerConfiguration, then that can achieve the same effect with a "using"
> directive in the Demo code.

I meant, of course,

195 + virtual std::shared_ptr<shell::SessionManager> the_session_manager();

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

Oops!

review: Abstain

[kevin gunn (kgunn72)]

moving to WIP as this has been sitting (altho daniel's been out)

[Daniel van Vugt (vanvugt)]

Resubmitted. I've fixed the vanishing surfaces problem. Not really sure what Alan wanted re: "set_session_manager".

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:682
http://jenkins.qa.ubuntu.com/job/mir-ci/682/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/838
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/720
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/167
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/167/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/682/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

220 - typedef uint32_t ValueType;
221 + typedef int ValueType;

(and related uint_32 -> int changes)

While these changes fix the problem mentioned here, I imagine that there was a reason for choosing uint32_t, and that this change could have unintended consequences. Has this been checked?

review: Needs Information

[Robert Ancell (robert-ancell)]

Approve as long as racarr doesn't indicate a problem with the uint32_t -> int change.

review: Approve

[Daniel van Vugt (vanvugt)]

I just noticed bug 1188451 as a result of playing with movement...

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:683
http://jenkins.qa.ubuntu.com/job/mir-ci/686/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/846
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/728
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/171
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/171/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/686/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

> 220 - typedef uint32_t ValueType;
> 221 + typedef int ValueType;
>
> (and related uint_32 -> int changes)
>
> While these changes fix the problem mentioned here, I imagine that there was a
> reason for choosing uint32_t, and that this change could have unintended
> consequences. Has this been checked?

Alan,

Yes it's been checked to some extent:
1. No test case failures.
2. No visible regressions when running mir binaries.

Furthermore, you have theoretical peace of mind:
1. All the +,-,==,!= operators are unaffected by sign. They produce the same result regardless of the signedness of the operands.
2. Only the >,<,>=,<= might be affected in theory. But you'd have to be unlucky to use them in a way that they are affected and all testing so far has shown no change in behaviour.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:685
http://jenkins.qa.ubuntu.com/job/mir-ci/692/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/855
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/737
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/177
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/177/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/692/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:686
http://jenkins.qa.ubuntu.com/job/mir-ci/693/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/856
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/738
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/178
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/178/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins:8080/job/mir-ci/693/rebuild

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

No point in discussing any longer

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/315/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/857
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/739
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-autolanding/105/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-autolanding-build/./distribution=quantal,flavor=amd64/200

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

Did I do that?...
The following tests FAILED:
  72 - memcheck(unit-tests.ProtobufCommunicator.*) (Failed)
Errors while running CTest
make[2]: *** [test] Error 8

=== modified file 'examples/demo-shell/CMakeLists.txt'
--- examples/demo-shell/CMakeLists.txt	2013-05-22 14:21:16 +0000
+++ examples/demo-shell/CMakeLists.txt	2013-06-10 06:32:24 +0000
@@ -1,7 +1,7 @@
 add_executable(mir_demo_server_shell
   demo_shell.cpp
   fullscreen_placement_strategy.cpp
-  application_switcher.cpp
+  window_manager.cpp
 )
 
 target_link_libraries(mir_demo_server_shell

=== modified file 'examples/demo-shell/demo_shell.cpp'
--- examples/demo-shell/demo_shell.cpp	2013-04-29 17:39:12 +0000
+++ examples/demo-shell/demo_shell.cpp	2013-06-10 06:32:24 +0000
@@ -18,7 +18,7 @@
 
 /// \example demo_shell.cpp A simple mir shell
 
-#include "application_switcher.h"
+#include "window_manager.h"
 #include "fullscreen_placement_strategy.h"
 
 #include "mir/run_mir.h"
@@ -76,14 +76,15 @@
 int main(int argc, char const* argv[])
 try
 {
-    auto app_switcher = std::make_shared<me::ApplicationSwitcher>();
-    me::DemoServerConfiguration config(argc, argv, {app_switcher});
-    
-    mir::run_mir(config, [&config, &app_switcher](mir::DisplayServer&)
+    auto wm = std::make_shared<me::WindowManager>();
+    me::DemoServerConfiguration config(argc, argv, {wm});
+
+    mir::run_mir(config, [&config, &wm](mir::DisplayServer&)
         {
             // We use this strange two stage initialization to avoid a circular dependency between the EventFilters
             // and the SessionStore
-            app_switcher->set_focus_controller(config.the_focus_controller());
+            wm->set_focus_controller(config.the_focus_controller());
+            wm->set_session_manager(config.the_session_manager());
         });
     return 0;
 }

=== renamed file 'examples/demo-shell/application_switcher.cpp' => 'examples/demo-shell/window_manager.cpp'
--- examples/demo-shell/application_switcher.cpp	2013-06-06 10:03:12 +0000
+++ examples/demo-shell/window_manager.cpp	2013-06-10 06:32:24 +0000
@@ -16,9 +16,12 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "application_switcher.h"
+#include "window_manager.h"
 
 #include "mir/shell/focus_controller.h"
+#include "mir/shell/session_manager.h"
+#include "mir/shell/session.h"
+#include "mir/shell/surface.h"
 
 #include <linux/input.h>
 
@@ -27,16 +30,22 @@
 namespace me = mir::examples;
 namespace msh = mir::shell;
 
-me::ApplicationSwitcher::ApplicationSwitcher()
+me::WindowManager::WindowManager()
 {
 }
 
-void me::ApplicationSwitcher::set_focus_controller(std::shared_ptr<msh::FocusController> const& controller)
+void me::WindowManager::set_focus_controller(std::shared_ptr<msh::FocusController> const& controller)
 {
     focus_controller = controller;
 }
 
-bool me::ApplicationSwitcher::handle(MirEvent const& event)
+void me::WindowManager::set_session_manager(
+    std::shared_ptr<msh::SessionManager> const& sm)
+{
+    session_manager = sm;
+}
+
+bool me::WindowManager::handle(MirEvent const& event)
 {
     assert(focus_controller);
 
@@ -48,5 +57,37 @@
         focus_controller->focus_next();
         return true;
     }
+    else if (event.type == mir_event_type_motion &&
+             session_manager)
+    {
+        std::shared_ptr<msh::Session> app =
+            session_manager->focussed_application().lock();
+
+        if (app)
+        {
+            // FIXME: We need to be able to select individual surfaces in
+            //        future and not just the "default" one.
+            std::shared_ptr<msh::Surface> surf = app->default_surface();
+
+            if (surf &&
+                event.motion.modifiers & mir_key_modifier_alt)
+            {
+                geometry::Point cursor{
+                    geometry::X{event.motion.pointer_coordinates[0].x},
+                    geometry::Y{event.motion.pointer_coordinates[0].y}};
+
+                if (event.motion.button_state == 0)
+                {
+                    relative_click = cursor - surf->top_left();
+                }
+                else if (event.motion.button_state & mir_motion_button_primary)
+                {
+                    geometry::Point abs = cursor - relative_click;
+                    surf->move_to(abs);
+                    return true;
+                }
+            }
+        }
+    }
     return false;
 }

=== renamed file 'examples/demo-shell/application_switcher.h' => 'examples/demo-shell/window_manager.h'
--- examples/demo-shell/application_switcher.h	2013-06-06 10:03:12 +0000
+++ examples/demo-shell/window_manager.h	2013-06-10 06:32:24 +0000
@@ -16,10 +16,11 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#ifndef MIR_EXAMPLES_APPLICATION_SWITCHER_H_
-#define MIR_EXAMPLES_APPLICATION_SWITCHER_H_
+#ifndef MIR_EXAMPLES_WINDOW_MANAGER_H_
+#define MIR_EXAMPLES_WINDOW_MANAGER_H_
 
 #include "mir/input/event_filter.h"
+#include "mir/geometry/displacement.h"
 
 #include <memory>
 
@@ -28,29 +29,33 @@
 namespace shell
 {
 class FocusController;
+class SessionManager;
 }
 namespace examples
 {
 
-class ApplicationSwitcher : public input::EventFilter
+class WindowManager : public input::EventFilter
 {
 public: 
-    ApplicationSwitcher();
-    ~ApplicationSwitcher() = default;
+    WindowManager();
+    ~WindowManager() = default;
 
     void set_focus_controller(std::shared_ptr<shell::FocusController> const& focus_controller);
+    void set_session_manager(std::shared_ptr<shell::SessionManager> const& sm);
     
     bool handle(MirEvent const& event) override;
 
 protected:
-    ApplicationSwitcher(const ApplicationSwitcher&) = delete;
-    ApplicationSwitcher& operator=(const ApplicationSwitcher&) = delete;
+    WindowManager(const WindowManager&) = delete;
+    WindowManager& operator=(const WindowManager&) = delete;
 
 private:
     std::shared_ptr<shell::FocusController> focus_controller;
+    std::shared_ptr<shell::SessionManager> session_manager;
+    geometry::Displacement relative_click;  // Click location in window space
 };
 
 }
 } // namespace mir
 
-#endif // MIR_EXAMPLES_APPLICATION_SWITCHER_H_
+#endif // MIR_EXAMPLES_WINDOW_MANAGER_H_

=== modified file 'include/server/mir/shell/session_manager.h'
--- include/server/mir/shell/session_manager.h	2013-05-28 14:34:35 +0000
+++ include/server/mir/shell/session_manager.h	2013-06-10 06:32:24 +0000
@@ -59,6 +59,7 @@
                                  SurfaceCreationParameters const& params);
 
     void focus_next();
+    std::weak_ptr<Session> focussed_application() const;
 
 protected:
     SessionManager(const SessionManager&) = delete;

=== modified file 'include/server/mir/shell/surface.h'
--- include/server/mir/shell/surface.h	2013-05-28 15:44:18 +0000
+++ include/server/mir/shell/surface.h	2013-06-10 06:32:24 +0000
@@ -66,6 +66,8 @@
 
     virtual std::string name() const;
 
+    virtual void move_to(geometry::Point const& top_left);
+
     virtual geometry::Size size() const;
     virtual geometry::Point top_left() const;
 

=== modified file 'include/shared/mir/geometry/dimensions.h'
--- include/shared/mir/geometry/dimensions.h	2013-04-24 05:22:20 +0000
+++ include/shared/mir/geometry/dimensions.h	2013-06-10 06:32:24 +0000
@@ -38,13 +38,17 @@
 class IntWrapper
 {
 public:
-    typedef uint32_t ValueType;
+    typedef int ValueType;
 
     IntWrapper() : value(0) {}
     template<typename AnyInteger>
     explicit IntWrapper(AnyInteger value) : value(static_cast<ValueType>(value)) {}
 
-    uint32_t as_uint32_t() const
+    uint32_t as_uint32_t() const  // TODO: Deprecate this later
+    {
+        return (uint32_t)value;
+    }
+    int as_int() const
     {
         return value;
     }
@@ -60,44 +64,44 @@
 template<DimensionTag Tag>
 std::ostream& operator<<(std::ostream& out, IntWrapper<Tag> const& value)
 {
-    out << value.as_uint32_t();
+    out << value.as_int();
     return out;
 }
 
 template<DimensionTag Tag>
 inline bool operator == (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
 {
-    return lhs.as_uint32_t() == rhs.as_uint32_t();
+    return lhs.as_int() == rhs.as_int();
 }
 
 template<DimensionTag Tag>
 inline bool operator != (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
 {
-    return lhs.as_uint32_t() != rhs.as_uint32_t();
+    return lhs.as_int() != rhs.as_int();
 }
 
 template<DimensionTag Tag>
 inline bool operator <= (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
 {
-    return lhs.as_uint32_t() <= rhs.as_uint32_t();
+    return lhs.as_int() <= rhs.as_int();
 }
 
 template<DimensionTag Tag>
 inline bool operator >= (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
 {
-    return lhs.as_uint32_t() >= rhs.as_uint32_t();
+    return lhs.as_int() >= rhs.as_int();
 }
 
 template<DimensionTag Tag>
 inline bool operator < (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
 {
-    return lhs.as_uint32_t() < rhs.as_uint32_t();
+    return lhs.as_int() < rhs.as_int();
 }
 
 template<DimensionTag Tag>
 inline bool operator > (IntWrapper<Tag> const& lhs, IntWrapper<Tag> const& rhs)
 {
-    return lhs.as_uint32_t() > rhs.as_uint32_t();
+    return lhs.as_int() > rhs.as_int();
 }
 } // namespace detail
 
@@ -111,23 +115,23 @@
 typedef detail::IntWrapper<detail::dy> DeltaY;
 
 // Adding deltas is fine
-inline DeltaX operator+(DeltaX lhs, DeltaX rhs) { return DeltaX(lhs.as_uint32_t() + rhs.as_uint32_t()); }
-inline DeltaY operator+(DeltaY lhs, DeltaY rhs) { return DeltaY(lhs.as_uint32_t() + rhs.as_uint32_t()); }
-inline DeltaX operator-(DeltaX lhs, DeltaX rhs) { return DeltaX(lhs.as_uint32_t() - rhs.as_uint32_t()); }
-inline DeltaY operator-(DeltaY lhs, DeltaY rhs) { return DeltaY(lhs.as_uint32_t() - rhs.as_uint32_t()); }
+inline DeltaX operator+(DeltaX lhs, DeltaX rhs) { return DeltaX(lhs.as_int() + rhs.as_int()); }
+inline DeltaY operator+(DeltaY lhs, DeltaY rhs) { return DeltaY(lhs.as_int() + rhs.as_int()); }
+inline DeltaX operator-(DeltaX lhs, DeltaX rhs) { return DeltaX(lhs.as_int() - rhs.as_int()); }
+inline DeltaY operator-(DeltaY lhs, DeltaY rhs) { return DeltaY(lhs.as_int() - rhs.as_int()); }
 
 // Adding deltas to co-ordinates is fine
-inline X operator+(X lhs, DeltaX rhs) { return X(lhs.as_uint32_t() + rhs.as_uint32_t()); }
-inline Y operator+(Y lhs, DeltaY rhs) { return Y(lhs.as_uint32_t() + rhs.as_uint32_t()); }
-inline X operator-(X lhs, DeltaX rhs) { return X(lhs.as_uint32_t() - rhs.as_uint32_t()); }
-inline Y operator-(Y lhs, DeltaY rhs) { return Y(lhs.as_uint32_t() - rhs.as_uint32_t()); }
+inline X operator+(X lhs, DeltaX rhs) { return X(lhs.as_int() + rhs.as_int()); }
+inline Y operator+(Y lhs, DeltaY rhs) { return Y(lhs.as_int() + rhs.as_int()); }
+inline X operator-(X lhs, DeltaX rhs) { return X(lhs.as_int() - rhs.as_int()); }
+inline Y operator-(Y lhs, DeltaY rhs) { return Y(lhs.as_int() - rhs.as_int()); }
 
 // Subtracting coordinates is fine
-inline DeltaX operator-(X lhs, X rhs) { return DeltaX(lhs.as_uint32_t() - rhs.as_uint32_t()); }
-inline DeltaY operator-(Y lhs, Y rhs) { return DeltaY(lhs.as_uint32_t() - rhs.as_uint32_t()); }
+inline DeltaX operator-(X lhs, X rhs) { return DeltaX(lhs.as_int() - rhs.as_int()); }
+inline DeltaY operator-(Y lhs, Y rhs) { return DeltaY(lhs.as_int() - rhs.as_int()); }
 
 template<typename Target, typename Source>
-inline Target dim_cast(Source s) { return Target(s.as_uint32_t()); }
+inline Target dim_cast(Source s) { return Target(s.as_int()); }
 }
 }
 

=== modified file 'src/server/shell/session_manager.cpp'
--- src/server/shell/session_manager.cpp	2013-05-28 14:34:35 +0000
+++ src/server/shell/session_manager.cpp	2013-06-10 06:32:24 +0000
@@ -128,6 +128,11 @@
     set_focus_to_locked(lock, focus);
 }
 
+std::weak_ptr<msh::Session> msh::SessionManager::focussed_application() const
+{
+    return focus_application;
+}
+
 mf::SurfaceId msh::SessionManager::create_surface_for(std::shared_ptr<mf::Session> const& session,
     msh::SurfaceCreationParameters const& params)
 {

=== modified file 'src/server/shell/surface.cpp'
--- src/server/shell/surface.cpp	2013-05-28 15:44:18 +0000
+++ src/server/shell/surface.cpp	2013-06-10 06:32:24 +0000
@@ -109,6 +109,18 @@
     }
 }
 
+void msh::Surface::move_to(geometry::Point const& p)
+{
+    if (auto const& s = surface.lock())
+    {
+        s->move_to(p);
+    }
+    else
+    {
+        BOOST_THROW_EXCEPTION(std::runtime_error("Invalid surface"));
+    }
+}
+
 mir::geometry::Point msh::Surface::top_left() const
 {
     if (auto const& s = surface.lock())

=== modified file 'src/server/surfaces/surface.cpp'
--- src/server/surfaces/surface.cpp	2013-05-22 17:36:47 +0000
+++ src/server/surfaces/surface.cpp	2013-06-10 06:32:24 +0000
@@ -113,8 +113,8 @@
 {
     const geom::Size sz = size();
 
-    const glm::vec3 top_left_vec{top_left_point.x.as_uint32_t(),
-                                 top_left_point.y.as_uint32_t(),
+    const glm::vec3 top_left_vec{top_left_point.x.as_int(),
+                                 top_left_point.y.as_int(),
                                  0.0f};
     const glm::vec3 size_vec{sz.width.as_uint32_t(),
                              sz.height.as_uint32_t(),

=== modified file 'tests/unit-tests/geometry/test-dimensions.cpp'
--- tests/unit-tests/geometry/test-dimensions.cpp	2012-09-18 09:44:45 +0000
+++ tests/unit-tests/geometry/test-dimensions.cpp	2013-06-10 06:32:24 +0000
@@ -89,3 +89,47 @@
     EXPECT_EQ(dx1, dim_cast<DeltaX>(w1));
     EXPECT_NE(dx1, dim_cast<DeltaX>(X()));
 }
+
+TEST(geometry, signed_dimensions)
+{
+    using namespace geom;
+
+    X const x0{0};
+    X const x2{2};
+    X const xn5{-5};
+    Y const y0{0};
+    Y const y3{3};
+    Y const yn6{-6};
+    Y const yn7{-7};
+
+    // Compare against zero to catch regressions of signed->unsigned that
+    // wouldn't be caught using as_*int()...
+    EXPECT_GT(x0, xn5);
+    EXPECT_GT(y0, yn7);
+
+    EXPECT_LT(xn5, x0);
+    EXPECT_LT(xn5, x2);
+    EXPECT_LT(yn7, yn6);
+    EXPECT_LT(yn7, y0);
+    EXPECT_LT(yn7, y3);
+
+    EXPECT_LE(xn5, x0);
+    EXPECT_LE(xn5, x2);
+    EXPECT_LE(yn7, yn6);
+    EXPECT_LE(yn7, y0);
+    EXPECT_LE(yn7, y3);
+    EXPECT_LE(yn7, yn7);
+
+    EXPECT_GT(x0, xn5);
+    EXPECT_GT(x2, xn5);
+    EXPECT_GT(yn6, yn7);
+    EXPECT_GT(y0, yn7);
+    EXPECT_GT(y3, yn7);
+
+    EXPECT_GE(x0, xn5);
+    EXPECT_GE(x2, xn5);
+    EXPECT_GE(yn6, yn7);
+    EXPECT_GE(y0, yn7);
+    EXPECT_GE(y3, yn7);
+    EXPECT_GE(yn7, yn7);
+}

=== modified file 'tests/unit-tests/geometry/test-displacement.cpp'
--- tests/unit-tests/geometry/test-displacement.cpp	2013-03-21 03:32:59 +0000
+++ tests/unit-tests/geometry/test-displacement.cpp	2013-06-10 06:32:24 +0000
@@ -62,16 +62,23 @@
     Point const x2y4{X{2}, Y{4}};
     Point const x3y9{X{3}, Y{9}};
     Displacement const dx2dy4{DeltaX{2}, DeltaY{4}};
+    Displacement const dx7dy11{DeltaX{7}, DeltaY{11}};
 
     Point const expected_pd_add{X{5}, Y{13}};
     Point const expected_pd_sub{X{1}, Y{5}};
+    Point const expected_pd_sub2{X{-4}, Y{-2}};
     Displacement const expected_pp_sub{DeltaX{1}, DeltaY{5}};
+    Displacement const expected_pp_sub2{DeltaX{-1}, DeltaY{-5}};
 
     Point const pd_add = x3y9 + dx2dy4;
     Point const pd_sub = x3y9 - dx2dy4;
+    Point const pd_sub2 = x3y9 - dx7dy11;
     Displacement const pp_sub = x3y9 - x2y4;
+    Displacement const pp_sub2 = x2y4 - x3y9;
 
     EXPECT_EQ(expected_pd_add, pd_add);
     EXPECT_EQ(expected_pd_sub, pd_sub);
+    EXPECT_EQ(expected_pd_sub2, pd_sub2);
     EXPECT_EQ(expected_pp_sub, pp_sub);
+    EXPECT_EQ(expected_pp_sub2, pp_sub2);
 }