From 48b4891f6e28191ffc1ef912dae387c980a734d0 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Tue, 16 Jun 2020 13:48:09 +0200 Subject: [PATCH] Rename nit_fb to gui_fb Issue #3778 --- doc/components.txt | 8 ++++---- repos/base/src/lib/base/root_proxy.cc | 2 +- repos/gems/recipes/pkg/sculpt/archives | 2 +- repos/gems/run/leitzentrale.run | 2 +- repos/gems/run/sculpt.run | 2 +- repos/gems/run/sculpt/leitzentrale.config | 12 ++++++------ repos/gems/run/terminal_log.run | 4 ++-- repos/gems/run/wm.run | 4 ++-- .../src/app/sculpt_manager/runtime/inspect_view.cc | 14 +++++++------- repos/os/recipes/src/{nit_fb => gui_fb}/content.mk | 2 +- repos/os/recipes/src/{nit_fb => gui_fb}/hash | 0 repos/os/recipes/src/{nit_fb => gui_fb}/used_apis | 0 repos/os/src/server/{nit_fb => gui_fb}/README | 8 ++++---- repos/os/src/server/{nit_fb => gui_fb}/main.cc | 8 ++++---- repos/os/src/server/{nit_fb => gui_fb}/target.mk | 2 +- repos/ports/recipes/pkg/system_shell/archives | 2 +- repos/ports/recipes/pkg/system_shell/runtime | 2 +- .../recipes/raw/system_shell/system_shell.config | 2 +- repos/ports/run/arora.run | 6 +++--- repos/ports/run/vim.run | 8 ++++---- repos/ports/run/virtualbox.run | 12 ++++++------ .../app/arora/demo/nitpicker_plugin/config.plugin | 2 +- 22 files changed, 52 insertions(+), 52 deletions(-) rename repos/os/recipes/src/{nit_fb => gui_fb}/content.mk (67%) rename repos/os/recipes/src/{nit_fb => gui_fb}/hash (100%) rename repos/os/recipes/src/{nit_fb => gui_fb}/used_apis (100%) rename repos/os/src/server/{nit_fb => gui_fb}/README (81%) rename repos/os/src/server/{nit_fb => gui_fb}/main.cc (98%) rename repos/os/src/server/{nit_fb => gui_fb}/target.mk (65%) diff --git a/doc/components.txt b/doc/components.txt index 0c12d15a7f..2d184544c1 100644 --- a/doc/components.txt +++ b/doc/components.txt @@ -336,11 +336,11 @@ one session interface to another, or in the form of libraries. Separate components =================== -:'os/src/server/nit_fb': +:'os/src/server/gui_fb': Translates a nitpicker session to a pair of framebuffer and input sessions. - Each 'nit_fb' instance is visible as a rectangular area on screen presenting + Each 'gui_fb' instance is visible as a rectangular area on screen presenting a virtual frame buffer. The area is statically positioned. For more - information, please refer to 'os/src/server/nit_fb/README'. + information, please refer to 'os/src/server/gui_fb/README'. :'gems/src/server/wm': Window manager that implements the nitpicker session interface but manages @@ -350,7 +350,7 @@ Separate components layouter located at 'gems/src/app/floating_window_layouter/'. :'demo/src/server/liquid_framebuffer': - Implements the same translation as 'nit_fb' but by presenting an interactive + Implements the same translation as 'gui_fb' but by presenting an interactive window rather than a statically positioned screen area. :'os/src/server/tar_rom': diff --git a/repos/base/src/lib/base/root_proxy.cc b/repos/base/src/lib/base/root_proxy.cc index d8485c6159..7ed09af27e 100644 --- a/repos/base/src/lib/base/root_proxy.cc +++ b/repos/base/src/lib/base/root_proxy.cc @@ -82,7 +82,7 @@ namespace { * scenario may result in a deadlock: * * A component provides two services, e.g., "Framebuffer" and - * "Input" (fb_sdl or nit_fb). In-between the two 'announce' + * "Input" (fb_sdl or gui_fb). In-between the two 'announce' * calls (within the 'Component::construct' function), a * service request for the already announced service comes in. * The root proxy calls 'apply' with the service name, which diff --git a/repos/gems/recipes/pkg/sculpt/archives b/repos/gems/recipes/pkg/sculpt/archives index 12ca7734e2..50811ee8b2 100644 --- a/repos/gems/recipes/pkg/sculpt/archives +++ b/repos/gems/recipes/pkg/sculpt/archives @@ -11,7 +11,7 @@ _/src/cached_fs_rom _/src/fs_report _/src/nitpicker _/src/global_keys_handler -_/src/nit_fb +_/src/gui_fb _/src/nit_fader _/src/rtc_drv _/src/rom_filter diff --git a/repos/gems/run/leitzentrale.run b/repos/gems/run/leitzentrale.run index a21e2c0e9e..33154b4617 100644 --- a/repos/gems/run/leitzentrale.run +++ b/repos/gems/run/leitzentrale.run @@ -14,7 +14,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/wm \ [depot_user]/src/themed_decorator \ [depot_user]/src/nic_router \ - [depot_user]/src/nit_fb \ + [depot_user]/src/gui_fb \ [depot_user]/src/nit_fader \ [depot_user]/src/libpng \ [depot_user]/src/zlib \ diff --git a/repos/gems/run/sculpt.run b/repos/gems/run/sculpt.run index 24f170a8ae..f7031210f4 100644 --- a/repos/gems/run/sculpt.run +++ b/repos/gems/run/sculpt.run @@ -71,7 +71,7 @@ install_config { - diff --git a/repos/gems/run/sculpt/leitzentrale.config b/repos/gems/run/sculpt/leitzentrale.config index b2b42eb479..630bde1ca7 100644 --- a/repos/gems/run/sculpt/leitzentrale.config +++ b/repos/gems/run/sculpt/leitzentrale.config @@ -64,7 +64,7 @@ - + @@ -83,8 +83,8 @@ - - + + @@ -249,8 +249,8 @@ - - + + @@ -279,7 +279,7 @@ - + diff --git a/repos/gems/run/terminal_log.run b/repos/gems/run/terminal_log.run index abc1b2dfa0..c40de75680 100644 --- a/repos/gems/run/terminal_log.run +++ b/repos/gems/run/terminal_log.run @@ -4,7 +4,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/pkg/[drivers_interactive_pkg] \ [depot_user]/pkg/terminal \ [depot_user]/src/nitpicker \ - [depot_user]/src/nit_fb \ + [depot_user]/src/gui_fb \ [depot_user]/src/demo \ [depot_user]/src/init @@ -69,7 +69,7 @@ install_config { - + diff --git a/repos/gems/run/wm.run b/repos/gems/run/wm.run index d129ba6d06..79fb9bc9ba 100644 --- a/repos/gems/run/wm.run +++ b/repos/gems/run/wm.run @@ -13,7 +13,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/demo \ [depot_user]/src/init \ [depot_user]/src/nitpicker \ - [depot_user]/src/nit_fb \ + [depot_user]/src/gui_fb \ [depot_user]/src/vfs install_config { @@ -87,7 +87,7 @@ install_config { - + diff --git a/repos/gems/src/app/sculpt_manager/runtime/inspect_view.cc b/repos/gems/src/app/sculpt_manager/runtime/inspect_view.cc index f35c351b36..4edcfce8c1 100644 --- a/repos/gems/src/app/sculpt_manager/runtime/inspect_view.cc +++ b/repos/gems/src/app/sculpt_manager/runtime/inspect_view.cc @@ -26,9 +26,9 @@ static void for_each_inspected_storage_target(Storage_devices const &devices, FN } -static void gen_nit_fb_start(Xml_generator &xml) +static void gen_gui_fb_start(Xml_generator &xml) { - gen_common_start_content(xml, "nit_fb", Cap_quota{100}, Ram_quota{18*1024*1024}); + gen_common_start_content(xml, "gui_fb", Cap_quota{100}, Ram_quota{18*1024*1024}); xml.node("provides", [&] () { gen_service_node(xml, [&] () {}); @@ -38,7 +38,7 @@ static void gen_nit_fb_start(Xml_generator &xml) xml.node("config", [&] () { }); xml.node("route", [&] () { - gen_parent_rom_route(xml, "nit_fb"); + gen_parent_rom_route(xml, "gui_fb"); gen_parent_rom_route(xml, "ld.lib.so"); gen_parent_route (xml); gen_parent_route (xml); @@ -56,10 +56,10 @@ static void gen_terminal_start(Xml_generator &xml) xml.node("route", [&] () { gen_service_node(xml, [&] () { - gen_named_node(xml, "child", "nit_fb"); }); + gen_named_node(xml, "child", "gui_fb"); }); gen_service_node(xml, [&] () { - gen_named_node(xml, "child", "nit_fb"); }); + gen_named_node(xml, "child", "gui_fb"); }); gen_parent_rom_route(xml, "config", "terminal.config"); @@ -251,7 +251,7 @@ void Sculpt::gen_inspect_view(Xml_generator &xml, gen_parent_service(xml); }); - xml.node("start", [&] () { gen_nit_fb_start(xml); }); + xml.node("start", [&] () { gen_gui_fb_start(xml); }); xml.node("start", [&] () { gen_terminal_start(xml); }); xml.node("start", [&] () { gen_vfs_start(xml, devices, ram_fs_state); }); xml.node("start", [&] () { gen_fs_rom_start(xml); }); @@ -279,7 +279,7 @@ void Sculpt::gen_inspect_view(Xml_generator &xml, gen_parent_rom_route(xml, "init"); gen_parent_rom_route(xml, "terminal"); gen_parent_rom_route(xml, "vfs"); - gen_parent_rom_route(xml, "nit_fb"); + gen_parent_rom_route(xml, "gui_fb"); gen_parent_rom_route(xml, "cached_fs_rom"); gen_parent_rom_route(xml, "vfs.lib.so"); gen_parent_rom_route(xml, "vfs_pipe.lib.so"); diff --git a/repos/os/recipes/src/nit_fb/content.mk b/repos/os/recipes/src/gui_fb/content.mk similarity index 67% rename from repos/os/recipes/src/nit_fb/content.mk rename to repos/os/recipes/src/gui_fb/content.mk index 5126e438bd..7b9abf1cf2 100644 --- a/repos/os/recipes/src/nit_fb/content.mk +++ b/repos/os/recipes/src/gui_fb/content.mk @@ -1,2 +1,2 @@ -SRC_DIR = src/server/nit_fb +SRC_DIR = src/server/gui_fb include $(GENODE_DIR)/repos/base/recipes/src/content.inc diff --git a/repos/os/recipes/src/nit_fb/hash b/repos/os/recipes/src/gui_fb/hash similarity index 100% rename from repos/os/recipes/src/nit_fb/hash rename to repos/os/recipes/src/gui_fb/hash diff --git a/repos/os/recipes/src/nit_fb/used_apis b/repos/os/recipes/src/gui_fb/used_apis similarity index 100% rename from repos/os/recipes/src/nit_fb/used_apis rename to repos/os/recipes/src/gui_fb/used_apis diff --git a/repos/os/src/server/nit_fb/README b/repos/os/src/server/gui_fb/README similarity index 81% rename from repos/os/src/server/nit_fb/README rename to repos/os/src/server/gui_fb/README index 3c638e3e2b..d7a6688780 100644 --- a/repos/os/src/server/nit_fb/README +++ b/repos/os/src/server/gui_fb/README @@ -1,9 +1,9 @@ -The 'nit_fb' server provides a single session of the 'Input' and 'Framebuffer' +The 'gui_fb' server provides a single session of the 'Input' and 'Framebuffer' services by presenting a Nitpicker view at a predefined screen position. If instantiated multiple times, it can be used to statically arrange multiple virtual frame buffers on one physical screen. The size and screen position -of each 'nit_fb' instance can be defined via Genode's configuration mechansim -using the following attributes of the 'nit_fb' config node: +of each 'gui_fb' instance can be defined via Genode's configuration mechansim +using the following attributes of the 'gui_fb' config node: ! @@ -17,7 +17,7 @@ relative to the physical screen size. E.g., when using a screen size of 640x480, the effective width for a 'width' attribute value of "-100" would be 640 - 100 = 540. -In case 'nit_fb' is used in a dynamic fashion, e.g., in combination with a +In case 'gui_fb' is used in a dynamic fashion, e.g., in combination with a window manager, the 'initial_width' and 'initial_height' attributes must be used to set the initial dimensions of the frame buffer rather than 'width' and 'height'. Mixing those attributes is not supported, 'width' or 'height' diff --git a/repos/os/src/server/nit_fb/main.cc b/repos/os/src/server/gui_fb/main.cc similarity index 98% rename from repos/os/src/server/nit_fb/main.cc rename to repos/os/src/server/gui_fb/main.cc index 126cd8696d..6a9ad75f09 100644 --- a/repos/os/src/server/nit_fb/main.cc +++ b/repos/os/src/server/gui_fb/main.cc @@ -89,7 +89,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object Gui::Connection &_gui; - Framebuffer::Session &_nit_fb = *_gui.framebuffer(); + Framebuffer::Session &_gui_fb = *_gui.framebuffer(); Genode::Signal_context_capability _mode_sigh { }; @@ -191,7 +191,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object */ _dataspace_is_new = true; - return _nit_fb.dataspace(); + return _gui_fb.dataspace(); } Mode mode() const override @@ -212,7 +212,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object _dataspace_is_new = false; } - _nit_fb.refresh(x, y, w, h); + _gui_fb.refresh(x, y, w, h); } void sync_sigh(Genode::Signal_context_capability sigh) override @@ -225,7 +225,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object */ _sync_sigh = sigh; - _nit_fb.sync_sigh(sigh); + _gui_fb.sync_sigh(sigh); } }; diff --git a/repos/os/src/server/nit_fb/target.mk b/repos/os/src/server/gui_fb/target.mk similarity index 65% rename from repos/os/src/server/nit_fb/target.mk rename to repos/os/src/server/gui_fb/target.mk index c0aaaa218a..e9d8931061 100644 --- a/repos/os/src/server/nit_fb/target.mk +++ b/repos/os/src/server/gui_fb/target.mk @@ -1,3 +1,3 @@ -TARGET = nit_fb +TARGET = gui_fb SRC_CC = main.cc LIBS = base diff --git a/repos/ports/recipes/pkg/system_shell/archives b/repos/ports/recipes/pkg/system_shell/archives index 60d547d8f2..b3c762e6b8 100644 --- a/repos/ports/recipes/pkg/system_shell/archives +++ b/repos/ports/recipes/pkg/system_shell/archives @@ -5,7 +5,7 @@ _/src/coreutils-minimal _/src/libc _/src/posix _/src/ncurses -_/src/nit_fb +_/src/gui_fb _/src/terminal _/src/init _/src/vfs diff --git a/repos/ports/recipes/pkg/system_shell/runtime b/repos/ports/recipes/pkg/system_shell/runtime index 4c2c140b68..5bd10eee3c 100644 --- a/repos/ports/recipes/pkg/system_shell/runtime +++ b/repos/ports/recipes/pkg/system_shell/runtime @@ -19,7 +19,7 @@ - + diff --git a/repos/ports/recipes/raw/system_shell/system_shell.config b/repos/ports/recipes/raw/system_shell/system_shell.config index 5428db62f9..2d0844b76a 100644 --- a/repos/ports/recipes/raw/system_shell/system_shell.config +++ b/repos/ports/recipes/raw/system_shell/system_shell.config @@ -15,7 +15,7 @@ - + diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run index a3df79162e..0f2130abd0 100644 --- a/repos/ports/run/arora.run +++ b/repos/ports/run/arora.run @@ -29,7 +29,7 @@ append build_components { server/clipboard server/loader server/tar_rom - server/nit_fb + server/gui_fb app/launchpad test/nitpicker } @@ -83,7 +83,7 @@ append config { - + @@ -148,7 +148,7 @@ append boot_modules { clipboard loader tar_rom - nit_fb + gui_fb launchpad testnit nitpicker_plugin.tar diff --git a/repos/ports/run/vim.run b/repos/ports/run/vim.run index b3eae15c21..b22a13934a 100644 --- a/repos/ports/run/vim.run +++ b/repos/ports/run/vim.run @@ -6,7 +6,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/pkg/motif_wm \ [depot_user]/src/init \ [depot_user]/src/nitpicker \ - [depot_user]/src/nit_fb \ + [depot_user]/src/gui_fb \ [depot_user]/src/clipboard \ [depot_user]/src/report_rom \ [depot_user]/src/libc \ @@ -121,7 +121,7 @@ install_config { - + @@ -147,8 +147,8 @@ install_config { - - + + diff --git a/repos/ports/run/virtualbox.run b/repos/ports/run/virtualbox.run index fd31d29375..3fa08d9eb7 100644 --- a/repos/ports/run/virtualbox.run +++ b/repos/ports/run/virtualbox.run @@ -219,10 +219,10 @@ append_if [expr $use_gui] config { - + - - + + } @@ -250,10 +250,10 @@ append_if [expr $use_bridge] config { } append config { - + - - + + diff --git a/repos/ports/src/app/arora/demo/nitpicker_plugin/config.plugin b/repos/ports/src/app/arora/demo/nitpicker_plugin/config.plugin index 611271d358..55591ccd50 100644 --- a/repos/ports/src/app/arora/demo/nitpicker_plugin/config.plugin +++ b/repos/ports/src/app/arora/demo/nitpicker_plugin/config.plugin @@ -10,7 +10,7 @@ - +