Mir

Merge lp://qastaging/~alan-griffiths/mir/fix-1668651 into lp://qastaging/mir

Proposed by Alan Griffiths
Status: Work in progress
Proposed branch: lp://qastaging/~alan-griffiths/mir/fix-1668651
Merge into: lp://qastaging/mir
Diff against target: 25322 lines (+24516/-0) (has conflicts)
155 files modified
.bzr-builddeb/default.conf (+2/-0)
.bzrignore (+3/-0)
CMakeLists.txt (+78/-0)
COPYING (+674/-0)
README.md (+46/-0)
cmake/Doxygen.cmake (+26/-0)
cmake/FindGLESv2.cmake (+25/-0)
cmake/FindPIL.cmake (+8/-0)
debian/changelog (+227/-0)
debian/compat (+1/-0)
debian/control (+90/-0)
debian/copyright (+24/-0)
debian/libmiral-dev.install (+3/-0)
debian/libmiral2.install (+1/-0)
debian/libmiral2.symbols (+383/-0)
debian/libmirclientcpp-dev.install (+2/-0)
debian/miral-doc.install (+1/-0)
debian/miral-examples.install (+9/-0)
debian/rules (+26/-0)
doc/Doxyfile.in (+1926/-0)
doc/extra.css (+40/-0)
doc/footer.html.in (+5/-0)
doc/introducing_the_miral_api.md (+25/-0)
doc/mainpage.md (+54/-0)
getting_and_using_miral.md (+179/-0)
include/mir/client/connection.h (+54/-0)
include/mir/client/detail/mir_forward_compatibility.h (+172/-0)
include/mir/client/display_config.h (+83/-0)
include/mir/client/window.h (+65/-0)
include/mir/client/window_id.h (+65/-0)
include/mir/client/window_spec.h (+329/-0)
include/miral/active_outputs.h (+73/-0)
include/miral/add_init_callback.h (+47/-0)
include/miral/append_event_filter.h (+44/-0)
include/miral/application.h (+42/-0)
include/miral/application_authorizer.h (+102/-0)
include/miral/application_info.h (+55/-0)
include/miral/canonical_window_manager.h (+59/-0)
include/miral/command_line_option.h (+100/-0)
include/miral/cursor_theme.h (+44/-0)
include/miral/debug_extension.h (+47/-0)
include/miral/display_configuration_option.h (+30/-0)
include/miral/internal_client.h (+88/-0)
include/miral/keymap.h (+58/-0)
include/miral/output.h (+113/-0)
include/miral/runner.h (+74/-0)
include/miral/set_command_line_hander.h (+50/-0)
include/miral/set_terminator.h (+47/-0)
include/miral/set_window_managment_policy.h (+54/-0)
include/miral/window.h (+82/-0)
include/miral/window_info.h (+130/-0)
include/miral/window_management_options.h (+65/-0)
include/miral/window_management_policy.h (+196/-0)
include/miral/window_manager_tools.h (+230/-0)
include/miral/window_specification.h (+136/-0)
include/miral/workspace_policy.h (+88/-0)
miral-kiosk/CMakeLists.txt (+11/-0)
miral-kiosk/kiosk_main.cpp (+101/-0)
miral-kiosk/kiosk_window_manager.cpp (+144/-0)
miral-kiosk/kiosk_window_manager.h (+56/-0)
miral-kiosk/sw_splash.cpp (+151/-0)
miral-kiosk/sw_splash.h (+44/-0)
miral-shell/CMakeLists.txt (+64/-0)
miral-shell/decoration_provider.cpp (+571/-0)
miral-shell/decoration_provider.h (+112/-0)
miral-shell/desktop/CMakeLists.txt (+12/-0)
miral-shell/desktop/miral-shell.desktop.in (+18/-0)
miral-shell/desktop/ubuntu-logo.svg (+27/-0)
miral-shell/miral-app.sh (+53/-0)
miral-shell/miral-desktop.sh (+45/-0)
miral-shell/miral-run.sh (+6/-0)
miral-shell/miral-screencast.sh (+48/-0)
miral-shell/miral-xrun.sh (+14/-0)
miral-shell/shell_main.cpp (+94/-0)
miral-shell/spinner/CMakeLists.txt (+66/-0)
miral-shell/spinner/eglapp.cpp (+164/-0)
miral-shell/spinner/eglapp.h (+33/-0)
miral-shell/spinner/eglspinner.cpp (+370/-0)
miral-shell/spinner/miregl.cpp (+248/-0)
miral-shell/spinner/miregl.h (+69/-0)
miral-shell/spinner/png2header.py (+87/-0)
miral-shell/spinner/splash.h (+45/-0)
miral-shell/tiling_window_manager.cpp (+677/-0)
miral-shell/tiling_window_manager.h (+141/-0)
miral-shell/titlebar_config.cpp (+38/-0)
miral-shell/titlebar_config.h (+30/-0)
miral-shell/titlebar_window_manager.cpp (+754/-0)
miral-shell/titlebar_window_manager.h (+132/-0)
miral/CMakeLists.txt (+124/-0)
miral/active_outputs.cpp (+236/-0)
miral/add_init_callback.cpp (+33/-0)
miral/append_event_filter.cpp (+48/-0)
miral/application.cpp (+51/-0)
miral/application_authorizer.cpp (+129/-0)
miral/application_info.cpp (+99/-0)
miral/basic_window_manager.cpp (+1971/-0)
miral/basic_window_manager.h (+226/-0)
miral/both_versions.h (+38/-0)
miral/canonical_window_manager.cpp (+77/-0)
miral/command_line_option.cpp (+199/-0)
miral/coordinate_translator.cpp (+51/-0)
miral/coordinate_translator.h (+52/-0)
miral/cursor_theme.cpp (+55/-0)
miral/debug_extension.cpp (+51/-0)
miral/display_configuration_option.cpp (+115/-0)
miral/internal_client.cpp (+176/-0)
miral/keymap.cpp (+189/-0)
miral/mir_features.h.in (+29/-0)
miral/miral.pc.in (+9/-0)
miral/mirclientcpp.pc.in (+7/-0)
miral/mru_window_list.cpp (+66/-0)
miral/mru_window_list.h (+46/-0)
miral/output.cpp (+118/-0)
miral/runner.cpp (+284/-0)
miral/set_command_line_hander.cpp (+33/-0)
miral/set_terminator.cpp (+33/-0)
miral/set_window_managment_policy.cpp (+68/-0)
miral/symbols.map (+397/-0)
miral/version.h.in (+67/-0)
miral/window.cpp (+127/-0)
miral/window_info.cpp (+594/-0)
miral/window_management_options.cpp (+93/-0)
miral/window_management_policy.cpp (+37/-0)
miral/window_management_trace.cpp (+739/-0)
miral/window_management_trace.h (+139/-0)
miral/window_manager_tools.cpp (+123/-0)
miral/window_manager_tools_implementation.h (+101/-0)
miral/window_specification.cpp (+644/-0)
miral/workspace_policy.cpp (+29/-0)
miral/xcursor.c (+899/-0)
miral/xcursor.h (+62/-0)
miral/xcursor_loader.cpp (+227/-0)
miral/xcursor_loader.h (+66/-0)
scripts/filter_symbols_diff.sh (+2/-0)
scripts/process_doxygen_xml.py (+600/-0)
tasks_for_the_interested_reader.md (+79/-0)
test/CMakeLists.txt (+74/-0)
test/active_outputs.cpp (+205/-0)
test/active_window.cpp (+378/-0)
test/display_reconfiguration.cpp (+89/-0)
test/drag_active_window.cpp (+155/-0)
test/modify_window_state.cpp (+107/-0)
test/mru_window_list.cpp (+193/-0)
test/raise_tree.cpp (+95/-0)
test/runner.cpp (+49/-0)
test/select_active_window.cpp (+123/-0)
test/test_server.cpp (+202/-0)
test/test_server.h (+91/-0)
test/test_window_manager_tools.h (+179/-0)
test/window_id.cpp (+156/-0)
test/window_placement.cpp (+554/-0)
test/window_placement_anchors_to_parent.cpp (+208/-0)
test/window_placement_client_api.cpp (+159/-0)
test/window_properties.cpp (+153/-0)
test/workspaces.cpp (+603/-0)
Conflict adding file .bzr-builddeb.  Moved existing file to .bzr-builddeb.moved.
Conflict adding file .bzrignore.  Moved existing file to .bzrignore.moved.
Conflict adding file CMakeLists.txt.  Moved existing file to CMakeLists.txt.moved.
Conflict adding file README.md.  Moved existing file to README.md.moved.
Conflict adding file cmake.  Moved existing file to cmake.moved.
Conflict adding file debian.  Moved existing file to debian.moved.
Conflict adding file doc.  Moved existing file to doc.moved.
Conflict adding file include.  Moved existing file to include.moved.
To merge this branch: bzr merge lp://qastaging/~alan-griffiths/mir/fix-1668651
Reviewer Review Type Date Requested Status
Mir development team Pending
Review via email: mp+318593@code.qastaging.launchpad.net

Commit message

Untangle part of the (largely hidden) miral-shell shutdown mess.

Description of the change

Untangle part of the miral-shell shutdown mess.

Closing the server caused the internal client to kill the server with SIGHUP which "just" resulted in an EXIT_FAILURE.

The server now closes cleanly (but the client code doesn't clear down correctly - working on that in a follow-up).

To post a comment you must log in.

Unmerged revisions

526. By Alan Griffiths

Remove an unnecessary worker thread

525. By Alan Griffiths

Don't kill the server with a SIGHUP

524. By Alan Griffiths

Don't treat workaround window as a titlebar

523. By Alan Griffiths

Update debian/changelog

522. By Alan Griffiths

[mirclientcpp] Avoid unnecessary include of deprecated functions

521. By Alan Griffiths

[libmiral] Fix initialization order so that policies can allocate workspaces when constructed

520. By Alan Griffiths

[libmiral] Workaround for server crash (LP: #1667645)

519. By Alan Griffiths

[libmirclientcpp] Prevent accidental double-release by deleting release functions for handle classes

518. By Alan Griffiths

[miral-kiosk] Use libmirclientcpp where possible

517. By Alan Griffiths

[libmiral] Fix access to invalidated iterators, use of dead objects and racy test code.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches