Merge lp:~andreas-pokorny/mir/use-one-cursor-position-per-seat into lp:mir

[Andreas Pokorny]

Unify the cursor position within a seat

This move changes the responsibility to track the cursor position out of the platforms to the mir::input::Seat. This reduces the EventBuilder interface and removes the InputSink::confine_cursor method - which was only added since there was no relative axis information in the beginnings of MirEvent.

The fixes cursor jumps when switching between mouse and keyboard.

Yet another ABI breaking change to EventBuilder. This time it moves the responsibility of controlling the cursor position to the 'Seat'. Now the relative changes of multiple pointing devices contribute to the same cursor position.

[Alberto Aguirre (albaguirre)]

Looks good other than L332

review: Needs Fixing

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3104
http://jenkins.qa.ubuntu.com/job/mir-ci/5577/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4906
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3813
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4849
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/806/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1731
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1731/artifact/work/output/*zip*/output.zip
    None: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/806/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4850
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4850/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7428
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25227
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/806/console

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3105
http://jenkins.qa.ubuntu.com/job/mir-ci/5588/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4922/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3828/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4868/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/824/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1741/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/822/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4868/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/825/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3106
http://jenkins.qa.ubuntu.com/job/mir-ci/5589/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4924
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3830/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4870
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/826/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1742
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1742/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/824
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/824/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4870
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4870/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7440
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25261
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/827/console

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3107
http://jenkins.qa.ubuntu.com/job/mir-ci/5594/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4931
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3837
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4877
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/833/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1747
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-ci/1747/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/831
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/831/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4877
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4877/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7446
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25273
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/834/console

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

review: Approve (continuous-integration)

[Alberto Aguirre (albaguirre)]

LGTM.

review: Approve

[Kevin DuBois (kdub)]

lgtm

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4976
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3882
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4922/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/878/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/709
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/709/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/876/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4922
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4922/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7482/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25372
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/879/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2160/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4981
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3887
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4927/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/883/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/713
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/713/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/881
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/881/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4927
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4927/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7489/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25379
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/884/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/mir-autolanding/2162/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-vivid-i386-build/4983
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-vivid-amd64-build/3889
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-vivid-touch/4929/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-wily-touch/885/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/715
        deb: http://jenkins.qa.ubuntu.com/job/mir-wily-amd64-autolanding/715/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-wily-i386-ci/883/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4929
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-vivid-armhf/4929/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-touch/7491/console
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/25381
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-wily-armhf/886/console

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'include/client/mir/events/event_builders.h'
--- include/client/mir/events/event_builders.h	2015-11-04 07:43:28 +0000
+++ include/client/mir/events/event_builders.h	2015-11-19 12:36:51 +0000
@@ -22,6 +22,7 @@
 #include "mir_toolkit/event.h"
 
 #include "mir/geometry/size.h"
+#include "mir/geometry/point.h"
 #include "mir/frontend/surface_id.h"
 
 #include <memory>
@@ -60,6 +61,7 @@
     int scan_code, MirInputEventModifiers modifiers);
 
 void set_modifier(MirEvent& event, MirInputEventModifiers modifiers);
+void set_cursor_position(MirEvent& event, mir::geometry::Point const& pos);
 
 // Deprecated version without mac
 EventUPtr make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,

=== modified file 'include/platform/mir/input/event_builder.h'
--- include/platform/mir/input/event_builder.h	2015-11-04 07:43:28 +0000
+++ include/platform/mir/input/event_builder.h	2015-11-19 12:36:51 +0000
@@ -46,8 +46,8 @@
                            float touch_minor_value, float size_value) = 0;
 
     virtual EventUPtr pointer_event(Timestamp timestamp, MirPointerAction action, MirPointerButtons buttons_pressed,
-                                    float x_axis_value, float y_axis_value, float hscroll_value, float vscroll_value,
-                                    float relative_x_value, float relative_y_value) = 0;
+                                    float hscroll_value, float vscroll_value, float relative_x_value,
+                                    float relative_y_value) = 0;
 
     virtual EventUPtr configuration_event(Timestamp timestamp, MirInputConfigurationAction action) = 0;
 

=== modified file 'include/platform/mir/input/input_sink.h'
--- include/platform/mir/input/input_sink.h	2015-06-17 05:20:42 +0000
+++ include/platform/mir/input/input_sink.h	2015-11-19 12:36:51 +0000
@@ -34,11 +34,6 @@
     InputSink() = default;
     virtual ~InputSink() = default;
     virtual void handle_input(MirEvent& event) = 0;
-    /**
-     * Confine position of a pointer
-     */
-    virtual void confine_pointer(mir::geometry::Point& position) = 0;
-
     /**!
      * Obtain the bounding rectangle of the destination area for this input sink
      */

=== modified file 'src/client/events/event_builders.cpp'
--- src/client/events/event_builders.cpp	2015-11-04 07:43:28 +0000
+++ src/client/events/event_builders.cpp	2015-11-19 12:36:51 +0000
@@ -189,6 +189,17 @@
     }
 }
 
+void mev::set_cursor_position(MirEvent& event, mir::geometry::Point const& pos)
+{
+    if (event.type != mir_event_type_motion &&
+        event.motion.source_id != AINPUT_SOURCE_MOUSE &&
+        event.motion.pointer_count == 1)
+        BOOST_THROW_EXCEPTION(std::invalid_argument("Cursor position is only valid for pointer events."));
+
+    event.motion.pointer_coordinates[0].x = pos.x.as_float();
+    event.motion.pointer_coordinates[0].y = pos.y.as_float();
+}
+
 // Deprecated version without mac
 mir::EventUPtr mev::make_event(MirInputDeviceId device_id, std::chrono::nanoseconds timestamp,
     MirKeyboardAction action, xkb_keysym_t key_code,

=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2015-11-04 07:43:28 +0000
+++ src/client/symbols.map	2015-11-19 12:36:51 +0000
@@ -250,6 +250,7 @@
   global:
     extern "C++" { 
       mir::events::set_modifier*;
+      mir::events::set_cursor_position*;
     };
 } MIR_CLIENT_DETAIL_9;
 

=== modified file 'src/platforms/evdev/libinput_device.cpp'
--- src/platforms/evdev/libinput_device.cpp	2015-11-19 04:54:42 +0000
+++ src/platforms/evdev/libinput_device.cpp	2015-11-19 12:36:51 +0000
@@ -163,8 +163,7 @@
     else
         button_state = MirPointerButton(button_state & ~uint32_t(pointer_button));
 
-    return builder->pointer_event(time, action, button_state, pointer_pos.x.as_float(), pointer_pos.y.as_float(),
-                                   hscroll_value, vscroll_value, relative_x_value, relative_y_value);
+    return builder->pointer_event(time, action, button_state, hscroll_value, vscroll_value, relative_x_value, relative_y_value);
 }
 
 mir::EventUPtr mie::LibInputDevice::convert_motion_event(libinput_event_pointer* pointer)
@@ -179,12 +178,9 @@
     mir::geometry::Displacement const movement{
         libinput_event_pointer_get_dx(pointer),
         libinput_event_pointer_get_dy(pointer)};
-    pointer_pos = pointer_pos + movement;
-
-    sink->confine_pointer(pointer_pos);
-
-    return builder->pointer_event(time, action, button_state, pointer_pos.x.as_float(), pointer_pos.y.as_float(),
-                                  hscroll_value, vscroll_value, movement.dx.as_float(), movement.dy.as_float());
+
+    return builder->pointer_event(time, action, button_state, hscroll_value, vscroll_value, movement.dx.as_float(),
+                                  movement.dy.as_float());
 }
 
 mir::EventUPtr mie::LibInputDevice::convert_absolute_motion_event(libinput_event_pointer* pointer)
@@ -205,10 +201,7 @@
         libinput_event_pointer_get_absolute_y_transformed(pointer, height)};
     auto const movement = pointer_pos - old_pointer_pos;
 
-    sink->confine_pointer(pointer_pos);
-
-    return builder->pointer_event(time, action, button_state, pointer_pos.x.as_float(), pointer_pos.y.as_float(),
-                                  hscroll_value, vscroll_value, movement.dx.as_float(), movement.dy.as_float());
+    return builder->pointer_event(time, action, button_state, hscroll_value, vscroll_value, movement.dx.as_float(), movement.dy.as_float());
 }
 
 mir::EventUPtr mie::LibInputDevice::convert_axis_event(libinput_event_pointer* pointer)
@@ -227,8 +220,8 @@
         : 0.0f;
 
     report->received_event_from_kernel(time.count(), EV_REL, 0, 0);
-    return builder->pointer_event(time, action, button_state, pointer_pos.x.as_float(), pointer_pos.y.as_float(),
-                                  hscroll_value, vscroll_value, relative_x_value, relative_y_value);
+    return builder->pointer_event(time, action, button_state, hscroll_value, vscroll_value, relative_x_value,
+                                  relative_y_value);
 }
 
 MirEvent& mie::LibInputDevice::get_accumulated_touch_event(std::chrono::nanoseconds timestamp)

=== modified file 'src/platforms/mesa/server/x11/input/input_device.h'
--- src/platforms/mesa/server/x11/input/input_device.h	2015-11-03 15:54:51 +0000
+++ src/platforms/mesa/server/x11/input/input_device.h	2015-11-19 12:36:51 +0000
@@ -21,6 +21,7 @@
 
 #include "mir/input/input_device.h"
 #include "mir/input/input_device_info.h"
+#include "mir/geometry/point.h"
 #include "mir/optional_value.h"
 
 namespace mir
@@ -48,6 +49,7 @@
 
     InputSink* sink{nullptr};
     EventBuilder* builder{nullptr};
+    geometry::Point pointer_pos;
 private:
     InputDeviceInfo info;
 };

=== modified file 'src/platforms/mesa/server/x11/input/input_platform.cpp'
--- src/platforms/mesa/server/x11/input/input_platform.cpp	2015-11-04 07:43:28 +0000
+++ src/platforms/mesa/server/x11/input/input_platform.cpp	2015-11-19 12:36:51 +0000
@@ -205,8 +205,6 @@
                             event_time,
                             mir_pointer_action_motion,
                             0,
-                            xbev.x,
-                            xbev.y,
                             0.0f,
                             (xbev.button == Button4) ? 1.0f : -1.0f,
                             0.0f,
@@ -216,6 +214,10 @@
                 }
                 else
                 {
+                    auto const old_pointer_pos = core_pointer->pointer_pos;
+                    core_pointer->pointer_pos = geometry::Point{xbev.x, xbev.y};
+                    auto const movement = core_pointer->pointer_pos - old_pointer_pos;
+
                     core_pointer->sink->handle_input(
                         *core_pointer->builder->pointer_event(
                             event_time,
@@ -223,12 +225,10 @@
                                 mir_pointer_action_button_down :
                                 mir_pointer_action_button_up,
                             buttons_pressed,
-                            xbev.x,
-                            xbev.y,
-                            0.0f,
-                            0.0f,
-                            0.0f,
-                            0.0f
+                            0.0f,
+                            0.0f,
+                            movement.dx.as_float(),
+                            movement.dy.as_float()
                             )
                         );
                 }
@@ -275,8 +275,6 @@
                         event_time,
                         mir_pointer_action_motion,
                         buttons_pressed,
-                        xmev.x,
-                        xmev.y,
                         0.0f,
                         0.0f,
                         0.0f,

=== modified file 'src/server/input/default_event_builder.cpp'
--- src/server/input/default_event_builder.cpp	2015-11-04 07:43:28 +0000
+++ src/server/input/default_event_builder.cpp	2015-11-19 12:36:51 +0000
@@ -60,10 +60,11 @@
 }
 
 mir::EventUPtr mi::DefaultEventBuilder::pointer_event(Timestamp timestamp, MirPointerAction action,
-                                                      MirPointerButtons buttons_pressed, float x_axis_value,
-                                                      float y_axis_value, float hscroll_value, float vscroll_value,
+                                                      MirPointerButtons buttons_pressed, float hscroll_value, float vscroll_value,
                                                       float relative_x_value, float relative_y_value)
 {
+    const float x_axis_value = 0;
+    const float y_axis_value = 0;
     uint64_t mac = 0;
     if (action == mir_pointer_action_button_up || action == mir_pointer_action_button_down)
         mac = cookie_factory->timestamp_to_cookie(timestamp.count()).mac;

=== modified file 'src/server/input/default_event_builder.h'
--- src/server/input/default_event_builder.h	2015-11-04 07:43:28 +0000
+++ src/server/input/default_event_builder.h	2015-11-19 12:36:51 +0000
@@ -45,8 +45,8 @@
                    float touch_minor_value, float size_value) override;
 
     EventUPtr pointer_event(Timestamp timestamp, MirPointerAction action, MirPointerButtons buttons_pressed,
-                            float x_axis_value, float y_axis_value, float hscroll_value, float vscroll_value,
-                            float relative_x_value, float relative_y_value) override;
+                            float hscroll_value, float vscroll_value, float relative_x_value,
+                            float relative_y_value) override;
 
     EventUPtr configuration_event(Timestamp timestamp, MirInputConfigurationAction action) override;
 

=== modified file 'src/server/input/default_input_device_hub.cpp'
--- src/server/input/default_input_device_hub.cpp	2015-11-04 15:42:43 +0000
+++ src/server/input/default_input_device_hub.cpp	2015-11-19 12:36:51 +0000
@@ -56,7 +56,7 @@
       device_queue(std::make_shared<dispatch::ActionQueue>()),
       input_region(input_region),
       cookie_factory(cookie_factory),
-      seat(touch_visualizer, cursor_listener),
+      seat(touch_visualizer, cursor_listener, input_region),
       device_id_generator{0}
 {
     input_dispatchable->add_watch(device_queue);
@@ -175,6 +175,9 @@
     else
         mev::set_modifier(event, seat->event_modifier());
 
+    if (mir_input_event_type_pointer == mir_input_event_get_type(input_event))
+        mev::set_cursor_position(event, seat->cursor_position());
+
     dispatcher->dispatch(event);
 }
 
@@ -193,11 +196,6 @@
     device->stop();
 }
 
-void mi::DefaultInputDeviceHub::RegisteredDevice::confine_pointer(mir::geometry::Point& position)
-{
-    hub->input_region->confine(position);
-}
-
 mir::geometry::Rectangle mi::DefaultInputDeviceHub::RegisteredDevice::bounding_rectangle() const
 {
     // TODO touchscreens only need the bounding rectangle of one output

=== modified file 'src/server/input/default_input_device_hub.h'
--- src/server/input/default_input_device_hub.h	2015-11-04 15:42:43 +0000
+++ src/server/input/default_input_device_hub.h	2015-11-19 12:36:51 +0000
@@ -99,7 +99,6 @@
                          DefaultInputDeviceHub* hub,
                          Seat* seat);
         void handle_input(MirEvent& event) override;
-        void confine_pointer(mir::geometry::Point& position) override;
         mir::geometry::Rectangle bounding_rectangle() const override;
         bool device_matches(std::shared_ptr<InputDevice> const& dev) const;
         void start();

=== modified file 'src/server/input/seat.cpp'
--- src/server/input/seat.cpp	2015-10-19 10:00:22 +0000
+++ src/server/input/seat.cpp	2015-11-19 12:36:51 +0000
@@ -20,6 +20,8 @@
 #include "seat.h"
 #include "mir/input/device.h"
 #include "mir/input/cursor_listener.h"
+#include "mir/input/input_region.h"
+#include "mir/geometry/displacement.h"
 
 #include "input_modifier_utils.h"
 
@@ -31,8 +33,9 @@
 namespace mi = mir::input;
 
 mi::Seat::Seat(std::shared_ptr<TouchVisualizer> const& touch_visualizer,
-               std::shared_ptr<CursorListener> const& cursor_listener)
-    : touch_visualizer{touch_visualizer}, cursor_listener{cursor_listener}, modifier{0}
+               std::shared_ptr<CursorListener> const& cursor_listener,
+               std::shared_ptr<InputRegion> const& input_region)
+    : touch_visualizer{touch_visualizer}, cursor_listener{cursor_listener}, input_region{input_region}, modifier{0}
 {
 }
 
@@ -153,9 +156,19 @@
                                });
 }
 
+mir::geometry::Point mi::Seat::cursor_position() const
+{
+    return cursor_pos;
+}
+
 void mi::Seat::update_cursor(MirPointerEvent const* event)
 {
-    cursor_listener->cursor_moved_to(mir_pointer_event_axis_value(event, mir_pointer_axis_x),
-                                     mir_pointer_event_axis_value(event, mir_pointer_axis_y));
+    mir::geometry::Displacement movement{
+        mir_pointer_event_axis_value(event, mir_pointer_axis_relative_x),
+        mir_pointer_event_axis_value(event, mir_pointer_axis_relative_y),
+    };
+    cursor_pos = cursor_pos + movement;
+    input_region->confine(cursor_pos);
+
+    cursor_listener->cursor_moved_to(cursor_pos.x.as_float(), cursor_pos.y.as_float());
 }
-

=== modified file 'src/server/input/seat.h'
--- src/server/input/seat.h	2015-10-19 10:00:22 +0000
+++ src/server/input/seat.h	2015-11-19 12:36:51 +0000
@@ -21,6 +21,7 @@
 #define MIR_INPUT_DEFAULT_SEAT_H_
 
 #include "mir/input/touch_visualizer.h"
+#include "mir/geometry/point.h"
 #include "mir_toolkit/event.h"
 #include <unordered_map>
 #include <memory>
@@ -30,6 +31,7 @@
 namespace input
 {
 class CursorListener;
+class InputRegion;
 
 /*
  * The seat bundles a group of devices. A cursor position, input event modifiers and the visible touch spots are properties
@@ -38,13 +40,15 @@
 class Seat
 {
 public:
-    Seat(std::shared_ptr<TouchVisualizer> const& touch_visualizer, std::shared_ptr<CursorListener> const& cursor_listener);
+    Seat(std::shared_ptr<TouchVisualizer> const& touch_visualizer,
+         std::shared_ptr<CursorListener> const& cursor_listener, std::shared_ptr<InputRegion> const& input_region);
     void add_device(MirInputDeviceId);
     void remove_device(MirInputDeviceId);
 
     MirInputEventModifiers event_modifier() const;
     MirInputEventModifiers event_modifier(MirInputDeviceId) const;
     void update_seat_properties(MirInputEvent const* event);
+    geometry::Point cursor_position() const;
 private:
     void update_cursor(MirPointerEvent const* event);
     void update_spots();
@@ -52,6 +56,7 @@
 
     std::shared_ptr<TouchVisualizer> const touch_visualizer;
     std::shared_ptr<CursorListener> const cursor_listener;
+    std::shared_ptr<InputRegion> const input_region;
 
     struct DeviceData
     {
@@ -63,6 +68,7 @@
         std::vector<TouchVisualizer::Spot> spots;
     };
 
+    mir::geometry::Point cursor_pos;
     MirInputEventModifiers modifier;
     std::unordered_map<MirInputDeviceId, DeviceData> device_data;
     std::vector<TouchVisualizer::Spot> spots;

=== modified file 'tests/mir_test_framework/fake_input_device_impl.cpp'
--- tests/mir_test_framework/fake_input_device_impl.cpp	2015-11-19 04:54:42 +0000
+++ tests/mir_test_framework/fake_input_device_impl.cpp	2015-11-19 12:36:51 +0000
@@ -117,8 +117,6 @@
     auto button_event = builder->pointer_event(event_time,
                                                action,
                                                buttons,
-                                               pos.x.as_float(),
-                                               pos.y.as_float(),
                                                scroll.x.as_float(),
                                                scroll.y.as_float(),
                                                0.0f,
@@ -157,12 +155,9 @@
     auto rel_x = pointer.rel_x * acceleration;
     auto rel_y = pointer.rel_y * acceleration;
 
-    update_position(rel_x, rel_y);
     auto pointer_event = builder->pointer_event(event_time,
                                                 mir_pointer_action_motion,
                                                 buttons,
-                                                pos.x.as_float(),
-                                                pos.y.as_float(),
                                                 scroll.x.as_float(),
                                                 scroll.y.as_float(),
                                                 rel_x,
@@ -171,12 +166,6 @@
     sink->handle_input(*pointer_event);
 }
 
-void mtf::FakeInputDeviceImpl::InputDevice::update_position(int rel_x, int rel_y)
-{
-    pos = pos + mir::geometry::Displacement{rel_x, rel_y};
-    sink->confine_pointer(pos);
-}
-
 void mtf::FakeInputDeviceImpl::InputDevice::synthesize_events(synthesis::TouchParameters const& touch)
 {
     if (!sink)

=== modified file 'tests/unit-tests/input/evdev/test_libinput_device.cpp'
--- tests/unit-tests/input/evdev/test_libinput_device.cpp	2015-11-19 04:54:42 +0000
+++ tests/unit-tests/input/evdev/test_libinput_device.cpp	2015-11-19 12:36:51 +0000
@@ -96,11 +96,11 @@
                                         return builder.add_touch(event, id, action, tooltype, x, y, major, minor,
                                                                  pressure, size);
                                   }));
-        ON_CALL(*this, pointer_event(_, _, _, _, _, _, _, _, _))
-            .WillByDefault(Invoke([this](Timestamp time, MirPointerAction action, MirPointerButtons buttons, float x,
-                                         float y, float hscroll, float vscroll, float relative_x, float relative_y)
+        ON_CALL(*this, pointer_event(_, _, _, _, _, _, _))
+            .WillByDefault(Invoke([this](Timestamp time, MirPointerAction action, MirPointerButtons buttons,
+                                         float hscroll, float vscroll, float relative_x, float relative_y)
                                   {
-                                      return builder.pointer_event(time, action, buttons, x, y, hscroll, vscroll,
+                                      return builder.pointer_event(time, action, buttons, hscroll, vscroll,
                                                                    relative_x, relative_y);
                                   }));
         ON_CALL(*this, configuration_event(_,_))
@@ -115,9 +115,8 @@
     MOCK_METHOD1(touch_event, mir::EventUPtr(Timestamp));
     MOCK_METHOD10(add_touch, void(MirEvent&, MirTouchId, MirTouchAction, MirTouchTooltype, float, float, float, float,
                                   float, float));
-
-    MOCK_METHOD9(pointer_event, mir::EventUPtr(Timestamp, MirPointerAction, MirPointerButtons, float, float, float,
-                                               float, float, float));
+    MOCK_METHOD7(pointer_event,
+                 mir::EventUPtr(Timestamp, MirPointerAction, MirPointerButtons, float, float, float, float));
     MOCK_METHOD2(configuration_event, mir::EventUPtr(Timestamp, MirInputConfigurationAction));
 };
 
@@ -549,28 +548,16 @@
     setup_absolute_pointer_event(fake_event_1, event_time_1, x1, y1);
     setup_absolute_pointer_event(fake_event_2, event_time_2, x2, y2);
 
-    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithPosition(x1, y1)));
+    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithDiff(x1, y1)));
     EXPECT_CALL(mock_sink,
-                handle_input(AllOf(mt::PointerEventWithPosition(x2, y2), mt::PointerEventWithDiff(x2 - x1, y2 - y1))));
+                handle_input(mt::PointerEventWithDiff(x2 - x1, y2 - y1)));
 
     mouse.start(&mock_sink, &mock_builder);
     mouse.process_event(fake_event_1);
     mouse.process_event(fake_event_2);
 }
 
-TEST_F(LibInputDeviceOnMouse, process_event_provides_relative_coordinates)
-{
-    float x = -5;
-    float y = 20;
-    setup_pointer_event(fake_event_1, event_time_1, x, y);
-
-    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithDiff(x,y)));
-
-    mouse.start(&mock_sink, &mock_builder);
-    mouse.process_event(fake_event_1);
-}
-
-TEST_F(LibInputDeviceOnMouse, process_event_accumulates_pointer_movement)
+TEST_F(LibInputDeviceOnMouse, process_event_motion_events_with_relative_changes)
 {
     float x1 = 15, x2 = 23;
     float y1 = 17, y2 = 21;
@@ -578,8 +565,8 @@
     setup_pointer_event(fake_event_1, event_time_1, x1, y1);
     setup_pointer_event(fake_event_2, event_time_2, x2, y2);
 
-    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithPosition(x1,y1)));
-    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithPosition(x1+x2,y1+y2)));
+    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithDiff(x1,y1)));
+    EXPECT_CALL(mock_sink, handle_input(mt::PointerEventWithDiff(x2,y2)));
 
     mouse.start(&mock_sink, &mock_builder);
     mouse.process_event(fake_event_1);
@@ -618,10 +605,10 @@
     InSequence seq;
     // expect two scroll events..
     EXPECT_CALL(mock_builder,
-                pointer_event(time_stamp_1, mir_pointer_action_motion, 0, 0.0f, 0.0f, 0.0f, 20.0f, 0.0f, 0.0f));
+                pointer_event(time_stamp_1, mir_pointer_action_motion, 0, 0.0f, 20.0f, 0.0f, 0.0f));
     EXPECT_CALL(mock_sink, handle_input(mt::PointerAxisChange(mir_pointer_axis_vscroll, 20.0f)));
     EXPECT_CALL(mock_builder,
-                pointer_event(time_stamp_2, mir_pointer_action_motion, 0, 0.0f, 0.0f, 5.0f, 0.0f, 0.0f, 0.0f));
+                pointer_event(time_stamp_2, mir_pointer_action_motion, 0, 5.0f, 0.0f, 0.0f, 0.0f));
     EXPECT_CALL(mock_sink, handle_input(mt::PointerAxisChange(mir_pointer_axis_hscroll, 5.0f)));
 
     mouse.start(&mock_sink, &mock_builder);

=== modified file 'tests/unit-tests/input/test_default_input_device_hub.cpp'
--- tests/unit-tests/input/test_default_input_device_hub.cpp	2015-11-04 15:42:43 +0000
+++ tests/unit-tests/input/test_default_input_device_hub.cpp	2015-11-19 12:36:51 +0000
@@ -340,22 +340,22 @@
 TEST_F(InputDeviceHubTest, tracks_pointer_position)
 {
     geom::Point first{10,10}, second{20,20}, third{10,30};
-    EXPECT_CALL(mock_region,confine(first));
-    EXPECT_CALL(mock_region,confine(second));
-    EXPECT_CALL(mock_region,confine(third));
+    EXPECT_CALL(mock_region, confine(first));
+    EXPECT_CALL(mock_region, confine(second));
+    EXPECT_CALL(mock_region, confine(third));
 
     mi::InputSink* sink;
     mi::EventBuilder* builder;
     capture_input_sink(device, sink, builder);
 
     hub.add_device(mt::fake_shared(device));
-
-    geom::Point pos = first;
-    sink->confine_pointer(pos);
-    pos = second;
-    sink->confine_pointer(pos);
-    pos = third;
-    sink->confine_pointer(pos);
+    observer_loop.trigger_server_actions();
+    sink->handle_input(
+        *builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0.0f, 0.0f, 10.0f, 10.0f));
+    sink->handle_input(
+        *builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0.0f, 0.0f, 10.0f, 10.0f));
+    sink->handle_input(
+        *builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0.0f, 0.0f, -10.0f, 10.0f));
 }
 
 TEST_F(InputDeviceHubTest, confines_pointer_movement)
@@ -364,34 +364,34 @@
 
     ON_CALL(mock_region,confine(_))
         .WillByDefault(SetArgReferee<0>(confined_pos));
+    EXPECT_CALL(mock_cursor_listener, cursor_moved_to(confined_pos.x.as_int(), confined_pos.y.as_int())).Times(2);
 
     mi::InputSink* sink;
     mi::EventBuilder* builder;
     capture_input_sink(device, sink, builder);
     hub.add_device(mt::fake_shared(device));
-
-    geom::Point pos1{10,20};
-    sink->confine_pointer(pos1);
-
-    geom::Point pos2{20,30};
-    sink->confine_pointer(pos2);
-
-    EXPECT_THAT(pos1, Eq(confined_pos));
-    EXPECT_THAT(pos2, Eq(confined_pos));
+    observer_loop.trigger_server_actions();
+
+    sink->handle_input(
+        *builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0.0f, 0.0f, 10.0f, 20.0f));
+    sink->handle_input(
+        *builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0.0f, 0.0f, 10.0f, 10.0f));
 }
 
 TEST_F(InputDeviceHubTest, forwards_pointer_updates_to_cursor_listener)
 {
-    auto x = 12.2f, y = 14.3f;
+    using namespace ::testing;
+
+    auto move_x = 12.0f, move_y = 14.0f;
 
     mi::InputSink* sink;
     mi::EventBuilder* builder;
     capture_input_sink(device, sink, builder);
     hub.add_device(mt::fake_shared(device));
 
-    auto event = builder->pointer_event(0ns, mir_pointer_action_motion, 0, x, y, 0.0f, 0.0f, 0.0f, 0.0f);
+    auto event = builder->pointer_event(0ns, mir_pointer_action_motion, 0, 0.0f, 0.0f, move_x, move_y);
 
-    EXPECT_CALL(mock_cursor_listener, cursor_moved_to(x, y)).Times(1);
+    EXPECT_CALL(mock_cursor_listener, cursor_moved_to(move_x, move_y)).Times(1);
 
     sink->handle_input(*event);
 }
@@ -490,7 +490,7 @@
     auto key =
         key_event_builder->key_event(arbitrary_timestamp, mir_keyboard_action_down, 0, KEY_RIGHTALT);
     auto motion =
-        mouse_event_builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 12, 40, 0, 0, 12, 40);
+        mouse_event_builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0, 0, 12, 40);
 
     EXPECT_CALL(mock_dispatcher, dispatch(mt::KeyWithModifiers(r_alt_modifier)));
     EXPECT_CALL(mock_dispatcher, dispatch(mt::PointerEventWithModifiers(r_alt_modifier)));
@@ -543,9 +543,9 @@
     auto ctrl_up = key_event_builder_2->key_event(arbitrary_timestamp, mir_keyboard_action_up, 0, KEY_LEFTCTRL);
 
     auto motion_1 =
-        mouse_event_builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 12, 40, 0, 0, 12, 40);
+        mouse_event_builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0, 0, 12, 40);
     auto motion_2 =
-        mouse_event_builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 30, 50, 0, 0, 18, 10);
+        mouse_event_builder->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0, 0, 18, 10);
 
     EXPECT_CALL(mock_dispatcher, dispatch(mt::KeyWithModifiers(r_alt_modifier)));
     EXPECT_CALL(mock_dispatcher, dispatch(mt::KeyWithModifiers(l_ctrl_modifier)));
@@ -561,3 +561,37 @@
 
     EXPECT_THAT(key_handle_1->id(), Ne(key_handle_2->id()));
 }
+
+TEST_F(InputDeviceHubTest, tracks_a_single_cursor_position_from_multiple_pointing_devices)
+{
+    using namespace ::testing;
+
+    mi::InputSink* mouse_sink_1;
+    mi::EventBuilder* mouse_event_builder_1;
+    mi::InputSink* mouse_sink_2;
+    mi::EventBuilder* mouse_event_builder_2;
+
+    capture_input_sink(device, mouse_sink_1, mouse_event_builder_1);
+    capture_input_sink(another_device, mouse_sink_2, mouse_event_builder_2);
+
+    hub.add_device(mt::fake_shared(device));
+    hub.add_device(mt::fake_shared(another_device));
+
+    observer_loop.trigger_server_actions();
+
+    auto motion_1 =
+        mouse_event_builder_1->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0, 0, 23, 20);
+    auto motion_2 =
+        mouse_event_builder_2->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0, 0, 18, -10);
+    auto motion_3 =
+        mouse_event_builder_2->pointer_event(arbitrary_timestamp, mir_pointer_action_motion, 0, 0, 0, 2, 10);
+
+    EXPECT_CALL(mock_cursor_listener, cursor_moved_to(23, 20));
+    EXPECT_CALL(mock_cursor_listener, cursor_moved_to(41, 10));
+    EXPECT_CALL(mock_cursor_listener, cursor_moved_to(43, 20));
+
+    mouse_sink_1->handle_input(*motion_1);
+    mouse_sink_2->handle_input(*motion_2);
+    mouse_sink_1->handle_input(*motion_3);
+
+}