From ce4f0cdd18ea3c78edf8c65c7bd3af57366ce4f0 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Tue, 3 Sep 2024 15:24:55 +0200 Subject: [PATCH] gui_fb: update coding style Avoid Genode:: prefix, indicate 'Main' members as being private. --- repos/os/src/server/gui_fb/main.cc | 170 ++++++++++++++--------------- 1 file changed, 83 insertions(+), 87 deletions(-) diff --git a/repos/os/src/server/gui_fb/main.cc b/repos/os/src/server/gui_fb/main.cc index ac9fd2d420..c8e761a69f 100644 --- a/repos/os/src/server/gui_fb/main.cc +++ b/repos/os/src/server/gui_fb/main.cc @@ -20,18 +20,18 @@ #include #include -namespace Nit_fb { +namespace Gui_fb { + using namespace Genode; + + struct View_updater; struct Main; - using Genode::Static_root; - using Genode::Signal_handler; - using Genode::Xml_node; - using Genode::size_t; + using Point = Gui::Point; + using Area = Gui::Area; + using Rect = Gui::Rect; - using Point = Genode::Surface_base::Point; - using Area = Genode::Surface_base::Area; - using Rect = Genode::Surface_base::Rect; + static ::Input::Event translate_event(::Input::Event, Point, Area); } @@ -42,16 +42,14 @@ namespace Nit_fb { /** * Translate input event */ -static Input::Event translate_event(Input::Event ev, - Nit_fb::Point const input_origin, - Nit_fb::Area const boundary) +static Input::Event Gui_fb::translate_event(Input::Event ev, + Point const input_origin, + Area const boundary) { - using Nit_fb::Point; - /* function to clamp point to bounday */ auto clamp = [boundary] (Point p) { - return Point(Genode::min((int)boundary.w - 1, Genode::max(0, p.x)), - Genode::min((int)boundary.h - 1, Genode::max(0, p.y))); }; + return Point(min((int)boundary.w - 1, max(0, p.x)), + min((int)boundary.h - 1, max(0, p.y))); }; /* function to translate point to 'input_origin' */ auto translate = [input_origin] (Point p) { return p - input_origin; }; @@ -70,7 +68,7 @@ static Input::Event translate_event(Input::Event ev, } -struct View_updater : Genode::Interface +struct Gui_fb::View_updater : Genode::Interface { virtual void update_view() = 0; }; @@ -80,18 +78,23 @@ struct View_updater : Genode::Interface ** Virtualized framebuffer ** *****************************/ -namespace Framebuffer { struct Session_component; } +namespace Framebuffer { + + using namespace Gui_fb; + + struct Session_component; +} struct Framebuffer::Session_component : Genode::Rpc_object { - Genode::Pd_session const &_pd; + Pd_session const &_pd; Gui::Connection &_gui; - Genode::Signal_context_capability _mode_sigh { }; + Signal_context_capability _mode_sigh { }; - Genode::Signal_context_capability _sync_sigh { }; + Signal_context_capability _sync_sigh { }; View_updater &_view_updater; @@ -101,8 +104,6 @@ struct Framebuffer::Session_component : Genode::Rpc_object */ Framebuffer::Mode _next_mode; - using size_t = Genode::size_t; - /* * Number of bytes used for backing the current virtual framebuffer at * the GUI server. @@ -134,7 +135,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object /** * Constructor */ - Session_component(Genode::Pd_session const &pd, + Session_component(Pd_session const &pd, Gui::Connection &gui, View_updater &view_updater, Framebuffer::Mode initial_mode) @@ -152,14 +153,14 @@ struct Framebuffer::Session_component : Genode::Rpc_object Framebuffer::Mode const mode { .area = size }; if (!_ram_suffices_for_mode(mode)) { - Genode::warning("insufficient RAM for mode ", mode); + warning("insufficient RAM for mode ", mode); return; } _next_mode = mode; if (_mode_sigh.valid()) - Genode::Signal_transmitter(_mode_sigh).submit(); + Signal_transmitter(_mode_sigh).submit(); } Gui::Area size() const @@ -172,13 +173,12 @@ struct Framebuffer::Session_component : Genode::Rpc_object ** Framebuffer::Session interface ** ************************************/ - Genode::Dataspace_capability dataspace() override + Dataspace_capability dataspace() override { _gui.buffer(_active_mode, false); _buffer_num_bytes = - Genode::max(_buffer_num_bytes, - Gui::Session::ram_quota(_active_mode, false)); + max(_buffer_num_bytes, Gui::Session::ram_quota(_active_mode, false)); /* * We defer the update of the view until the client calls refresh the @@ -196,7 +196,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object return _active_mode; } - void mode_sigh(Genode::Signal_context_capability sigh) override + void mode_sigh(Signal_context_capability sigh) override { _mode_sigh = sigh; } @@ -211,7 +211,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object _gui.framebuffer.refresh(x, y, w, h); } - void sync_sigh(Genode::Signal_context_capability sigh) override + void sync_sigh(Signal_context_capability sigh) override { /* * Keep a component-local copy of the signal capability. Otherwise, @@ -230,21 +230,21 @@ struct Framebuffer::Session_component : Genode::Rpc_object ** Main program ** ******************/ -struct Nit_fb::Main : View_updater +struct Gui_fb::Main : View_updater { - Genode::Env &env; + Env &_env; - Genode::Attached_rom_dataspace config_rom { env, "config" }; + Attached_rom_dataspace _config_rom { _env, "config" }; - Gui::Connection gui { env }; + Gui::Connection _gui { _env }; - Point position { 0, 0 }; + Point _position { 0, 0 }; - unsigned refresh_rate = 0; + unsigned _refresh_rate = 0; - Gui::Top_level_view const view { gui }; + Gui::Top_level_view const _view { _gui }; - Genode::Attached_dataspace input_ds { env.rm(), gui.input.dataspace() }; + Attached_dataspace _input_ds { _env.rm(), _gui.input.dataspace() }; struct Initial_size { @@ -253,7 +253,7 @@ struct Nit_fb::Main : View_updater bool set { false }; - Initial_size(Genode::Xml_node config) + Initial_size(Xml_node config) : _width (config.attribute_value("initial_width", 0L)), _height(config.attribute_value("initial_height", 0L)) @@ -275,21 +275,21 @@ struct Nit_fb::Main : View_updater bool valid() const { return _width != 0 && _height != 0; } - } _initial_size { config_rom.xml() }; + } _initial_size { _config_rom.xml() }; Framebuffer::Mode _initial_mode() { - return Framebuffer::Mode { .area = { _initial_size.width (gui.mode()), - _initial_size.height(gui.mode()) } }; + return Framebuffer::Mode { .area = { _initial_size.width (_gui.mode()), + _initial_size.height(_gui.mode()) } }; } /* * Input and framebuffer sessions provided to our client */ - Input::Session_component input_session { env, env.ram() }; - Framebuffer::Session_component fb_session { env.pd(), gui, *this, _initial_mode() }; + Input::Session_component _input_session { _env, _env.ram() }; + Framebuffer::Session_component _fb_session { _env.pd(), _gui, *this, _initial_mode() }; - Static_root input_root { env.ep().manage(input_session) }; + Static_root _input_root { _env.ep().manage(_input_session) }; /* * Attach root interfaces to the entry point @@ -301,18 +301,18 @@ struct Nit_fb::Main : View_updater Fb_root(Main &main) : - Static_root(main.env.ep().manage(main.fb_session)), + Static_root(main._env.ep().manage(main._fb_session)), _main(main) { } - void close(Genode::Capability) override + void close(Capability) override { - _main.fb_session.sync_sigh(Genode::Signal_context_capability()); - _main.fb_session.mode_sigh(Genode::Signal_context_capability()); + _main._fb_session.sync_sigh(Signal_context_capability()); + _main._fb_session.mode_sigh(Signal_context_capability()); } }; - Fb_root fb_root { *this }; + Fb_root _fb_root { *this }; /** * View_updater interface @@ -320,9 +320,9 @@ struct Nit_fb::Main : View_updater void update_view() override { using Command = Gui::Session::Command; - gui.enqueue(view.id(), Rect(position, fb_session.size())); - gui.enqueue(view.id()); - gui.execute(); + _gui.enqueue(_view.id(), Rect(_position, _fb_session.size())); + _gui.enqueue(_view.id()); + _gui.execute(); } /** @@ -335,7 +335,7 @@ struct Nit_fb::Main : View_updater if (!config.has_attribute(attr)) return Point(0, 0); - using Value = Genode::String<32>; + using Value = String<32>; Value const value = config.attribute_value(attr, Value()); if (value == "top_left") return Point(0, 0); @@ -349,17 +349,17 @@ struct Nit_fb::Main : View_updater void _update_size() { - Xml_node const config = config_rom.xml(); + Xml_node const config = _config_rom.xml(); - Framebuffer::Mode const gui_mode = gui.mode(); + Framebuffer::Mode const gui_mode = _gui.mode(); - position = _coordinate_origin(gui_mode, config) + Point::from_xml(config); + _position = _coordinate_origin(gui_mode, config) + Point::from_xml(config); bool const attr = config.has_attribute("width") || config.has_attribute("height"); if (_initial_size.valid() && attr) { - Genode::warning("setting both inital and normal attributes not " - " supported, ignore initial size"); + warning("setting both inital and normal attributes not " + " supported, ignore initial size"); /* force initial to disable check below */ _initial_size.set = true; } @@ -385,39 +385,36 @@ struct Nit_fb::Main : View_updater if (height < 0) height = gui_height + height; } - fb_session.size(Area((unsigned)width, (unsigned)height)); + _fb_session.size(Area((unsigned)width, (unsigned)height)); } - void handle_config_update() + void _handle_config_update() { - config_rom.update(); + _config_rom.update(); _update_size(); update_view(); } - Signal_handler
config_update_handler = - { env.ep(), *this, &Main::handle_config_update }; + Signal_handler
_config_update_handler = + { _env.ep(), *this, &Main::_handle_config_update }; - void handle_mode_update() + void _handle_mode_update() { _update_size(); } + + Signal_handler
_mode_update_handler = + { _env.ep(), *this, &Main::_handle_mode_update }; + + void _handle_input() { - _update_size(); - } + Input::Event const * const events = _input_ds.local_addr(); - Signal_handler
mode_update_handler = - { env.ep(), *this, &Main::handle_mode_update }; - - void handle_input() - { - Input::Event const * const events = input_ds.local_addr(); - - unsigned const num = gui.input.flush(); + unsigned const num = _gui.input.flush(); bool update = false; for (unsigned i = 0; i < num; i++) { update |= events[i].focus_enter(); - input_session.submit(translate_event(events[i], position, fb_session.size())); + _input_session.submit(translate_event(events[i], _position, _fb_session.size())); } /* get to front if we got input focus */ @@ -425,36 +422,35 @@ struct Nit_fb::Main : View_updater update_view(); } - Signal_handler
input_handler = - { env.ep(), *this, &Main::handle_input }; + Signal_handler
_input_handler { _env.ep(), *this, &Main::_handle_input }; /** * Constructor */ - Main(Genode::Env &env) : env(env) + Main(Env &env) : _env(env) { - input_session.event_queue().enabled(true); + _input_session.event_queue().enabled(true); /* * Announce services */ - env.parent().announce(env.ep().manage(fb_root)); - env.parent().announce(env.ep().manage(input_root)); + _env.parent().announce(_env.ep().manage(_fb_root)); + _env.parent().announce(_env.ep().manage(_input_root)); /* * Apply initial configuration */ - handle_config_update(); + _handle_config_update(); /* * Register signal handlers */ - config_rom.sigh(config_update_handler); - gui.mode_sigh(mode_update_handler); - gui.input.sigh(input_handler); + _config_rom.sigh(_config_update_handler); + _gui.mode_sigh(_mode_update_handler); + _gui.input.sigh(_input_handler); } }; -void Component::construct(Genode::Env &env) { static Nit_fb::Main inst(env); } +void Component::construct(Genode::Env &env) { static Gui_fb::Main inst(env); }