ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-02-21 10:01:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename nit_fb to gui_fb

Browse Source 
Issue #3778
This commit is contained in:
Norman Feske 2020-06-16 13:48:09 +02:00
parent 5d40c0c1ce
commit 48b4891f6e
22 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/components.txt
View File

@ -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':

2
repos/base/src/lib/base/root_proxy.cc
View File

@ -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

2
repos/gems/recipes/pkg/sculpt/archives
View File

@ -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

2
repos/gems/run/leitzentrale.run
View File

@ -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 \

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

@ -71,7 +71,7 @@ install_config {
<policy label="nit_focus -> slides"
report="global_keys_handler -> slides"/>
<policy label="nit_focus -> hover" report="nitpicker -> hover"/>
<policy label="slides_nit_fb_config -> slides"
<policy label="slides_gui_fb_config -> slides"
report="global_keys_handler -> slides"/>
<policy label="leitzentrale -> manager -> displays"
report="nitpicker -> displays"/>

12
repos/gems/run/sculpt/leitzentrale.config
View File

@ -64,7 +64,7 @@
</else>
</if>
<inline>
<start name="nit_fb">
<start name="gui_fb">
<resource name="RAM" quantum="18M"/>
<provides> <service name="Framebuffer"/> <service name="Input"/> </provides>
<config/>
@ -83,8 +83,8 @@
<default-policy domain="default"/>
</config>
<route>
<service name="Input"> <child name="nit_fb"/> </service>
<service name="Framebuffer"> <child name="nit_fb"/> </service>
<service name="Input"> <child name="gui_fb"/> </service>
<service name="Framebuffer"> <child name="gui_fb"/> </service>
<service name="ROM" label="focus"> <child name="report_rom"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<any-service> <parent/> <any-child/> </any-service>
@ -249,8 +249,8 @@
</route>
</start>
<start name="log_nit_fb">
<binary name="nit_fb"/>
<start name="log_gui_fb">
<binary name="gui_fb"/>
<resource name="RAM" quantum="4M"/>
<provides> <service name="Framebuffer"/> <service name="Input"/> </provides>
<config origin="top_right" xpos="-412" ypos="2" initial_width="400" initial_height="400"/>
@ -279,7 +279,7 @@
</vfs>
</config>
<route>
<any-service> <child name="log_nit_fb"/> <parent/> </any-service>
<any-service> <child name="log_gui_fb"/> <parent/> </any-service>
</route>
</start>

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

@ -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 {
</start>
<start name="terminal_fb">
<binary name="nit_fb"/>
<binary name="gui_fb"/>
<resource name="RAM" quantum="4M"/>
<provides>
<service name="Framebuffer"/>

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

@ -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 {
<start name="launchpad" priority="-1" caps="1000">
<resource name="RAM" quantum="20M"/>
<config>
<launcher name="nit_fb" ram_quota="7M" caps="100">
<launcher name="gui_fb" ram_quota="7M" caps="100">
<config initial_width="500" initial_height="400" />
</launcher>
<launcher name="nitpicker" ram_quota="1M" caps="100">

14
repos/gems/src/app/sculpt_manager/runtime/inspect_view.cc
View File

@ -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<Framebuffer::Session>(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<Cpu_session> (xml);
gen_parent_route<Pd_session> (xml);
@ -56,10 +56,10 @@ static void gen_terminal_start(Xml_generator &xml)
xml.node("route", [&] () {
gen_service_node<Framebuffer::Session>(xml, [&] () {
gen_named_node(xml, "child", "nit_fb"); });
gen_named_node(xml, "child", "gui_fb"); });
gen_service_node<Input::Session>(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<Gui::Session>(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");

2
repos/os/recipes/src/nit_fb/content.mk → repos/os/recipes/src/gui_fb/content.mk
View File

@ -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

0
repos/os/recipes/src/nit_fb/hash → repos/os/recipes/src/gui_fb/hash
View File

0
repos/os/recipes/src/nit_fb/used_apis → repos/os/recipes/src/gui_fb/used_apis
View File

8
repos/os/src/server/nit_fb/README → repos/os/src/server/gui_fb/README
View File

@ -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:
! <config xpos="100" ypos="150" width="300" height="200" origin="top_left"/>
@ -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'

8
repos/os/src/server/nit_fb/main.cc → repos/os/src/server/gui_fb/main.cc
View File

@ -89,7 +89,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object<Framebuffer::Session>
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<Framebuffer::Session>
*/
_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<Framebuffer::Session>
_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<Framebuffer::Session>
*/
_sync_sigh = sigh;
_nit_fb.sync_sigh(sigh);
_gui_fb.sync_sigh(sigh);
}
};

2
repos/os/src/server/nit_fb/target.mk → repos/os/src/server/gui_fb/target.mk
View File

@ -1,3 +1,3 @@
TARGET = nit_fb
TARGET = gui_fb
SRC_CC = main.cc
LIBS = base

2
repos/ports/recipes/pkg/system_shell/archives
View File

@ -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

2
repos/ports/recipes/pkg/system_shell/runtime
View File

@ -19,7 +19,7 @@
<rom label="libc.lib.so"/>
<rom label="libm.lib.so"/>
<rom label="init"/>
<rom label="nit_fb"/>
<rom label="gui_fb"/>
<rom label="vfs"/>
<rom label="vfs_pipe.lib.so"/>
<rom label="cached_fs_rom"/>

2
repos/ports/recipes/raw/system_shell/system_shell.config
View File

@ -15,7 +15,7 @@
<default caps="100"/>
<start name="nit_fb">
<start name="gui_fb">
<resource name="RAM" quantum="8M"/>
<provides> <service name="Framebuffer"/> <service name="Input"/> </provides>
<config xpos="10" ypos="10" initial_width="800" initial_height="600"/>

6
repos/ports/run/arora.run
View File

@ -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 {
<parent-rom name="ld.lib.so"/>
<parent-rom name="init"/>
<parent-rom name="tar_rom"/>
<parent-rom name="nit_fb"/>
<parent-rom name="gui_fb"/>
<parent-rom name="nitpicker"/>
<parent-rom name="pointer"/>
<parent-rom name="launchpad"/>
@ -148,7 +148,7 @@ append boot_modules {
clipboard
loader
tar_rom
nit_fb
gui_fb
launchpad
testnit
nitpicker_plugin.tar

8
repos/ports/run/vim.run
View File

@ -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 {
</route>
</start>
<start name="nit_fb">
<start name="gui_fb">
<resource name="RAM" quantum="4M"/>
<provides> <service name="Framebuffer"/> <service name="Input"/> </provides>
<config xpos="10" ypos="10" initial_width="800" initial_height="600"/>
@ -147,8 +147,8 @@ install_config {
<route>
<service name="ROM" label="clipboard"> <child name="wm"/> </service>
<service name="Report" label="clipboard"> <child name="wm"/> </service>
<service name="Framebuffer"> <child name="nit_fb"/> </service>
<service name="Input"> <child name="nit_fb"/> </service>
<service name="Framebuffer"> <child name="gui_fb"/> </service>
<service name="Input"> <child name="gui_fb"/> </service>
<any-service> <parent/> <any-child/> </any-service>
</route>
</start>

12
repos/ports/run/virtualbox.run
View File

@ -219,10 +219,10 @@ append_if [expr $use_gui] config {
</config>
<route>
<service name="Nic"> <child name="nic_bridge"/> </service>
<service name="Report" label="shape"> <child name="pointer" label="nit_fb2 -> shape"/> </service>
<service name="Report" label="shape"> <child name="pointer" label="gui_fb2 -> shape"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<service name="Framebuffer"> <child name="nit_fb2" /> </service>
<service name="Input"> <child name="nit_fb2" /> </service>
<service name="Framebuffer"> <child name="gui_fb2" /> </service>
<service name="Input"> <child name="gui_fb2" /> </service>
<any-service> <parent /> <any-child /> </any-service>
</route>
</start>}
@ -250,10 +250,10 @@ append_if [expr $use_bridge] config {
<service name="Nic"> <child name="nic_bridge"/> </service>}
append config {
<service name="Report" label="shape"> <child name="pointer" label="nit_fb1 -> shape"/> </service>
<service name="Report" label="shape"> <child name="pointer" label="gui_fb1 -> shape"/> </service>
<service name="Report"> <child name="report_rom"/> </service>
<service name="Framebuffer"> <child name="nit_fb1" /> </service>
<service name="Input"> <child name="nit_fb1" /> </service>
<service name="Framebuffer"> <child name="gui_fb1" /> </service>
<service name="Input"> <child name="gui_fb1" /> </service>
<any-service> <parent /> <any-child /> </any-service>
</route>
</start>

2
repos/ports/src/app/arora/demo/nitpicker_plugin/config.plugin
View File

@ -10,7 +10,7 @@
</parent-provides>
<default-route> <any-service> <any-child/> <parent/> </any-service> </default-route>
<start name="framebuffer" caps="100">
<binary name="nit_fb"/>
<binary name="gui_fb"/>
<resource name="RAM" quantum="4M"/>
<provides>
<service name="Framebuffer"/>