diff --git a/recipes/pkg/chocolate-doom/README b/recipes/pkg/chocolate-doom/README index 80483b7..0a086b0 100644 --- a/recipes/pkg/chocolate-doom/README +++ b/recipes/pkg/chocolate-doom/README @@ -1,5 +1,5 @@ Chocolate-doom is a Doom1/2 engine source port that tries to -stay true to the original DOS versions. +stay true to the original DOS versions. This pkg is configured for playing the Doom 1 shareware version. It can also be used to play the Heretic 1 shareware as well as the Hexen 1 demo @@ -7,4 +7,4 @@ by changing the 'init.config' file. Replace all occurences of 'doom' to either 'heretic' or 'hexen' (the Hexen 1 demo file has to be called 'hexen.wad', there is no '1' in the name). -The pkg requires Nic and Nitpicker services, Audio_out is optional. +The pkg requires Nic and Gui services, Audio_out is optional. diff --git a/recipes/pkg/ssh_client/README b/recipes/pkg/ssh_client/README index 735739a..07e578a 100644 --- a/recipes/pkg/ssh_client/README +++ b/recipes/pkg/ssh_client/README @@ -1,7 +1,7 @@ - SSH terminal client + SSH terminal client -A Nitpicker terminal that connects to a shell on a remote SSH server. +A GUI terminal that connects to a shell on a remote SSH server. It is configured with a "host" file found in its root directory with the following format: diff --git a/recipes/pkg/terminal_editor/archives b/recipes/pkg/terminal_editor/archives index c78120e..6824dfc 100644 --- a/recipes/pkg/terminal_editor/archives +++ b/recipes/pkg/terminal_editor/archives @@ -11,7 +11,7 @@ _/src/qt5_core _/src/qt5_gui _/src/qt5_printsupport _/src/qt5_qjpeg -_/src/qt5_qpa_nitpicker +_/src/qt5_qpa_genode _/src/qt5_widgets _/src/stdcxx _/src/vfs diff --git a/recipes/pkg/terminal_editor/runtime b/recipes/pkg/terminal_editor/runtime index 6d9dda4..9ba960f 100644 --- a/recipes/pkg/terminal_editor/runtime +++ b/recipes/pkg/terminal_editor/runtime @@ -24,7 +24,7 @@ - + diff --git a/recipes/src/io_editor/used_apis b/recipes/src/io_editor/used_apis index f80e668..bfbb2f5 100644 --- a/recipes/src/io_editor/used_apis +++ b/recipes/src/io_editor/used_apis @@ -6,6 +6,6 @@ qt5_core qt5_gui qt5_printsupport qt5_qjpeg -qt5_qpa_nitpicker +qt5_qpa_genode qt5_widgets stdcxx diff --git a/recipes/src/qt5_avplay/used_apis b/recipes/src/qt5_avplay/used_apis index 6cadb78..24a4796 100644 --- a/recipes/src/qt5_avplay/used_apis +++ b/recipes/src/qt5_avplay/used_apis @@ -9,9 +9,9 @@ os qoost qt5_core qt5_gui -qt5_qpa_nitpicker +qt5_qpa_genode qt5_qjpeg -qt5_qnitpickerviewwidget +qt5_qgenodeviewwidget qt5_widgets qt5_xml stdcxx diff --git a/run/nit_entropy.run b/run/nit_entropy.run index 0801705..72495fa 100644 --- a/run/nit_entropy.run +++ b/run/nit_entropy.run @@ -93,7 +93,6 @@ install_config $config build_boot_image { jitter_sponge nit_entropy - libkeccak.lib.so } run_genode_until forever diff --git a/run/qt5_avplay.run b/run/qt5_avplay.run index 447d132..15371ff 100644 --- a/run/qt5_avplay.run +++ b/run/qt5_avplay.run @@ -4,7 +4,7 @@ import_from_depot [depot_user]/raw/qt5_avplay \ [depot_user]/src/avplay \ [depot_user]/src/libav \ [depot_user]/src/qt5_avplay \ - [depot_user]/src/qt5_qnitpickerviewwidget \ + [depot_user]/src/qt5_qgenodeviewwidget \ [depot_user]/src/qt5_widgets \ [depot_user]/src/qt5_xml \ [depot_user]/src/vfs_pipe \ diff --git a/src/app/flif_view/flif_view.cc b/src/app/flif_view/flif_view.cc index 47d2239..31197d8 100644 --- a/src/app/flif_view/flif_view.cc +++ b/src/app/flif_view/flif_view.cc @@ -1,5 +1,5 @@ /* - * \brief FLIF viewer for Nitpicker + * \brief FLIF viewer * \author Emery Hemingway * \date 2017-12-02 */ @@ -46,7 +46,7 @@ namespace Flif_view { struct Main; using Framebuffer::Mode; - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; } @@ -59,7 +59,7 @@ struct Flif_view::Main Attached_ram_dataspace back_ds { env.pd(), env.rm(), 0 }; - Nitpicker::Connection nitpicker { env }; + Gui::Connection gui { env }; Signal_handler
config_handler { env.ep(), *this, &Main::handle_config_signal }; @@ -76,7 +76,7 @@ struct Flif_view::Main /* signal transmitter to wake application from input handling */ Signal_transmitter app_transmitter { app_handler }; - Mode nit_mode = nitpicker.mode(); + Mode nit_mode = gui.mode(); Surface_base::Area img_area { }; @@ -89,16 +89,16 @@ struct Flif_view::Main Mode new_mode(max(nit_mode.width(), width), max(nit_mode.height(), height), Mode::RGB565); - Genode::log("resize nitpicker buffer to ", new_mode); + Genode::log("resize gui buffer to ", new_mode); if (nit_ds.constructed()) nit_ds.destruct(); - nitpicker.buffer(new_mode, false); - nit_ds.construct(env.rm(), nitpicker.framebuffer()->dataspace()); - nit_mode = nitpicker.mode(); + gui.buffer(new_mode, false); + nit_ds.construct(env.rm(), gui.framebuffer()->dataspace()); + nit_mode = gui.mode(); Genode::log("rebuffering complete"); } else if (!nit_ds.constructed()) { - nitpicker.buffer(nit_mode, false); - nit_ds.construct(env.rm(), nitpicker.framebuffer()->dataspace()); + gui.buffer(nit_mode, false); + nit_ds.construct(env.rm(), gui.framebuffer()->dataspace()); } Genode::size_t const buffer_size = @@ -126,17 +126,17 @@ struct Flif_view::Main surface, texture, Color(), Surface_base::Point(), Texture_painter::SOLID, true); - nitpicker.enqueue( - view_handle, Nitpicker::Rect(Nitpicker::Point(), img_area)); - nitpicker.enqueue(view_handle); - nitpicker.execute(); + gui.enqueue( + view_handle, Gui::Rect(Gui::Point(), img_area)); + gui.enqueue(view_handle); + gui.execute(); - nitpicker.framebuffer()->sync_sigh(Signal_context_capability()); + gui.framebuffer()->sync_sigh(Signal_context_capability()); } Genode::Attached_rom_dataspace config_rom { env, "config" }; - Input::Session_client &input = *nitpicker.input(); + Input::Session_client &input = *gui.input(); Timer::Connection timer { env, "animation" }; @@ -145,7 +145,7 @@ struct Flif_view::Main Timer::One_shot_timeout
render_timeout { timer, *this, &Main::render_animation }; - Nitpicker::Session::View_handle view_handle = nitpicker.create_view(); + Gui::Session::View_handle view_handle = gui.create_view(); void render(FLIF_IMAGE *img); @@ -309,7 +309,7 @@ void Flif_view::Main::render(FLIF_IMAGE *img) /* flush to surface on next sync signal */ img_area = Surface_base::Area(f_width, f_height); - nitpicker.framebuffer()->sync_sigh(sync_handler); + gui.framebuffer()->sync_sigh(sync_handler); } @@ -329,7 +329,7 @@ bool Flif_view::Main::render_page() flif_decoder_set_resize(flif_dec, nit_mode.width(), nit_mode.height()); flif_decoder_set_callback(flif_dec, &(progressive_render), this); - nitpicker.enqueue(view_handle, filename); + gui.enqueue(view_handle, filename); if (verbose) last_ms = timer.elapsed_ms(); diff --git a/src/app/julia_fractal/main.cc b/src/app/julia_fractal/main.cc index 6df3c57..42836f3 100644 --- a/src/app/julia_fractal/main.cc +++ b/src/app/julia_fractal/main.cc @@ -49,11 +49,11 @@ struct Painter_T { }; class window { - using View_handle = Nitpicker::Session::View_handle; + using View_handle = Gui::Session::View_handle; using Reattachable_dataspace = Genode::Constructible; Genode::Env& _env; - Nitpicker::Connection _npconn; + Gui::Connection _npconn; Framebuffer::Mode _mode; Painter_T& _draw; Reattachable_dataspace _ds{}; @@ -72,26 +72,26 @@ class window { _draw_frame(); _refresh(); - auto rect = Nitpicker::Rect{Nitpicker::Point{0, 0}, - Nitpicker::Area{(unsigned)_mode.width(), - (unsigned)_mode.height()}}; - _npconn.enqueue(_view, rect); + auto rect = Gui::Rect{Gui::Point{0, 0}, + Gui::Area{(unsigned)_mode.width(), + (unsigned)_mode.height()}}; + _npconn.enqueue(_view, rect); _npconn.execute(); } Genode::Signal_handler _on_resize{_env.ep(), *this, &window::_new_mode}; - + public: using Title_String_T = Genode::String<64>; ~window() = default; window() = delete; window(Genode::Env& env, Painter_T& painter, - Title_String_T title, Nitpicker::Area wsize) + Title_String_T title, Gui::Area wsize) : _env{env}, _npconn{env}, _mode{(int)wsize.w(), (int)wsize.h(), Framebuffer::Mode::RGB565}, _draw{painter} { - using Nitpicker::Session; + using Gui::Session; _npconn.buffer(_mode, false); _view = _npconn.create_view(); @@ -177,8 +177,8 @@ public: void Libc::Component::construct(Libc::Env& env) { static julia painter{-.75, 20}; - static window win{env, painter, "julia", Nitpicker::Area{256, 256}}; - + static window win{env, painter, "julia", Gui::Area{256, 256}}; + auto update_win = [&] { painter.C -= 0.003; win.draw_next_frame(); diff --git a/src/app/nit_entropy/main.cc b/src/app/nit_entropy/main.cc index fa74ddb..ad442a6 100644 --- a/src/app/nit_entropy/main.cc +++ b/src/app/nit_entropy/main.cc @@ -39,9 +39,9 @@ struct Nit_entropy::Main Heap _heap { _env.ram(), _env.rm() }; - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; - Framebuffer::Session &_fb = *_nitpicker.framebuffer(); + Framebuffer::Session &_fb = *_gui.framebuffer(); Terminal::Connection _entropy { _env, "entropy" }; @@ -49,13 +49,13 @@ struct Nit_entropy::Main { using Framebuffer::Mode; Mode mode(WIDTH, HEIGHT, Mode::RGB565); - _nitpicker.buffer(mode, false); + _gui.buffer(mode, false); return _fb.dataspace(); } Attached_dataspace _fb_ds { _env.rm(), _fb_ds_cap() }; - Nitpicker::Session::View_handle _view = _nitpicker.create_view(); + Gui::Session::View_handle _view = _gui.create_view(); void _refresh() { _fb.refresh(0, 0, WIDTH, HEIGHT); } @@ -81,12 +81,12 @@ struct Nit_entropy::Main Main(Env &env) : _env(env) { - _nitpicker.enqueue( + _gui.enqueue( _view, Rect(Point(0, 0), Area (WIDTH, HEIGHT))); - _nitpicker.enqueue( - _view, Nitpicker::Session::View_handle()); - _nitpicker.execute(); + _gui.enqueue( + _view, Gui::Session::View_handle()); + _gui.execute(); _fb.sync_sigh(_sync_handler); } diff --git a/src/app/qt_avplay/README b/src/app/qt_avplay/README index 5e9a2ef..9ec87d2 100644 --- a/src/app/qt_avplay/README +++ b/src/app/qt_avplay/README @@ -1,7 +1,7 @@ This directory contains a simple Qt-based media player which is actually a graphical user interface for the SDL-based 'avplay' media player from 'libav'. It starts 'avplay' as a child and shows its graphical output in a -'QNitpickerViewWidget'. The widgets for controlling the player state send the +'QGenodeViewWidget'. The widgets for controlling the player state send the according keyboard and mouse input events to 'avplay'. The 'qt_avplay' player supports the following configuration options: diff --git a/src/app/qt_avplay/avplay_slave.h b/src/app/qt_avplay/avplay_slave.h index 067af82..e37f457 100644 --- a/src/app/qt_avplay/avplay_slave.h +++ b/src/app/qt_avplay/avplay_slave.h @@ -29,9 +29,9 @@ #include /* local includes */ -#include "nitpicker_session_component.h" +#include "gui_session_component.h" -typedef Genode::Local_service Nitpicker_service; +typedef Genode::Local_service Gui_service; class Avplay_slave : public QObject { @@ -56,7 +56,7 @@ class Avplay_slave : public QObject { private: - Nitpicker_service &_nitpicker_service; + Gui_service &_gui_service; const char *_mediafile; int _sdl_audio_volume; @@ -121,24 +121,24 @@ class Avplay_slave : public QObject Genode::Service &_matching_service(Genode::Service::Name const &name) { if (name == "Gui") - return _nitpicker_service; + return _gui_service; throw Genode::Service_denied(); } public: - Policy(Genode::Env &env, - Genode::Entrypoint &entrypoint, - Nitpicker_service &nitpicker_service, - char const *mediafile) + Policy(Genode::Env &env, + Genode::Entrypoint &entrypoint, + Gui_service &gui_service, + char const *mediafile) : Policy_base(env), Genode::Slave::Policy(env, _name(), _name(), Policy_base::_parent_services, entrypoint.rpc_ep(), _caps(), _ram_quota()), - _nitpicker_service(nitpicker_service), + _gui_service(gui_service), _mediafile(mediafile), _sdl_audio_volume(100) { @@ -174,12 +174,12 @@ class Avplay_slave : public QObject /** * Constructor */ - Avplay_slave(Genode::Env &env, - Genode::Entrypoint &ep, - Nitpicker_service &nitpicker_service, - char const *mediafile) + Avplay_slave(Genode::Env &env, + Genode::Entrypoint &ep, + Gui_service &gui_service, + char const *mediafile) : - _policy(env, ep, nitpicker_service, mediafile), + _policy(env, ep, gui_service, mediafile), _child(env.rm(), ep.rpc_ep(), _policy) { } diff --git a/src/app/qt_avplay/nitpicker_session_component.h b/src/app/qt_avplay/gui_session_component.h similarity index 69% rename from src/app/qt_avplay/nitpicker_session_component.h rename to src/app/qt_avplay/gui_session_component.h index f7a271b..d72acb6 100644 --- a/src/app/qt_avplay/nitpicker_session_component.h +++ b/src/app/qt_avplay/gui_session_component.h @@ -1,5 +1,5 @@ /* - * \brief Nitpicker session component + * \brief GUI session component * \author Christian Prochaska * \date 2019-03-12 */ @@ -11,39 +11,38 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _NITPICKER_SESSION_COMPONENT_H_ -#define _NITPICKER_SESSION_COMPONENT_H_ +#ifndef _GUI_SESSION_COMPONENT_H_ +#define _GUI_SESSION_COMPONENT_H_ /* Genode includes */ #include /* Qt includes */ -#include -#include +#include +#include -namespace Nitpicker { +namespace Gui { using namespace Genode; struct Session_component; } -struct Nitpicker::Session_component : Rpc_object +struct Gui::Session_component : Rpc_object { - Env &_env; - Entrypoint &_ep; - QNitpickerViewWidget &_nitpicker_view_widget; + Env &_env; + Entrypoint &_ep; + QGenodeViewWidget &_genode_view_widget; - Nitpicker::Connection _connection; + Gui::Connection _connection; Input::Session_component _input_component { _env, _env.ram() }; - typedef Nitpicker::Session::Command_buffer Command_buffer; + using Command_buffer = Gui::Session::Command_buffer; Attached_ram_dataspace _command_ds; Command_buffer &_command_buffer = *_command_ds.local_addr(); - Nitpicker::Session::View_handle _view_handle; - + Gui::Session::View_handle _view_handle; Input::Session_component &input_component() { return _input_component; } @@ -53,11 +52,9 @@ struct Nitpicker::Session_component : Rpc_object case Command::OP_GEOMETRY: { - Nitpicker::Rect rect = command.geometry.rect; - _nitpicker_view_widget.setNitpickerView(&_connection, - _view_handle, - 0, 0, - rect.w(), rect.h()); + Gui::Rect rect = command.geometry.rect; + _genode_view_widget.setGenodeView(&_connection, _view_handle, + 0, 0, rect.w(), rect.h()); return; } @@ -71,10 +68,10 @@ struct Nitpicker::Session_component : Rpc_object } Session_component(Env &env, Entrypoint &ep, - QNitpickerViewWidget &nitpicker_view_widget) + QGenodeViewWidget &genode_view_widget) : _env(env), _ep(ep), - _nitpicker_view_widget(nitpicker_view_widget), + _genode_view_widget(genode_view_widget), _connection(env), _command_ds(env.ram(), env.rm(), sizeof(Command_buffer)) { @@ -97,11 +94,11 @@ struct Nitpicker::Session_component : Rpc_object View_handle create_view(View_handle parent) override { - QNitpickerPlatformWindow *platform_window = - dynamic_cast(_nitpicker_view_widget + QGenodePlatformWindow *platform_window = + dynamic_cast(_genode_view_widget .window()->windowHandle()->handle()); - Nitpicker::Session::View_handle parent_view_handle = + Gui::Session::View_handle parent_view_handle = _connection.view_handle(platform_window->view_cap()); _view_handle = _connection.create_view(parent_view_handle); @@ -137,9 +134,9 @@ struct Nitpicker::Session_component : Rpc_object Framebuffer::Mode connection_mode { _connection.mode() }; Framebuffer::Mode new_mode { Genode::min(connection_mode.width(), - _nitpicker_view_widget.maximumWidth()), + _genode_view_widget.maximumWidth()), Genode::min(connection_mode.height(), - _nitpicker_view_widget.maximumHeight()), + _genode_view_widget.maximumHeight()), connection_mode.format() }; return new_mode; @@ -151,8 +148,8 @@ struct Nitpicker::Session_component : Rpc_object void buffer(Framebuffer::Mode mode, bool use_alpha) override { _connection.buffer(mode, use_alpha); } - void focus(Capability session) override { + void focus(Capability session) override { _connection.focus(session); } }; -#endif /* _NITPICKER_SESSION_COMPONENT_H_ */ +#endif /* _GUI_SESSION_COMPONENT_H_ */ diff --git a/src/app/qt_avplay/main_window.cpp b/src/app/qt_avplay/main_window.cpp index 58363fa..1eb0dff 100644 --- a/src/app/qt_avplay/main_window.cpp +++ b/src/app/qt_avplay/main_window.cpp @@ -22,7 +22,7 @@ Main_window::Main_window(Genode::Env &env) : _env(env), _mediafile_name(env), - _control_bar(_nitpicker_session_component.input_component()) + _control_bar(_gui_session_component.input_component()) { /* add widgets to layout */ @@ -30,9 +30,9 @@ Main_window::Main_window(Genode::Env &env) _layout->addWidget(_control_bar); /* - * The main window must be visible before avplay requests the Nitpicker - * session, because the parent view of the new Nitpicker view is part of - * the QNitpickerPlatformWindow object, which is created when the main + * The main window must be visible before avplay requests the GUI + * session, because the parent view of the new GUI view is part of + * the QGenodePlatformWindow object, which is created when the main * window becomes visible. */ @@ -41,7 +41,7 @@ Main_window::Main_window(Genode::Env &env) /* start avplay */ Avplay_slave *avplay_slave = new Avplay_slave(_env, _ep, - _nitpicker_service, + _gui_service, _mediafile_name.name.string()); connect(_control_bar, SIGNAL(volume_changed(int)), avplay_slave, SLOT(volume_changed(int))); diff --git a/src/app/qt_avplay/main_window.h b/src/app/qt_avplay/main_window.h index fe5bf1c..d10b423 100644 --- a/src/app/qt_avplay/main_window.h +++ b/src/app/qt_avplay/main_window.h @@ -17,7 +17,7 @@ /* Qt includes */ #include #include -#include +#include /* Qoost includes */ #include @@ -32,7 +32,7 @@ /* local includes */ #include "avplay_slave.h" #include "control_bar.h" -#include "nitpicker_session_component.h" +#include "gui_session_component.h" class Main_window : public Compound_widget @@ -68,25 +68,23 @@ class Main_window : public Compound_widget Mediafile_name(Genode::Env &env) : name(_name_from_config(env)) { } }; - Genode::Env &_env; + Genode::Env &_env; - Genode::size_t const _ep_stack_size { 16 * 1024 }; - Genode::Entrypoint _ep { _env, _ep_stack_size, - "avplay_ep", - Genode::Affinity::Location() }; + Genode::size_t const _ep_stack_size { 16 * 1024 }; + Genode::Entrypoint _ep { _env, _ep_stack_size, + "avplay_ep", + Genode::Affinity::Location() }; - Mediafile_name _mediafile_name; + Mediafile_name _mediafile_name; - QMember _avplay_widget; - QMember _control_bar; + QMember _avplay_widget; + QMember _control_bar; - Nitpicker::Session_component _nitpicker_session_component { - _env, _ep, *_avplay_widget }; + Gui::Session_component _gui_session_component { _env, _ep, *_avplay_widget }; - Nitpicker_service::Single_session_factory _nitpicker_factory { - _nitpicker_session_component }; + Gui_service::Single_session_factory _gui_factory { _gui_session_component }; - Nitpicker_service _nitpicker_service { _nitpicker_factory }; + Gui_service _gui_service { _gui_factory }; public: diff --git a/src/app/qt_avplay/target.mk b/src/app/qt_avplay/target.mk index f470581..d121891 100644 --- a/src/app/qt_avplay/target.mk +++ b/src/app/qt_avplay/target.mk @@ -2,8 +2,8 @@ include $(call select_from_repositories,src/app/qt5/tmpl/target_defaults.inc) include $(call select_from_repositories,src/app/qt5/tmpl/target_final.inc) -LIBS += qt5_qnitpickerviewwidget qoost base +LIBS += qt5_qgenodeviewwidget qoost base -REP_INC_DIR += include/qt5/qpa_nitpicker +REP_INC_DIR += include/qt5/qpa_genode CC_CXX_WARN_STRICT = diff --git a/src/app/show_input/main.cc b/src/app/show_input/main.cc index 3aa91eb..1b773c4 100644 --- a/src/app/show_input/main.cc +++ b/src/app/show_input/main.cc @@ -49,20 +49,20 @@ struct Show_input::Main Vfs_font _font { _heap, _root, "fonts/text/regular" }; - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; - Input::Session_client &_input = *_nitpicker.input(); - Framebuffer::Session &_fb = *_nitpicker.framebuffer(); + Input::Session_client &_input = *_gui.input(); + Framebuffer::Session &_fb = *_gui.framebuffer(); Dataspace_capability _fb_ds_cap() { - _nitpicker.buffer(_nitpicker.mode(), false); + _gui.buffer(_gui.mode(), false); return _fb.dataspace(); } Attached_dataspace _fb_ds { _env.rm(), _fb_ds_cap() }; - Nitpicker::Session::View_handle _view = _nitpicker.create_view(); + Gui::Session::View_handle _view = _gui.create_view(); typedef Pixel_rgb565 PT; @@ -105,13 +105,13 @@ struct Show_input::Main auto w = _font.string_width(info.string()).decimal(); auto h = _font.height(); - _nitpicker.enqueue( + _gui.enqueue( _view, Rect(Point(0, 0), Area(w*2, h*2))); }); }); if (refresh) { - _nitpicker.execute(); + _gui.execute(); _refresh(); } } @@ -120,12 +120,12 @@ struct Show_input::Main { _input.sigh(_input_sigh); - _nitpicker.enqueue( + _gui.enqueue( _view, Rect(Point(0, 0), _size)); - _nitpicker.enqueue( - _view, Nitpicker::Session::View_handle()); - _nitpicker.execute(); + _gui.enqueue( + _view, Gui::Session::View_handle()); + _gui.execute(); _surface.clip(Rect(Point(0, 0), _size)); } diff --git a/src/lib/sdl/video/SDL_genode_fb_events.cc b/src/lib/sdl/video/SDL_genode_fb_events.cc index 5223891..ae82538 100644 --- a/src/lib/sdl/video/SDL_genode_fb_events.cc +++ b/src/lib/sdl/video/SDL_genode_fb_events.cc @@ -46,7 +46,7 @@ Video video_events; static Genode::Env *_global_env = nullptr; -static Genode::Constructible _global_nitpicker { }; +static Genode::Constructible _global_gui { }; Genode::Env &global_env() @@ -60,12 +60,12 @@ Genode::Env &global_env() } -Nitpicker::Connection &global_nitpicker() +Gui::Connection &global_gui() { - if (!_global_nitpicker.constructed()) - _global_nitpicker.construct(global_env()); + if (!_global_gui.constructed()) + _global_gui.construct(global_env()); - return *_global_nitpicker; + return *_global_gui; } @@ -167,7 +167,7 @@ extern "C" { { try { input.construct(_global_env->rm(), - _global_nitpicker->input_session()); + _global_gui->input_session()); } catch (...) { Genode::error("no input driver available!"); return; diff --git a/src/lib/sdl/video/SDL_genode_fb_video.cc b/src/lib/sdl/video/SDL_genode_fb_video.cc index 6e370eb..9eea870 100644 --- a/src/lib/sdl/video/SDL_genode_fb_video.cc +++ b/src/lib/sdl/video/SDL_genode_fb_video.cc @@ -38,8 +38,8 @@ #include -extern Genode::Env &global_env(); -extern Nitpicker::Connection &global_nitpicker(); +extern Genode::Env &global_env(); +extern Gui::Connection &global_gui(); extern Genode::Lock event_lock; extern Video video_events; @@ -62,16 +62,15 @@ extern "C" { struct Sdl_framebuffer { - Genode::Env &_env; - Nitpicker::Connection &_nitpicker; - Nitpicker::Session::View_handle _view { - _nitpicker.create_view() }; + Genode::Env &_env; + Gui::Connection &_gui; + Gui::Session::View_handle _view { _gui.create_view() }; void _handle_mode_change() { Genode::Lock_guard guard(event_lock); - Framebuffer::Mode mode = _nitpicker.mode(); + Framebuffer::Mode mode = _gui.mode(); df_mode.w = mode.width(); df_mode.h = mode.height(); @@ -83,15 +82,15 @@ extern "C" { Genode::Signal_handler _mode_handler { _env.ep(), *this, &Sdl_framebuffer::_handle_mode_change }; - Sdl_framebuffer(Genode::Env &env, Nitpicker::Connection &nitpicker) + Sdl_framebuffer(Genode::Env &env, Gui::Connection &gui) : - _env(env), _nitpicker(nitpicker) + _env(env), _gui(gui) { - _nitpicker.mode_sigh(_mode_handler); + _gui.mode_sigh(_mode_handler); - using namespace Nitpicker; - _nitpicker.enqueue(_view, Session::View_handle()); - _nitpicker.execute(); + using namespace Gui; + _gui.enqueue(_view, Session::View_handle()); + _gui.execute(); } @@ -101,35 +100,35 @@ extern "C" { Genode::Dataspace_capability dataspace(int width, int height) { - _nitpicker.buffer( + _gui.buffer( ::Framebuffer::Mode(width, height, Framebuffer::Mode::RGB565), false); - ::Framebuffer::Mode mode = _nitpicker.framebuffer()->mode(); + ::Framebuffer::Mode mode = _gui.framebuffer()->mode(); - using namespace Nitpicker; + using namespace Gui; Area area( Genode::min(mode.width(), width), Genode::min(mode.height(), height)); - typedef Nitpicker::Session::Command Command; - _nitpicker.enqueue( + typedef Gui::Session::Command Command; + _gui.enqueue( _view, Rect(Point(0, 0), area)); - _nitpicker.execute(); + _gui.execute(); - return _nitpicker.framebuffer()->dataspace(); + return _gui.framebuffer()->dataspace(); } Framebuffer::Mode mode() const { - return _nitpicker.mode(); } + return _gui.mode(); } void refresh(int x, int y, int w, int h) { - _nitpicker.framebuffer()->refresh(x, y, w, h); } + _gui.framebuffer()->refresh(x, y, w, h); } void title(char const *string) { - _nitpicker.enqueue(_view, string); - _nitpicker.execute(); + _gui.enqueue(_view, string); + _gui.execute(); } }; @@ -298,7 +297,7 @@ extern "C" { static int Genode_Fb_Available(void) { if (!framebuffer.constructed()) { - framebuffer.construct(global_env(), global_nitpicker()); + framebuffer.construct(global_env(), global_gui()); } return 1; diff --git a/src/lib/sdl2/video/SDL_genode_fb_events.cc b/src/lib/sdl2/video/SDL_genode_fb_events.cc index 1f4a999..e9ac623 100644 --- a/src/lib/sdl2/video/SDL_genode_fb_events.cc +++ b/src/lib/sdl2/video/SDL_genode_fb_events.cc @@ -46,7 +46,7 @@ Video video_events; static Genode::Env *_global_env = nullptr; -static Genode::Constructible _global_nitpicker { }; +static Genode::Constructible _global_gui { }; Genode::Env &global_env() @@ -60,12 +60,12 @@ Genode::Env &global_env() } -Nitpicker::Connection &global_nitpicker() +Gui::Connection &global_gui() { - if (!_global_nitpicker.constructed()) - _global_nitpicker.construct(global_env()); + if (!_global_gui.constructed()) + _global_gui.construct(global_env()); - return *_global_nitpicker; + return *_global_gui; } @@ -172,7 +172,7 @@ extern "C" { { try { input.construct(_global_env->rm(), - _global_nitpicker->input_session()); + _global_gui->input_session()); } catch (...) { Genode::error("no input driver available!"); return; diff --git a/src/lib/sdl2/video/SDL_genode_fb_video.cc b/src/lib/sdl2/video/SDL_genode_fb_video.cc index df26937..fac88a0 100644 --- a/src/lib/sdl2/video/SDL_genode_fb_video.cc +++ b/src/lib/sdl2/video/SDL_genode_fb_video.cc @@ -39,8 +39,8 @@ #include -extern Genode::Env &global_env(); -extern Nitpicker::Connection &global_nitpicker(); +extern Genode::Env &global_env(); +extern Gui::Connection &global_gui(); extern Genode::Lock event_lock; extern Video video_events; @@ -63,16 +63,15 @@ extern "C" { struct Sdl_framebuffer { - Genode::Env &_env; - Nitpicker::Connection &_nitpicker; - Nitpicker::Session::View_handle _view { - _nitpicker.create_view() }; + Genode::Env &_env; + Gui::Connection &_gui; + Gui::Session::View_handle _view { _gui.create_view() }; void _handle_mode_change() { Genode::Lock_guard guard(event_lock); - Framebuffer::Mode mode = _nitpicker.mode(); + Framebuffer::Mode mode = _gui.mode(); video_events.resize_pending = true; video_events.width = mode.width(); @@ -82,23 +81,23 @@ extern "C" { Genode::Signal_handler _mode_handler { _env.ep(), *this, &Sdl_framebuffer::_handle_mode_change }; - Sdl_framebuffer(Genode::Env &env, Nitpicker::Connection &nitpicker) + Sdl_framebuffer(Genode::Env &env, Gui::Connection &gui) : - _env(env), _nitpicker(nitpicker) + _env(env), _gui(gui) { - _nitpicker.mode_sigh(_mode_handler); + _gui.mode_sigh(_mode_handler); - using namespace Nitpicker; - _nitpicker.enqueue(_view, Session::View_handle()); - _nitpicker.execute(); + using namespace Gui; + _gui.enqueue(_view, Session::View_handle()); + _gui.execute(); } ~Sdl_framebuffer() { /* clean up and reduce noise about invalid signals */ - _nitpicker.mode_sigh(Genode::Signal_context_capability()); + _gui.mode_sigh(Genode::Signal_context_capability()); dataspace(0, 0); - _nitpicker.destroy_view(_view); + _gui.destroy_view(_view); } /************************************ @@ -107,35 +106,35 @@ extern "C" { Genode::Dataspace_capability dataspace(int width, int height) { - _nitpicker.buffer( + _gui.buffer( ::Framebuffer::Mode(width, height, Framebuffer::Mode::RGB565), false); - ::Framebuffer::Mode mode = _nitpicker.framebuffer()->mode(); + ::Framebuffer::Mode mode = _gui.framebuffer()->mode(); - using namespace Nitpicker; + using namespace Gui; Area area( Genode::min(mode.width(), width), Genode::min(mode.height(), height)); - typedef Nitpicker::Session::Command Command; - _nitpicker.enqueue( + typedef Gui::Session::Command Command; + _gui.enqueue( _view, Rect(Point(0, 0), area)); - _nitpicker.execute(); + _gui.execute(); - return _nitpicker.framebuffer()->dataspace(); + return _gui.framebuffer()->dataspace(); } Framebuffer::Mode mode() const { - return _nitpicker.mode(); } + return _gui.mode(); } void refresh(int x, int y, int w, int h) { - _nitpicker.framebuffer()->refresh(x, y, w, h); } + _gui.framebuffer()->refresh(x, y, w, h); } void title(char const *string) { - _nitpicker.enqueue(_view, string); - _nitpicker.execute(); + _gui.enqueue(_view, string); + _gui.execute(); } }; @@ -353,7 +352,7 @@ extern "C" { return nullptr; } - data->framebuffer.construct(global_env(), global_nitpicker()); + data->framebuffer.construct(global_env(), global_gui()); device->driverdata = data;