Merge lp:~raof/mir/xserver-spawner into lp:mir
Status: | Work in progress |
---|---|
Proposed branch: | lp:~raof/mir/xserver-spawner |
Merge into: | lp:mir |
Prerequisite: | lp:~raof/mir/process-wrapper |
Diff against target: |
725 lines (+566/-2) 16 files modified
.clang-format (+1/-1) include/server/mir/default_server_configuration.h (+11/-0) include/server/mir/xserver/null_server_spawner.h (+25/-0) include/server/mir/xserver/xserver_launcher.h (+59/-0) src/server/CMakeLists.txt (+3/-1) src/server/default_server_configuration.cpp (+6/-0) src/server/xserver/CMakeLists.txt (+12/-0) src/server/xserver/global_socket_listening_server_spawner.cpp (+71/-0) src/server/xserver/global_socket_listening_server_spawner.h (+52/-0) src/server/xserver/null_server_spawner.cpp (+34/-0) tests/CMakeLists.txt (+1/-0) tests/acceptance-tests/CMakeLists.txt (+2/-0) tests/acceptance-tests/test_xserver_spawner.cpp (+73/-0) tests/unit-tests/CMakeLists.txt (+2/-0) tests/unit-tests/xserver/CMakeLists.txt (+8/-0) tests/unit-tests/xserver/test_xserver_spawner.cpp (+206/-0) |
To merge this branch: | bzr merge lp:~raof/mir/xserver-spawner |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andreas Pokorny (community) | Needs Fixing | ||
Daniel van Vugt | Needs Fixing | ||
Alan Griffiths | Needs Information | ||
PS Jenkins bot (community) | continuous-integration | Needs Fixing | |
Review via email: mp+203475@code.launchpad.net |
This proposal supersedes a proposal from 2014-01-28.
Description of the change
A first cut at the infrastructure required for seamless nesting of X11 clients.
In order to do this we need to be able to spawn an Xorg server, wait until it's
ready to accept connections, connect a Mir X11 client to act as a bridging WM,
and *then* offer the X11 socket to clients.
This branch accomplishes the first two requirements.
I'm proposing it now because it's a reasonable checkpoint and I need to go and work on something else.
Unmerged revisions
- 1349. By Chris Halse Rogers
-
clang-format: We always split constructor initialisers on new lines
- 1348. By Chris Halse Rogers
-
Disable X11ClientConnects acceptance test.
This needs a bit more fiddling - it all roughly works, but in the acceptance
test framework we don't have a real graphics card, so XMir currently fails.Needs at least an xorg.conf specifying the dummy graphics driver
- 1347. By Chris Halse Rogers
-
Get the Xserver to connect to a Mir socket
- 1346. By Chris Halse Rogers
-
Update for process::Spawner API change
- 1345. By Chris Halse Rogers
-
Merged subprocess-wrapper into xserver-spawner.
- 1344. By Chris Halse Rogers
-
X::ServerSpawne
r::create_ server must take a shared_ ptr<process: :Spawner> create_server does things asynchronously, so it has to take shared ownership
of the process::Spawner it's using - 1343. By Chris Halse Rogers
-
Rejigger X::ServerSpawner API.
spawn_server() now returns a future<
ServerHandle> that will become a present ServerHandle once
the server is ready, rather than returning a ServerHandle now that has methods that will only
work in the future. - 1342. By Chris Halse Rogers
-
Implement -displayfd handling for GlobalSocketLis
teningServerSpa wner. client_
connection_ string now returns a string that should be associated with an Xorg server that's ready to accept connections - 1341. By Chris Halse Rogers
-
Merge process::Spawner work required to do Xserver startup properly
- 1340. By Chris Halse Rogers
-
More basic unittests for GlobalSocketLis
teningServerSpa wner
Please rethink class names ending in "er". That's almost always a bad decision, and an indication that a different cleaner design is possible...
http:// www.benhallbenh all.com/ 2013/01/ naming- objects- er-object- names/