ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2024-12-19 05:37:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

sculpt: remove deferred GUI initialization

Browse Source 
The sculpt manager used to defer the initialization of the GUI until
nitpicker's first display report became ready. This way, Sculpt was able
to run headlessly even if the framebuffer driver failed to start up.
Thanks to #3827, nitpicker no longer depends on a working framebuffer
driver. So the sculpt manager is safe to rely on nitpicker in any case,
simplifying the code.

Issue #3827
This commit is contained in:
Norman Feske 2020-08-14 16:30:36 +02:00
parent c7d9b2ca92
commit a59b69758b
3 changed files with 14 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
repos/gems/run/sculpt.run
View File

@ -73,8 +73,6 @@ install_config {
<policy label="nit_focus -> hover" report="nitpicker -> hover"/>
<policy label="slides_gui_fb_config -> slides"
report="global_keys_handler -> slides"/>
<policy label="leitzentrale -> manager -> displays"
report="nitpicker -> displays"/>
</config>
</start>
@ -416,8 +414,6 @@ install_config {
<child name="report_fs_rom"/> </service>
<service name="ROM" label_prefix="manager -> config -> ">
<child name="config_fs_rom"/> </service>
<service name="ROM" label_prefix="manager -> displays">
<child name="report_rom"/> </service>
<service name="ROM" label_prefix="config -> ">
<child name="config_fs_rom"/> </service>
<service name="ROM" label="manager -> nitpicker_hover">

2
repos/gems/run/sculpt/nitpicker.config
View File

@ -1,6 +1,6 @@
<config focus="rom">
<capture/> <event/>
<report hover="yes" focus="yes" clicked="yes" keystate="no" displays="yes"/>
<report hover="yes" focus="yes" clicked="yes" keystate="no"/>
<background color="#000000"/>
<domain name="pointer" layer="1" content="client" label="no" origin="pointer" />

62
repos/gems/src/app/sculpt_manager/main.cc
View File

@ -68,14 +68,16 @@ struct Sculpt::Main : Input_event_handler,
Registry<Child_state> _child_states { };
Constructible<Gui::Connection> _gui { };
Gui::Connection _gui { _env, "input" };
Gui::Root _gui_root { _env, _heap, *this };
Signal_handler<Main> _input_handler {
_env.ep(), *this, &Main::_handle_input };
void _handle_input()
{
_gui->input()->for_each_event([&] (Input::Event const &ev) {
_gui.input()->for_each_event([&] (Input::Event const &ev) {
handle_input_event(ev); });
}
@ -984,44 +986,6 @@ struct Sculpt::Main : Input_event_handler,
_fb_drv_config.try_generate_manually_managed();
}
Attached_rom_dataspace _gui_displays { _env, "displays" };
Signal_handler<Main> _gui_displays_handler {
_env.ep(), *this, &Main::_handle_gui_displays };
void _handle_gui_displays()
{
_gui_displays.update();
if (!_gui_displays.xml().has_sub_node("display"))
return;
if (_gui.constructed())
return;
/*
* Since the nitpicker GUI server has successfully issued the first
* 'displays' report, there is a good chance that the framebuffer
* driver is running. This is a good time to activate the GUI.
*/
_gui.construct(_env, "input");
_gui->input()->sigh(_input_handler);
_gui->mode_sigh(_gui_mode_handler);
/*
* Adjust GUI parameters to initial GUI mode
*/
_handle_gui_mode();
/*
* Avoid 'Constructible<Gui::Root>' because it requires the definition
* of 'Gui::Session_component'.
*/
static Gui::Root gui_nitpicker(_env, _heap, *this);
generate_runtime_config();
}
void _handle_window_layout();
template <size_t N, typename FN>
@ -1065,7 +1029,8 @@ struct Sculpt::Main : Input_event_handler,
_manual_deploy_rom.sigh(_manual_deploy_handler);
_runtime_state_rom.sigh(_runtime_state_handler);
_runtime_config_rom.sigh(_runtime_config_handler);
_gui_displays.sigh(_gui_displays_handler);
_gui.input()->sigh(_input_handler);
_gui.mode_sigh(_gui_mode_handler);
/*
* Subscribe to reports
@ -1087,6 +1052,7 @@ struct Sculpt::Main : Input_event_handler,
/*
* Import initial report content
*/
_handle_gui_mode();
_storage.handle_storage_devices_update();
_deploy.handle_deploy();
_handle_pci_devices();
@ -1137,9 +1103,6 @@ void Sculpt::Main::_handle_window_layout()
unsigned const log_min_w = 400;
if (!_gui.constructed())
return;
typedef String<128> Label;
Label const
inspect_label ("runtime -> leitzentrale -> inspect"),
@ -1168,7 +1131,11 @@ void Sculpt::Main::_handle_window_layout()
if (panel_height == 0)
return;
Framebuffer::Mode const mode = _gui->mode();
Framebuffer::Mode const mode = _gui.mode();
/* suppress intermediate boot-time states before the framebuffer driver is up */
if (mode.area.count() <= 1)
return;
/* area reserved for the panel */
Rect const panel(Point(0, 0), Area(mode.area.w(), panel_height));
@ -1334,10 +1301,7 @@ void Sculpt::Main::_handle_window_layout()
void Sculpt::Main::_handle_gui_mode()
{
if (!_gui.constructed())
return;
Framebuffer::Mode const mode = _gui->mode();
Framebuffer::Mode const mode = _gui.mode();
_handle_window_layout();