Mir

Merge lp:~brandontschaefer/mir/pointer-confinement into lp:mir

pointer-confinement
Merge into development-branch

Proposed by Brandon Schaefer on 2016-06-20

Status:

Merged

Approved by:

Cemil Azizoglu on 2016-06-27

Approved revision:

no longer in the source branch.

Merged at revision:

3560

Proposed branch:

lp:~brandontschaefer/mir/pointer-confinement

Merge into:

lp:mir

Diff against target:

1159 lines (+429/-17)

36 files modified

examples/server_example_canonical_window_manager.cpp (+5/-0)
include/server/mir/scene/surface.h (+3/-0)
include/server/mir/scene/surface_creation_parameters.h (+1/-0)
include/server/mir/shell/abstract_shell.h (+7/-1)
include/test/mir/test/doubles/stub_surface.h (+2/-0)
src/client/mir_connection.cpp (+1/-0)
src/include/server/mir/input/seat.h (+3/-0)
src/include/server/mir/shell/window_management_info.h (+1/-1)
src/protobuf/mir_protobuf.proto (+1/-0)
src/server/frontend/session_mediator.cpp (+1/-0)
src/server/input/basic_seat.cpp (+10/-0)
src/server/input/basic_seat.h (+2/-0)
src/server/input/seat_input_device_tracker.cpp (+29/-7)
src/server/input/seat_input_device_tracker.h (+6/-0)
src/server/scene/basic_surface.cpp (+14/-1)
src/server/scene/basic_surface.h (+6/-0)
src/server/scene/surface_allocator.cpp (+2/-0)
src/server/shell/abstract_shell.cpp (+23/-1)
src/server/shell/canonical_window_manager.cpp (+5/-0)
src/server/shell/default_configuration.cpp (+2/-1)
tests/acceptance-tests/CMakeLists.txt (+1/-0)
tests/acceptance-tests/test_confined_pointer.cpp (+214/-0)
tests/acceptance-tests/test_surface_placement.cpp (+1/-0)
tests/include/mir/test/doubles/mock_input_seat.h (+3/-0)
tests/include/mir/test/doubles/mock_surface.h (+1/-0)
tests/include/mir/test/doubles/stub_scene_surface.h (+3/-0)
tests/integration-tests/surface_composition.cpp (+1/-0)
tests/integration-tests/test_surface_stack_with_compositor.cpp (+1/-0)
tests/mir_test_framework/stub_surface.cpp (+10/-0)
tests/unit-tests/input/test_seat_input_device_tracker.cpp (+36/-0)
tests/unit-tests/scene/test_abstract_shell.cpp (+4/-1)
tests/unit-tests/scene/test_basic_surface.cpp (+8/-2)
tests/unit-tests/scene/test_session_manager.cpp (+1/-0)
tests/unit-tests/scene/test_surface.cpp (+4/-1)
tests/unit-tests/scene/test_surface_impl.cpp (+3/-1)
tests/unit-tests/scene/test_surface_stack.cpp (+14/-0)

To merge this branch:

bzr merge lp:~brandontschaefer/mir/pointer-confinement

Medium

Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2016-06-27
Cemil Azizoglu (community)			Approve on 2016-06-27
Kevin DuBois (community)			Approve on 2016-06-27
Chris Halse Rogers			Approve on 2016-06-27
Andreas Pokorny (community)		2016-06-20	Approve on 2016-06-24
Review via email: mp+297941@code.launchpad.net

Commit message

Implements pointer confinement for a surface as a spec.

Only works for a focus windows. The window manager is in charge of actually setting the surface to have pointer confinement if the spec is updated. Right now we need to depend on setting the seat in the abstract shell since its where we need to update the mouse events.

Description of the change

Implements pointer confinement for a surface as a spec.

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-06-20:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1167/rebuild

review: Approve (continuous-integration)

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2016-06-20:

Need to implement this for SurfaceSpecParams (ie. the creation parms which are different then the normal SurfaceSpec struct!)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-06-21:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1168/rebuild

review: Approve (continuous-integration)

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-06-21:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1169/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2016-06-22:

Not blocking: A piece is missing here: the handling of surface movements... I.e. imagine a window manager short cut that changes the window position on screen i.e. toggles form full screen to windows or back - without loosing focus.

I am not sure who should be in charge of that. In the past in mirserver we would use a surface change observer. With AbstractShell we might want to have a move_resize_surface_to(...) that handles that and more things...

Codewise a suggestion:

void mi::SeatInputDeviceTracker::set_confinement_regions(geometry::Rectangles const& regions)
+{
+ confine_function = [regions,this](mir::geometry::Point& pos)
+ {
+ regions.confine(pos);
+ input_region->confine(pos);
+ };
+}
+
+void mi::SeatInputDeviceTracker::reset_confinement_regions()
+{
+ confine_function = [this](geometry::Point& pos) {input_region->confine(pos);};
+}
+
+void mi::SeatInputDeviceTracker::confine_pointer()
+{
     mir::geometry::Point const old{cursor_x, cursor_y};
     auto confined = old;
- input_region->confine(confined);
+ confine_function(confined);
     if (confined.x != old.x) cursor_x = confined.x.as_int();
     if (confined.y != old.y) cursor_y = confined.y.as_int();
+}
+
+void mi::SeatInputDeviceTracker::update_cursor(MirPointerEvent const* event)
+{
+ cursor_x += mir_pointer_event_axis_value(event, mir_pointer_axis_relative_x);
+ cursor_y += mir_pointer_event_axis_value(event, mir_pointer_axis_relative_y);
+
+ confine_pointer();

and just let confine_function be a std::function<void(geometry::Point&)> confine_function initialized like reset_confinement_regions.

hmm is that a needs fixing..

Revision history for this message

Brandon Schaefer (brandontschaefer) wrote on 2016-06-23:

O i like that!

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-06-23:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1183/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Andreas Pokorny (andreas-pokorny) wrote on 2016-06-24:

lgtm

review: Approve

Revision history for this message

Chris Halse Rogers (raof) wrote on 2016-06-27:

747 -#include <gmock/gmock.h>
747 +#include "mir/input/device.h"
748 +#include "mir/test/gmock_fixes.h"

You've accidentally removed <gmock/gmock.h> and replaced it with (the unnecessary, I think?) gmock_fixes.h.

Not blocking, but if you need to update it for any other reason, please fix.

Other than that, looks fine.

review: Approve

Revision history for this message

Kevin DuBois (kdub) wrote on 2016-06-27:

lgtm too

review: Approve

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-06-27:

25 + virtual void set_confine_pointer(MirPointerConfinementState state) = 0;

set_confine_pointer_state would be more consistent, IMO.
-----------------------------------------------------

285 + geometry::Rectangles pointer_confinment_regions;

s/pointer_confinment_regions/pointer_confinement_regions

review: Needs Fixing

Revision history for this message

Cemil Azizoglu (cemil-azizoglu) wrote on 2016-06-27:

Looks good

review: Approve

Revision history for this message

Mir CI Bot (mir-ci-bot) wrote on 2016-06-27:

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/1203/rebuild

review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Brandon Schaefer

Emanuele Antonio Faraone

Gerry Boland

Mir development team

1	=== modified file 'examples/server_example_canonical_window_manager.cpp'
2	--- examples/server_example_canonical_window_manager.cpp 2016-05-04 01:48:16 +0000
3	+++ examples/server_example_canonical_window_manager.cpp 2016-06-27 20:45:54 +0000
4	@@ -416,6 +416,11 @@
5	auto const state = handle_set_state(surface, modifications.state.value());
6	surface->configure(mir_surface_attrib_state, state);
7	}
8	+
9	+ if (modifications.confine_pointer.is_set())
10	+ {
11	+ surface->set_confine_pointer_state(modifications.confine_pointer.value());
12	+ }
13	}
14
15	void me::CanonicalWindowManagerPolicyCopy::handle_delete_surface(std::shared_ptr<ms::Session> const& session, std::weak_ptr<ms::Surface> const& surface)
16
17	=== modified file 'include/server/mir/scene/surface.h'
18	--- include/server/mir/scene/surface.h 2016-05-03 06:55:25 +0000
19	+++ include/server/mir/scene/surface.h 2016-06-27 20:45:54 +0000
20	@@ -115,6 +115,9 @@
21	std::string const& variant, std::string const& options) = 0;
22	virtual void rename(std::string const& title) = 0;
23	virtual void set_streams(std::list<StreamInfo> const& streams) = 0;
24	+
25	+ virtual void set_confine_pointer_state(MirPointerConfinementState state) = 0;
26	+ virtual MirPointerConfinementState confine_pointer_state() const = 0;
27	};
28	}
29	}
30
31	=== modified file 'include/server/mir/scene/surface_creation_parameters.h'
32	--- include/server/mir/scene/surface_creation_parameters.h 2016-04-13 01:27:36 +0000
33	+++ include/server/mir/scene/surface_creation_parameters.h 2016-06-27 20:45:54 +0000
34	@@ -102,6 +102,7 @@
35	mir::optional_value<std::vector<geometry::Rectangle>> input_shape;
36	mir::optional_value<MirShellChrome> shell_chrome;
37	mir::optional_value<std::vector<shell::StreamSpecification>> streams;
38	+ mir::optional_value<MirPointerConfinementState> confine_pointer;
39	};
40