From 5d40c0c1ce7f702b0b4c3735a4501ba705c14ffb Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 12 Jun 2020 11:23:57 +0200 Subject: [PATCH] Rename 'Nitpicker' namespace to 'Gui' Issue #3778 --- ...hics_backend.h => graphics_backend_impl.h} | 62 ++-- repos/demo/src/app/launchpad/main.cc | 10 +- repos/demo/src/app/scout/main.cc | 10 +- .../src/server/liquid_framebuffer/main.cc | 12 +- repos/demo/src/server/nitlog/main.cc | 66 ++-- .../gems/{nitpicker_buffer.h => gui_buffer.h} | 28 +- repos/gems/include/nano3d/scene.h | 58 ++-- repos/gems/recipes/src/mixer_gui_qt/used_apis | 2 +- .../gems/recipes/src/test-tiled_wm/used_apis | 2 +- repos/gems/src/app/backdrop/main.cc | 44 +-- repos/gems/src/app/cpu_load_display/main.cc | 16 +- repos/gems/src/app/decorator/main.cc | 6 +- repos/gems/src/app/decorator/window.cc | 2 +- repos/gems/src/app/decorator/window.h | 52 ++-- repos/gems/src/app/menu_view/main.cc | 28 +- repos/gems/src/app/nano3d/main.cc | 6 +- .../sculpt_manager/{nitpicker.cc => gui.cc} | 20 +- .../app/sculpt_manager/{nitpicker.h => gui.h} | 6 +- repos/gems/src/app/sculpt_manager/main.cc | 82 ++--- .../gems/src/app/sculpt_manager/menu_view.cc | 2 +- .../sculpt_manager/model/file_browser_state.h | 2 +- .../sculpt_manager/runtime/inspect_view.cc | 12 +- .../sculpt_manager/runtime/runtime_view.cc | 2 +- repos/gems/src/app/sculpt_manager/types.h | 6 +- .../src/app/text_area/{nitpicker.h => gui.h} | 16 +- .../src/app/text_area/input_event_handler.h | 4 +- repos/gems/src/app/text_area/main.cc | 26 +- repos/gems/src/app/themed_decorator/main.cc | 36 +-- repos/gems/src/app/themed_decorator/window.h | 145 +++++---- repos/gems/src/app/window_layouter/main.cc | 12 +- repos/gems/src/server/nit_fader/main.cc | 120 +++---- ...{decorator_nitpicker.h => decorator_gui.h} | 138 ++++----- .../wm/{direct_nitpicker.h => direct_gui.h} | 28 +- .../gems/src/server/wm/{nitpicker.h => gui.h} | 257 ++++++++------- .../{layouter_nitpicker.h => layouter_gui.h} | 41 ++- repos/gems/src/server/wm/main.cc | 19 +- repos/gems/src/server/wm/report_forwarder.h | 13 +- repos/gems/src/server/wm/rom_forwarder.h | 2 +- .../qgenodeviewwidget.h} | 24 +- .../qgenodeplatformwindow.h} | 70 ++--- .../include/qt5/qpluginwidget/qpluginwidget.h | 32 +- ...get.mk => import-qt5_qgenodeviewwidget.mk} | 2 +- ..._nitpicker.mk => import-qt5_qpa_genode.mk} | 4 +- .../lib/import/import-qt5_qpluginwidget.mk | 4 +- .../libports/lib/mk/qt5_qgenodeviewwidget.mk | 13 + .../lib/mk/qt5_qnitpickerviewwidget.mk | 13 - ...qt5_qpa_nitpicker.mk => qt5_qpa_genode.mk} | 24 +- repos/libports/lib/mk/qt5_qpluginwidget.mk | 2 +- .../lib/symbols/qt5_qgenodeviewwidget | 30 ++ .../lib/symbols/qt5_qnitpickerviewwidget | 30 -- repos/libports/lib/symbols/qt5_qpa_genode | 283 +++++++++++++++++ repos/libports/lib/symbols/qt5_qpa_nitpicker | 292 ------------------ repos/libports/lib/symbols/qt5_qpluginwidget | 4 +- repos/libports/ports/qt5.hash | 2 +- repos/libports/recipes/api/qt5_gui/hash | 2 +- .../api/qt5_qgenodeviewwidget/content.mk | 11 + .../hash | 0 .../api/qt5_qnitpickerviewwidget/content.mk | 11 - .../content.mk | 6 +- .../libports/recipes/api/qt5_qpa_genode/hash | 1 + .../recipes/api/qt5_qpa_nitpicker/hash | 1 - .../recipes/pkg/qt5_textedit/archives | 2 +- .../libports/recipes/pkg/qt5_textedit/runtime | 2 +- .../recipes/src/qt5_calculatorform/used_apis | 2 +- .../recipes/src/qt5_launchpad/used_apis | 2 +- .../recipes/src/qt5_openglwindow/used_apis | 2 +- .../recipes/src/qt5_qgenodeviewwidget/api | 1 + .../src/qt5_qgenodeviewwidget/content.mk | 14 + .../hash | 0 .../used_apis | 2 +- .../recipes/src/qt5_qnitpickerviewwidget/api | 1 - .../src/qt5_qnitpickerviewwidget/content.mk | 14 - repos/libports/recipes/src/qt5_qpa_genode/api | 1 + .../content.mk | 10 +- .../libports/recipes/src/qt5_qpa_genode/hash | 1 + .../used_apis | 0 .../recipes/src/qt5_qpa_nitpicker/api | 1 - .../recipes/src/qt5_qpa_nitpicker/hash | 1 - .../recipes/src/qt5_qpluginwidget/used_apis | 4 +- .../recipes/src/qt5_samegame/used_apis | 2 +- .../recipes/src/qt5_testqstring/used_apis | 2 +- .../libports/recipes/src/qt5_tetrix/used_apis | 2 +- .../recipes/src/qt5_textedit/used_apis | 2 +- .../src/qt5_virtualkeyboard_example/used_apis | 2 +- .../recipes/src/test-qpluginwidget/used_apis | 4 +- .../recipes/src/test-qt_quick/used_apis | 2 +- repos/libports/run/qt5_common.inc | 2 +- repos/libports/run/qt5_qpluginwidget.run | 2 +- repos/libports/src/app/pdf_view/main.cc | 32 +- .../src/app/qt5/tmpl/target_final.inc | 2 +- .../src/lib/qt5/patches/qtbase_genode.patch | 2 +- .../qgenodeviewwidget.cpp} | 101 +++--- .../lib/qt5/qpluginwidget/qpluginwidget.cpp | 12 +- .../src/plugins/platforms/genode/genode.json | 3 + .../platforms/{nitpicker => genode}/main.cpp | 18 +- .../qgenodeclipboard.cpp | 0 .../{nitpicker => genode}/qgenodeclipboard.h | 0 .../qgenodecursor.cpp} | 8 +- .../qgenodecursor.h} | 12 +- .../qgenodeglcontext.cpp} | 22 +- .../qgenodeglcontext.h} | 12 +- .../platforms/genode/qgenodeintegration.cpp | 111 +++++++ .../qgenodeintegration.h} | 18 +- .../qgenodeintegrationplugin.h} | 14 +- .../qgenodeplatformwindow.cpp} | 284 ++++++++--------- .../qgenodescreen.h} | 22 +- .../qgenodewindowsurface.cpp} | 32 +- .../qgenodewindowsurface.h} | 24 +- .../platforms/nitpicker/nitpicker.json | 3 - .../nitpicker/qnitpickerintegration.cpp | 111 ------- repos/os/include/decorator/window.h | 6 +- repos/os/include/decorator/window_stack.h | 8 +- repos/os/include/gui_session/capability.h | 2 +- repos/os/include/gui_session/client.h | 6 +- repos/os/include/gui_session/connection.h | 10 +- repos/os/include/gui_session/gui_session.h | 6 +- repos/os/include/loader_session/client.h | 2 +- .../include/loader_session/loader_session.h | 4 +- repos/os/src/app/global_keys_handler/main.cc | 4 +- repos/os/src/app/pointer/main.cc | 54 ++-- repos/os/src/app/status_bar/main.cc | 32 +- repos/os/src/server/loader/child.h | 8 +- .../src/server/loader/{nitpicker.h => gui.h} | 66 ++-- repos/os/src/server/loader/input.h | 2 +- repos/os/src/server/loader/main.cc | 56 ++-- repos/os/src/server/nit_fb/main.cc | 65 ++-- repos/os/src/server/nitpicker/main.cc | 4 +- .../src/server/nitpicker/session_component.cc | 2 +- .../src/server/nitpicker/session_component.h | 8 +- repos/os/src/server/nitpicker/types.h | 3 + .../os/src/server/nitpicker/view_component.h | 12 +- repos/os/src/server/nitpicker/view_owner.h | 6 +- repos/os/src/test/nitpicker/test.cc | 74 ++--- repos/ports/recipes/pkg/arora/archives | 4 +- repos/ports/recipes/pkg/arora/runtime | 4 +- repos/ports/recipes/src/arora/used_apis | 4 +- repos/ports/run/arora.run | 2 +- repos/ports/src/app/arora/target.mk | 2 +- repos/ports/src/app/seoul/component.cc | 24 +- repos/ports/src/app/seoul/console.cc | 6 +- repos/ports/src/app/seoul/console.h | 2 +- .../ports/src/virtualbox5/frontend/console.cc | 4 +- .../ports/src/virtualbox5/frontend/console.h | 8 +- repos/ports/src/virtualbox5/frontend/fb.h | 46 +-- repos/ports/src/virtualbox5/frontend/main.cc | 2 +- 145 files changed, 1856 insertions(+), 1869 deletions(-) rename repos/demo/include/scout/{nitpicker_graphics_backend.h => graphics_backend_impl.h} (60%) rename repos/gems/include/gems/{nitpicker_buffer.h => gui_buffer.h} (86%) rename repos/gems/src/app/sculpt_manager/{nitpicker.cc => gui.cc} (82%) rename repos/gems/src/app/sculpt_manager/{nitpicker.h => gui.h} (84%) rename repos/gems/src/app/text_area/{nitpicker.h => gui.h} (88%) rename repos/gems/src/server/wm/{decorator_nitpicker.h => decorator_gui.h} (69%) rename repos/gems/src/server/wm/{direct_nitpicker.h => direct_gui.h} (70%) rename repos/gems/src/server/wm/{nitpicker.h => gui.h} (81%) rename repos/gems/src/server/wm/{layouter_nitpicker.h => layouter_gui.h} (60%) rename repos/libports/include/qt5/{qnitpickerviewwidget/qnitpickerviewwidget.h => qgenodeviewwidget/qgenodeviewwidget.h} (68%) rename repos/libports/include/qt5/{qpa_nitpicker/qnitpickerplatformwindow.h => qpa_genode/qgenodeplatformwindow.h} (67%) rename repos/libports/lib/import/{import-qt5_qnitpickerviewwidget.mk => import-qt5_qgenodeviewwidget.mk} (66%) rename repos/libports/lib/import/{import-qt5_qpa_nitpicker.mk => import-qt5_qpa_genode.mk} (69%) create mode 100644 repos/libports/lib/mk/qt5_qgenodeviewwidget.mk delete mode 100644 repos/libports/lib/mk/qt5_qnitpickerviewwidget.mk rename repos/libports/lib/mk/{qt5_qpa_nitpicker.mk => qt5_qpa_genode.mk} (77%) create mode 100644 repos/libports/lib/symbols/qt5_qgenodeviewwidget delete mode 100644 repos/libports/lib/symbols/qt5_qnitpickerviewwidget create mode 100644 repos/libports/lib/symbols/qt5_qpa_genode delete mode 100644 repos/libports/lib/symbols/qt5_qpa_nitpicker create mode 100644 repos/libports/recipes/api/qt5_qgenodeviewwidget/content.mk rename repos/libports/recipes/api/{qt5_qnitpickerviewwidget => qt5_qgenodeviewwidget}/hash (100%) delete mode 100644 repos/libports/recipes/api/qt5_qnitpickerviewwidget/content.mk rename repos/libports/recipes/api/{qt5_qpa_nitpicker => qt5_qpa_genode}/content.mk (76%) create mode 100644 repos/libports/recipes/api/qt5_qpa_genode/hash delete mode 100644 repos/libports/recipes/api/qt5_qpa_nitpicker/hash create mode 100644 repos/libports/recipes/src/qt5_qgenodeviewwidget/api create mode 100644 repos/libports/recipes/src/qt5_qgenodeviewwidget/content.mk rename repos/libports/recipes/src/{qt5_qnitpickerviewwidget => qt5_qgenodeviewwidget}/hash (100%) rename repos/libports/recipes/src/{qt5_qnitpickerviewwidget => qt5_qgenodeviewwidget}/used_apis (85%) delete mode 100644 repos/libports/recipes/src/qt5_qnitpickerviewwidget/api delete mode 100644 repos/libports/recipes/src/qt5_qnitpickerviewwidget/content.mk create mode 100644 repos/libports/recipes/src/qt5_qpa_genode/api rename repos/libports/recipes/src/{qt5_qpa_nitpicker => qt5_qpa_genode}/content.mk (84%) create mode 100644 repos/libports/recipes/src/qt5_qpa_genode/hash rename repos/libports/recipes/src/{qt5_qpa_nitpicker => qt5_qpa_genode}/used_apis (100%) delete mode 100644 repos/libports/recipes/src/qt5_qpa_nitpicker/api delete mode 100644 repos/libports/recipes/src/qt5_qpa_nitpicker/hash rename repos/libports/src/lib/qt5/{qnitpickerviewwidget/qnitpickerviewwidget.cpp => qgenodeviewwidget/qgenodeviewwidget.cpp} (56%) create mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/genode.json rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker => genode}/main.cpp (53%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker => genode}/qgenodeclipboard.cpp (100%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker => genode}/qgenodeclipboard.h (100%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker/qnitpickercursor.cpp => genode/qgenodecursor.cpp} (90%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker/qnitpickercursor.h => genode/qgenodecursor.h} (79%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker/qnitpickerglcontext.cpp => genode/qgenodeglcontext.cpp} (82%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker/qnitpickerglcontext.h => genode/qgenodeglcontext.h} (78%) create mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.cpp rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker/qnitpickerintegration.h => genode/qgenodeintegration.h} (78%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker/qnitpickerintegrationplugin.h => genode/qgenodeintegrationplugin.h} (70%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker/qnitpickerplatformwindow.cpp => genode/qgenodeplatformwindow.cpp} (69%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker/qnitpickerscreen.h => genode/qgenodescreen.h} (67%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker/qnitpickerwindowsurface.cpp => genode/qgenodewindowsurface.cpp} (71%) rename repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/{nitpicker/qnitpickerwindowsurface.h => genode/qgenodewindowsurface.h} (54%) delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/nitpicker.json delete mode 100644 repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp rename repos/os/src/server/loader/{nitpicker.h => gui.h} (76%) diff --git a/repos/demo/include/scout/nitpicker_graphics_backend.h b/repos/demo/include/scout/graphics_backend_impl.h similarity index 60% rename from repos/demo/include/scout/nitpicker_graphics_backend.h rename to repos/demo/include/scout/graphics_backend_impl.h index 2f133a5a08..635cac0e33 100644 --- a/repos/demo/include/scout/nitpicker_graphics_backend.h +++ b/repos/demo/include/scout/graphics_backend_impl.h @@ -1,5 +1,5 @@ /* - * \brief Nitpicker-based graphics backend for scout + * \brief Graphics backend based on the GUI session interface * \date 2013-12-30 * \author Norman Feske */ @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _INCLUDE__SCOUT__NITPICKER_GRAPHICS_BACKEND_H_ -#define _INCLUDE__SCOUT__NITPICKER_GRAPHICS_BACKEND_H_ +#ifndef _INCLUDE__SCOUT__GRAPHICS_BACKEND_IMPL_H_ +#define _INCLUDE__SCOUT__GRAPHICS_BACKEND_IMPL_H_ /* Genode includes */ #include @@ -25,61 +25,61 @@ namespace Scout { using Genode::Pixel_rgb565; - class Nitpicker_graphics_backend; + class Graphics_backend_impl; } -class Scout::Nitpicker_graphics_backend : public Graphics_backend +class Scout::Graphics_backend_impl : public Graphics_backend { private: /* * Noncopyable */ - Nitpicker_graphics_backend(Nitpicker_graphics_backend const &); - Nitpicker_graphics_backend &operator = (Nitpicker_graphics_backend const &); + Graphics_backend_impl(Graphics_backend_impl const &); + Graphics_backend_impl &operator = (Graphics_backend_impl const &); Genode::Region_map &_local_rm; - Nitpicker::Connection &_nitpicker; + Gui::Connection &_gui; Genode::Dataspace_capability _init_fb_ds(Area max_size) { - _nitpicker.buffer(Framebuffer::Mode(max_size.w(), max_size.h()*2, - Framebuffer::Mode::RGB565), false); - return _nitpicker.framebuffer()->dataspace(); + _gui.buffer(Framebuffer::Mode(max_size.w(), max_size.h()*2, + Framebuffer::Mode::RGB565), false); + return _gui.framebuffer()->dataspace(); } Area _max_size; Genode::Attached_dataspace _fb_ds { _local_rm, _init_fb_ds(_max_size) }; - typedef Nitpicker::Session::View_handle View_handle; + typedef Gui::Session::View_handle View_handle; Point _position; Area _view_size; - View_handle _view { _nitpicker.create_view() }; + View_handle _view { _gui.create_view() }; Canvas_base *_canvas[2]; bool _flip_state = { false }; void _update_viewport() { - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; - Nitpicker::Rect rect(_position, _view_size); - _nitpicker.enqueue(_view, rect); + Gui::Rect rect(_position, _view_size); + _gui.enqueue(_view, rect); - Nitpicker::Point offset(0, _flip_state ? -_max_size.h() : 0); - _nitpicker.enqueue(_view, offset); + Gui::Point offset(0, _flip_state ? -_max_size.h() : 0); + _gui.enqueue(_view, offset); - _nitpicker.execute(); + _gui.execute(); } void _refresh_view(Rect rect) { int const y_offset = _flip_state ? _max_size.h() : 0; - _nitpicker.framebuffer()->refresh(rect.x1(), rect.y1() + y_offset, - rect.w(), rect.h()); + _gui.framebuffer()->refresh(rect.x1(), rect.y1() + y_offset, + rect.w(), rect.h()); } template @@ -98,13 +98,13 @@ class Scout::Nitpicker_graphics_backend : public Graphics_backend * * \param alloc allocator used for allocating textures */ - Nitpicker_graphics_backend(Genode::Region_map &local_rm, - Nitpicker::Connection &nitpicker, - Genode::Allocator &alloc, - Area max_size, Point position, Area view_size) + Graphics_backend_impl(Genode::Region_map &local_rm, + Gui::Connection &gui, + Genode::Allocator &alloc, + Area max_size, Point position, Area view_size) : _local_rm(local_rm), - _nitpicker(nitpicker), + _gui(gui), _max_size(max_size), _position(position), _view_size(view_size) @@ -160,10 +160,10 @@ class Scout::Nitpicker_graphics_backend : public Graphics_backend void bring_to_front() override { - typedef Nitpicker::Session::Command Command; - typedef Nitpicker::Session::View_handle View_handle; - _nitpicker.enqueue(_view, View_handle()); - _nitpicker.execute(); + typedef Gui::Session::Command Command; + typedef Gui::Session::View_handle View_handle; + _gui.enqueue(_view, View_handle()); + _gui.execute(); } void view_area(Area area) override @@ -172,4 +172,4 @@ class Scout::Nitpicker_graphics_backend : public Graphics_backend } }; -#endif /* _INCLUDE__SCOUT__NITPICKER_GRAPHICS_BACKEND_H_ */ +#endif /* _INCLUDE__SCOUT__GRAPHICS_BACKEND_IMPL_H_ */ diff --git a/repos/demo/src/app/launchpad/main.cc b/repos/demo/src/app/launchpad/main.cc index a7ca60c254..f5f3de319c 100644 --- a/repos/demo/src/app/launchpad/main.cc +++ b/repos/demo/src/app/launchpad/main.cc @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include "config.h" #include "elements.h" @@ -84,9 +84,9 @@ struct Main : Scout::Event_handler bool const _global_new_initialized = (_alloc_ptr = &_heap, true); - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; - Platform _platform { _env, *_nitpicker.input() }; + Platform _platform { _env, *_gui.input() }; bool const _event_handler_registered = (_platform.event_handler(*this), true); @@ -101,8 +101,8 @@ struct Main : Scout::Event_handler Scout::Point const _initial_position { _initial_x, _initial_y }; Scout::Area const _initial_size { _initial_w, _initial_h }; - Nitpicker_graphics_backend - _graphics_backend { _env.rm(), _nitpicker, _heap, _max_size, + Graphics_backend_impl + _graphics_backend { _env.rm(), _gui, _heap, _max_size, _initial_position, _initial_size }; Launchpad_window diff --git a/repos/demo/src/app/scout/main.cc b/repos/demo/src/app/scout/main.cc index 8e4ba321b7..26f5b347b6 100644 --- a/repos/demo/src/app/scout/main.cc +++ b/repos/demo/src/app/scout/main.cc @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "config.h" #include "elements.h" @@ -63,9 +63,9 @@ struct Scout::Main : Scout::Event_handler bool const _launcher_initialized = (Launcher::init(_env, _heap), true); bool const _png_image_initialized = (Png_image::init(_heap), true); - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; - Platform _platform { _env, *_nitpicker.input() }; + Platform _platform { _env, *_gui.input() }; bool const _event_handler_registered = (_platform.event_handler(*this), true); @@ -75,8 +75,8 @@ struct Scout::Main : Scout::Event_handler Config const _config { }; - Nitpicker_graphics_backend - _graphics_backend { _env.rm(), _nitpicker, _heap, _max_size, + Graphics_backend_impl + _graphics_backend { _env.rm(), _gui, _heap, _max_size, _initial_position, _initial_size }; void _init_navicons() diff --git a/repos/demo/src/server/liquid_framebuffer/main.cc b/repos/demo/src/server/liquid_framebuffer/main.cc index 17d167eaba..2d9e0b1d36 100644 --- a/repos/demo/src/server/liquid_framebuffer/main.cc +++ b/repos/demo/src/server/liquid_framebuffer/main.cc @@ -1,5 +1,5 @@ /* - * \brief Nitpicker-based virtual framebuffer + * \brief Virtual framebuffer * \author Norman Feske * \date 2006-09-21 */ @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include "framebuffer_window.h" #include "services.h" @@ -148,9 +148,9 @@ class Liquid_fb::Main : public Scout::Event_handler /* heuristic for allocating the double-buffer backing store */ enum { WINBORDER_WIDTH = 10, WINBORDER_HEIGHT = 40 }; - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; - Platform _platform { _env, *_nitpicker.input() }; + Platform _platform { _env, *_gui.input() }; bool const _event_handler_registered = (_platform.event_handler(*this), true); @@ -159,8 +159,8 @@ class Liquid_fb::Main : public Scout::Event_handler Scout::Point const _initial_position { (int)config_fb_x, (int)config_fb_y }; Scout::Area const _initial_size = _max_size; - Nitpicker_graphics_backend - _graphics_backend { _env.rm(), _nitpicker, _heap, _max_size, + Graphics_backend_impl + _graphics_backend { _env.rm(), _gui, _heap, _max_size, _initial_position, _initial_size }; Input::Session_component _input_session_component { _env, _env.ram() }; diff --git a/repos/demo/src/server/nitlog/main.cc b/repos/demo/src/server/nitlog/main.cc index e246b21345..c91932c04e 100644 --- a/repos/demo/src/server/nitlog/main.cc +++ b/repos/demo/src/server/nitlog/main.cc @@ -351,22 +351,22 @@ class Log_view { private: - Nitpicker::Session_client &_nitpicker; - Nitpicker::Point _pos; - Nitpicker::Area _size; - Nitpicker::Session::View_handle _handle; + Gui::Session_client &_gui; + Gui::Point _pos; + Gui::Area _size; + Gui::Session::View_handle _handle; - typedef Nitpicker::Session::Command Command; - typedef Nitpicker::Session::View_handle View_handle; + typedef Gui::Session::Command Command; + typedef Gui::Session::View_handle View_handle; public: - Log_view(Nitpicker::Session_client &nitpicker, Nitpicker::Rect geometry) + Log_view(Gui::Session_client &gui, Gui::Rect geometry) : - _nitpicker(nitpicker), + _gui(gui), _pos(geometry.p1()), _size(geometry.area()), - _handle(nitpicker.create_view()) + _handle(gui.create_view()) { move(_pos); top(); @@ -374,20 +374,20 @@ class Log_view void top() { - _nitpicker.enqueue(_handle, View_handle()); - _nitpicker.execute(); + _gui.enqueue(_handle, View_handle()); + _gui.execute(); } - void move(Nitpicker::Point pos) + void move(Gui::Point pos) { _pos = pos; - Nitpicker::Rect rect(_pos, _size); - _nitpicker.enqueue(_handle, rect); - _nitpicker.execute(); + Gui::Rect rect(_pos, _size); + _gui.enqueue(_handle, rect); + _gui.execute(); } - Nitpicker::Point pos() const { return _pos; } + Gui::Point pos() const { return _pos; } }; @@ -404,21 +404,21 @@ struct Nitlog::Main unsigned const _win_h = _font.bounding_box().h() * LOG_H + 2; /* init sessions to the required external services */ - Nitpicker::Connection _nitpicker { _env }; - Timer::Connection _timer { _env }; + Gui::Connection _gui { _env }; + Timer::Connection _timer { _env }; - void _init_nitpicker_buffer() + void _init_gui_buffer() { - _nitpicker.buffer(Framebuffer::Mode(_win_w, _win_h, - Framebuffer::Mode::RGB565), false); + _gui.buffer(Framebuffer::Mode(_win_w, _win_h, + Framebuffer::Mode::RGB565), false); } - bool const _nitpicker_buffer_initialized = (_init_nitpicker_buffer(), true); + bool const _gui_buffer_initialized = (_init_gui_buffer(), true); Sliced_heap _sliced_heap { _env.ram(), _env.rm() }; /* create log window */ - Attached_dataspace _fb_ds { _env.rm(), _nitpicker.framebuffer()->dataspace() }; + Attached_dataspace _fb_ds { _env.rm(), _gui.framebuffer()->dataspace() }; Canvas _canvas { _fb_ds.local_addr(), ::Area(_win_w, _win_h) }; @@ -438,18 +438,18 @@ struct Nitlog::Main bool const _canvas_initialized = (_init_canvas(), true); /* create view for log window */ - Nitpicker::Rect const _view_geometry { Nitpicker::Point(20, 20), - Nitpicker::Area(_win_w, _win_h) }; - Log_view _view { _nitpicker, _view_geometry }; + Gui::Rect const _view_geometry { Gui::Point(20, 20), + Gui::Area(_win_w, _win_h) }; + Log_view _view { _gui, _view_geometry }; /* create root interface for service */ Root _root { _env.ep(), _sliced_heap, _log_window }; - Attached_dataspace _ev_ds { _env.rm(), _nitpicker.input()->dataspace() }; + Attached_dataspace _ev_ds { _env.rm(), _gui.input()->dataspace() }; - Nitpicker::Point const _initial_mouse_pos { -1, -1 }; + Gui::Point const _initial_mouse_pos { -1, -1 }; - Nitpicker::Point _old_mouse_pos = _initial_mouse_pos; + Gui::Point _old_mouse_pos = _initial_mouse_pos; unsigned _key_cnt = 0; @@ -460,7 +460,7 @@ struct Nitlog::Main { Input::Event const *ev_buf = _ev_ds.local_addr(); - for (int i = 0, num_ev = _nitpicker.input()->flush(); i < num_ev; i++) { + for (int i = 0, num_ev = _gui.input()->flush(); i < num_ev; i++) { Input::Event const &ev = ev_buf[i]; @@ -470,7 +470,7 @@ struct Nitlog::Main /* move view */ ev.handle_absolute_motion([&] (int x, int y) { - Nitpicker::Point const mouse_pos(x, y); + Gui::Point const mouse_pos(x, y); if (_key_cnt && _old_mouse_pos != _initial_mouse_pos) _view.move(_view.pos() + mouse_pos - _old_mouse_pos); @@ -491,7 +491,7 @@ struct Nitlog::Main void _handle_timer() { if (_log_window.draw()) - _nitpicker.framebuffer()->refresh(0, 0, _win_w, _win_h); + _gui.framebuffer()->refresh(0, 0, _win_w, _win_h); } Main(Env &env) : _env(env) @@ -502,7 +502,7 @@ struct Nitlog::Main _timer.sigh(_timer_handler); _timer.trigger_periodic(20*1000); - _nitpicker.input()->sigh(_input_handler); + _gui.input()->sigh(_input_handler); } }; diff --git a/repos/gems/include/gems/nitpicker_buffer.h b/repos/gems/include/gems/gui_buffer.h similarity index 86% rename from repos/gems/include/gems/nitpicker_buffer.h rename to repos/gems/include/gems/gui_buffer.h index ce1f4a9d25..a3442e7d48 100644 --- a/repos/gems/include/gems/nitpicker_buffer.h +++ b/repos/gems/include/gems/gui_buffer.h @@ -1,5 +1,5 @@ /* - * \brief Utility for the buffered pixel output via nitpicker + * \brief Utility for the buffered pixel output via the GUI server interface * \author Norman Feske * \date 2014-08-22 */ @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _INCLUDE__GEMS__NITPICKER_BUFFER_H_ -#define _INCLUDE__GEMS__NITPICKER_BUFFER_H_ +#ifndef _INCLUDE__GEMS__GUI_BUFFER_H_ +#define _INCLUDE__GEMS__GUI_BUFFER_H_ /* Genode includes */ #include @@ -28,7 +28,7 @@ #include -struct Nitpicker_buffer +struct Gui_buffer { typedef Genode::Pixel_rgb888 Pixel_rgb888; typedef Genode::Pixel_rgb565 Pixel_rgb565; @@ -46,27 +46,27 @@ struct Nitpicker_buffer Genode::Ram_allocator &ram; Genode::Region_map &rm; - Nitpicker::Connection &nitpicker; + Gui::Connection &gui; Framebuffer::Mode const mode; /** * Return dataspace capability for virtual framebuffer */ - Genode::Dataspace_capability _ds_cap(Nitpicker::Connection &nitpicker) + Genode::Dataspace_capability _ds_cap(Gui::Connection &gui) { /* setup virtual framebuffer mode */ - nitpicker.buffer(mode, true); + gui.buffer(mode, true); if (mode.format() != Framebuffer::Mode::RGB565) { Genode::warning("color mode ", mode, " not supported"); return Genode::Dataspace_capability(); } - return nitpicker.framebuffer()->dataspace(); + return gui.framebuffer()->dataspace(); } - Genode::Attached_dataspace fb_ds { rm, _ds_cap(nitpicker) }; + Genode::Attached_dataspace fb_ds { rm, _ds_cap(gui) }; Genode::size_t pixel_surface_num_bytes() const { @@ -84,12 +84,12 @@ struct Nitpicker_buffer /** * Constructor */ - Nitpicker_buffer(Nitpicker::Connection &nitpicker, Area size, - Genode::Ram_allocator &ram, Genode::Region_map &rm) + Gui_buffer(Gui::Connection &gui, Area size, + Genode::Ram_allocator &ram, Genode::Region_map &rm) : - ram(ram), rm(rm), nitpicker(nitpicker), + ram(ram), rm(rm), gui(gui), mode(Genode::max(1UL, size.w()), Genode::max(1UL, size.h()), - nitpicker.mode().format()) + gui.mode().format()) { reset_surface(); } @@ -186,4 +186,4 @@ struct Nitpicker_buffer } }; -#endif /* _INCLUDE__GEMS__NITPICKER_BUFFER_H_ */ +#endif /* _INCLUDE__GEMS__GUI_BUFFER_H_ */ diff --git a/repos/gems/include/nano3d/scene.h b/repos/gems/include/nano3d/scene.h index f916c606df..123222d346 100644 --- a/repos/gems/include/nano3d/scene.h +++ b/repos/gems/include/nano3d/scene.h @@ -3,7 +3,7 @@ * \author Norman Feske * \date 2015-06-22 * - * The 'Scene' class template contains the code for setting up a nitpicker + * The 'Scene' class template contains the code for setting up a GUI * view with a triple-buffer for rendering tearing-free animations. * A derrived class implements the to-be-displayed content in the virtual * 'render' method. @@ -64,12 +64,12 @@ class Nano3d::Scene Genode::Env &_env; /** - * Position and size of nitpicker view + * Position and size of GUI view */ - Nitpicker::Point const _pos; - Nitpicker::Area const _size; + Gui::Point const _pos; + Gui::Area const _size; - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; struct Mapped_framebuffer { @@ -78,10 +78,10 @@ class Nano3d::Scene Genode::Region_map &rm; static Framebuffer::Session & - _init_framebuffer(Nitpicker::Connection &nitpicker, - Nitpicker::Area const size) + _init_framebuffer(Gui::Connection &gui, + Gui::Area const size) { - Framebuffer::Mode::Format const format = nitpicker.mode().format(); + Framebuffer::Mode::Format const format = gui.mode().format(); if (format != Framebuffer::Mode::RGB565) { Genode::error("framebuffer mode ", (int)format, " is not supported"); throw Unsupported_color_depth(); @@ -94,10 +94,10 @@ class Nano3d::Scene */ bool const use_alpha = true; unsigned const height = size.h()*NUM_BUFFERS; - nitpicker.buffer(Framebuffer::Mode(size.w(), height, format), + gui.buffer(Framebuffer::Mode(size.w(), height, format), use_alpha); - return *nitpicker.framebuffer(); + return *gui.framebuffer(); } Framebuffer::Session &framebuffer; @@ -107,9 +107,9 @@ class Nano3d::Scene /** * Return visible size */ - Nitpicker::Area size() const + Gui::Area size() const { - return Nitpicker::Area(mode.width(), mode.height()/NUM_BUFFERS); + return Gui::Area(mode.width(), mode.height()/NUM_BUFFERS); } Genode::Attached_dataspace ds { rm, framebuffer.dataspace() }; @@ -142,15 +142,15 @@ class Nano3d::Scene NUM_BUFFERS*size().count()); } - Mapped_framebuffer(Nitpicker::Connection &nitpicker, Nitpicker::Area size, + Mapped_framebuffer(Gui::Connection &gui, Gui::Area size, Genode::Region_map &rm) : - rm(rm), framebuffer(_init_framebuffer(nitpicker, size)) + rm(rm), framebuffer(_init_framebuffer(gui, size)) { } - } _framebuffer { _nitpicker, _size, _env.rm() }; + } _framebuffer { _gui, _size, _env.rm() }; - Nitpicker::Session::View_handle _view_handle = _nitpicker.create_view(); + Gui::Session::View_handle _view_handle = _gui.create_view(); typedef Genode::Surface Pixel_surface; typedef Genode::Surface Alpha_surface; @@ -198,7 +198,7 @@ class Nano3d::Scene Timer::Connection _timer { _env }; - Genode::Attached_dataspace _input_ds { _env.rm(), _nitpicker.input()->dataspace() }; + Genode::Attached_dataspace _input_ds { _env.rm(), _gui.input()->dataspace() }; Input_handler *_input_handler_callback = nullptr; @@ -207,7 +207,7 @@ class Nano3d::Scene if (!_input_handler_callback) return; - while (int num = _nitpicker.input()->flush()) { + while (int num = _gui.input()->flush()) { auto const *ev_buf = _input_ds.local_addr(); @@ -266,9 +266,9 @@ class Nano3d::Scene : (_surface_visible == &_surface_1) ? -h : -2*h; - Nitpicker::Point const offset(0, buf_y); - _nitpicker.enqueue(_view_handle, offset); - _nitpicker.execute(); + Gui::Point const offset(0, buf_y); + _gui.enqueue(_view_handle, offset); + _gui.execute(); _do_sync = false; } @@ -276,23 +276,23 @@ class Nano3d::Scene Genode::Signal_handler _sync_handler { _env.ep(), *this, &Scene::_handle_sync }; - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; public: Scene(Genode::Env &env, Genode::uint64_t update_rate_ms, - Nitpicker::Point pos, Nitpicker::Area size) + Gui::Point pos, Gui::Area size) : _env(env), _pos(pos), _size(size) { - typedef Nitpicker::Session::View_handle View_handle; + typedef Gui::Session::View_handle View_handle; - Nitpicker::Rect rect(_pos, _size); - _nitpicker.enqueue(_view_handle, rect); - _nitpicker.enqueue(_view_handle, View_handle()); - _nitpicker.execute(); + Gui::Rect rect(_pos, _size); + _gui.enqueue(_view_handle, rect); + _gui.enqueue(_view_handle, View_handle()); + _gui.execute(); - _nitpicker.input()->sigh(_input_handler); + _gui.input()->sigh(_input_handler); _timer.sigh(_periodic_handler); _timer.trigger_periodic(1000*update_rate_ms); diff --git a/repos/gems/recipes/src/mixer_gui_qt/used_apis b/repos/gems/recipes/src/mixer_gui_qt/used_apis index 5e1d37ddb4..bb8ce485eb 100644 --- a/repos/gems/recipes/src/mixer_gui_qt/used_apis +++ b/repos/gems/recipes/src/mixer_gui_qt/used_apis @@ -5,7 +5,7 @@ qoost qt5_core qt5_gui qt5_qjpeg -qt5_qpa_nitpicker +qt5_qpa_genode qt5_widgets report_session stdcxx diff --git a/repos/gems/recipes/src/test-tiled_wm/used_apis b/repos/gems/recipes/src/test-tiled_wm/used_apis index a73c52e02d..97a6f87570 100644 --- a/repos/gems/recipes/src/test-tiled_wm/used_apis +++ b/repos/gems/recipes/src/test-tiled_wm/used_apis @@ -5,7 +5,7 @@ qoost qt5_core qt5_gui qt5_qjpeg -qt5_qpa_nitpicker +qt5_qpa_genode qt5_widgets report_session stdcxx diff --git a/repos/gems/src/app/backdrop/main.cc b/repos/gems/src/app/backdrop/main.cc index d3e6840d19..dbb80d52e4 100644 --- a/repos/gems/src/app/backdrop/main.cc +++ b/repos/gems/src/app/backdrop/main.cc @@ -1,5 +1,5 @@ /* - * \brief Backdrop for Nitpicker + * \brief Backdrop * \author Norman Feske * \date 2009-08-28 */ @@ -47,28 +47,28 @@ struct Backdrop::Main Genode::Attached_rom_dataspace _config { _env, "config" }; - Nitpicker::Connection _nitpicker { _env, "backdrop" }; + Gui::Connection _gui { _env, "backdrop" }; struct Buffer { - Nitpicker::Connection &nitpicker; + Gui::Connection &gui; Framebuffer::Mode const mode; /** * Return dataspace capability for virtual framebuffer */ - Dataspace_capability _ds_cap(Nitpicker::Connection &nitpicker) + Dataspace_capability _ds_cap(Gui::Connection &gui) { /* setup virtual framebuffer mode */ - nitpicker.buffer(mode, false); + gui.buffer(mode, false); if (mode.format() != Framebuffer::Mode::RGB565) { Genode::warning("Color mode %d not supported\n", (int)mode.format()); return Dataspace_capability(); } - return nitpicker.framebuffer()->dataspace(); + return gui.framebuffer()->dataspace(); } Attached_dataspace fb_ds; @@ -83,9 +83,9 @@ struct Backdrop::Main /** * Constructor */ - Buffer(Genode::Env &env, Nitpicker::Connection &nitpicker, Framebuffer::Mode mode) - : nitpicker(nitpicker), mode(mode), - fb_ds(env.rm(), _ds_cap(nitpicker)), + Buffer(Genode::Env &env, Gui::Connection &gui, Framebuffer::Mode mode) + : gui(gui), mode(mode), + fb_ds(env.rm(), _ds_cap(gui)), surface_ds(env.ram(), env.rm(), surface_num_bytes()) { } @@ -117,19 +117,19 @@ struct Backdrop::Main Constructible _buffer { }; - Nitpicker::Session::View_handle _view_handle = _nitpicker.create_view(); + Gui::Session::View_handle _view_handle = _gui.create_view(); void _update_view() { /* display view behind all others */ - typedef Nitpicker::Session::Command Command; - typedef Nitpicker::Session::View_handle View_handle; + typedef Gui::Session::Command Command; + typedef Gui::Session::View_handle View_handle; - _nitpicker.enqueue(_view_handle); - Nitpicker::Rect rect(Nitpicker::Point(), _buffer->size()); - _nitpicker.enqueue(_view_handle, rect); - _nitpicker.enqueue(_view_handle, View_handle()); - _nitpicker.execute(); + _gui.enqueue(_view_handle); + Gui::Rect rect(Gui::Point(), _buffer->size()); + _gui.enqueue(_view_handle, rect); + _gui.enqueue(_view_handle, View_handle()); + _gui.execute(); } /** @@ -156,7 +156,7 @@ struct Backdrop::Main Main(Genode::Env &env) : _env(env) { - _nitpicker.mode_sigh(_config_handler); + _gui.mode_sigh(_config_handler); _config.sigh(_config_handler); @@ -324,13 +324,13 @@ void Backdrop::Main::_handle_config() { _config.update(); - Framebuffer::Mode const phys_mode = _nitpicker.mode(); + Framebuffer::Mode const phys_mode = _gui.mode(); Framebuffer::Mode const mode(_config.xml().attribute_value("width", (unsigned)phys_mode.width()), _config.xml().attribute_value("height", (unsigned)phys_mode.height()), phys_mode.format()); - _buffer.construct(_env, _nitpicker, mode); + _buffer.construct(_env, _gui, mode); /* clear surface */ _apply_fill(Xml_node("")); @@ -353,7 +353,7 @@ void Backdrop::Main::_handle_config() }); /* schedule buffer refresh */ - _nitpicker.framebuffer()->sync_sigh(_sync_handler); + _gui.framebuffer()->sync_sigh(_sync_handler); } @@ -365,7 +365,7 @@ void Backdrop::Main::_handle_sync() }); /* disable sync signal until the next call of 'handle_config' */ - _nitpicker.framebuffer()->sync_sigh(Signal_context_capability()); + _gui.framebuffer()->sync_sigh(Signal_context_capability()); } diff --git a/repos/gems/src/app/cpu_load_display/main.cc b/repos/gems/src/app/cpu_load_display/main.cc index aecd2c5457..2f7525c61f 100644 --- a/repos/gems/src/app/cpu_load_display/main.cc +++ b/repos/gems/src/app/cpu_load_display/main.cc @@ -282,7 +282,7 @@ class Cpu_load_display::Scene : public Nano3d::Scene Genode::Env &_env; - Nitpicker::Area const _size; + Gui::Area const _size; Genode::Attached_rom_dataspace _config { _env, "config" }; @@ -318,7 +318,7 @@ class Cpu_load_display::Scene : public Nano3d::Scene public: Scene(Genode::Env &env, Genode::uint64_t update_rate_ms, - Nitpicker::Point pos, Nitpicker::Area size) + Gui::Point pos, Gui::Area size) : Nano3d::Scene(env, update_rate_ms, pos, size), _env(env), _size(size), @@ -341,7 +341,7 @@ class Cpu_load_display::Scene : public Nano3d::Scene void _plot_cpu(Genode::Surface &pixel, Genode::Surface &alpha, - Cpu const &cpu, Nitpicker::Rect rect) + Cpu const &cpu, Gui::Rect rect) { enum { HISTORY_LEN = Timeline::HISTORY_LEN }; @@ -453,12 +453,12 @@ class Cpu_load_display::Scene : public Nano3d::Scene /* plot graphs for the CPUs below each other */ enum { GAP = 8 }; - Nitpicker::Point const step(0, _size.h()/num_cpus); - Nitpicker::Area const size(_size.w(), step.y() - GAP); - Nitpicker::Point point(0, GAP/2); + Gui::Point const step(0, _size.h()/num_cpus); + Gui::Area const size(_size.w(), step.y() - GAP); + Gui::Point point(0, GAP/2); _cpu_registry.for_each_cpu([&] (Cpu const &cpu) { - _plot_cpu(pixel, alpha, cpu, Nitpicker::Rect(point, size)); + _plot_cpu(pixel, alpha, cpu, Gui::Rect(point, size)); point = point + step; }); } @@ -471,5 +471,5 @@ void Component::construct(Genode::Env &env) static Cpu_load_display::Scene scene(env, UPDATE_RATE_MS, - Nitpicker::Point(0, 0), Nitpicker::Area(400, 400)); + Gui::Point(0, 0), Gui::Area(400, 400)); } diff --git a/repos/gems/src/app/decorator/main.cc b/repos/gems/src/app/decorator/main.cc index b55812afd6..8070c7b278 100644 --- a/repos/gems/src/app/decorator/main.cc +++ b/repos/gems/src/app/decorator/main.cc @@ -39,7 +39,7 @@ struct Decorator::Main : Window_factory_base { Env &_env; - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _nitpicker { _env }; struct Canvas { @@ -47,7 +47,7 @@ struct Decorator::Main : Window_factory_base Attached_dataspace fb_ds; Decorator::Canvas canvas; - Canvas(Env &env, Nitpicker::Connection &nitpicker) + Canvas(Env &env, Gui::Connection &nitpicker) : mode(nitpicker.mode()), fb_ds(env.rm(), @@ -339,7 +339,7 @@ void Decorator::Main::_handle_nitpicker_sync() Dirty_rect dirty = _window_stack.draw(_canvas->canvas); - _window_stack.update_nitpicker_views(); + _window_stack.update_gui_views(); _nitpicker.execute(); diff --git a/repos/gems/src/app/decorator/window.cc b/repos/gems/src/app/decorator/window.cc index 94977ff2ab..ad67c6c900 100644 --- a/repos/gems/src/app/decorator/window.cc +++ b/repos/gems/src/app/decorator/window.cc @@ -208,7 +208,7 @@ bool Decorator::Window::update(Genode::Xml_node window_node) geometry(new_geometry); - _nitpicker_views_up_to_date = false; + _gui_views_up_to_date = false; updated |= true; } diff --git a/repos/gems/src/app/decorator/window.h b/repos/gems/src/app/decorator/window.h index 4a73645db8..e152873367 100644 --- a/repos/gems/src/app/decorator/window.h +++ b/repos/gems/src/app/decorator/window.h @@ -29,25 +29,25 @@ class Decorator::Window : public Window_base { private: - Nitpicker::Session_client &_nitpicker; + Gui::Session_client &_gui; /* * Flag indicating that the current window position has been propagated - * to the window's corresponding nitpicker views. + * to the window's corresponding GUI views. */ - bool _nitpicker_views_up_to_date = false; + bool _gui_views_up_to_date = false; - struct Nitpicker_view + struct Gui_view { - Nitpicker::Session_client &_nitpicker; + Gui::Session_client &_gui; - View_handle _handle { _nitpicker.create_view() }; + View_handle _handle { _gui.create_view() }; - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; - Nitpicker_view(Nitpicker::Session_client &nitpicker, unsigned id = 0) + Gui_view(Gui::Session_client &gui, unsigned id = 0) : - _nitpicker(nitpicker) + _gui(gui) { /* * We supply the window ID as label for the anchor view. @@ -56,41 +56,41 @@ class Decorator::Window : public Window_base char buf[128]; Genode::snprintf(buf, sizeof(buf), "%d", id); - _nitpicker.enqueue(_handle, Genode::Cstring(buf)); + _gui.enqueue(_handle, Genode::Cstring(buf)); } } - ~Nitpicker_view() + ~Gui_view() { - _nitpicker.destroy_view(_handle); + _gui.destroy_view(_handle); } View_handle handle() const { return _handle; } void stack(View_handle neighbor) { - _nitpicker.enqueue(_handle, neighbor); + _gui.enqueue(_handle, neighbor); } void stack_back_most() { - _nitpicker.enqueue(_handle, View_handle()); + _gui.enqueue(_handle, View_handle()); } void place(Rect rect) { - _nitpicker.enqueue(_handle, rect); + _gui.enqueue(_handle, rect); Point offset = Point(0, 0) - rect.p1(); - _nitpicker.enqueue(_handle, offset); + _gui.enqueue(_handle, offset); } }; - Nitpicker_view _bottom_view { _nitpicker }, - _right_view { _nitpicker }, - _left_view { _nitpicker }, - _top_view { _nitpicker }; + Gui_view _bottom_view { _gui }, + _right_view { _gui }, + _left_view { _gui }, + _top_view { _gui }; - Nitpicker_view _content_view { _nitpicker, (unsigned)id() }; + Gui_view _content_view { _gui, (unsigned)id() }; static Border _init_border() { return Border(_border_size + _title_height, @@ -419,11 +419,11 @@ class Decorator::Window : public Window_base public: - Window(unsigned id, Nitpicker::Session_client &nitpicker, + Window(unsigned id, Gui::Session_client &gui, Animator &animator, Config const &config) : Window_base(id), - _nitpicker(nitpicker), + _gui(gui), _animator(animator), _config(config) { } @@ -470,9 +470,9 @@ class Decorator::Window : public Window_base outer_geometry().cut(geometry(), top, left, right, bottom); } - void update_nitpicker_views() override + void update_gui_views() override { - if (!_nitpicker_views_up_to_date) { + if (!_gui_views_up_to_date) { /* update view positions */ Rect top, left, right, bottom; @@ -484,7 +484,7 @@ class Decorator::Window : public Window_base _right_view .place(right); _bottom_view .place(bottom); - _nitpicker_views_up_to_date = true; + _gui_views_up_to_date = true; } } diff --git a/repos/gems/src/app/menu_view/main.cc b/repos/gems/src/app/menu_view/main.cc index f5563f2803..896dfa2705 100644 --- a/repos/gems/src/app/menu_view/main.cc +++ b/repos/gems/src/app/menu_view/main.cc @@ -28,7 +28,7 @@ #include /* gems includes */ -#include +#include namespace Menu_view { struct Main; } @@ -37,11 +37,11 @@ struct Menu_view::Main { Env &_env; - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; - Constructible _buffer { }; + Constructible _buffer { }; - Nitpicker::Session::View_handle _view_handle = _nitpicker.create_view(); + Gui::Session::View_handle _view_handle = _gui.create_view(); /** * Dialog position in screen coordinate space @@ -75,13 +75,13 @@ struct Menu_view::Main return; /* display view behind all others */ - typedef Nitpicker::Session::Command Command; - typedef Nitpicker::Session::View_handle View_handle; + typedef Gui::Session::Command Command; + typedef Gui::Session::View_handle View_handle; _view_geometry = geometry; - _nitpicker.enqueue(_view_handle, _view_geometry); - _nitpicker.enqueue(_view_handle, View_handle()); - _nitpicker.execute(); + _gui.enqueue(_view_handle, _view_geometry); + _gui.enqueue(_view_handle, View_handle()); + _gui.execute(); } /** @@ -125,7 +125,7 @@ struct Menu_view::Main Attached_rom_dataspace _dialog_rom { _env, "dialog" }; - Attached_dataspace _input_ds { _env.rm(), _nitpicker.input()->dataspace() }; + Attached_dataspace _input_ds { _env.rm(), _gui.input()->dataspace() }; Widget::Hovered _last_reported_hovered { }; @@ -189,7 +189,7 @@ struct Menu_view::Main _dialog_rom.sigh(_dialog_update_handler); _config.sigh(_config_handler); - _nitpicker.input()->sigh(_input_handler); + _gui.input()->sigh(_input_handler); _timer.sigh(_frame_timer_handler); @@ -284,7 +284,7 @@ void Menu_view::Main::_handle_input() Point const orig_hovered_position = _hovered_position; bool const orig_dialog_hovered = _dialog_hovered; - _nitpicker.input()->for_each_event([&] (Input::Event const &ev) { + _gui.input()->for_each_event([&] (Input::Event const &ev) { ev.handle_absolute_motion([&] (int x, int y) { _dialog_hovered = true; _hovered_position = Point(x, y) - _position; @@ -343,7 +343,7 @@ void Menu_view::Main::_handle_frame_timer() || (max_size.h() > buffer_h); if (!_buffer.constructed() || size_increased) - _buffer.construct(_nitpicker, max_size, _env.ram(), _env.rm()); + _buffer.construct(_gui, max_size, _env.ram(), _env.rm()); else _buffer->reset_surface(); @@ -357,7 +357,7 @@ void Menu_view::Main::_handle_frame_timer() }); _buffer->flush_surface(); - _nitpicker.framebuffer()->refresh(0, 0, _buffer->size().w(), _buffer->size().h()); + _gui.framebuffer()->refresh(0, 0, _buffer->size().w(), _buffer->size().h()); _update_view(Rect(_position, size)); _schedule_redraw = false; diff --git a/repos/gems/src/app/nano3d/main.cc b/repos/gems/src/app/nano3d/main.cc index 4fa4607d5f..bd9f11fd6a 100644 --- a/repos/gems/src/app/nano3d/main.cc +++ b/repos/gems/src/app/nano3d/main.cc @@ -37,7 +37,7 @@ class Scene : public Nano3d::Scene Genode::Env &_env; Genode::Heap _heap { _env.ram(), _env.rm() }; - Nitpicker::Area const _size; + Gui::Area const _size; struct Radial_texture { @@ -104,7 +104,7 @@ class Scene : public Nano3d::Scene public: Scene(Genode::Env &env, Genode::uint64_t update_rate_ms, - Nitpicker::Point pos, Nitpicker::Area size) + Gui::Point pos, Gui::Area size) : Nano3d::Scene(env, update_rate_ms, pos, size), _env(env), _size(size), @@ -231,5 +231,5 @@ void Component::construct(Genode::Env &env) static Scene scene(env, UPDATE_RATE_MS, - Nitpicker::Point(-200, -200), Nitpicker::Area(400, 400)); + Gui::Point(-200, -200), Gui::Area(400, 400)); } diff --git a/repos/gems/src/app/sculpt_manager/nitpicker.cc b/repos/gems/src/app/sculpt_manager/gui.cc similarity index 82% rename from repos/gems/src/app/sculpt_manager/nitpicker.cc rename to repos/gems/src/app/sculpt_manager/gui.cc index 69045bfb33..6be2d8df44 100644 --- a/repos/gems/src/app/sculpt_manager/nitpicker.cc +++ b/repos/gems/src/app/sculpt_manager/gui.cc @@ -1,5 +1,5 @@ /* - * \brief Nitpicker wrapper for monitoring the user input of GUI components + * \brief GUI wrapper for monitoring the user input of GUI components * \author Norman Feske * \date 2018-04-30 */ @@ -11,20 +11,20 @@ * under the terms of the GNU Affero General Public License version 3. */ -#include "nitpicker.h" +#include "gui.h" /* Genode includes */ #include #include #include -struct Nitpicker::Session_component : Rpc_object +struct Gui::Session_component : Rpc_object { Env &_env; Input_event_handler &_event_handler; - Nitpicker::Connection _connection; + Gui::Connection _connection; Input::Session_component _input_component { _env, _env.ram() }; @@ -101,30 +101,30 @@ struct Nitpicker::Session_component : Rpc_object _connection.Client::buffer(mode, use_alpha); } - void focus(Capability session) override { + void focus(Capability session) override { _connection.focus(session); } }; -Nitpicker::Session_component *Nitpicker::Root::_create_session(const char *args) +Gui::Session_component *Gui::Root::_create_session(const char *args) { return new (md_alloc()) Session_component(_env, args, _event_handler); } -void Nitpicker::Root::_upgrade_session(Session_component *session, const char *args) +void Gui::Root::_upgrade_session(Session_component *session, const char *args) { session->upgrade(session_resources_from_args(args)); } -void Nitpicker::Root::_destroy_session(Session_component *session) +void Gui::Root::_destroy_session(Session_component *session) { Genode::destroy(md_alloc(), session); } -Nitpicker::Root::Root(Env &env, Allocator &md_alloc, Input_event_handler &event_handler) +Gui::Root::Root(Env &env, Allocator &md_alloc, Input_event_handler &event_handler) : Root_component(env.ep(), md_alloc), _env(env), _event_handler(event_handler) @@ -133,5 +133,5 @@ Nitpicker::Root::Root(Env &env, Allocator &md_alloc, Input_event_handler &event_ } -Nitpicker::Root::~Root() { _env.ep().dissolve(*this); } +Gui::Root::~Root() { _env.ep().dissolve(*this); } diff --git a/repos/gems/src/app/sculpt_manager/nitpicker.h b/repos/gems/src/app/sculpt_manager/gui.h similarity index 84% rename from repos/gems/src/app/sculpt_manager/nitpicker.h rename to repos/gems/src/app/sculpt_manager/gui.h index 494fc686e0..5d13b1ec2a 100644 --- a/repos/gems/src/app/sculpt_manager/nitpicker.h +++ b/repos/gems/src/app/sculpt_manager/gui.h @@ -1,5 +1,5 @@ /* - * \brief Nitpicker wrapper for monitoring the user input of GUI components + * \brief GUI wrapper for monitoring the user input of GUI components * \author Norman Feske * \date 2018-04-30 */ @@ -22,7 +22,7 @@ /* local includes */ #include "input_event_handler.h" -namespace Nitpicker { +namespace Gui { using namespace Genode; using Sculpt::Input_event_handler; @@ -32,7 +32,7 @@ namespace Nitpicker { } -struct Nitpicker::Root : Genode::Root_component +struct Gui::Root : Genode::Root_component { Env &_env; Input_event_handler &_event_handler; diff --git a/repos/gems/src/app/sculpt_manager/main.cc b/repos/gems/src/app/sculpt_manager/main.cc index afdc30de00..b2a2ae4df9 100644 --- a/repos/gems/src/app/sculpt_manager/main.cc +++ b/repos/gems/src/app/sculpt_manager/main.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include #include @@ -68,21 +68,21 @@ struct Sculpt::Main : Input_event_handler, Registry _child_states { }; - Constructible _nitpicker { }; + Constructible _gui { }; Signal_handler
_input_handler { _env.ep(), *this, &Main::_handle_input }; void _handle_input() { - _nitpicker->input()->for_each_event([&] (Input::Event const &ev) { + _gui->input()->for_each_event([&] (Input::Event const &ev) { handle_input_event(ev); }); } - Signal_handler
_nitpicker_mode_handler { - _env.ep(), *this, &Main::_handle_nitpicker_mode }; + Signal_handler
_gui_mode_handler { + _env.ep(), *this, &Main::_handle_gui_mode }; - void _handle_nitpicker_mode(); + void _handle_gui_mode(); Managed_config
_fonts_config { _env, "config", "fonts", *this, &Main::_handle_fonts_config }; @@ -103,7 +103,7 @@ struct Sculpt::Main : Input_event_handler, if (px > 0.0) _font_size_px = px; }); } }); } }); }); - _handle_nitpicker_mode(); + _handle_gui_mode(); } Managed_config
_input_filter_config { @@ -114,12 +114,12 @@ struct Sculpt::Main : Input_event_handler, _input_filter_config.try_generate_manually_managed(); } - Attached_rom_dataspace _nitpicker_hover { _env, "nitpicker_hover" }; + Attached_rom_dataspace _gui_hover { _env, "nitpicker_hover" }; - Signal_handler
_nitpicker_hover_handler { - _env.ep(), *this, &Main::_handle_nitpicker_hover }; + Signal_handler
_gui_hover_handler { + _env.ep(), *this, &Main::_handle_gui_hover }; - void _handle_nitpicker_hover(); + void _handle_gui_hover(); /********************** @@ -710,7 +710,7 @@ struct Sculpt::Main : Input_event_handler, void select_font_size(Font_size font_size) override { _font_size = font_size; - _handle_nitpicker_mode(); + _handle_gui_mode(); } Signal_handler
_fs_query_result_handler { @@ -983,40 +983,40 @@ struct Sculpt::Main : Input_event_handler, _fb_drv_config.try_generate_manually_managed(); } - Attached_rom_dataspace _nitpicker_displays { _env, "displays" }; + Attached_rom_dataspace _gui_displays { _env, "displays" }; - Signal_handler
_nitpicker_displays_handler { - _env.ep(), *this, &Main::_handle_nitpicker_displays }; + Signal_handler
_gui_displays_handler { + _env.ep(), *this, &Main::_handle_gui_displays }; - void _handle_nitpicker_displays() + void _handle_gui_displays() { - _nitpicker_displays.update(); + _gui_displays.update(); - if (!_nitpicker_displays.xml().has_sub_node("display")) + if (!_gui_displays.xml().has_sub_node("display")) return; - if (_nitpicker.constructed()) + if (_gui.constructed()) return; /* - * Since nitpicker 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. + * 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. */ - _nitpicker.construct(_env, "input"); - _nitpicker->input()->sigh(_input_handler); - _nitpicker->mode_sigh(_nitpicker_mode_handler); + _gui.construct(_env, "input"); + _gui->input()->sigh(_input_handler); + _gui->mode_sigh(_gui_mode_handler); /* - * Adjust GUI parameters to initial nitpicker mode + * Adjust GUI parameters to initial GUI mode */ - _handle_nitpicker_mode(); + _handle_gui_mode(); /* - * Avoid 'Constructible' because it requires the - * definition of 'Nitpicker::Session_component'. + * Avoid 'Constructible' because it requires the definition + * of 'Gui::Session_component'. */ - static Nitpicker::Root gui_nitpicker(_env, _heap, *this); + static Gui::Root gui_nitpicker(_env, _heap, *this); generate_runtime_config(); } @@ -1064,13 +1064,13 @@ 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); - _nitpicker_displays.sigh(_nitpicker_displays_handler); + _gui_displays.sigh(_gui_displays_handler); /* * Subscribe to reports */ _update_state_rom .sigh(_update_state_handler); - _nitpicker_hover .sigh(_nitpicker_hover_handler); + _gui_hover .sigh(_gui_hover_handler); _pci_devices .sigh(_pci_devices_handler); _window_list .sigh(_window_list_handler); _decorator_margins .sigh(_decorator_margins_handler); @@ -1128,7 +1128,7 @@ void Sculpt::Main::_handle_window_layout() unsigned const log_min_w = 400; - if (!_nitpicker.constructed()) + if (!_gui.constructed()) return; typedef String<128> Label; @@ -1159,7 +1159,7 @@ void Sculpt::Main::_handle_window_layout() if (panel_height == 0) return; - Framebuffer::Mode const mode = _nitpicker->mode(); + Framebuffer::Mode const mode = _gui->mode(); /* area reserved for the panel */ Rect const panel(Point(0, 0), Area(mode.width(), panel_height)); @@ -1323,12 +1323,12 @@ void Sculpt::Main::_handle_window_layout() } -void Sculpt::Main::_handle_nitpicker_mode() +void Sculpt::Main::_handle_gui_mode() { - if (!_nitpicker.constructed()) + if (!_gui.constructed()) return; - Framebuffer::Mode const mode = _nitpicker->mode(); + Framebuffer::Mode const mode = _gui->mode(); _handle_window_layout(); @@ -1409,7 +1409,7 @@ Sculpt::Dialog::Hover_result Sculpt::Main::hover(Xml_node hover) } -void Sculpt::Main::_handle_nitpicker_hover() +void Sculpt::Main::_handle_gui_hover() { if (!_storage._discovery_state.discovery_in_progress()) return; @@ -1418,8 +1418,8 @@ void Sculpt::Main::_handle_nitpicker_hover() if (_storage._discovery_state.user_state != Discovery_state::USER_UNKNOWN) return; - _nitpicker_hover.update(); - Xml_node const hover = _nitpicker_hover.xml(); + _gui_hover.update(); + Xml_node const hover = _gui_hover.xml(); if (!hover.has_type("hover")) return; @@ -1678,7 +1678,7 @@ void Sculpt::Main::_generate_runtime_config(Xml_generator &xml) const gen_parent_service(xml); gen_parent_service(xml); gen_parent_service<::File_system::Session>(xml); - gen_parent_service(xml); + gen_parent_service(xml); gen_parent_service(xml); gen_parent_service(xml); gen_parent_service(xml); diff --git a/repos/gems/src/app/sculpt_manager/menu_view.cc b/repos/gems/src/app/sculpt_manager/menu_view.cc index 7f5ae8d15d..9aac73bdb5 100644 --- a/repos/gems/src/app/sculpt_manager/menu_view.cc +++ b/repos/gems/src/app/sculpt_manager/menu_view.cc @@ -126,7 +126,7 @@ void Menu_view::_gen_start_node_content(Xml_generator &xml) const Label const label = _child_state.name(); - gen_service_node(xml, [&] () { + gen_service_node(xml, [&] () { xml.node("parent", [&] () { xml.attribute("label", Label("leitzentrale -> ", label)); }); }); diff --git a/repos/gems/src/app/sculpt_manager/model/file_browser_state.h b/repos/gems/src/app/sculpt_manager/model/file_browser_state.h index c094477a7c..3eee4050bf 100644 --- a/repos/gems/src/app/sculpt_manager/model/file_browser_state.h +++ b/repos/gems/src/app/sculpt_manager/model/file_browser_state.h @@ -185,7 +185,7 @@ struct Sculpt::File_browser_state : Noncopyable xml.attribute("label", "clipboard"); xml.node("parent", [&] () { }); }); - gen_service_node(xml, [&] () { + gen_service_node(xml, [&] () { xml.node("parent", [&] () { xml.attribute("label", Label("leitzentrale -> editor")); }); }); 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 7f342a2ad7..f35c351b36 100644 --- a/repos/gems/src/app/sculpt_manager/runtime/inspect_view.cc +++ b/repos/gems/src/app/sculpt_manager/runtime/inspect_view.cc @@ -40,10 +40,10 @@ static void gen_nit_fb_start(Xml_generator &xml) xml.node("route", [&] () { gen_parent_rom_route(xml, "nit_fb"); gen_parent_rom_route(xml, "ld.lib.so"); - gen_parent_route (xml); - gen_parent_route (xml); - gen_parent_route (xml); - gen_parent_route (xml); + gen_parent_route (xml); + gen_parent_route (xml); + gen_parent_route (xml); + gen_parent_route (xml); }); } @@ -248,7 +248,7 @@ void Sculpt::gen_inspect_view(Xml_generator &xml, gen_parent_service(xml); gen_parent_service(xml); gen_parent_service<::File_system::Session>(xml); - gen_parent_service(xml); + gen_parent_service(xml); }); xml.node("start", [&] () { gen_nit_fb_start(xml); }); @@ -315,7 +315,7 @@ void Sculpt::gen_inspect_view(Xml_generator &xml, gen_named_node(xml, "child", "ram_fs"); }); - gen_service_node(xml, [&] () { + gen_service_node(xml, [&] () { xml.node("parent", [&] () { xml.attribute("label", String<64>("leitzentrale -> inspect")); }); }); diff --git a/repos/gems/src/app/sculpt_manager/runtime/runtime_view.cc b/repos/gems/src/app/sculpt_manager/runtime/runtime_view.cc index 0e5d1f2d0d..fc3289c909 100644 --- a/repos/gems/src/app/sculpt_manager/runtime/runtime_view.cc +++ b/repos/gems/src/app/sculpt_manager/runtime/runtime_view.cc @@ -46,7 +46,7 @@ void Sculpt::gen_runtime_view_start_content(Xml_generator &xml, xml.node("route", [&] () { - gen_service_node(xml, [&] () { + gen_service_node(xml, [&] () { xml.node("parent", [&] () { xml.attribute("label", "leitzentrale -> runtime_view"); }); }); diff --git a/repos/gems/src/app/sculpt_manager/types.h b/repos/gems/src/app/sculpt_manager/types.h index 4cea3d31b2..c1ecb46592 100644 --- a/repos/gems/src/app/sculpt_manager/types.h +++ b/repos/gems/src/app/sculpt_manager/types.h @@ -42,9 +42,9 @@ namespace Sculpt { typedef String<36> Start_name; typedef String<64> Label; - typedef Nitpicker::Point Point; - typedef Nitpicker::Rect Rect; - typedef Nitpicker::Area Area; + typedef Gui::Point Point; + typedef Gui::Rect Rect; + typedef Gui::Area Area; enum Writeable { WRITEABLE, READ_ONLY }; } diff --git a/repos/gems/src/app/text_area/nitpicker.h b/repos/gems/src/app/text_area/gui.h similarity index 88% rename from repos/gems/src/app/text_area/nitpicker.h rename to repos/gems/src/app/text_area/gui.h index 42e00d2d51..1b47d54dbb 100644 --- a/repos/gems/src/app/text_area/nitpicker.h +++ b/repos/gems/src/app/text_area/gui.h @@ -1,5 +1,5 @@ /* - * \brief Nitpicker wrapper for monitoring the user input of GUI components + * \brief GUI wrapper for monitoring the user input of GUI components * \author Norman Feske * \date 2020-01-12 */ @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _NITPICKER_H_ -#define _NITPICKER_H_ +#ifndef _GUI_H_ +#define _GUI_H_ /* Genode includes */ #include @@ -22,7 +22,7 @@ /* local includes */ #include -namespace Nitpicker { +namespace Gui { using namespace Genode; @@ -30,13 +30,13 @@ namespace Nitpicker { } -struct Nitpicker::Session_component : Session_object +struct Gui::Session_component : Session_object { Env &_env; Input_event_handler &_event_handler; - Nitpicker::Connection _connection; + Gui::Connection _connection; Input::Session_component _input_component { _env, _env.ram() }; @@ -115,8 +115,8 @@ struct Nitpicker::Session_component : Session_object _connection.Client::buffer(mode, use_alpha); } - void focus(Capability session) override { + void focus(Capability session) override { _connection.focus(session); } }; -#endif /* _NITPICKER_H_ */ +#endif /* _GUI_H_ */ diff --git a/repos/gems/src/app/text_area/input_event_handler.h b/repos/gems/src/app/text_area/input_event_handler.h index 7bb6386d89..25329dcb52 100644 --- a/repos/gems/src/app/text_area/input_event_handler.h +++ b/repos/gems/src/app/text_area/input_event_handler.h @@ -18,9 +18,9 @@ #include #include -namespace Nitpicker { struct Input_event_handler; } +namespace Gui { struct Input_event_handler; } -struct Nitpicker::Input_event_handler : Genode::Interface +struct Gui::Input_event_handler : Genode::Interface { virtual void handle_input_event(Input::Event const &) = 0; }; diff --git a/repos/gems/src/app/text_area/main.cc b/repos/gems/src/app/text_area/main.cc index 0b8b15e0b5..82b3bbaf67 100644 --- a/repos/gems/src/app/text_area/main.cc +++ b/repos/gems/src/app/text_area/main.cc @@ -23,7 +23,7 @@ #include /* local includes */ -#include +#include #include #include #include @@ -33,7 +33,7 @@ namespace Text_area { struct Main; } struct Text_area::Main : Sandbox::Local_service_base::Wakeup, Sandbox::State_handler, - Nitpicker::Input_event_handler, + Gui::Input_event_handler, Dialog::Trigger_copy, Dialog::Trigger_paste, Dialog::Trigger_save { @@ -76,9 +76,9 @@ struct Text_area::Main : Sandbox::Local_service_base::Wakeup, Sandbox _sandbox { _env, *this }; - typedef Sandbox::Local_service Nitpicker_service; + typedef Sandbox::Local_service Gui_service; - Nitpicker_service _nitpicker_service { _sandbox, *this }; + Gui_service _gui_service { _sandbox, *this }; typedef Sandbox::Local_service Rom_service; @@ -245,30 +245,30 @@ struct Text_area::Main : Sandbox::Local_service_base::Wakeup, return Report_service::Close_response::CLOSED; }); - _nitpicker_service.for_each_requested_session([&] (Nitpicker_service::Request &request) { + _gui_service.for_each_requested_session([&] (Gui_service::Request &request) { - Nitpicker::Session_component &session = *new (_heap) - Nitpicker::Session_component(_env, *this, _env.ep(), - request.resources, "", request.diag); + Gui::Session_component &session = *new (_heap) + Gui::Session_component(_env, *this, _env.ep(), + request.resources, "", request.diag); request.deliver_session(session); }); - _nitpicker_service.for_each_upgraded_session([&] (Nitpicker::Session_component &session, + _gui_service.for_each_upgraded_session([&] (Gui::Session_component &session, Session::Resources const &amount) { session.upgrade(amount); - return Nitpicker_service::Upgrade_response::CONFIRMED; + return Gui_service::Upgrade_response::CONFIRMED; }); - _nitpicker_service.for_each_session_to_close([&] (Nitpicker::Session_component &session) { + _gui_service.for_each_session_to_close([&] (Gui::Session_component &session) { destroy(_heap, &session); - return Nitpicker_service::Close_response::CLOSED; + return Gui_service::Close_response::CLOSED; }); } /** - * Nitpicker::Input_event_handler interface + * Gui::Input_event_handler interface */ void handle_input_event(Input::Event const &event) override { diff --git a/repos/gems/src/app/themed_decorator/main.cc b/repos/gems/src/app/themed_decorator/main.cc index 86ea3b3693..44b8ac17cb 100644 --- a/repos/gems/src/app/themed_decorator/main.cc +++ b/repos/gems/src/app/themed_decorator/main.cc @@ -63,9 +63,9 @@ struct Decorator::Main : Window_factory_base Reporter _hover_reporter = { _env, "hover" }; /** - * Nitpicker connection used to sync animations + * GUI connection used to sync animations */ - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; bool _window_layout_update_needed = false; @@ -78,13 +78,13 @@ struct Decorator::Main : Window_factory_base Reporter _decorator_margins_reporter = { _env, "decorator_margins" }; /** - * Process the update every 'frame_period' nitpicker sync signals. The - * 'frame_cnt' holds the counter of the nitpicker sync signals. + * Process the update every 'frame_period' GUI sync signals. The + * 'frame_cnt' holds the counter of the GUI sync signals. * * A lower 'frame_period' value makes the decorations more responsive * but it also puts more load on the system. * - * If the nitpicker sync signal fires every 10 milliseconds, a + * If the GUI sync signal fires every 10 milliseconds, a * 'frame_period' of 2 results in an update rate of 1000/20 = 50 frames per * second. */ @@ -92,12 +92,12 @@ struct Decorator::Main : Window_factory_base unsigned _frame_period = 2; /** - * Install handler for responding to nitpicker sync events + * Install handler for responding to GUI sync events */ - void _handle_nitpicker_sync(); + void _handle_gui_sync(); - Signal_handler
_nitpicker_sync_handler = { - _env.ep(), *this, &Main::_handle_nitpicker_sync }; + Signal_handler
_gui_sync_handler = { + _env.ep(), *this, &Main::_handle_gui_sync }; Attached_rom_dataspace _config { _env, "config" }; @@ -122,7 +122,7 @@ struct Decorator::Main : Window_factory_base * and view_handle operations. Currently, these exceptions will * abort the decorator. */ - _nitpicker.upgrade_ram(256*1024); + _gui.upgrade_ram(256*1024); _config.sigh(_config_handler); _handle_config(); @@ -136,7 +136,7 @@ struct Decorator::Main : Window_factory_base Genode::log("pointer information unavailable"); } - _nitpicker.framebuffer()->sync_sigh(_nitpicker_sync_handler); + _gui.framebuffer()->sync_sigh(_gui_sync_handler); _hover_reporter.enabled(true); @@ -167,7 +167,7 @@ struct Decorator::Main : Window_factory_base { return new (_heap) Window(_env, window_node.attribute_value("id", 0UL), - _nitpicker, _animator, _theme, _decorator_config); + _gui, _animator, _theme, _decorator_config); } /** @@ -249,7 +249,7 @@ void Decorator::Main::_handle_window_layout_update() } -void Decorator::Main::_handle_nitpicker_sync() +void Decorator::Main::_handle_gui_sync() { if (_frame_cnt++ < _frame_period) return; @@ -259,7 +259,7 @@ void Decorator::Main::_handle_nitpicker_sync() bool model_updated = false; auto flush_window_stack_changes = [&] () { - _window_stack.update_nitpicker_views(); }; + _window_stack.update_gui_views(); }; if (_window_layout_update_needed) { @@ -281,8 +281,8 @@ void Decorator::Main::_handle_nitpicker_sync() /* * To make the perceived animation speed independent from the setting of - * 'frame_period', we update the animation as often as the nitpicker - * sync signal occurs. + * 'frame_period', we update the animation as often as the GUI sync signal + * occurs. */ for (unsigned i = 0; i < _frame_period; i++) _animator.animate(); @@ -290,8 +290,8 @@ void Decorator::Main::_handle_nitpicker_sync() if (!model_updated && !windows_animated) return; - _window_stack.update_nitpicker_views(); - _nitpicker.execute(); + _window_stack.update_gui_views(); + _gui.execute(); } diff --git a/repos/gems/src/app/themed_decorator/window.h b/repos/gems/src/app/themed_decorator/window.h index e9286e5002..3f90942b1f 100644 --- a/repos/gems/src/app/themed_decorator/window.h +++ b/repos/gems/src/app/themed_decorator/window.h @@ -22,7 +22,7 @@ #include /* gems includes */ -#include +#include #include /* local includes */ @@ -48,9 +48,9 @@ class Decorator::Window : public Window_base, public Animator::Item /* * Flag indicating that the current window position has been propagated - * to the window's corresponding nitpicker views. + * to the window's corresponding GUI views. */ - bool _nitpicker_views_up_to_date = false; + bool _gui_views_up_to_date = false; unsigned _topped_cnt = 0; @@ -141,22 +141,21 @@ class Decorator::Window : public Window_base, public Animator::Item func(_maximizer); } - struct Nitpicker_view + struct Gui_view { - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; bool const _view_is_remote; - Nitpicker::Session_client &_nitpicker; + Gui::Session_client &_gui; View_handle _handle; - Nitpicker_view(Nitpicker::Session_client &nitpicker, - unsigned id = 0) + Gui_view(Gui::Session_client &gui, unsigned id = 0) : _view_is_remote(false), - _nitpicker(nitpicker), - _handle(_nitpicker.create_view()) + _gui(gui), + _handle(_gui.create_view()) { /* * We supply the window ID as label for the anchor view. @@ -165,63 +164,63 @@ class Decorator::Window : public Window_base, public Animator::Item char buf[128]; Genode::snprintf(buf, sizeof(buf), "%d", id); - _nitpicker.enqueue(_handle, Genode::Cstring(buf)); + _gui.enqueue(_handle, Genode::Cstring(buf)); } } - View_handle _create_remote_view(Nitpicker::Session_client &remote_nitpicker) + View_handle _create_remote_view(Gui::Session_client &remote_gui) { - /* create view at the remote nitpicker session */ - View_handle handle = remote_nitpicker.create_view(); - Nitpicker::View_capability view_cap = remote_nitpicker.view_capability(handle); + /* create view at the remote GUI session */ + View_handle handle = remote_gui.create_view(); + Gui::View_capability view_cap = remote_gui.view_capability(handle); - /* import remote view into local nitpicker session */ - return _nitpicker.view_handle(view_cap); + /* import remote view into local GUI session */ + return _gui.view_handle(view_cap); } /** * Constructor called for creating a view that refers to a buffer - * of another nitpicker session + * of another GUI session */ - Nitpicker_view(Nitpicker::Session_client &nitpicker, - Nitpicker::Session_client &remote_nitpicker) + Gui_view(Gui::Session_client &gui, + Gui::Session_client &remote_gui) : _view_is_remote(true), - _nitpicker(nitpicker), - _handle(_create_remote_view(remote_nitpicker)) + _gui(gui), + _handle(_create_remote_view(remote_gui)) { } - ~Nitpicker_view() + ~Gui_view() { if (_view_is_remote) - _nitpicker.release_view_handle(_handle); + _gui.release_view_handle(_handle); else - _nitpicker.destroy_view(_handle); + _gui.destroy_view(_handle); } View_handle handle() const { return _handle; } void stack(View_handle neighbor) { - _nitpicker.enqueue(_handle, neighbor); + _gui.enqueue(_handle, neighbor); } void stack_back_most() { - _nitpicker.enqueue(_handle, View_handle()); + _gui.enqueue(_handle, View_handle()); } void place(Rect rect, Point offset) { - _nitpicker.enqueue(_handle, rect); - _nitpicker.enqueue(_handle, offset); + _gui.enqueue(_handle, rect); + _gui.enqueue(_handle, offset); } }; /** - * Nitpicker used as a global namespace of view handles + * GUI session used as a global namespace of view handles */ - Nitpicker::Session_client &_nitpicker; + Gui::Session_client &_gui; Config const &_config; @@ -243,25 +242,23 @@ class Decorator::Window : public Window_base, public Animator::Item Genode::Animated_rect _animated_rect { _animator }; /* - * Geometry most recently propagated to nitpicker + * Geometry most recently propagated to GUI server */ - Rect _nitpicker_view_rect { }; + Rect _gui_view_rect { }; /** - * Nitpicker session that contains the upper and lower window - * decorations. + * GUI session that contains the upper and lower window decorations */ - Nitpicker::Connection _nitpicker_top_bottom { _env }; - Genode::Constructible _buffer_top_bottom { }; - Area _size_top_bottom { }; + Gui::Connection _gui_top_bottom { _env }; + Genode::Constructible _buffer_top_bottom { }; + Area _size_top_bottom { }; /** - * Nitpicker session that contains the left and right window - * decorations. + * GUI session that contains the left and right window decorations */ - Nitpicker::Connection _nitpicker_left_right { _env }; - Genode::Constructible _buffer_left_right { }; - Area _size_left_right { }; + Gui::Connection _gui_left_right { _env }; + Genode::Constructible _buffer_left_right { }; + Area _size_left_right { }; Area _visible_top_bottom_area(Area const inner_size) const { @@ -277,14 +274,14 @@ class Decorator::Window : public Window_base, public Animator::Item return Area(outer_size.w() - inner_size.w(), outer_size.h()); } - Nitpicker_view _bottom_view { _nitpicker, _nitpicker_top_bottom }, - _right_view { _nitpicker, _nitpicker_left_right }, - _left_view { _nitpicker, _nitpicker_left_right }, - _top_view { _nitpicker, _nitpicker_top_bottom }; + Gui_view _bottom_view { _gui, _gui_top_bottom }, + _right_view { _gui, _gui_left_right }, + _left_view { _gui, _gui_left_right }, + _top_view { _gui, _gui_top_bottom }; - Nitpicker_view _content_view { _nitpicker, (unsigned)id() }; + Gui_view _content_view { _gui, (unsigned)id() }; - void _repaint_decorations(Nitpicker_buffer &buffer, Area area) + void _repaint_decorations(Gui_buffer &buffer, Area area) { buffer.reset_surface(); @@ -306,7 +303,7 @@ class Decorator::Window : public Window_base, public Animator::Item buffer.flush_surface(); - buffer.nitpicker.framebuffer()->refresh(0, 0, buffer.size().w(), buffer.size().h()); + buffer.gui.framebuffer()->refresh(0, 0, buffer.size().w(), buffer.size().h()); } void _repaint_decorations() @@ -317,7 +314,7 @@ class Decorator::Window : public Window_base, public Animator::Item _repaint_decorations(*_buffer_left_right, _visible_left_right_area(inner_size)); } - void _reallocate_nitpicker_buffers() + void _reallocate_gui_buffers() { bool const use_alpha = true; @@ -327,12 +324,12 @@ class Decorator::Window : public Window_base, public Animator::Item || size_top_bottom.h() > _size_top_bottom.h() || !_buffer_top_bottom.constructed()) { - _nitpicker_top_bottom.buffer(Framebuffer::Mode(size_top_bottom.w(), - size_top_bottom.h(), - Framebuffer::Mode::RGB565), - use_alpha); + _gui_top_bottom.buffer(Framebuffer::Mode(size_top_bottom.w(), + size_top_bottom.h(), + Framebuffer::Mode::RGB565), + use_alpha); - _buffer_top_bottom.construct(_nitpicker_top_bottom, size_top_bottom, + _buffer_top_bottom.construct(_gui_top_bottom, size_top_bottom, _env.ram(), _env.rm()); _size_top_bottom = size_top_bottom; @@ -344,12 +341,12 @@ class Decorator::Window : public Window_base, public Animator::Item || size_left_right.h() > _size_left_right.h() || !_buffer_left_right.constructed()) { - _nitpicker_left_right.buffer(Framebuffer::Mode(size_left_right.w(), - size_left_right.h(), - Framebuffer::Mode::RGB565), - use_alpha); + _gui_left_right.buffer(Framebuffer::Mode(size_left_right.w(), + size_left_right.h(), + Framebuffer::Mode::RGB565), + use_alpha); - _buffer_left_right.construct(_nitpicker_left_right, size_left_right, + _buffer_left_right.construct(_gui_left_right, size_left_right, _env.ram(), _env.rm()); _size_left_right = size_left_right; @@ -377,15 +374,15 @@ class Decorator::Window : public Window_base, public Animator::Item public: - Window(Genode::Env &env, unsigned id, Nitpicker::Session_client &nitpicker, + Window(Genode::Env &env, unsigned id, Gui::Session_client &gui, Animator &animator, Theme const &theme, Config const &config) : Window_base(id), Animator::Item(animator), _env(env), _theme(theme), _animator(animator), - _nitpicker(nitpicker), _config(config) + _gui(gui), _config(config) { - _reallocate_nitpicker_buffers(); + _reallocate_gui_buffers(); _alpha.dst(_focused ? 256 : 200, 20); animate(); } @@ -458,13 +455,13 @@ class Decorator::Window : public Window_base, public Animator::Item return _outer_from_inner_geometry(geometry()); } - void update_nitpicker_views() override + void update_gui_views() override { - bool const nitpicker_view_rect_up_to_date = - _nitpicker_view_rect.p1() == geometry().p1() && - _nitpicker_view_rect.p2() == geometry().p2(); + bool const gui_view_rect_up_to_date = + _gui_view_rect.p1() == geometry().p1() && + _gui_view_rect.p2() == geometry().p2(); - if (!_nitpicker_views_up_to_date || !nitpicker_view_rect_up_to_date) { + if (!_gui_views_up_to_date || !gui_view_rect_up_to_date) { Area const theme_size = _theme.background_size(); Rect const inner = _curr_inner_geometry(); @@ -480,10 +477,10 @@ class Decorator::Window : public Window_base, public Animator::Item _right_view .place(right, Point(-right.w(), -top.h())); _bottom_view .place(bottom, Point(0, -theme_size.h() + bottom.h())); - _nitpicker.execute(); + _gui.execute(); - _nitpicker_view_rect = inner; - _nitpicker_views_up_to_date = true; + _gui_view_rect = inner; + _gui_views_up_to_date = true; } } @@ -537,7 +534,7 @@ class Decorator::Window : public Window_base, public Animator::Item * Detect position changes */ if (geometry_changed || motion_triggered) { - _nitpicker_views_up_to_date = false; + _gui_views_up_to_date = false; updated = true; } @@ -546,7 +543,7 @@ class Decorator::Window : public Window_base, public Animator::Item */ if (size_changed || motion_triggered) { - _reallocate_nitpicker_buffers(); + _reallocate_gui_buffers(); /* triggering the animation has the side effect of repainting */ trigger_animation = true; diff --git a/repos/gems/src/app/window_layouter/main.cc b/repos/gems/src/app/window_layouter/main.cc index 112b31aefe..119f5e5938 100644 --- a/repos/gems/src/app/window_layouter/main.cc +++ b/repos/gems/src/app/window_layouter/main.cc @@ -322,12 +322,12 @@ struct Window_layouter::Main : Operations, Signal_handler
_input_handler { _env.ep(), *this, &Main::_handle_input }; - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; void _handle_mode_change() { /* determine maximized window geometry */ - Framebuffer::Mode const mode = _nitpicker.mode(); + Framebuffer::Mode const mode = _gui.mode(); _screen_size = Area(mode.width(), mode.height()); @@ -338,7 +338,7 @@ struct Window_layouter::Main : Operations, _env.ep(), *this, &Main::_handle_mode_change }; - Input::Session_client _input { _env.rm(), _nitpicker.input_session() }; + Input::Session_client _input { _env.rm(), _gui.input_session() }; Attached_dataspace _input_ds { _env.rm(), _input.dataspace() }; @@ -377,7 +377,7 @@ struct Window_layouter::Main : Operations, */ Main(Env &env) : _env(env) { - _nitpicker.mode_sigh(_mode_change_handler); + _gui.mode_sigh(_mode_change_handler); _handle_mode_change(); _drop_timer.sigh(_drop_timer_handler); @@ -609,10 +609,10 @@ void Window_layouter::Main::_handle_hover() /* * Don't generate a focus-model update here. In a situation where the - * pointer has moved over a native nitpicker view (outside the realm of + * pointer has moved over a native GUI view (outside the realm of * the window manager), the hover model as generated by the decorator * naturally becomes empty. If we posted a focus update, this would - * steal the focus away from the native nitpicker view. + * steal the focus away from the native GUI view. */ } diff --git a/repos/gems/src/server/nit_fader/main.cc b/repos/gems/src/server/nit_fader/main.cc index 0dd73bcfd2..ea84be2f50 100644 --- a/repos/gems/src/server/nit_fader/main.cc +++ b/repos/gems/src/server/nit_fader/main.cc @@ -1,5 +1,5 @@ /* - * \brief Fader for a nitpicker client + * \brief Fader for a GUI client * \author Norman Feske * \date 2014-09-08 */ @@ -29,13 +29,13 @@ /* local includes */ #include -namespace Nit_fader { +namespace Gui_fader { class Main; class Src_buffer; class Dst_buffer; class Framebuffer_session_component; - class Nitpicker_session_component; + class Gui_session_component; typedef Genode::Surface_base::Area Area; typedef Genode::Surface_base::Point Point; @@ -58,7 +58,7 @@ namespace Nit_fader { /** * Buffer handed out to our client as virtual framebuffer */ -class Nit_fader::Src_buffer +class Gui_fader::Src_buffer { private: @@ -96,7 +96,7 @@ class Nit_fader::Src_buffer }; -class Nit_fader::Dst_buffer +class Gui_fader::Dst_buffer { private: @@ -129,7 +129,7 @@ class Nit_fader::Dst_buffer }; -class Nit_fader::Framebuffer_session_component +class Gui_fader::Framebuffer_session_component : public Genode::Rpc_object { @@ -137,8 +137,8 @@ class Nit_fader::Framebuffer_session_component Genode::Env &_env; - Nitpicker::Connection &_nitpicker; - Src_buffer &_src_buffer; + Gui::Connection &_gui; + Src_buffer &_src_buffer; Constructible _dst_buffer { }; @@ -150,11 +150,11 @@ class Nit_fader::Framebuffer_session_component /** * Constructor */ - Framebuffer_session_component(Genode::Env &env, - Nitpicker::Connection &nitpicker, - Src_buffer &src_buffer) + Framebuffer_session_component(Genode::Env &env, + Gui::Connection &gui, + Src_buffer &src_buffer) : - _env(env), _nitpicker(nitpicker), _src_buffer(src_buffer) + _env(env), _gui(gui), _src_buffer(src_buffer) { } void dst_buffer(Dataspace_capability ds_cap, Area size) @@ -207,7 +207,7 @@ class Nit_fader::Framebuffer_session_component transfer_src_to_dst_alpha(rect); - _nitpicker.framebuffer()->refresh(rect.x1(), rect.y1(), rect.w(), rect.h()); + _gui.framebuffer()->refresh(rect.x1(), rect.y1(), rect.w(), rect.h()); /* keep animating as long as the destination value is not reached */ return _fade != _fade.dst(); @@ -230,12 +230,12 @@ class Nit_fader::Framebuffer_session_component Framebuffer::Mode mode() const override { - return _nitpicker.framebuffer()->mode(); + return _gui.framebuffer()->mode(); } void mode_sigh(Genode::Signal_context_capability sigh) override { - _nitpicker.framebuffer()->mode_sigh(sigh); + _gui.framebuffer()->mode_sigh(sigh); } void refresh(int x, int y, int w, int h) override @@ -243,42 +243,42 @@ class Nit_fader::Framebuffer_session_component transfer_src_to_dst_pixel(Rect(Point(x, y), Area(w, h))); transfer_src_to_dst_alpha(Rect(Point(x, y), Area(w, h))); - _nitpicker.framebuffer()->refresh(x, y, w, h); + _gui.framebuffer()->refresh(x, y, w, h); } void sync_sigh(Genode::Signal_context_capability sigh) override { - _nitpicker.framebuffer()->sync_sigh(sigh); + _gui.framebuffer()->sync_sigh(sigh); } }; -class Nit_fader::Nitpicker_session_component +class Gui_fader::Gui_session_component : - public Genode::Rpc_object + public Genode::Rpc_object { private: - typedef Nitpicker::View_capability View_capability; - typedef Nitpicker::Session::View_handle View_handle; + typedef Gui::View_capability View_capability; + typedef Gui::Session::View_handle View_handle; Genode::Env &_env; Reconstructible _src_buffer { _env, Area(1, 1), false }; - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; Genode::Attached_ram_dataspace _command_ds { - _env.ram(), _env.rm(), sizeof(Nitpicker::Session::Command_buffer) }; + _env.ram(), _env.rm(), sizeof(Gui::Session::Command_buffer) }; - Nitpicker::Session::Command_buffer &_commands = - *_command_ds.local_addr(); + Gui::Session::Command_buffer &_commands = + *_command_ds.local_addr(); - Framebuffer_session_component _fb_session { _env, _nitpicker, *_src_buffer }; + Framebuffer_session_component _fb_session { _env, _gui, *_src_buffer }; Framebuffer::Session_capability _fb_cap { _env.ep().manage(_fb_session) }; - Nitpicker::Session::View_handle _view_handle { }; + Gui::Session::View_handle _view_handle { }; bool _view_visible = false; Rect _view_geometry { }; @@ -288,14 +288,14 @@ class Nit_fader::Nitpicker_session_component if (!_view_handle.valid() || (_view_visible == _fb_session.visible())) return; - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; if (_fb_session.visible()) - _nitpicker.enqueue(_view_handle, _view_geometry); + _gui.enqueue(_view_handle, _view_geometry); else - _nitpicker.enqueue(_view_handle, Rect()); + _gui.enqueue(_view_handle, Rect()); - _nitpicker.execute(); + _gui.execute(); _view_visible = _fb_session.visible(); } @@ -305,13 +305,13 @@ class Nit_fader::Nitpicker_session_component /** * Constructor */ - Nitpicker_session_component(Genode::Env &env) : _env(env) + Gui_session_component(Genode::Env &env) : _env(env) { } /** * Destructor */ - ~Nitpicker_session_component() + ~Gui_session_component() { _env.ep().dissolve(_fb_session); } @@ -331,9 +331,9 @@ class Nit_fader::Nitpicker_session_component } - /********************************** - ** Nitpicker::Session interface ** - **********************************/ + /**************************** + ** Gui::Session interface ** + ****************************/ Framebuffer::Session_capability framebuffer_session() override { @@ -342,35 +342,35 @@ class Nit_fader::Nitpicker_session_component Input::Session_capability input_session() override { - return _nitpicker.input_session(); + return _gui.input_session(); } View_handle create_view(View_handle parent) override { - _view_handle = _nitpicker.create_view(parent); + _view_handle = _gui.create_view(parent); _update_view_visibility(); return _view_handle; } void destroy_view(View_handle handle) override { - return _nitpicker.destroy_view(handle); + return _gui.destroy_view(handle); } View_handle view_handle(View_capability view_cap, View_handle handle) override { - return _nitpicker.view_handle(view_cap, handle); + return _gui.view_handle(view_cap, handle); } View_capability view_capability(View_handle handle) override { - return _nitpicker.view_capability(handle); + return _gui.view_capability(handle); } void release_view_handle(View_handle handle) override { - _nitpicker.release_view_handle(handle); + _gui.release_view_handle(handle); } Dataspace_capability command_dataspace() override @@ -382,11 +382,11 @@ class Nit_fader::Nitpicker_session_component { for (unsigned i = 0; i < _commands.num(); i++) { - Nitpicker::Session::Command command = _commands.get(i); + Gui::Session::Command command = _commands.get(i); bool forward_command = true; - if (command.opcode == Nitpicker::Session::Command::OP_GEOMETRY) { + if (command.opcode == Gui::Session::Command::OP_GEOMETRY) { /* remember view geometry as defined by the client */ _view_geometry = command.geometry.rect; @@ -396,21 +396,21 @@ class Nit_fader::Nitpicker_session_component } if (forward_command) - _nitpicker.enqueue(command); + _gui.enqueue(command); } _fb_session.transfer_src_to_dst_pixel(Rect(Point(0, 0), _fb_session.size())); _fb_session.transfer_src_to_dst_alpha(Rect(Point(0, 0), _fb_session.size())); - return _nitpicker.execute(); + return _gui.execute(); } Framebuffer::Mode mode() override { - return _nitpicker.mode(); + return _gui.mode(); } void mode_sigh(Genode::Signal_context_capability sigh) override { - _nitpicker.mode_sigh(sigh); + _gui.mode_sigh(sigh); } void buffer(Framebuffer::Mode mode, bool use_alpha) override @@ -419,19 +419,19 @@ class Nit_fader::Nitpicker_session_component _src_buffer.construct(_env, size, use_alpha); - _nitpicker.buffer(mode, true); + _gui.buffer(mode, true); - _fb_session.dst_buffer(_nitpicker.framebuffer()->dataspace(), size); + _fb_session.dst_buffer(_gui.framebuffer()->dataspace(), size); } void focus(Genode::Capability focused) override { - _nitpicker.focus(focused); + _gui.focus(focused); } }; -struct Nit_fader::Main +struct Gui_fader::Main { Genode::Env &env; @@ -461,17 +461,17 @@ struct Nit_fader::Main env.ep(), *this, &Main::handle_config_update }; - Nitpicker_session_component nitpicker_session { env }; + Gui_session_component gui_session { env }; - Genode::Static_root nitpicker_root + Genode::Static_root gui_root { - env.ep().manage(nitpicker_session) + env.ep().manage(gui_session) }; void handle_timer() { Genode::uint64_t frame = curr_frame(); - if (nitpicker_session.animate(frame - last_frame)) + if (gui_session.animate(frame - last_frame)) timer.trigger_once(PERIOD); last_frame = frame; @@ -491,12 +491,12 @@ struct Nit_fader::Main /* apply initial config */ handle_config_update(); - env.parent().announce(env.ep().manage(nitpicker_root)); + env.parent().announce(env.ep().manage(gui_root)); } }; -void Nit_fader::Main::handle_config_update() +void Gui_fader::Main::handle_config_update() { config.update(); @@ -521,7 +521,7 @@ void Nit_fader::Main::handle_config_update() initial_fade_in = false; - nitpicker_session.fade(280*new_alpha, steps); + gui_session.fade(280*new_alpha, steps); alpha = new_alpha; @@ -537,4 +537,4 @@ void Nit_fader::Main::handle_config_update() ***************/ void Component::construct(Genode::Env &env) { - static Nit_fader::Main desktop(env); } + static Gui_fader::Main desktop(env); } diff --git a/repos/gems/src/server/wm/decorator_nitpicker.h b/repos/gems/src/server/wm/decorator_gui.h similarity index 69% rename from repos/gems/src/server/wm/decorator_nitpicker.h rename to repos/gems/src/server/wm/decorator_gui.h index 5477917729..4d8c5c494d 100644 --- a/repos/gems/src/server/wm/decorator_nitpicker.h +++ b/repos/gems/src/server/wm/decorator_gui.h @@ -1,5 +1,5 @@ /* - * \brief Nitpicker service provided to decorator + * \brief GUI service provided to decorator * \author Norman Feske * \date 2014-02-14 */ @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _DECORATOR_NITPICKER_H_ -#define _DECORATOR_NITPICKER_H_ +#ifndef _DECORATOR_GUI_H_ +#define _DECORATOR_GUI_H_ /* Genode includes */ #include @@ -42,7 +42,7 @@ namespace Wm { class Main; namespace Wm { - struct Decorator_nitpicker_session; + struct Decorator_gui_session; struct Decorator_content_callback; struct Decorator_content_registry; } @@ -52,7 +52,7 @@ struct Wm::Decorator_content_callback : Interface { virtual void content_geometry(Window_registry::Id win_id, Rect rect) = 0; - virtual Nitpicker::View_capability content_view(Window_registry::Id win_id) = 0; + virtual Gui::View_capability content_view(Window_registry::Id win_id) = 0; virtual void update_content_child_views(Window_registry::Id win_id) = 0; }; @@ -69,13 +69,14 @@ class Wm::Decorator_content_registry private: + using View_handle = Gui::Session::View_handle; + struct Entry : List::Element { - Nitpicker::Session::View_handle const decorator_view_handle; - Window_registry::Id const win_id; + View_handle const decorator_view_handle; + Window_registry::Id const win_id; - Entry(Nitpicker::Session::View_handle decorator_view_handle, - Window_registry::Id win_id) + Entry(View_handle decorator_view_handle, Window_registry::Id win_id) : decorator_view_handle(decorator_view_handle), win_id(win_id) @@ -85,7 +86,7 @@ class Wm::Decorator_content_registry List _list { }; Allocator &_entry_alloc; - Entry const &_lookup(Nitpicker::Session::View_handle view_handle) const + Entry const &_lookup(View_handle view_handle) const { for (Entry const *e = _list.first(); e; e = e->next()) { if (e->decorator_view_handle == view_handle) @@ -114,8 +115,7 @@ class Wm::Decorator_content_registry _remove(*e); } - void insert(Nitpicker::Session::View_handle decorator_view_handle, - Window_registry::Id win_id) + void insert(View_handle decorator_view_handle, Window_registry::Id win_id) { Entry *e = new (_entry_alloc) Entry(decorator_view_handle, win_id); _list.insert(e); @@ -126,12 +126,12 @@ class Wm::Decorator_content_registry * * \throw Lookup_failed */ - Window_registry::Id lookup(Nitpicker::Session::View_handle view_handle) const + Window_registry::Id lookup(View_handle view_handle) const { return _lookup(view_handle).win_id; } - bool registered(Nitpicker::Session::View_handle view_handle) const + bool registered(View_handle view_handle) const { try { lookup(view_handle); return true; } catch (...) { } return false; @@ -142,21 +142,22 @@ class Wm::Decorator_content_registry * * \throw Lookup_failed */ - void remove(Nitpicker::Session::View_handle view_handle) + void remove(View_handle view_handle) { _remove(_lookup(view_handle)); } }; -struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, - private List::Element +struct Wm::Decorator_gui_session : Genode::Rpc_object, + private List::Element { - friend class List; - using List::Element::next; + friend class List; + using List::Element::next; - typedef Nitpicker::View_capability View_capability; - typedef Nitpicker::Session::View_handle View_handle; + using View_capability = Gui::View_capability; + using View_handle = Gui::Session::View_handle; + using Command_buffer = Gui::Session::Command_buffer; Genode::Env &_env; @@ -164,12 +165,10 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, Genode::Ram_allocator &_ram; - Nitpicker::Connection _nitpicker_session { _env, "decorator" }; + Gui::Connection _gui_session { _env, "decorator" }; Genode::Signal_context_capability _mode_sigh { }; - typedef Nitpicker::Session::Command_buffer Command_buffer; - Attached_ram_dataspace _command_ds { _ram, _env.rm(), sizeof(Command_buffer) }; Command_buffer &_command_buffer = *_command_ds.local_addr(); @@ -191,26 +190,26 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, Allocator &_md_alloc; - /* Nitpicker::Connection requires a valid input session */ + /* Gui::Connection requires a valid input session */ Input::Session_component _dummy_input_component { _env, _env.ram() }; Input::Session_capability _dummy_input_component_cap = _env.ep().manage(_dummy_input_component); - Signal_handler - _input_handler { _env.ep(), *this, &Decorator_nitpicker_session::_handle_input }; + Signal_handler + _input_handler { _env.ep(), *this, &Decorator_gui_session::_handle_input }; /** * Constructor * * \param ep entrypoint used for dispatching signals */ - Decorator_nitpicker_session(Genode::Env &env, - Genode::Ram_allocator &ram, - Allocator &md_alloc, - Reporter &pointer_reporter, - Last_motion &last_motion, - Input::Session_component &window_layouter_input, - Decorator_content_callback &content_callback) + Decorator_gui_session(Genode::Env &env, + Genode::Ram_allocator &ram, + Allocator &md_alloc, + Reporter &pointer_reporter, + Last_motion &last_motion, + Input::Session_component &window_layouter_input, + Decorator_content_callback &content_callback) : _env(env), _ram(ram), @@ -220,10 +219,10 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, _content_callback(content_callback), _md_alloc(md_alloc) { - _nitpicker_session.input()->sigh(_input_handler); + _gui_session.input()->sigh(_input_handler); } - ~Decorator_nitpicker_session() + ~Decorator_gui_session() { _env.ep().dissolve(_dummy_input_component); } @@ -238,8 +237,8 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, }); }; - while (_nitpicker_session.input()->pending()) - _nitpicker_session.input()->for_each_event([&] (Input::Event const &ev) { + while (_gui_session.input()->pending()) + _gui_session.input()->for_each_event([&] (Input::Event const &ev) { if (ev.press()) _key_cnt++; @@ -325,14 +324,13 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, * Replace content view originally created by the decorator * by view that shows the real window content. */ - Nitpicker::View_capability view_cap = - _content_callback.content_view(win_id); + View_capability view_cap = _content_callback.content_view(win_id); - _nitpicker_session.destroy_view(view_handle); - _nitpicker_session.view_handle(view_cap, view_handle); + _gui_session.destroy_view(view_handle); + _gui_session.view_handle(view_cap, view_handle); - _nitpicker_session.enqueue(cmd); - _nitpicker_session.execute(); + _gui_session.enqueue(cmd); + _gui_session.execute(); /* * Now that the physical content view exists, it is time @@ -342,7 +340,7 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, } catch (Decorator_content_registry::Lookup_failed) { - _nitpicker_session.enqueue(cmd); + _gui_session.enqueue(cmd); } return; @@ -353,8 +351,8 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, /* * If the content view changes position, propagate the new - * position to the nitpicker service to properly transform - * absolute input coordinates. + * position to the GUI service to properly transform absolute + * input coordinates. */ Window_registry::Id win_id = _content_registry.lookup(cmd.geometry.view); @@ -363,7 +361,7 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, catch (Decorator_content_registry::Lookup_failed) { } /* forward command */ - _nitpicker_session.enqueue(cmd); + _gui_session.enqueue(cmd); return; case Command::OP_OFFSET: @@ -377,14 +375,14 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, _content_registry.lookup(cmd.geometry.view); } catch (Decorator_content_registry::Lookup_failed) { - _nitpicker_session.enqueue(cmd); + _gui_session.enqueue(cmd); } return; case Command::OP_BACKGROUND: case Command::OP_NOP: - _nitpicker_session.enqueue(cmd); + _gui_session.enqueue(cmd); return; } } @@ -392,17 +390,17 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, void upgrade(const char *args) { size_t const ram_quota = Arg_string::find_arg(args, "ram_quota").ulong_value(0); - _nitpicker_session.upgrade_ram(ram_quota); + _gui_session.upgrade_ram(ram_quota); } - /********************************* - ** Nitpicker session interface ** - *********************************/ + /*************************** + ** GUI session interface ** + ***************************/ Framebuffer::Session_capability framebuffer_session() override { - return _nitpicker_session.framebuffer_session(); + return _gui_session.framebuffer_session(); } Input::Session_capability input_session() override @@ -416,7 +414,7 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, View_handle create_view(View_handle parent) override { - return _nitpicker_session.create_view(parent); + return _gui_session.create_view(parent); } void destroy_view(View_handle view) override @@ -425,28 +423,28 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, * Reset view geometry when destroying a content view */ if (_content_registry.registered(view)) { - Nitpicker::Rect rect(Nitpicker::Point(0, 0), Nitpicker::Area(0, 0)); - _nitpicker_session.enqueue(view, rect); - _nitpicker_session.execute(); + Gui::Rect rect(Gui::Point(0, 0), Gui::Area(0, 0)); + _gui_session.enqueue(view, rect); + _gui_session.execute(); } - _nitpicker_session.destroy_view(view); + _gui_session.destroy_view(view); } View_handle view_handle(View_capability view_cap, View_handle handle) override { - return _nitpicker_session.view_handle(view_cap, handle); + return _gui_session.view_handle(view_cap, handle); } View_capability view_capability(View_handle view) override { - return _nitpicker_session.view_capability(view); + return _gui_session.view_capability(view); } void release_view_handle(View_handle view) override { /* XXX dealloc View_ptr */ - _nitpicker_session.release_view_handle(view); + _gui_session.release_view_handle(view); } Genode::Dataspace_capability command_dataspace() override @@ -464,12 +462,12 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, Genode::warning("unhandled exception while processing command from decorator"); } } - _nitpicker_session.execute(); + _gui_session.execute(); } Framebuffer::Mode mode() override { - return _nitpicker_session.mode(); + return _gui_session.mode(); } void mode_sigh(Genode::Signal_context_capability sigh) override @@ -479,18 +477,18 @@ struct Wm::Decorator_nitpicker_session : Genode::Rpc_object, * transitive delegations of the capability. */ _mode_sigh = sigh; - _nitpicker_session.mode_sigh(sigh); + _gui_session.mode_sigh(sigh); } void buffer(Framebuffer::Mode mode, bool use_alpha) override { /* - * See comment in 'Wm::Nitpicker::Session_component::buffer'. + * See comment in 'Wm::Gui::Session_component::buffer'. */ - Nitpicker::Session_client(_env.rm(), _nitpicker_session.cap()).buffer(mode, use_alpha); + Gui::Session_client(_env.rm(), _gui_session.cap()).buffer(mode, use_alpha); } - void focus(Genode::Capability) override { } + void focus(Genode::Capability) override { } }; -#endif /* _DECORATOR_NITPICKER_H_ */ +#endif /* _DECORATOR_GUI_H_ */ diff --git a/repos/gems/src/server/wm/direct_nitpicker.h b/repos/gems/src/server/wm/direct_gui.h similarity index 70% rename from repos/gems/src/server/wm/direct_nitpicker.h rename to repos/gems/src/server/wm/direct_gui.h index b66775e3e4..af29a848be 100644 --- a/repos/gems/src/server/wm/direct_nitpicker.h +++ b/repos/gems/src/server/wm/direct_gui.h @@ -1,5 +1,5 @@ /* - * \brief Pass-through nitpicker service announced to the outside world + * \brief Pass-through GUI service announced to the outside world * \author Norman Feske * \date 2015-09-29 */ @@ -11,29 +11,29 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _DIRECT_NITPICKER_H_ -#define _DIRECT_NITPICKER_H_ +#ifndef _DIRECT_GUI_H_ +#define _DIRECT_GUI_H_ /* Genode includes */ #include #include -namespace Wm { class Direct_nitpicker_session; } +namespace Wm { class Direct_gui_session; } -class Wm::Direct_nitpicker_session : public Genode::Rpc_object +class Wm::Direct_gui_session : public Genode::Rpc_object { private: Genode::Session_label _session_label; - Nitpicker::Connection _session; + Gui::Connection _session; public: /** * Constructor */ - Direct_nitpicker_session(Genode::Env &env, Genode::Session_label const &session_label) + Direct_gui_session(Genode::Env &env, Genode::Session_label const &session_label) : _session_label(session_label), _session(env, _session_label.string()) @@ -46,9 +46,9 @@ class Wm::Direct_nitpicker_session : public Genode::Rpc_object session) override + void focus(Genode::Capability session) override { _session.focus(session); } }; -#endif /* _DIRECT_NITPICKER_H_ */ +#endif /* _DIRECT_GUI_H_ */ diff --git a/repos/gems/src/server/wm/nitpicker.h b/repos/gems/src/server/wm/gui.h similarity index 81% rename from repos/gems/src/server/wm/nitpicker.h rename to repos/gems/src/server/wm/gui.h index 2a6f099b21..a341854b9f 100644 --- a/repos/gems/src/server/wm/nitpicker.h +++ b/repos/gems/src/server/wm/gui.h @@ -1,5 +1,5 @@ /* - * \brief Virtualized nitpicker service announced to the outside world + * \brief Virtualized GUI service announced to the outside world * \author Norman Feske * \date 2014-02-14 */ @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _NITPICKER_H_ -#define _NITPICKER_H_ +#ifndef _GUI_H_ +#define _GUI_H_ /* Genode includes */ #include @@ -29,9 +29,9 @@ /* local includes */ #include -#include -#include -#include +#include +#include +#include namespace Wm { @@ -53,9 +53,9 @@ namespace Wm { using Genode::Interface; } -namespace Wm { namespace Nitpicker { +namespace Wm { namespace Gui { - using namespace ::Nitpicker; + using namespace ::Gui; class Click_handler; class Input_origin_changed_handler; @@ -82,7 +82,7 @@ namespace Wm { namespace Nitpicker { * clicks into an already focused window should be of no interest to the * layouter. So we hide them from the layouter. */ -struct Wm::Nitpicker::Click_handler : Interface +struct Wm::Gui::Click_handler : Interface { virtual void handle_click(Point pos) = 0; virtual void handle_enter(Point pos) = 0; @@ -93,17 +93,17 @@ struct Wm::Nitpicker::Click_handler : Interface * Called by a top-level view to propagate the need to update the virtual * pointer position of a client when the client's window moved. */ -struct Wm::Nitpicker::Input_origin_changed_handler : Interface +struct Wm::Gui::Input_origin_changed_handler : Interface { virtual void input_origin_changed() = 0; }; -struct Nitpicker::View : Genode::Interface { GENODE_RPC_INTERFACE(); }; +struct Gui::View : Genode::Interface { GENODE_RPC_INTERFACE(); }; -class Wm::Nitpicker::View : private Genode::Weak_object, - public Genode::Rpc_object< ::Nitpicker::View> +class Wm::Gui::View : private Genode::Weak_object, + public Genode::Rpc_object< ::Gui::View> { private: @@ -112,35 +112,35 @@ class Wm::Nitpicker::View : private Genode::Weak_object, protected: - typedef Genode::String<100> Title; - typedef Nitpicker::Session::Command Command; - typedef Nitpicker::Session::View_handle View_handle; + using Title = Genode::String<100>; + using Command = Gui::Session::Command; + using View_handle = Gui::Session::View_handle; - Session_label _session_label; - Nitpicker::Session_client &_real_nitpicker; - View_handle _real_handle { }; - Title _title { }; - Rect _geometry { }; - Point _buffer_offset { }; - Weak_ptr _neighbor_ptr { }; - bool _neighbor_behind { }; - bool _has_alpha; + Session_label _session_label; + Gui::Session_client &_real_gui; + View_handle _real_handle { }; + Title _title { }; + Rect _geometry { }; + Point _buffer_offset { }; + Weak_ptr _neighbor_ptr { }; + bool _neighbor_behind { }; + bool _has_alpha; - View(Nitpicker::Session_client &real_nitpicker, - Session_label const &session_label, - bool has_alpha) + View(Gui::Session_client &real_gui, + Session_label const &session_label, + bool has_alpha) : - _session_label(session_label), _real_nitpicker(real_nitpicker), + _session_label(session_label), _real_gui(real_gui), _has_alpha(has_alpha) { } /** - * Propagate cached view geometry to the physical nitpicker view + * Propagate cached view geometry to the physical GUI view */ virtual void _propagate_view_geometry() = 0; /** - * Apply cached view state to the physical nitpicker view + * Apply cached view state to the physical GUI view */ void _unsynchronized_apply_view_config(Locked_ptr &neighbor) { @@ -148,23 +148,23 @@ class Wm::Nitpicker::View : private Genode::Weak_object, return; _propagate_view_geometry(); - _real_nitpicker.enqueue(_real_handle, _buffer_offset); - _real_nitpicker.enqueue (_real_handle, _title.string()); + _real_gui.enqueue(_real_handle, _buffer_offset); + _real_gui.enqueue (_real_handle, _title.string()); View_handle real_neighbor_handle; if (neighbor.valid()) - real_neighbor_handle = _real_nitpicker.view_handle(neighbor->real_view_cap()); + real_neighbor_handle = _real_gui.view_handle(neighbor->real_view_cap()); if (_neighbor_behind) - _real_nitpicker.enqueue(_real_handle, real_neighbor_handle); + _real_gui.enqueue(_real_handle, real_neighbor_handle); else - _real_nitpicker.enqueue(_real_handle, real_neighbor_handle); + _real_gui.enqueue(_real_handle, real_neighbor_handle); - _real_nitpicker.execute(); + _real_gui.execute(); if (real_neighbor_handle.valid()) - _real_nitpicker.release_view_handle(real_neighbor_handle); + _real_gui.release_view_handle(real_neighbor_handle); } void _apply_view_config() @@ -178,7 +178,7 @@ class Wm::Nitpicker::View : private Genode::Weak_object, ~View() { if (_real_handle.valid()) - _real_nitpicker.destroy_view(_real_handle); + _real_gui.destroy_view(_real_handle); } using Genode::Weak_object::weak_ptr; @@ -193,11 +193,11 @@ class Wm::Nitpicker::View : private Genode::Weak_object, _geometry = geometry; /* - * Propagate new size to real nitpicker view but + * Propagate new size to real GUI view but */ if (_real_handle.valid()) { _propagate_view_geometry(); - _real_nitpicker.execute(); + _real_gui.execute(); } } @@ -206,8 +206,8 @@ class Wm::Nitpicker::View : private Genode::Weak_object, _title = Title(title); if (_real_handle.valid()) { - _real_nitpicker.enqueue(_real_handle, title); - _real_nitpicker.execute(); + _real_gui.enqueue(_real_handle, title); + _real_gui.execute(); } } @@ -219,7 +219,7 @@ class Wm::Nitpicker::View : private Genode::Weak_object, View_capability real_view_cap() { - return _real_nitpicker.view_capability(_real_handle); + return _real_gui.view_capability(_real_handle); } void buffer_offset(Point buffer_offset) @@ -227,8 +227,8 @@ class Wm::Nitpicker::View : private Genode::Weak_object, _buffer_offset = buffer_offset; if (_real_handle.valid()) { - _real_nitpicker.enqueue(_real_handle, _buffer_offset); - _real_nitpicker.execute(); + _real_gui.enqueue(_real_handle, _buffer_offset); + _real_gui.execute(); } } @@ -236,8 +236,7 @@ class Wm::Nitpicker::View : private Genode::Weak_object, }; -class Wm::Nitpicker::Top_level_view : public View, - private List::Element +class Wm::Gui::Top_level_view : public View, private List::Element { private: @@ -260,17 +259,17 @@ class Wm::Nitpicker::Top_level_view : public View, Title _window_title { }; Session_label _session_label; - typedef Nitpicker::Session::Command Command; + using Command = Gui::Session::Command; public: - Top_level_view(Nitpicker::Session_client &real_nitpicker, + Top_level_view(Gui::Session_client &real_gui, Session_label const &session_label, bool has_alpha, Window_registry &window_registry, Input_origin_changed_handler &input_origin_changed_handler) : - View(real_nitpicker, session_label, has_alpha), + View(real_gui, session_label, has_alpha), _window_registry(window_registry), _input_origin_changed_handler(input_origin_changed_handler), _session_label(session_label) @@ -347,16 +346,16 @@ class Wm::Nitpicker::Top_level_view : public View, if (!_real_handle.valid()) { /* - * Create and configure physical nitpicker view. + * Create and configure physical GUI view. */ - _real_handle = _real_nitpicker.create_view(); + _real_handle = _real_gui.create_view(); - _real_nitpicker.enqueue(_real_handle, _buffer_offset); - _real_nitpicker.enqueue (_real_handle, _title.string()); - _real_nitpicker.execute(); + _real_gui.enqueue(_real_handle, _buffer_offset); + _real_gui.enqueue (_real_handle, _title.string()); + _real_gui.execute(); } - return _real_nitpicker.view_capability(_real_handle); + return _real_gui.view_capability(_real_handle); } void hidden(bool hidden) { _window_registry.hidden(_win_id, hidden); } @@ -371,8 +370,7 @@ class Wm::Nitpicker::Top_level_view : public View, }; -class Wm::Nitpicker::Child_view : public View, - private List::Element +class Wm::Gui::Child_view : public View, private List::Element { private: @@ -382,12 +380,12 @@ class Wm::Nitpicker::Child_view : public View, public: - Child_view(Nitpicker::Session_client &real_nitpicker, - Session_label const &session_label, - bool has_alpha, - Weak_ptr parent) + Child_view(Gui::Session_client &real_gui, + Session_label const &session_label, + bool has_alpha, + Weak_ptr parent) : - View(real_nitpicker, session_label, has_alpha), _parent(parent) + View(real_gui, session_label, has_alpha), _parent(parent) { try_to_init_real_view(); } @@ -401,7 +399,7 @@ class Wm::Nitpicker::Child_view : public View, void _propagate_view_geometry() override { - _real_nitpicker.enqueue(_real_handle, _geometry); + _real_gui.enqueue(_real_handle, _geometry); } void stack(Weak_ptr neighbor_ptr, bool behind) override @@ -436,13 +434,13 @@ class Wm::Nitpicker::Child_view : public View, if (!parent.valid()) return; - View_handle parent_handle = _real_nitpicker.view_handle(parent->real_view_cap()); + View_handle parent_handle = _real_gui.view_handle(parent->real_view_cap()); if (!parent_handle.valid()) return; - _real_handle = _real_nitpicker.create_view(parent_handle); + _real_handle = _real_gui.create_view(parent_handle); - _real_nitpicker.release_view_handle(parent_handle); + _real_gui.release_view_handle(parent_handle); if (_neighbor_ptr == _parent) _unsynchronized_apply_view_config(parent); @@ -457,28 +455,28 @@ class Wm::Nitpicker::Child_view : public View, }; -struct Wm::Nitpicker::Session_control_fn : Interface +struct Wm::Gui::Session_control_fn : Interface { virtual void session_control(char const *selector, Session::Session_control) = 0; }; -class Wm::Nitpicker::Session_component : public Rpc_object, - private List::Element, - private Input_origin_changed_handler +class Wm::Gui::Session_component : public Rpc_object, + private List::Element, + private Input_origin_changed_handler { private: friend class List; - typedef Nitpicker::Session::View_handle View_handle; + using View_handle = Gui::Session::View_handle; Genode::Env &_env; Session_label _session_label; Genode::Ram_allocator &_ram; - Nitpicker::Connection _session { _env, _session_label.string() }; + Gui::Connection _session { _env, _session_label.string() }; Window_registry &_window_registry; Session_control_fn &_session_control_fn; @@ -501,7 +499,7 @@ class Wm::Nitpicker::Session_component : public Rpc_object, /* * Command buffer */ - typedef Nitpicker::Session::Command_buffer Command_buffer; + using Command_buffer = Gui::Session::Command_buffer; Attached_ram_dataspace _command_ds { _ram, _env.rm(), sizeof(Command_buffer) }; @@ -518,8 +516,8 @@ class Wm::Nitpicker::Session_component : public Rpc_object, /* * Input */ - Input::Session_client _nitpicker_input { _env.rm(), _session.input_session() }; - Attached_dataspace _nitpicker_input_ds { _env.rm(), _nitpicker_input.dataspace() }; + Input::Session_client _gui_input { _env.rm(), _session.input_session() }; + Attached_dataspace _gui_input_ds { _env.rm(), _gui_input.dataspace() }; Signal_handler _input_handler { _env.ep(), *this, &Session_component::_handle_input }; @@ -569,13 +567,16 @@ class Wm::Nitpicker::Session_component : public Rpc_object, Point const input_origin = _input_origin(); Input::Event const * const events = - _nitpicker_input_ds.local_addr(); + _gui_input_ds.local_addr(); - while (_nitpicker_input.pending()) { + while (_gui_input.pending()) { - size_t const num_events = _nitpicker_input.flush(); + size_t const num_events = _gui_input.flush(); - /* we trust nitpicker to return a valid number of events */ + /* + * We trust the nitpicker GUI server to return a valid number + * of events. + */ for (size_t i = 0; i < num_events; i++) { @@ -788,7 +789,7 @@ class Wm::Nitpicker::Session_component : public Rpc_object, _click_handler(click_handler), _view_handle_registry(session_alloc) { - _nitpicker_input.sigh(_input_handler); + _gui_input.sigh(_input_handler); _input_session.event_queue().enabled(true); } @@ -886,14 +887,14 @@ class Wm::Nitpicker::Session_component : public Rpc_object, } /** - * Return session capability to real nitpicker session + * Return session capability to real GUI session */ Capability session() { return _session.rpc_cap(); } - /********************************* - ** Nitpicker session interface ** - *********************************/ + /*************************** + ** GUI session interface ** + ***************************/ Framebuffer::Session_capability framebuffer_session() override { @@ -985,7 +986,7 @@ class Wm::Nitpicker::Session_component : public Rpc_object, /* * If the first top-level view has a defined size, use it - * as the size of the virtualized nitpicker session. + * as the size of the virtualized GUI session. */ if (Top_level_view const *v = _top_level_views.first()) if (v->size().valid()) @@ -1017,19 +1018,18 @@ class Wm::Nitpicker::Session_component : public Rpc_object, { /* * We must not perform the 'buffer' operation on the connection - * object because the 'Nitpicker::Connection::buffer' - * implementation implicitly performs upgrade operations. + * object because the 'Gui::Connection::buffer' implementation + * implicitly performs upgrade operations. * * Here, we merely want to forward the buffer RPC call to the - * wrapped nitpicker session. Otherwise, we would perform - * session upgrades initiated by the wm client's buffer - * operation twice. + * wrapped GUI session. Otherwise, we would perform session + * upgrades initiated by the wm client's buffer operation twice. */ - Nitpicker::Session_client(_env.rm(), _session.cap()).buffer(mode, has_alpha); + Gui::Session_client(_env.rm(), _session.cap()).buffer(mode, has_alpha); _has_alpha = has_alpha; } - void focus(Genode::Capability) override { } + void focus(Genode::Capability) override { } void session_control(Label suffix, Session_control operation) override { @@ -1040,9 +1040,9 @@ class Wm::Nitpicker::Session_component : public Rpc_object, }; -class Wm::Nitpicker::Root : public Genode::Rpc_object >, - public Decorator_content_callback, - public Session_control_fn +class Wm::Gui::Root : public Genode::Rpc_object >, + public Decorator_content_callback, + public Session_control_fn { private: @@ -1077,13 +1077,13 @@ class Wm::Nitpicker::Root : public Genode::Rpc_object _sessions { }; - Layouter_nitpicker_session *_layouter_session = nullptr; + Layouter_gui_session *_layouter_session = nullptr; - List _decorator_sessions { }; + List _decorator_sessions { }; /** - * Nitpicker session used to perform session-control operations + * GUI session used to perform session-control operations */ - Nitpicker::Session &_focus_nitpicker_session; + Gui::Session &_focus_gui_session; public: @@ -1150,14 +1150,14 @@ class Wm::Nitpicker::Root : public Genode::Rpc_objectupgrade(args.string()); - Decorator_nitpicker_session *decorator_session = - dynamic_cast(session); + Decorator_gui_session *decorator_session = + dynamic_cast(session); if (decorator_session) decorator_session->upgrade(args.string()); - Direct_nitpicker_session *direct_session = - dynamic_cast(session); + Direct_gui_session *direct_session = + dynamic_cast(session); if (direct_session) direct_session->upgrade(args.string()); @@ -1292,8 +1292,8 @@ class Wm::Nitpicker::Root : public Genode::Rpc_object_env.ep().dissolve(*_layouter_session); _layouter_session = nullptr; return session; @@ -1366,11 +1366,10 @@ class Wm::Nitpicker::Root : public Genode::Rpc_objectcontent_geometry(id, rect); } - Capability lookup_nitpicker_session(unsigned win_id) + Capability lookup_gui_session(unsigned win_id) { for (Session_component *s = _sessions.first(); s; s = s->next()) if (s->has_win_id(win_id)) @@ -1440,4 +1439,4 @@ class Wm::Nitpicker::Root : public Genode::Rpc_object #include namespace Wm { - struct Layouter_nitpicker_session; - struct Layouter_nitpicker_service; + struct Layouter_gui_session; + struct Layouter_gui_service; } -struct Wm::Layouter_nitpicker_session : Genode::Rpc_object +struct Wm::Layouter_gui_session : Genode::Rpc_object { - typedef Nitpicker::View_capability View_capability; - typedef Nitpicker::Session::View_handle View_handle; + using View_capability = Gui::View_capability; + using View_handle = Gui::Session::View_handle; Input::Session_capability _input_session_cap; /* - * Nitpicker session solely used to supply the nitpicker mode to the - * layouter + * GUI session solely used to supply the GUI mode to the layouter */ - Nitpicker::Connection _mode_sigh_nitpicker; + Gui::Connection _mode_sigh_gui; Genode::Signal_context_capability _mode_sigh { }; Attached_ram_dataspace _command_ds; - Layouter_nitpicker_session(Genode::Env &env, - Input::Session_capability input_session_cap) + Layouter_gui_session(Genode::Env &env, + Input::Session_capability input_session_cap) : _input_session_cap(input_session_cap), - _mode_sigh_nitpicker(env), _command_ds(env.ram(), env.rm(), 4096) + _mode_sigh_gui(env), _command_ds(env.ram(), env.rm(), 4096) { } - /********************************* - ** Nitpicker session interface ** - *********************************/ + /*************************** + ** GUI session interface ** + ***************************/ Framebuffer::Session_capability framebuffer_session() override { @@ -86,7 +85,7 @@ struct Wm::Layouter_nitpicker_session : Genode::Rpc_object void execute() override { } - Framebuffer::Mode mode() override { return _mode_sigh_nitpicker.mode(); } + Framebuffer::Mode mode() override { return _mode_sigh_gui.mode(); } void mode_sigh(Genode::Signal_context_capability sigh) override { @@ -96,12 +95,12 @@ struct Wm::Layouter_nitpicker_session : Genode::Rpc_object */ _mode_sigh = sigh; - _mode_sigh_nitpicker.mode_sigh(sigh); + _mode_sigh_gui.mode_sigh(sigh); } void buffer(Framebuffer::Mode, bool) override { } - void focus(Genode::Capability) override { } + void focus(Genode::Capability) override { } }; -#endif /* _LAYOUTER_NITPICKER_H_ */ +#endif /* _LAYOUTER_GUI_H_ */ diff --git a/repos/gems/src/server/wm/main.cc b/repos/gems/src/server/wm/main.cc index 67aa5a3da5..285162a867 100644 --- a/repos/gems/src/server/wm/main.cc +++ b/repos/gems/src/server/wm/main.cc @@ -21,7 +21,7 @@ #include /* local includes */ -#include +#include #include #include @@ -60,12 +60,11 @@ struct Wm::Main Window_registry window_registry { heap, window_list_reporter }; - Nitpicker::Connection focus_nitpicker_session { env }; + Gui::Connection focus_gui_session { env }; - Nitpicker::Root nitpicker_root { env, window_registry, - heap, env.ram(), - pointer_reporter, focus_request_reporter, - focus_nitpicker_session }; + Gui::Root gui_root { env, window_registry, heap, env.ram(), + pointer_reporter, focus_request_reporter, + focus_gui_session }; void handle_focus_update() { @@ -80,10 +79,10 @@ struct Wm::Main .attribute("id").value(win_id); if (win_id) { - Nitpicker::Session_capability session_cap = - nitpicker_root.lookup_nitpicker_session(win_id); + Gui::Session_capability session_cap = + gui_root.lookup_gui_session(win_id); - focus_nitpicker_session.focus(session_cap); + focus_gui_session.focus(session_cap); } } catch (...) { } @@ -103,7 +102,7 @@ struct Wm::Main width = window.attribute_value("width", 0UL), height = window.attribute_value("height", 0UL); - nitpicker_root.request_resize(win_id, Area(width, height)); + gui_root.request_resize(win_id, Area(width, height)); }); } diff --git a/repos/gems/src/server/wm/report_forwarder.h b/repos/gems/src/server/wm/report_forwarder.h index 50c212ee0b..ddf90d1471 100644 --- a/repos/gems/src/server/wm/report_forwarder.h +++ b/repos/gems/src/server/wm/report_forwarder.h @@ -4,12 +4,13 @@ * \date 2019-02-18 * * This report service has the sole purpose of applying the same labeling - * policy to an application's shape report as done for the application's - * 'Nitpicker' session. This consistency is needed by the pointer to correlate - * the currently hovered nitpicker session with the reported shapes. - * Analogously, clipboard reports can be routed through the window - * manager to support the clipboard component with associating its clients - * with nitpicker's reported focus. + * policy to an application's shape report as done for the application's GUI + * session. This consistency is needed by the pointer to correlate the + * currently hovered GUI session with the reported shapes. + * + * Analogously, clipboard reports can be routed through the window manager to + * support the clipboard component with associating its clients with + * nitpicker's reported focus. */ /* diff --git a/repos/gems/src/server/wm/rom_forwarder.h b/repos/gems/src/server/wm/rom_forwarder.h index 5da945943b..b73c7d8513 100644 --- a/repos/gems/src/server/wm/rom_forwarder.h +++ b/repos/gems/src/server/wm/rom_forwarder.h @@ -5,7 +5,7 @@ * * This ROM service can be used as proxy for clipboard ROMs to ensure the * consistency of the client labels appearing at the clipboard component - * with the label of the currently focused nitpicker client. + * with the label of the currently focused GUI client. */ /* diff --git a/repos/libports/include/qt5/qnitpickerviewwidget/qnitpickerviewwidget.h b/repos/libports/include/qt5/qgenodeviewwidget/qgenodeviewwidget.h similarity index 68% rename from repos/libports/include/qt5/qnitpickerviewwidget/qnitpickerviewwidget.h rename to repos/libports/include/qt5/qgenodeviewwidget/qgenodeviewwidget.h index 948e1d97e6..d2a6b3704c 100644 --- a/repos/libports/include/qt5/qnitpickerviewwidget/qnitpickerviewwidget.h +++ b/repos/libports/include/qt5/qgenodeviewwidget/qgenodeviewwidget.h @@ -1,5 +1,5 @@ /* - * \brief A Qt Widget that shows a nitpicker view + * \brief A Qt Widget that shows a Genode GUI view * \author Christian Prochaska * \date 2010-08-26 */ @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef QNITPICKERVIEWWIDGET_H -#define QNITPICKERVIEWWIDGET_H +#ifndef QGENODEVIEWWIDGET_H +#define QGENODEVIEWWIDGET_H #include #if 0 @@ -63,14 +63,14 @@ protected: }; -class QNitpickerViewWidget : public QEmbeddedViewWidget +class QGenodeViewWidget : public QEmbeddedViewWidget { Q_OBJECT protected: - Nitpicker::Session_client *nitpicker; - Nitpicker::Session::View_handle view_handle; + Gui::Session_client *gui; + Gui::Session::View_handle view_handle; virtual void showEvent(QShowEvent *event); virtual void hideEvent(QHideEvent *event); @@ -79,11 +79,11 @@ protected: public: - QNitpickerViewWidget(QWidget *parent =0); - ~QNitpickerViewWidget(); - void setNitpickerView(Nitpicker::Session_client *nitpicker, - Nitpicker::Session::View_handle view_handle, - int buf_x, int buf_y, int w, int h); + QGenodeViewWidget(QWidget *parent =0); + ~QGenodeViewWidget(); + void setGenodeView(Gui::Session_client *gui, + Gui::Session::View_handle view_handle, + int buf_x, int buf_y, int w, int h); }; -#endif // QNITPICKERVIEWWIDGET_H +#endif // QGENODEVIEWWIDGET_H diff --git a/repos/libports/include/qt5/qpa_nitpicker/qnitpickerplatformwindow.h b/repos/libports/include/qt5/qpa_genode/qgenodeplatformwindow.h similarity index 67% rename from repos/libports/include/qt5/qpa_nitpicker/qnitpickerplatformwindow.h rename to repos/libports/include/qt5/qpa_genode/qgenodeplatformwindow.h index f44a4278e1..7a8047caf8 100644 --- a/repos/libports/include/qt5/qpa_nitpicker/qnitpickerplatformwindow.h +++ b/repos/libports/include/qt5/qpa_genode/qgenodeplatformwindow.h @@ -1,5 +1,5 @@ /* - * \brief QNitpickerPlatformWindow + * \brief QGenodePlatformWindow * \author Christian Prochaska * \author Christian Helmuth * \date 2013-05-08 @@ -13,8 +13,8 @@ */ -#ifndef _QNITPICKERPLATFORMWINDOW_H_ -#define _QNITPICKERPLATFORMWINDOW_H_ +#ifndef _QGENODEPLATFORMWINDOW_H_ +#define _QGENODEPLATFORMWINDOW_H_ /* Genode includes */ #include @@ -33,31 +33,31 @@ QT_BEGIN_NAMESPACE -class QNitpickerPlatformWindow : public QObject, public QPlatformWindow +class QGenodePlatformWindow : public QObject, public QPlatformWindow { Q_OBJECT private: - Genode::Env &_env; - QString _nitpicker_session_label; - static QStringList _nitpicker_session_label_list; - Nitpicker::Connection _nitpicker_session; - Framebuffer::Session_client _framebuffer_session; - unsigned char *_framebuffer; - bool _framebuffer_changed; - bool _geometry_changed; - Framebuffer::Mode _current_mode; - Nitpicker::Session::View_handle _view_handle; - Input::Session_client _input_session; - Genode::Attached_dataspace _ev_buf; - QPoint _mouse_position; - Qt::KeyboardModifiers _keyboard_modifiers; - Qt::MouseButtons _mouse_button_state; - QByteArray _title; - bool _resize_handle; - bool _decoration; - EGLSurface _egl_surface; + Genode::Env &_env; + QString _gui_session_label; + static QStringList _gui_session_label_list; + Gui::Connection _gui_session; + Framebuffer::Session_client _framebuffer_session; + unsigned char *_framebuffer; + bool _framebuffer_changed; + bool _geometry_changed; + Framebuffer::Mode _current_mode; + Gui::Session::View_handle _view_handle; + Input::Session_client _input_session; + Genode::Attached_dataspace _ev_buf; + QPoint _mouse_position; + Qt::KeyboardModifiers _keyboard_modifiers; + Qt::MouseButtons _mouse_button_state; + QByteArray _title; + bool _resize_handle; + bool _decoration; + EGLSurface _egl_surface; QPoint _local_position() const { @@ -82,8 +82,8 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow void _key_event(Input::Keycode, Codepoint, Mapped_key::Event); void _mouse_button_event(Input::Keycode, bool press); - Genode::Io_signal_handler _input_signal_handler; - Genode::Io_signal_handler _mode_changed_signal_handler; + Genode::Io_signal_handler _input_signal_handler; + Genode::Io_signal_handler _mode_changed_signal_handler; QVector _touch_points { 16 }; QTouchDevice *_touch_device; @@ -91,7 +91,7 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow void _process_touch_events(QList const &events); - Nitpicker::Session::View_handle _create_view(); + Gui::Session::View_handle _create_view(); void _adjust_and_set_geometry(const QRect &rect); QString _sanitize_label(QString label); @@ -114,10 +114,10 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow public: - QNitpickerPlatformWindow(Genode::Env &env, QWindow *window, - int screen_width, int screen_height); + QGenodePlatformWindow(Genode::Env &env, QWindow *window, + int screen_width, int screen_height); - ~QNitpickerPlatformWindow(); + ~QGenodePlatformWindow(); QSurfaceFormat format() const override; @@ -184,24 +184,24 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow bool frameStrutEventsEnabled() const override; - /* for QNitpickerWindowSurface */ + /* for QGenodeWindowSurface */ unsigned char *framebuffer(); void refresh(int x, int y, int w, int h); - /* for QNitpickerGLContext */ + /* for QGenodeGLContext */ EGLSurface egl_surface() const; void egl_surface(EGLSurface egl_surface); - /* for QNitpickerViewWidget */ + /* for QGenodeViewWidget */ - Nitpicker::Session_client &nitpicker(); - Nitpicker::View_capability view_cap() const; + Gui::Session_client &gui_session(); + Gui::View_capability view_cap() const; signals: @@ -211,4 +211,4 @@ class QNitpickerPlatformWindow : public QObject, public QPlatformWindow QT_END_NAMESPACE -#endif /* _QNITPICKERPLATFORMWINDOW_H_ */ +#endif /* _QGENODEPLATFORMWINDOW_H_ */ diff --git a/repos/libports/include/qt5/qpluginwidget/qpluginwidget.h b/repos/libports/include/qt5/qpluginwidget/qpluginwidget.h index f07f5b1a63..455540b0a0 100644 --- a/repos/libports/include/qt5/qpluginwidget/qpluginwidget.h +++ b/repos/libports/include/qt5/qpluginwidget/qpluginwidget.h @@ -1,5 +1,5 @@ /* - * \brief A Qt Widget that can load a plugin application and show its Nitpicker view + * \brief A Qt Widget that can load a plugin application and show its GUI view * \author Christian Prochaska * \date 2010-08-26 */ @@ -22,7 +22,7 @@ #include #include -#include +#include enum Plugin_loading_state { @@ -45,19 +45,19 @@ class PluginStarter : public QThread private: - Libc::Env *_env; - QUrl _plugin_url; - QByteArray _args; - int _max_width; - int _max_height; - Nitpicker::View_capability _parent_view; + Libc::Env *_env; + QUrl _plugin_url; + QByteArray _args; + int _max_width; + int _max_height; + Gui::View_capability _parent_view; - Loader::Connection *_pc; - enum Plugin_loading_state _plugin_loading_state; - QString _plugin_loading_error_string; + Loader::Connection *_pc; + enum Plugin_loading_state _plugin_loading_state; + QString _plugin_loading_error_string; - QNetworkAccessManager *_qnam; - QNetworkReply *_reply; + QNetworkAccessManager *_qnam; + QNetworkReply *_reply; void _start_plugin(QString &file_name, QByteArray const &file_buf); @@ -68,19 +68,19 @@ class PluginStarter : public QThread PluginStarter(Libc::Env *env, QUrl plugin_url, QString &args, int max_width, int max_height, - Nitpicker::View_capability parent_view); + Gui::View_capability parent_view); void run(); enum Plugin_loading_state plugin_loading_state() { return _plugin_loading_state; } QString &plugin_loading_error_string() { return _plugin_loading_error_string; } /** - * Requst size of the nitpicker view of the loaded subsystem + * Requst size of the Genode GUI view of the loaded subsystem */ Loader::Area view_size(); /** - * Set geometry of the nitpicker view of the loaded subsystem + * Set geometry of the Genode GUI view of the loaded subsystem */ void view_geometry(Loader::Rect rect, Loader::Point offset); diff --git a/repos/libports/lib/import/import-qt5_qnitpickerviewwidget.mk b/repos/libports/lib/import/import-qt5_qgenodeviewwidget.mk similarity index 66% rename from repos/libports/lib/import/import-qt5_qnitpickerviewwidget.mk rename to repos/libports/lib/import/import-qt5_qgenodeviewwidget.mk index 08f3235266..098c6682db 100644 --- a/repos/libports/lib/import/import-qt5_qnitpickerviewwidget.mk +++ b/repos/libports/lib/import/import-qt5_qgenodeviewwidget.mk @@ -1 +1 @@ -QT5_INC_DIR += $(realpath $(call select_from_repositories,include/qt5/qnitpickerviewwidget)/..) +QT5_INC_DIR += $(realpath $(call select_from_repositories,include/qt5/qgenodeviewwidget)/..) diff --git a/repos/libports/lib/import/import-qt5_qpa_nitpicker.mk b/repos/libports/lib/import/import-qt5_qpa_genode.mk similarity index 69% rename from repos/libports/lib/import/import-qt5_qpa_nitpicker.mk rename to repos/libports/lib/import/import-qt5_qpa_genode.mk index 632ee9b0b2..bbf676a03c 100644 --- a/repos/libports/lib/import/import-qt5_qpa_nitpicker.mk +++ b/repos/libports/lib/import/import-qt5_qpa_genode.mk @@ -3,9 +3,9 @@ IMPORT_QT5_INC=$(call select_from_repositories,lib/import/import-qt5.inc) include $(IMPORT_QT5_INC) ifeq ($(CONTRIB_DIR),) -INC_DIR += $(call select_from_repositories,include/qt5/qpa_nitpicker) \ +INC_DIR += $(call select_from_repositories,include/qt5/qpa_genode) \ $(call select_from_repositories,include/QtInputSupport/$(QT_VERSION)) else -INC_DIR += $(REP_DIR)/include/qt5/qpa_nitpicker \ +INC_DIR += $(REP_DIR)/include/qt5/qpa_genode \ $(QT5_PORT_DIR)/include/QtInputSupport/$(QT_VERSION) endif diff --git a/repos/libports/lib/import/import-qt5_qpluginwidget.mk b/repos/libports/lib/import/import-qt5_qpluginwidget.mk index d49f897d80..66ec3d615d 100644 --- a/repos/libports/lib/import/import-qt5_qpluginwidget.mk +++ b/repos/libports/lib/import/import-qt5_qpluginwidget.mk @@ -1,4 +1,4 @@ QT5_INC_DIR += $(realpath $(call select_from_repositories,include/qt5/qpluginwidget)/..) -# 'qpluginwidget.h' includes 'qnitpickerviewwidget.h' -include $(call select_from_repositories,lib/import/import-qt5_qnitpickerviewwidget.mk) +# 'qpluginwidget.h' includes 'qgenodeviewwidget.h' +include $(call select_from_repositories,lib/import/import-qt5_qgenodeviewwidget.mk) diff --git a/repos/libports/lib/mk/qt5_qgenodeviewwidget.mk b/repos/libports/lib/mk/qt5_qgenodeviewwidget.mk new file mode 100644 index 0000000000..431b7ec7db --- /dev/null +++ b/repos/libports/lib/mk/qt5_qgenodeviewwidget.mk @@ -0,0 +1,13 @@ +include $(call select_from_repositories,lib/import/import-qt5_qgenodeviewwidget.mk) + +SHARED_LIB = yes + +SRC_CC = qgenodeviewwidget.cpp \ + moc_qgenodeviewwidget.cpp + +vpath %.h $(call select_from_repositories,include/qt5/qgenodeviewwidget) +vpath %.cpp $(REP_DIR)/src/lib/qt5/qgenodeviewwidget + +LIBS += libc qoost qt5_core qt5_gui qt5_qpa_genode qt5_widgets + +CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qnitpickerviewwidget.mk b/repos/libports/lib/mk/qt5_qnitpickerviewwidget.mk deleted file mode 100644 index 4a8feb2f40..0000000000 --- a/repos/libports/lib/mk/qt5_qnitpickerviewwidget.mk +++ /dev/null @@ -1,13 +0,0 @@ -include $(call select_from_repositories,lib/import/import-qt5_qnitpickerviewwidget.mk) - -SHARED_LIB = yes - -SRC_CC = qnitpickerviewwidget.cpp \ - moc_qnitpickerviewwidget.cpp - -vpath %.h $(call select_from_repositories,include/qt5/qnitpickerviewwidget) -vpath %.cpp $(REP_DIR)/src/lib/qt5/qnitpickerviewwidget - -LIBS += libc qoost qt5_core qt5_gui qt5_qpa_nitpicker qt5_widgets - -CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qpa_nitpicker.mk b/repos/libports/lib/mk/qt5_qpa_genode.mk similarity index 77% rename from repos/libports/lib/mk/qt5_qpa_nitpicker.mk rename to repos/libports/lib/mk/qt5_qpa_genode.mk index b2b6cbacef..36a392cd86 100644 --- a/repos/libports/lib/mk/qt5_qpa_nitpicker.mk +++ b/repos/libports/lib/mk/qt5_qpa_genode.mk @@ -1,4 +1,4 @@ -include $(call select_from_repositories,lib/import/import-qt5_qpa_nitpicker.mk) +include $(call select_from_repositories,lib/import/import-qt5_qpa_genode.mk) SHARED_LIB = yes @@ -11,15 +11,15 @@ SRC_CC = qgenericunixeventdispatcher.cpp \ SRC_CC += main.cpp \ qgenodeclipboard.cpp \ - qnitpickercursor.cpp \ - qnitpickerglcontext.cpp \ - qnitpickerintegration.cpp \ - qnitpickerplatformwindow.cpp \ - qnitpickerwindowsurface.cpp \ + qgenodecursor.cpp \ + qgenodeglcontext.cpp \ + qgenodeintegration.cpp \ + qgenodeplatformwindow.cpp \ + qgenodewindowsurface.cpp \ moc_qgenodeclipboard.cpp \ - moc_qnitpickerplatformwindow.cpp \ - moc_qnitpickerwindowsurface.cpp \ - moc_qnitpickerintegrationplugin.cpp + moc_qgenodeplatformwindow.cpp \ + moc_qgenodewindowsurface.cpp \ + moc_qgenodeintegrationplugin.cpp ifeq ($(CONTRIB_DIR),) @@ -32,7 +32,7 @@ INC_DIR += $(call select_from_repositories,include/QtEglSupport/$(QT_VERSION)) \ $(call select_from_repositories,include/QtInputSupport/$(QT_VERSION)/QtInputSupport/private) vpath qunixeventdispatcher_qpa_p.h $(call select_from_repositories,include/QtEventDispatcherSupport/$(QT_VERSION)/QtEventDispatcherSupport/private) -vpath qnitpickerplatformwindow.h $(call select_from_repositories,include/qt5/qpa_nitpicker) +vpath qgenodeplatformwindow.h $(call select_from_repositories,include/qt5/qpa_genode) else @@ -41,7 +41,7 @@ INC_DIR += $(QT5_PORT_DIR)/include/QtEglSupport/$(QT_VERSION) \ $(QT5_PORT_DIR)/include/QtFontDatabaseSupport/$(QT_VERSION) \ $(QT5_PORT_DIR)/include/QtInputSupport/$(QT_VERSION) -vpath %.h $(REP_DIR)/include/qt5/qpa_nitpicker +vpath %.h $(REP_DIR)/include/qt5/qpa_genode endif @@ -50,6 +50,6 @@ LIBS += qt5_gui qt5_core qoost egl freetype libc vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eglconvenience vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/eventdispatchers vpath % $(QT5_CONTRIB_DIR)/qtbase/src/platformsupport/fontdatabases/freetype -vpath % $(REP_DIR)/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker +vpath % $(REP_DIR)/src/lib/qt5/qtbase/src/plugins/platforms/genode CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/mk/qt5_qpluginwidget.mk b/repos/libports/lib/mk/qt5_qpluginwidget.mk index d67063d47f..e7c2cac4af 100644 --- a/repos/libports/lib/mk/qt5_qpluginwidget.mk +++ b/repos/libports/lib/mk/qt5_qpluginwidget.mk @@ -8,6 +8,6 @@ SRC_CC = qpluginwidget.cpp \ vpath %.h $(call select_from_repositories,include/qt5/qpluginwidget) vpath %.cpp $(REP_DIR)/src/lib/qt5/qpluginwidget -LIBS += libc qoost qt5_core qt5_gui qt5_network qt5_qnitpickerviewwidget qt5_qpa_nitpicker qt5_widgets zlib +LIBS += libc qoost qt5_core qt5_gui qt5_network qt5_qgenodeviewwidget qt5_qpa_genode qt5_widgets zlib CC_CXX_WARN_STRICT = diff --git a/repos/libports/lib/symbols/qt5_qgenodeviewwidget b/repos/libports/lib/symbols/qt5_qgenodeviewwidget new file mode 100644 index 0000000000..6824448b50 --- /dev/null +++ b/repos/libports/lib/symbols/qt5_qgenodeviewwidget @@ -0,0 +1,30 @@ +_ZN17QGenodeViewWidget10paintEventEP11QPaintEvent T +_ZN17QGenodeViewWidget11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN17QGenodeViewWidget11qt_metacastEPKc T +_ZN17QGenodeViewWidget12focusInEventEP11QFocusEvent T +_ZN17QGenodeViewWidget13setGenodeViewEPN3Gui14Session_clientEN6Genode6HandleINS0_4ViewEEEiiii T +_ZN17QGenodeViewWidget16staticMetaObjectE D 48 +_ZN17QGenodeViewWidget9hideEventEP10QHideEvent T +_ZN17QGenodeViewWidget9showEventEP10QShowEvent T +_ZN17QGenodeViewWidgetC1EP7QWidget T +_ZN17QGenodeViewWidgetC2EP7QWidget T +_ZN17QGenodeViewWidgetD0Ev T +_ZN17QGenodeViewWidgetD1Ev T +_ZN17QGenodeViewWidgetD2Ev T +_ZN19QEmbeddedViewWidget11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN19QEmbeddedViewWidget11qt_metacastEPKc T +_ZN19QEmbeddedViewWidget12valueChangedEv T +_ZN19QEmbeddedViewWidget16staticMetaObjectE D 48 +_ZN19QEmbeddedViewWidget19_calc_view_geometryEv T +_ZN19QEmbeddedViewWidget9destroyedEP7QObject T +_ZN19QEmbeddedViewWidgetC1EP7QWidget T +_ZN19QEmbeddedViewWidgetC2EP7QWidget T +_ZN19QEmbeddedViewWidgetD0Ev T +_ZN19QEmbeddedViewWidgetD1Ev T +_ZN19QEmbeddedViewWidgetD2Ev T +_ZNK17QGenodeViewWidget10metaObjectEv T +_ZNK19QEmbeddedViewWidget10metaObjectEv T +_ZThn16_N17QGenodeViewWidgetD0Ev T +_ZThn16_N17QGenodeViewWidgetD1Ev T +_ZThn16_N19QEmbeddedViewWidgetD0Ev T +_ZThn16_N19QEmbeddedViewWidgetD1Ev T diff --git a/repos/libports/lib/symbols/qt5_qnitpickerviewwidget b/repos/libports/lib/symbols/qt5_qnitpickerviewwidget deleted file mode 100644 index 63825a036b..0000000000 --- a/repos/libports/lib/symbols/qt5_qnitpickerviewwidget +++ /dev/null @@ -1,30 +0,0 @@ -_ZN19QEmbeddedViewWidget11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN19QEmbeddedViewWidget11qt_metacastEPKc T -_ZN19QEmbeddedViewWidget12valueChangedEv T -_ZN19QEmbeddedViewWidget16staticMetaObjectE D 48 -_ZN19QEmbeddedViewWidget19_calc_view_geometryEv T -_ZN19QEmbeddedViewWidget9destroyedEP7QObject T -_ZN19QEmbeddedViewWidgetC1EP7QWidget T -_ZN19QEmbeddedViewWidgetC2EP7QWidget T -_ZN19QEmbeddedViewWidgetD0Ev T -_ZN19QEmbeddedViewWidgetD1Ev T -_ZN19QEmbeddedViewWidgetD2Ev T -_ZN20QNitpickerViewWidget10paintEventEP11QPaintEvent T -_ZN20QNitpickerViewWidget11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN20QNitpickerViewWidget11qt_metacastEPKc T -_ZN20QNitpickerViewWidget12focusInEventEP11QFocusEvent T -_ZN20QNitpickerViewWidget16setNitpickerViewEPN9Nitpicker14Session_clientEN6Genode6HandleINS0_4ViewEEEiiii T -_ZN20QNitpickerViewWidget16staticMetaObjectE D 48 -_ZN20QNitpickerViewWidget9hideEventEP10QHideEvent T -_ZN20QNitpickerViewWidget9showEventEP10QShowEvent T -_ZN20QNitpickerViewWidgetC1EP7QWidget T -_ZN20QNitpickerViewWidgetC2EP7QWidget T -_ZN20QNitpickerViewWidgetD0Ev T -_ZN20QNitpickerViewWidgetD1Ev T -_ZN20QNitpickerViewWidgetD2Ev T -_ZNK19QEmbeddedViewWidget10metaObjectEv T -_ZNK20QNitpickerViewWidget10metaObjectEv T -_ZThn16_N19QEmbeddedViewWidgetD0Ev T -_ZThn16_N19QEmbeddedViewWidgetD1Ev T -_ZThn16_N20QNitpickerViewWidgetD0Ev T -_ZThn16_N20QNitpickerViewWidgetD1Ev T diff --git a/repos/libports/lib/symbols/qt5_qpa_genode b/repos/libports/lib/symbols/qt5_qpa_genode new file mode 100644 index 0000000000..d52263cbca --- /dev/null +++ b/repos/libports/lib/symbols/qt5_qpa_genode @@ -0,0 +1,283 @@ +_Z14qt_getFreetypev T +_Z16q_printEglConfigPvS_ T +_Z17initialize_qt_guiRN6Genode3EnvE T +_Z17q_hasEglExtensionPvPKc T +_Z18q_screenSizeFromFbi T +_Z18qt_getFreetypeDatav T +_Z19q_refreshRateFromFbi T +_Z19q_screenDepthFromFbi T +_Z20q_configFromGLFormatPvRK14QSurfaceFormatbi T +_Z20q_glFormatFromConfigPvS_RK14QSurfaceFormat T +_Z24q_reduceConfigAttributesP7QVectorIiE T +_Z26q_physicalScreenSizeFromFbiRK5QSize T +_Z34q_createConfigAttributesFromFormatRK14QSurfaceFormat T +_Z41qt_static_plugin_QGenodeIntegrationPluginv T +_ZN13QFontEngineFT11boundingBoxERK12QGlyphLayout T +_ZN13QFontEngineFT11boundingBoxEj T +_ZN13QFontEngineFT11boundingBoxEjRK10QTransform T +_ZN13QFontEngineFT12loadGlyphForEj6QFixedN11QFontEngine11GlyphFormatERK10QTransformbb T +_ZN13QFontEngineFT12loadGlyphSetERK10QTransform T +_ZN13QFontEngineFT14bitmapForGlyphEj6QFixedRK10QTransform T +_ZN13QFontEngineFT15addGlyphsToPathEPjP11QFixedPointiP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE T +_ZN13QFontEngineFT16addOutlineToPathEddRK12QGlyphLayoutP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE T +_ZN13QFontEngineFT16alphaMapForGlyphEj6QFixed T +_ZN13QFontEngineFT16alphaMapForGlyphEj6QFixedRK10QTransform T +_ZN13QFontEngineFT16getUnscaledGlyphEjP12QPainterPathP15glyph_metrics_t T +_ZN13QFontEngineFT17getPointInOutlineEjijP6QFixedS1_Pj T +_ZN13QFontEngineFT18initFromFontEngineEPKS_ T +_ZN13QFontEngineFT19alphaMapBoundingBoxEj6QFixedRK10QTransformN11QFontEngine11GlyphFormatE T +_ZN13QFontEngineFT19alphaRGBMapForGlyphEj6QFixedRK10QTransform T +_ZN13QFontEngineFT19setDefaultHintStyleEN11QFontEngine9HintStyleE T +_ZN13QFontEngineFT20removeGlyphFromCacheEj T +_ZN13QFontEngineFT21setQtDefaultHintStyleEN5QFont17HintingPreferenceE T +_ZN13QFontEngineFT22lockedAlphaMapForGlyphEj6QFixedN11QFontEngine11GlyphFormatERK10QTransformP6QPoint T +_ZN13QFontEngineFT22unlockAlphaMapForGlyphEv T +_ZN13QFontEngineFT4initEN11QFontEngine6FaceIdEbNS0_11GlyphFormatEP13QFreetypeFace T +_ZN13QFontEngineFT4initEN11QFontEngine6FaceIdEbNS0_11GlyphFormatERK10QByteArray T +_ZN13QFontEngineFT5GlyphD1Ev T +_ZN13QFontEngineFT5GlyphD2Ev T +_ZN13QFontEngineFT6createERK10QByteArraydN5QFont17HintingPreferenceE T +_ZN13QFontEngineFT6createERK8QFontDefN11QFontEngine6FaceIdERK10QByteArray T +_ZN13QFontEngineFT9QGlyphSet20removeGlyphFromCacheEj6QFixed T +_ZN13QFontEngineFT9QGlyphSet5clearEv T +_ZN13QFontEngineFT9QGlyphSet8setGlyphEj6QFixedPNS_5GlyphE T +_ZN13QFontEngineFT9QGlyphSetC1Ev T +_ZN13QFontEngineFT9QGlyphSetC2Ev T +_ZN13QFontEngineFT9QGlyphSetD1Ev T +_ZN13QFontEngineFT9QGlyphSetD2Ev T +_ZN13QFontEngineFTC1ERK8QFontDef T +_ZN13QFontEngineFTC2ERK8QFontDef T +_ZN13QFontEngineFTD0Ev T +_ZN13QFontEngineFTD1Ev T +_ZN13QFontEngineFTD2Ev T +_ZN13QFreetypeFace11computeSizeERK8QFontDefPiS3_PbP6QFixed T +_ZN13QFreetypeFace14addGlyphToPathEP11FT_FaceRec_P16FT_GlyphSlotRec_RK11QFixedPointP12QPainterPathll T +_ZN13QFreetypeFace15addBitmapToPathEP16FT_GlyphSlotRec_RK11QFixedPointP12QPainterPath T +_ZN13QFreetypeFace17getPointInOutlineEjijP6QFixedS1_Pj T +_ZN13QFreetypeFace7cleanupEv T +_ZN13QFreetypeFace7getFaceERKN11QFontEngine6FaceIdERK10QByteArray T +_ZN13QFreetypeFace7releaseERKN11QFontEngine6FaceIdE T +_ZN13QGenodeCursor12changeCursorEP7QCursorP7QWindow T +_ZN13QGenodeCursorC1ERN6Genode3EnvE T +_ZN13QGenodeCursorC2ERN6Genode3EnvE T +_ZN14QtFreetypeDataD1Ev T +_ZN14QtFreetypeDataD2Ev T +_ZN16QGenodeClipboard11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN16QGenodeClipboard11qt_metacastEPKc T +_ZN16QGenodeClipboard11setMimeDataEP9QMimeDataN10QClipboard4ModeE T +_ZN16QGenodeClipboard16staticMetaObjectE D 48 +_ZN16QGenodeClipboard17_handle_clipboardEv T +_ZN16QGenodeClipboard18_clipboard_changedEv T +_ZN16QGenodeClipboard8mimeDataEN10QClipboard4ModeE T +_ZN16QGenodeClipboardC1ERN6Genode3EnvE T +_ZN16QGenodeClipboardC2ERN6Genode3EnvE T +_ZN16QGenodeClipboardD0Ev T +_ZN16QGenodeClipboardD1Ev T +_ZN16QGenodeClipboardD2Ev T +_ZN16QGenodeGLContext11doneCurrentEv T +_ZN16QGenodeGLContext11makeCurrentEP16QPlatformSurface T +_ZN16QGenodeGLContext11swapBuffersEP16QPlatformSurface T +_ZN16QGenodeGLContext14getProcAddressEPKc T +_ZN16QGenodeGLContextC1EP14QOpenGLContext T +_ZN16QGenodeGLContextC2EP14QOpenGLContext T +_ZN17QEglConfigChooser12chooseConfigEv T +_ZN17QEglConfigChooserC1EPv T +_ZN17QEglConfigChooserC2EPv T +_ZN17QEglConfigChooserD0Ev T +_ZN17QEglConfigChooserD1Ev T +_ZN17QEglConfigChooserD2Ev T +_ZN18QGenodeIntegration10initializeEv T +_ZN18QGenodeIntegrationC1ERN6Genode3EnvE T +_ZN18QGenodeIntegrationC2ERN6Genode3EnvE T +_ZN20QGenodeWindowSurface11paintDeviceEv T +_ZN20QGenodeWindowSurface11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN20QGenodeWindowSurface11qt_metacastEPKc T +_ZN20QGenodeWindowSurface16staticMetaObjectE D 48 +_ZN20QGenodeWindowSurface19framebuffer_changedEv T +_ZN20QGenodeWindowSurface5flushEP7QWindowRK7QRegionRK6QPoint T +_ZN20QGenodeWindowSurface6resizeERK5QSizeRK7QRegion T +_ZN20QGenodeWindowSurfaceC1EP7QWindow T +_ZN20QGenodeWindowSurfaceC2EP7QWindow T +_ZN20QGenodeWindowSurfaceD0Ev T +_ZN20QGenodeWindowSurfaceD1Ev T +_ZN20QGenodeWindowSurfaceD2Ev T +_ZN21QFreeTypeFontDatabase10fontEngineERK10QByteArraydN5QFont17HintingPreferenceE T +_ZN21QFreeTypeFontDatabase10fontEngineERK8QFontDefPv T +_ZN21QFreeTypeFontDatabase13releaseHandleEPv T +_ZN21QFreeTypeFontDatabase18addApplicationFontERK10QByteArrayRK7QString T +_ZN21QFreeTypeFontDatabase20populateFontDatabaseEv T +_ZN21QFreeTypeFontDatabase9addTTFileERK10QByteArrayS2_ T +_ZN21QGenodePlatformWindow10_key_eventEN5Input7KeycodeEN6Genode9CodepointENS_10Mapped_key5EventE T +_ZN21QGenodePlatformWindow10setOpacityEd T +_ZN21QGenodePlatformWindow10setVisibleEb T +_ZN21QGenodePlatformWindow11egl_surfaceEPv T +_ZN21QGenodePlatformWindow11framebufferEv T +_ZN21QGenodePlatformWindow11gui_sessionEv T +_ZN21QGenodePlatformWindow11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN21QGenodePlatformWindow11qt_metacastEPKc T +_ZN21QGenodePlatformWindow11setGeometryERK5QRect T +_ZN21QGenodePlatformWindow11windowEventEP6QEvent T +_ZN21QGenodePlatformWindow12_create_viewEv T +_ZN21QGenodePlatformWindow13_handle_inputEv T +_ZN21QGenodePlatformWindow13_mode_changedEv T +_ZN21QGenodePlatformWindow13setWindowIconERK5QIcon T +_ZN21QGenodePlatformWindow14setWindowFlagsE6QFlagsIN2Qt10WindowTypeEE T +_ZN21QGenodePlatformWindow14setWindowStateE6QFlagsIN2Qt11WindowStateEE T +_ZN21QGenodePlatformWindow14setWindowTitleERK7QString T +_ZN21QGenodePlatformWindow15_sanitize_labelE7QString T +_ZN21QGenodePlatformWindow16staticMetaObjectE D 48 +_ZN21QGenodePlatformWindow17setWindowFilePathERK7QString T +_ZN21QGenodePlatformWindow17setWindowModifiedEb T +_ZN21QGenodePlatformWindow17startSystemResizeERK6QPointN2Qt6CornerE T +_ZN21QGenodePlatformWindow18_init_touch_deviceEv T +_ZN21QGenodePlatformWindow18propagateSizeHintsEv T +_ZN21QGenodePlatformWindow19_mouse_button_eventEN5Input7KeycodeEb T +_ZN21QGenodePlatformWindow19framebuffer_changedEv T +_ZN21QGenodePlatformWindow19setMouseGrabEnabledEb T +_ZN21QGenodePlatformWindow20_handle_mode_changedEv T +_ZN21QGenodePlatformWindow21_process_touch_eventsERK5QListIN5Input5EventEE T +_ZN21QGenodePlatformWindow21requestActivateWindowEv T +_ZN21QGenodePlatformWindow22setKeyboardGrabEnabledEb T +_ZN21QGenodePlatformWindow23_gui_session_label_listE B 8 +_ZN21QGenodePlatformWindow24_adjust_and_set_geometryERK5QRect T +_ZN21QGenodePlatformWindow26setFrameStrutEventsEnabledEb T +_ZN21QGenodePlatformWindow30handleContentOrientationChangeEN2Qt17ScreenOrientationE T +_ZN21QGenodePlatformWindow5lowerEv T +_ZN21QGenodePlatformWindow5raiseEv T +_ZN21QGenodePlatformWindow6_inputEv T +_ZN21QGenodePlatformWindow7refreshEiiii T +_ZN21QGenodePlatformWindow7setMaskERK7QRegion T +_ZN21QGenodePlatformWindow8_map_keyEN5Input7KeycodeEN6Genode9CodepointENS_10Mapped_key5EventE T +_ZN21QGenodePlatformWindow9setParentEPK15QPlatformWindow T +_ZN21QGenodePlatformWindowC1ERN6Genode3EnvEP7QWindowii T +_ZN21QGenodePlatformWindowC2ERN6Genode3EnvEP7QWindowii T +_ZN21QGenodePlatformWindowD0Ev T +_ZN21QGenodePlatformWindowD1Ev T +_ZN21QGenodePlatformWindowD2Ev T +_ZN23QUnixEventDispatcherQPA11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN23QUnixEventDispatcherQPA11qt_metacastEPKc T +_ZN23QUnixEventDispatcherQPA13processEventsE6QFlagsIN10QEventLoop17ProcessEventsFlagEE T +_ZN23QUnixEventDispatcherQPA16hasPendingEventsEv T +_ZN23QUnixEventDispatcherQPA16staticMetaObjectE D 48 +_ZN23QUnixEventDispatcherQPA5flushEv T +_ZN23QUnixEventDispatcherQPAC1EP7QObject T +_ZN23QUnixEventDispatcherQPAC2EP7QObject T +_ZN23QUnixEventDispatcherQPAD0Ev T +_ZN23QUnixEventDispatcherQPAD1Ev T +_ZN23QUnixEventDispatcherQPAD2Ev T +_ZN23QtGenericUnixDispatcher25createUnixEventDispatcherEv T +_ZN24QGenodeIntegrationPlugin11qt_metacallEN11QMetaObject4CallEiPPv T +_ZN24QGenodeIntegrationPlugin11qt_metacastEPKc T +_ZN24QGenodeIntegrationPlugin16staticMetaObjectE D 48 +_ZN24QGenodeIntegrationPlugin4_envE B 8 +_ZN24QGenodeIntegrationPlugin6createERK7QStringRK11QStringList T +_ZNK13QFontEngineFT10glyphCountEv T +_ZNK13QFontEngineFT10glyphIndexEj T +_ZNK13QFontEngineFT10propertiesEv T +_ZNK13QFontEngineFT10unlockFaceEv T +_ZNK13QFontEngineFT11synthesizedEv T +_ZNK13QFontEngineFT12emSquareSizeEv T +_ZNK13QFontEngineFT12maxCharWidthEv T +_ZNK13QFontEngineFT12stringToCMapEPK5QChariP12QGlyphLayoutPi6QFlagsIN11QFontEngine10ShaperFlagEE T +_ZNK13QFontEngineFT13cloneWithSizeEd T +_ZNK13QFontEngineFT13lineThicknessEv T +_ZNK13QFontEngineFT14recalcAdvancesEP12QGlyphLayout6QFlagsIN11QFontEngine10ShaperFlagEE T +_ZNK13QFontEngineFT15non_locked_faceEv T +_ZNK13QFontEngineFT16averageCharWidthEv T +_ZNK13QFontEngineFT16getSfntTableDataEjPhPj T +_ZNK13QFontEngineFT17underlinePositionEv T +_ZNK13QFontEngineFT19scaledBitmapMetricsE6QFixed T +_ZNK13QFontEngineFT19scaledBitmapMetricsERK15glyph_metrics_tRK10QTransform T +_ZNK13QFontEngineFT22shouldUseDesignMetricsE6QFlagsIN11QFontEngine10ShaperFlagEE T +_ZNK13QFontEngineFT22supportsTransformationERK10QTransform T +_ZNK13QFontEngineFT29expectsGammaCorrectedBlendingEv T +_ZNK13QFontEngineFT6ascentEv T +_ZNK13QFontEngineFT6faceIdEv T +_ZNK13QFontEngineFT6handleEv T +_ZNK13QFontEngineFT7descentEv T +_ZNK13QFontEngineFT7leadingEv T +_ZNK13QFontEngineFT7xHeightEv T +_ZNK13QFontEngineFT8lockFaceENS_7ScalingE T +_ZNK13QFontEngineFT9capHeightEv T +_ZNK13QFontEngineFT9doKerningEP12QGlyphLayout6QFlagsIN11QFontEngine10ShaperFlagEE T +_ZNK13QFontEngineFT9loadFlagsEPNS_9QGlyphSetEN11QFontEngine11GlyphFormatEiRbRi T +_ZNK13QFontEngineFT9loadGlyphEPNS_9QGlyphSetEj6QFixedN11QFontEngine11GlyphFormatEbb T +_ZNK13QFreetypeFace10propertiesEv T +_ZNK13QFreetypeFace12getSfntTableEjPhPj T +_ZNK13QFreetypeFace16isScalableBitmapEv T +_ZNK13QFreetypeFace6fsTypeEv T +_ZNK16QGenodeClipboard10metaObjectEv T +_ZNK16QGenodeGLContext6formatEv T +_ZNK17QEglConfigChooser12filterConfigEPv T +_ZNK18QGenodeIntegration12fontDatabaseEv T +_ZNK18QGenodeIntegration12inputContextEv T +_ZNK18QGenodeIntegration13hasCapabilityEN20QPlatformIntegration10CapabilityE T +_ZNK18QGenodeIntegration20createPlatformWindowEP7QWindow T +_ZNK18QGenodeIntegration21createEventDispatcherEv T +_ZNK18QGenodeIntegration26createPlatformBackingStoreEP7QWindow T +_ZNK18QGenodeIntegration27createPlatformOpenGLContextEP14QOpenGLContext T +_ZNK18QGenodeIntegration9clipboardEv T +_ZNK20QGenodeWindowSurface10metaObjectEv T +_ZNK21QGenodePlatformWindow10isEmbeddedEv T +_ZNK21QGenodePlatformWindow10metaObjectEv T +_ZNK21QGenodePlatformWindow11egl_surfaceEv T +_ZNK21QGenodePlatformWindow11mapToGlobalERK6QPoint T +_ZNK21QGenodePlatformWindow12frameMarginsEv T +_ZNK21QGenodePlatformWindow13mapFromGlobalERK6QPoint T +_ZNK21QGenodePlatformWindow16devicePixelRatioEv T +_ZNK21QGenodePlatformWindow23frameStrutEventsEnabledEv T +_ZNK21QGenodePlatformWindow5winIdEv T +_ZNK21QGenodePlatformWindow6formatEv T +_ZNK21QGenodePlatformWindow8geometryEv T +_ZNK21QGenodePlatformWindow8isActiveEv T +_ZNK21QGenodePlatformWindow8view_capEv T +_ZNK21QGenodePlatformWindow9isExposedEv T +_ZNK23QUnixEventDispatcherQPA10metaObjectEv T +_ZNK24QGenodeIntegrationPlugin10metaObjectEv T +_ZNK24QGenodeIntegrationPlugin4keysEv T +_ZThn16_N16QGenodeClipboard11setMimeDataEP9QMimeDataN10QClipboard4ModeE T +_ZThn16_N16QGenodeClipboard8mimeDataEN10QClipboard4ModeE T +_ZThn16_N16QGenodeClipboardD0Ev T +_ZThn16_N16QGenodeClipboardD1Ev T +_ZThn16_N20QGenodeWindowSurface11paintDeviceEv T +_ZThn16_N20QGenodeWindowSurface5flushEP7QWindowRK7QRegionRK6QPoint T +_ZThn16_N20QGenodeWindowSurface6resizeERK5QSizeRK7QRegion T +_ZThn16_N20QGenodeWindowSurfaceD0Ev T +_ZThn16_N20QGenodeWindowSurfaceD1Ev T +_ZThn16_N21QGenodePlatformWindow10setOpacityEd T +_ZThn16_N21QGenodePlatformWindow10setVisibleEb T +_ZThn16_N21QGenodePlatformWindow11setGeometryERK5QRect T +_ZThn16_N21QGenodePlatformWindow11windowEventEP6QEvent T +_ZThn16_N21QGenodePlatformWindow13setWindowIconERK5QIcon T +_ZThn16_N21QGenodePlatformWindow14setWindowFlagsE6QFlagsIN2Qt10WindowTypeEE T +_ZThn16_N21QGenodePlatformWindow14setWindowStateE6QFlagsIN2Qt11WindowStateEE T +_ZThn16_N21QGenodePlatformWindow14setWindowTitleERK7QString T +_ZThn16_N21QGenodePlatformWindow17setWindowFilePathERK7QString T +_ZThn16_N21QGenodePlatformWindow17setWindowModifiedEb T +_ZThn16_N21QGenodePlatformWindow17startSystemResizeERK6QPointN2Qt6CornerE T +_ZThn16_N21QGenodePlatformWindow18propagateSizeHintsEv T +_ZThn16_N21QGenodePlatformWindow19setMouseGrabEnabledEb T +_ZThn16_N21QGenodePlatformWindow21requestActivateWindowEv T +_ZThn16_N21QGenodePlatformWindow22setKeyboardGrabEnabledEb T +_ZThn16_N21QGenodePlatformWindow26setFrameStrutEventsEnabledEb T +_ZThn16_N21QGenodePlatformWindow30handleContentOrientationChangeEN2Qt17ScreenOrientationE T +_ZThn16_N21QGenodePlatformWindow5lowerEv T +_ZThn16_N21QGenodePlatformWindow5raiseEv T +_ZThn16_N21QGenodePlatformWindow7setMaskERK7QRegion T +_ZThn16_N21QGenodePlatformWindow9setParentEPK15QPlatformWindow T +_ZThn16_N21QGenodePlatformWindowD0Ev T +_ZThn16_N21QGenodePlatformWindowD1Ev T +_ZThn16_NK21QGenodePlatformWindow10isEmbeddedEv T +_ZThn16_NK21QGenodePlatformWindow11mapToGlobalERK6QPoint T +_ZThn16_NK21QGenodePlatformWindow12frameMarginsEv T +_ZThn16_NK21QGenodePlatformWindow13mapFromGlobalERK6QPoint T +_ZThn16_NK21QGenodePlatformWindow16devicePixelRatioEv T +_ZThn16_NK21QGenodePlatformWindow23frameStrutEventsEnabledEv T +_ZThn16_NK21QGenodePlatformWindow5winIdEv T +_ZThn16_NK21QGenodePlatformWindow6formatEv T +_ZThn16_NK21QGenodePlatformWindow8geometryEv T +_ZThn16_NK21QGenodePlatformWindow8isActiveEv T +_ZThn16_NK21QGenodePlatformWindow9isExposedEv T + +# manually added typeinfo and vtable symbols +_ZTI21QGenodePlatformWindow V diff --git a/repos/libports/lib/symbols/qt5_qpa_nitpicker b/repos/libports/lib/symbols/qt5_qpa_nitpicker deleted file mode 100644 index 09f6d484f2..0000000000 --- a/repos/libports/lib/symbols/qt5_qpa_nitpicker +++ /dev/null @@ -1,292 +0,0 @@ -_Z11qLcEvdevKeyv T -_Z14qLcEvdevKeyMapv T -_Z14qt_getFreetypev T -_Z16q_printEglConfigPvS_ T -_Z17initialize_qt_guiRN6Genode3EnvE T -_Z17q_hasEglExtensionPvPKc T -_Z18q_screenSizeFromFbi T -_Z18qt_getFreetypeDatav T -_Z19q_refreshRateFromFbi T -_Z19q_screenDepthFromFbi T -_Z20q_configFromGLFormatPvRK14QSurfaceFormatbi T -_Z20q_glFormatFromConfigPvS_RK14QSurfaceFormat T -_Z24q_reduceConfigAttributesP7QVectorIiE T -_Z25createUnixEventDispatcherv T -_Z26q_physicalScreenSizeFromFbiRK5QSize T -_Z34q_createConfigAttributesFromFormatRK14QSurfaceFormat T -_Z44qt_static_plugin_QNitpickerIntegrationPluginv T -_ZN12QFdContainer5resetEv T -_ZN13QFontEngineFT11boundingBoxERK12QGlyphLayout T -_ZN13QFontEngineFT11boundingBoxEj T -_ZN13QFontEngineFT11boundingBoxEjRK10QTransform T -_ZN13QFontEngineFT12loadGlyphForEj6QFixedN11QFontEngine11GlyphFormatERK10QTransformbb T -_ZN13QFontEngineFT12loadGlyphSetERK10QTransform T -_ZN13QFontEngineFT14bitmapForGlyphEj6QFixedRK10QTransform T -_ZN13QFontEngineFT15addGlyphsToPathEPjP11QFixedPointiP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE T -_ZN13QFontEngineFT16addOutlineToPathEddRK12QGlyphLayoutP12QPainterPath6QFlagsIN9QTextItem10RenderFlagEE T -_ZN13QFontEngineFT16alphaMapForGlyphEj6QFixed T -_ZN13QFontEngineFT16alphaMapForGlyphEj6QFixedRK10QTransform T -_ZN13QFontEngineFT16getUnscaledGlyphEjP12QPainterPathP15glyph_metrics_t T -_ZN13QFontEngineFT17getPointInOutlineEjijP6QFixedS1_Pj T -_ZN13QFontEngineFT18initFromFontEngineEPKS_ T -_ZN13QFontEngineFT19alphaMapBoundingBoxEj6QFixedRK10QTransformN11QFontEngine11GlyphFormatE T -_ZN13QFontEngineFT19alphaRGBMapForGlyphEj6QFixedRK10QTransform T -_ZN13QFontEngineFT19setDefaultHintStyleEN11QFontEngine9HintStyleE T -_ZN13QFontEngineFT20removeGlyphFromCacheEj T -_ZN13QFontEngineFT21setQtDefaultHintStyleEN5QFont17HintingPreferenceE T -_ZN13QFontEngineFT22lockedAlphaMapForGlyphEj6QFixedN11QFontEngine11GlyphFormatERK10QTransformP6QPoint T -_ZN13QFontEngineFT22unlockAlphaMapForGlyphEv T -_ZN13QFontEngineFT4initEN11QFontEngine6FaceIdEbNS0_11GlyphFormatEP13QFreetypeFace T -_ZN13QFontEngineFT4initEN11QFontEngine6FaceIdEbNS0_11GlyphFormatERK10QByteArray T -_ZN13QFontEngineFT5GlyphD1Ev T -_ZN13QFontEngineFT5GlyphD2Ev T -_ZN13QFontEngineFT9QGlyphSet20removeGlyphFromCacheEj6QFixed T -_ZN13QFontEngineFT9QGlyphSet5clearEv T -_ZN13QFontEngineFT9QGlyphSet8setGlyphEj6QFixedPNS_5GlyphE T -_ZN13QFontEngineFT9QGlyphSetC1Ev T -_ZN13QFontEngineFT9QGlyphSetC2Ev T -_ZN13QFontEngineFT9QGlyphSetD1Ev T -_ZN13QFontEngineFT9QGlyphSetD2Ev T -_ZN13QFontEngineFTC1ERK8QFontDef T -_ZN13QFontEngineFTC2ERK8QFontDef T -_ZN13QFontEngineFTD0Ev T -_ZN13QFontEngineFTD1Ev T -_ZN13QFontEngineFTD2Ev T -_ZN13QFreetypeFace11computeSizeERK8QFontDefPiS3_PbP6QFixed T -_ZN13QFreetypeFace14addGlyphToPathEP11FT_FaceRec_P16FT_GlyphSlotRec_RK11QFixedPointP12QPainterPathll T -_ZN13QFreetypeFace15addBitmapToPathEP16FT_GlyphSlotRec_RK11QFixedPointP12QPainterPath T -_ZN13QFreetypeFace17getPointInOutlineEjijP6QFixedS1_Pj T -_ZN13QFreetypeFace7cleanupEv T -_ZN13QFreetypeFace7getFaceERKN11QFontEngine6FaceIdERK10QByteArray T -_ZN13QFreetypeFace7releaseERKN11QFontEngine6FaceIdE T -_ZN14QtFreetypeDataD1Ev T -_ZN14QtFreetypeDataD2Ev T -_ZN16QGenodeClipboard11setMimeDataEP9QMimeDataN10QClipboard4ModeE T -_ZN16QGenodeClipboard17_handle_clipboardEj T -_ZN16QGenodeClipboard8mimeDataEN10QClipboard4ModeE T -_ZN16QGenodeClipboardC1ERN6Genode3EnvERNS0_15Signal_receiverE T -_ZN16QGenodeClipboardC2ERN6Genode3EnvERNS0_15Signal_receiverE T -_ZN16QGenodeClipboardD0Ev T -_ZN16QGenodeClipboardD1Ev T -_ZN16QGenodeClipboardD2Ev T -_ZN16QNitpickerCursor12changeCursorEP7QCursorP7QWindow T -_ZN16QNitpickerCursorC1ERN6Genode3EnvE T -_ZN16QNitpickerCursorC2ERN6Genode3EnvE T -_ZN17QEglConfigChooser12chooseConfigEv T -_ZN17QEglConfigChooserC1EPv T -_ZN17QEglConfigChooserC2EPv T -_ZN17QEglConfigChooserD0Ev T -_ZN17QEglConfigChooserD1Ev T -_ZN17QEglConfigChooserD2Ev T -_ZN18QBasicFontDatabase10fontEngineERK10QByteArraydN5QFont17HintingPreferenceE T -_ZN18QBasicFontDatabase10fontEngineERK8QFontDefPv T -_ZN18QBasicFontDatabase13releaseHandleEPv T -_ZN18QBasicFontDatabase18addApplicationFontERK10QByteArrayRK7QString T -_ZN18QBasicFontDatabase20populateFontDatabaseEv T -_ZN18QBasicFontDatabase9addTTFileERK10QByteArrayS2_ T -_ZN19QNitpickerGLContext11doneCurrentEv T -_ZN19QNitpickerGLContext11makeCurrentEP16QPlatformSurface T -_ZN19QNitpickerGLContext11swapBuffersEP16QPlatformSurface T -_ZN19QNitpickerGLContext14getProcAddressEPKc T -_ZN19QNitpickerGLContextC1EP14QOpenGLContext T -_ZN19QNitpickerGLContextC2EP14QOpenGLContext T -_ZN20QSignalHandlerThread11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN20QSignalHandlerThread11qt_metacastEPKc T -_ZN20QSignalHandlerThread16staticMetaObjectE D 48 -_ZN20QSignalHandlerThread3runEv T -_ZN21QEvdevKeyboardHandler10loadKeymapERK7QString T -_ZN21QEvdevKeyboardHandler11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN21QEvdevKeyboardHandler11qt_metacastEPKc T -_ZN21QEvdevKeyboardHandler12unloadKeymapEv T -_ZN21QEvdevKeyboardHandler14processKeycodeEtbb T -_ZN21QEvdevKeyboardHandler15processKeyEventEiii6QFlagsIN2Qt16KeyboardModifierEEbb T -_ZN21QEvdevKeyboardHandler16s_keymap_defaultE R 7032 -_ZN21QEvdevKeyboardHandler16staticMetaObjectE D 48 -_ZN21QEvdevKeyboardHandler20s_keycompose_defaultE R 882 -_ZN21QEvdevKeyboardHandlerC1ERK7QStringR12QFdContainerbbS2_ T -_ZN21QEvdevKeyboardHandlerC2ERK7QStringR12QFdContainerbbS2_ T -_ZN21QEvdevKeyboardHandlerD0Ev T -_ZN21QEvdevKeyboardHandlerD1Ev T -_ZN21QEvdevKeyboardHandlerD2Ev T -_ZN21QNitpickerIntegration10initializeEv T -_ZN21QNitpickerIntegration16_signal_receiverEv T -_ZN21QNitpickerIntegrationC1ERN6Genode3EnvE T -_ZN21QNitpickerIntegrationC2ERN6Genode3EnvE T -_ZN23QNitpickerWindowSurface11paintDeviceEv T -_ZN23QNitpickerWindowSurface11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN23QNitpickerWindowSurface11qt_metacastEPKc T -_ZN23QNitpickerWindowSurface16staticMetaObjectE D 48 -_ZN23QNitpickerWindowSurface19framebuffer_changedEv T -_ZN23QNitpickerWindowSurface5flushEP7QWindowRK7QRegionRK6QPoint T -_ZN23QNitpickerWindowSurface6resizeERK5QSizeRK7QRegion T -_ZN23QNitpickerWindowSurfaceC1EP7QWindow T -_ZN23QNitpickerWindowSurfaceC2EP7QWindow T -_ZN23QNitpickerWindowSurfaceD0Ev T -_ZN23QNitpickerWindowSurfaceD1Ev T -_ZN23QNitpickerWindowSurfaceD2Ev T -_ZN23QUnixEventDispatcherQPA11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN23QUnixEventDispatcherQPA11qt_metacastEPKc T -_ZN23QUnixEventDispatcherQPA13processEventsE6QFlagsIN10QEventLoop17ProcessEventsFlagEE T -_ZN23QUnixEventDispatcherQPA16hasPendingEventsEv T -_ZN23QUnixEventDispatcherQPA16staticMetaObjectE D 48 -_ZN23QUnixEventDispatcherQPA5flushEv T -_ZN23QUnixEventDispatcherQPAC1EP7QObject T -_ZN23QUnixEventDispatcherQPAC2EP7QObject T -_ZN23QUnixEventDispatcherQPAD0Ev T -_ZN23QUnixEventDispatcherQPAD1Ev T -_ZN23QUnixEventDispatcherQPAD2Ev T -_ZN24QNitpickerPlatformWindow10setOpacityEd T -_ZN24QNitpickerPlatformWindow10setVisibleEb T -_ZN24QNitpickerPlatformWindow11_key_repeatEv T -_ZN24QNitpickerPlatformWindow11egl_surfaceEPv T -_ZN24QNitpickerPlatformWindow11framebufferEv T -_ZN24QNitpickerPlatformWindow11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN24QNitpickerPlatformWindow11qt_metacastEPKc T -_ZN24QNitpickerPlatformWindow11setGeometryERK5QRect T -_ZN24QNitpickerPlatformWindow11windowEventEP6QEvent T -_ZN24QNitpickerPlatformWindow12_create_viewEv T -_ZN24QNitpickerPlatformWindow13_handle_inputEj T -_ZN24QNitpickerPlatformWindow13_mode_changedEj T -_ZN24QNitpickerPlatformWindow13setWindowIconERK5QIcon T -_ZN24QNitpickerPlatformWindow14setWindowFlagsE6QFlagsIN2Qt10WindowTypeEE T -_ZN24QNitpickerPlatformWindow14setWindowStateEN2Qt11WindowStateE T -_ZN24QNitpickerPlatformWindow14setWindowTitleERK7QString T -_ZN24QNitpickerPlatformWindow16staticMetaObjectE D 48 -_ZN24QNitpickerPlatformWindow17setWindowFilePathERK7QString T -_ZN24QNitpickerPlatformWindow17setWindowModifiedEb T -_ZN24QNitpickerPlatformWindow17startSystemResizeERK6QPointN2Qt6CornerE T -_ZN24QNitpickerPlatformWindow18_init_touch_deviceEv T -_ZN24QNitpickerPlatformWindow18_process_key_eventERKN5Input5EventE T -_ZN24QNitpickerPlatformWindow18propagateSizeHintsEv T -_ZN24QNitpickerPlatformWindow19framebuffer_changedEv T -_ZN24QNitpickerPlatformWindow19setMouseGrabEnabledEb T -_ZN24QNitpickerPlatformWindow20_handle_mode_changedEj T -_ZN24QNitpickerPlatformWindow20_process_mouse_eventERKN5Input5EventE T -_ZN24QNitpickerPlatformWindow21_process_touch_eventsERK5QListIN5Input5EventEE T -_ZN24QNitpickerPlatformWindow21requestActivateWindowEv T -_ZN24QNitpickerPlatformWindow22setKeyboardGrabEnabledEb T -_ZN24QNitpickerPlatformWindow24_adjust_and_set_geometryERK5QRect T -_ZN24QNitpickerPlatformWindow26setFrameStrutEventsEnabledEb T -_ZN24QNitpickerPlatformWindow30handleContentOrientationChangeEN2Qt17ScreenOrientationE T -_ZN24QNitpickerPlatformWindow5lowerEv T -_ZN24QNitpickerPlatformWindow5raiseEv T -_ZN24QNitpickerPlatformWindow6_inputEj T -_ZN24QNitpickerPlatformWindow7refreshEiiii T -_ZN24QNitpickerPlatformWindow7setMaskERK7QRegion T -_ZN24QNitpickerPlatformWindow9nitpickerEv T -_ZN24QNitpickerPlatformWindow9setParentEPK15QPlatformWindow T -_ZN24QNitpickerPlatformWindowC1ERN6Genode3EnvEP7QWindowRNS0_15Signal_receiverEii T -_ZN24QNitpickerPlatformWindowC2ERN6Genode3EnvEP7QWindowRNS0_15Signal_receiverEii T -_ZN27QNitpickerIntegrationPlugin11qt_metacallEN11QMetaObject4CallEiPPv T -_ZN27QNitpickerIntegrationPlugin11qt_metacastEPKc T -_ZN27QNitpickerIntegrationPlugin16staticMetaObjectE D 48 -_ZN27QNitpickerIntegrationPlugin4_envE B 8 -_ZN27QNitpickerIntegrationPlugin6createERK7QStringRK11QStringList T -_ZNK13QFontEngineFT10glyphCountEv T -_ZNK13QFontEngineFT10glyphIndexEj T -_ZNK13QFontEngineFT10propertiesEv T -_ZNK13QFontEngineFT10unlockFaceEv T -_ZNK13QFontEngineFT11synthesizedEv T -_ZNK13QFontEngineFT12emSquareSizeEv T -_ZNK13QFontEngineFT12maxCharWidthEv T -_ZNK13QFontEngineFT12stringToCMapEPK5QChariP12QGlyphLayoutPi6QFlagsIN11QFontEngine10ShaperFlagEE T -_ZNK13QFontEngineFT13cloneWithSizeEd T -_ZNK13QFontEngineFT13lineThicknessEv T -_ZNK13QFontEngineFT14recalcAdvancesEP12QGlyphLayout6QFlagsIN11QFontEngine10ShaperFlagEE T -_ZNK13QFontEngineFT15non_locked_faceEv T -_ZNK13QFontEngineFT16averageCharWidthEv T -_ZNK13QFontEngineFT16getSfntTableDataEjPhPj T -_ZNK13QFontEngineFT17underlinePositionEv T -_ZNK13QFontEngineFT19scaledBitmapMetricsE6QFixed T -_ZNK13QFontEngineFT19scaledBitmapMetricsERK15glyph_metrics_t T -_ZNK13QFontEngineFT22shouldUseDesignMetricsE6QFlagsIN11QFontEngine10ShaperFlagEE T -_ZNK13QFontEngineFT22supportsTransformationERK10QTransform T -_ZNK13QFontEngineFT6ascentEv T -_ZNK13QFontEngineFT6faceIdEv T -_ZNK13QFontEngineFT6handleEv T -_ZNK13QFontEngineFT7descentEv T -_ZNK13QFontEngineFT7leadingEv T -_ZNK13QFontEngineFT7xHeightEv T -_ZNK13QFontEngineFT8lockFaceENS_7ScalingE T -_ZNK13QFontEngineFT9capHeightEv T -_ZNK13QFontEngineFT9doKerningEP12QGlyphLayout6QFlagsIN11QFontEngine10ShaperFlagEE T -_ZNK13QFontEngineFT9loadFlagsEPNS_9QGlyphSetEN11QFontEngine11GlyphFormatEiRbRi T -_ZNK13QFontEngineFT9loadGlyphEPNS_9QGlyphSetEj6QFixedN11QFontEngine11GlyphFormatEbb T -_ZNK13QFreetypeFace10propertiesEv T -_ZNK13QFreetypeFace12getSfntTableEjPhPj T -_ZNK13QFreetypeFace16isScalableBitmapEv T -_ZNK13QFreetypeFace6fsTypeEv T -_ZNK17QEglConfigChooser12filterConfigEPv T -_ZNK19QNitpickerGLContext6formatEv T -_ZNK20QSignalHandlerThread10metaObjectEv T -_ZNK21QEvdevKeyboardHandler10metaObjectEv T -_ZNK21QNitpickerIntegration12fontDatabaseEv T -_ZNK21QNitpickerIntegration12inputContextEv T -_ZNK21QNitpickerIntegration13hasCapabilityEN20QPlatformIntegration10CapabilityE T -_ZNK21QNitpickerIntegration20createPlatformWindowEP7QWindow T -_ZNK21QNitpickerIntegration21createEventDispatcherEv T -_ZNK21QNitpickerIntegration26createPlatformBackingStoreEP7QWindow T -_ZNK21QNitpickerIntegration27createPlatformOpenGLContextEP14QOpenGLContext T -_ZNK21QNitpickerIntegration9clipboardEv T -_ZNK23QNitpickerWindowSurface10metaObjectEv T -_ZNK23QUnixEventDispatcherQPA10metaObjectEv T -_ZNK24QNitpickerPlatformWindow10isEmbeddedEPK15QPlatformWindow T -_ZNK24QNitpickerPlatformWindow10metaObjectEv T -_ZNK24QNitpickerPlatformWindow11egl_surfaceEv T -_ZNK24QNitpickerPlatformWindow11mapToGlobalERK6QPoint T -_ZNK24QNitpickerPlatformWindow12frameMarginsEv T -_ZNK24QNitpickerPlatformWindow13mapFromGlobalERK6QPoint T -_ZNK24QNitpickerPlatformWindow16devicePixelRatioEv T -_ZNK24QNitpickerPlatformWindow23frameStrutEventsEnabledEv T -_ZNK24QNitpickerPlatformWindow5winIdEv T -_ZNK24QNitpickerPlatformWindow6formatEv T -_ZNK24QNitpickerPlatformWindow6parentEv T -_ZNK24QNitpickerPlatformWindow6screenEv T -_ZNK24QNitpickerPlatformWindow6windowEv T -_ZNK24QNitpickerPlatformWindow8geometryEv T -_ZNK24QNitpickerPlatformWindow8isActiveEv T -_ZNK24QNitpickerPlatformWindow8view_capEv T -_ZNK24QNitpickerPlatformWindow9isExposedEv T -_ZNK27QNitpickerIntegrationPlugin10metaObjectEv T -_ZNK27QNitpickerIntegrationPlugin4keysEv T -_ZThn16_N23QNitpickerWindowSurface11paintDeviceEv T -_ZThn16_N23QNitpickerWindowSurface5flushEP7QWindowRK7QRegionRK6QPoint T -_ZThn16_N23QNitpickerWindowSurface6resizeERK5QSizeRK7QRegion T -_ZThn16_N23QNitpickerWindowSurfaceD0Ev T -_ZThn16_N23QNitpickerWindowSurfaceD1Ev T -_ZThn16_N24QNitpickerPlatformWindow10setOpacityEd T -_ZThn16_N24QNitpickerPlatformWindow10setVisibleEb T -_ZThn16_N24QNitpickerPlatformWindow11setGeometryERK5QRect T -_ZThn16_N24QNitpickerPlatformWindow11windowEventEP6QEvent T -_ZThn16_N24QNitpickerPlatformWindow13setWindowIconERK5QIcon T -_ZThn16_N24QNitpickerPlatformWindow14setWindowFlagsE6QFlagsIN2Qt10WindowTypeEE T -_ZThn16_N24QNitpickerPlatformWindow14setWindowStateEN2Qt11WindowStateE T -_ZThn16_N24QNitpickerPlatformWindow14setWindowTitleERK7QString T -_ZThn16_N24QNitpickerPlatformWindow17setWindowFilePathERK7QString T -_ZThn16_N24QNitpickerPlatformWindow17setWindowModifiedEb T -_ZThn16_N24QNitpickerPlatformWindow17startSystemResizeERK6QPointN2Qt6CornerE T -_ZThn16_N24QNitpickerPlatformWindow18propagateSizeHintsEv T -_ZThn16_N24QNitpickerPlatformWindow19setMouseGrabEnabledEb T -_ZThn16_N24QNitpickerPlatformWindow21requestActivateWindowEv T -_ZThn16_N24QNitpickerPlatformWindow22setKeyboardGrabEnabledEb T -_ZThn16_N24QNitpickerPlatformWindow26setFrameStrutEventsEnabledEb T -_ZThn16_N24QNitpickerPlatformWindow30handleContentOrientationChangeEN2Qt17ScreenOrientationE T -_ZThn16_N24QNitpickerPlatformWindow5lowerEv T -_ZThn16_N24QNitpickerPlatformWindow5raiseEv T -_ZThn16_N24QNitpickerPlatformWindow7setMaskERK7QRegion T -_ZThn16_N24QNitpickerPlatformWindow9setParentEPK15QPlatformWindow T -_ZThn16_NK24QNitpickerPlatformWindow10isEmbeddedEPK15QPlatformWindow T -_ZThn16_NK24QNitpickerPlatformWindow11mapToGlobalERK6QPoint T -_ZThn16_NK24QNitpickerPlatformWindow12frameMarginsEv T -_ZThn16_NK24QNitpickerPlatformWindow13mapFromGlobalERK6QPoint T -_ZThn16_NK24QNitpickerPlatformWindow16devicePixelRatioEv T -_ZThn16_NK24QNitpickerPlatformWindow23frameStrutEventsEnabledEv T -_ZThn16_NK24QNitpickerPlatformWindow5winIdEv T -_ZThn16_NK24QNitpickerPlatformWindow6formatEv T -_ZThn16_NK24QNitpickerPlatformWindow8geometryEv T -_ZThn16_NK24QNitpickerPlatformWindow8isActiveEv T -_ZThn16_NK24QNitpickerPlatformWindow9isExposedEv T - -# manually added typeinfo and vtable symbols - -_ZTI24QNitpickerPlatformWindow V diff --git a/repos/libports/lib/symbols/qt5_qpluginwidget b/repos/libports/lib/symbols/qt5_qpluginwidget index fe07038746..8e57299d3e 100644 --- a/repos/libports/lib/symbols/qt5_qpluginwidget +++ b/repos/libports/lib/symbols/qt5_qpluginwidget @@ -7,8 +7,8 @@ _ZN13PluginStarter20networkReplyFinishedEv T _ZN13PluginStarter3runEv T _ZN13PluginStarter8finishedEv T _ZN13PluginStarter9view_sizeEv T -_ZN13PluginStarterC1EPN4Libc3EnvE4QUrlR7QStringiiN6Genode10CapabilityIN9Nitpicker4ViewEEE T -_ZN13PluginStarterC2EPN4Libc3EnvE4QUrlR7QStringiiN6Genode10CapabilityIN9Nitpicker4ViewEEE T +_ZN13PluginStarterC1EPN4Libc3EnvE4QUrlR7QStringiiN6Genode10CapabilityIN3Gui4ViewEEE T +_ZN13PluginStarterC2EPN4Libc3EnvE4QUrlR7QStringiiN6Genode10CapabilityIN3Gui4ViewEEE T _ZN13QPluginWidget10paintEventEP11QPaintEvent T _ZN13QPluginWidget11qt_metacallEN11QMetaObject4CallEiPPv T _ZN13QPluginWidget11qt_metacastEPKc T diff --git a/repos/libports/ports/qt5.hash b/repos/libports/ports/qt5.hash index f1f95d8be5..09a96e6c8b 100644 --- a/repos/libports/ports/qt5.hash +++ b/repos/libports/ports/qt5.hash @@ -1 +1 @@ -08438581c2490afe7ced218efdded14505063f7b +4a78b61b0e73803e65095f65b4c054861a308411 diff --git a/repos/libports/recipes/api/qt5_gui/hash b/repos/libports/recipes/api/qt5_gui/hash index 9d9f384b0e..c4fbca7d03 100644 --- a/repos/libports/recipes/api/qt5_gui/hash +++ b/repos/libports/recipes/api/qt5_gui/hash @@ -1 +1 @@ -2019-11-18 e36032edf2fa4646293574a1d587ac3057ffc98a +2020-06-17 966a17f191101426c8f56ec435c7ffa908482fa5 diff --git a/repos/libports/recipes/api/qt5_qgenodeviewwidget/content.mk b/repos/libports/recipes/api/qt5_qgenodeviewwidget/content.mk new file mode 100644 index 0000000000..f91502f8b0 --- /dev/null +++ b/repos/libports/recipes/api/qt5_qgenodeviewwidget/content.mk @@ -0,0 +1,11 @@ +MIRROR_FROM_REP_DIR := include/qt5/qgenodeviewwidget \ + lib/import/import-qt5_qgenodeviewwidget.mk \ + lib/symbols/qt5_qgenodeviewwidget + +content: $(MIRROR_FROM_REP_DIR) LICENSE + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +LICENSE: + cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/api/qt5_qnitpickerviewwidget/hash b/repos/libports/recipes/api/qt5_qgenodeviewwidget/hash similarity index 100% rename from repos/libports/recipes/api/qt5_qnitpickerviewwidget/hash rename to repos/libports/recipes/api/qt5_qgenodeviewwidget/hash diff --git a/repos/libports/recipes/api/qt5_qnitpickerviewwidget/content.mk b/repos/libports/recipes/api/qt5_qnitpickerviewwidget/content.mk deleted file mode 100644 index 8da5ca1ad5..0000000000 --- a/repos/libports/recipes/api/qt5_qnitpickerviewwidget/content.mk +++ /dev/null @@ -1,11 +0,0 @@ -MIRROR_FROM_REP_DIR := include/qt5/qnitpickerviewwidget \ - lib/import/import-qt5_qnitpickerviewwidget.mk \ - lib/symbols/qt5_qnitpickerviewwidget - -content: $(MIRROR_FROM_REP_DIR) LICENSE - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -LICENSE: - cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/api/qt5_qpa_nitpicker/content.mk b/repos/libports/recipes/api/qt5_qpa_genode/content.mk similarity index 76% rename from repos/libports/recipes/api/qt5_qpa_nitpicker/content.mk rename to repos/libports/recipes/api/qt5_qpa_genode/content.mk index 9580d31d61..1c082100b3 100644 --- a/repos/libports/recipes/api/qt5_qpa_nitpicker/content.mk +++ b/repos/libports/recipes/api/qt5_qpa_genode/content.mk @@ -1,7 +1,7 @@ -MIRROR_FROM_REP_DIR := include/qt5/qpa_nitpicker \ - lib/import/import-qt5_qpa_nitpicker.mk \ +MIRROR_FROM_REP_DIR := include/qt5/qpa_genode \ + lib/import/import-qt5_qpa_genode.mk \ lib/import/import-qt5.inc \ - lib/symbols/qt5_qpa_nitpicker + lib/symbols/qt5_qpa_genode content: $(MIRROR_FROM_REP_DIR) diff --git a/repos/libports/recipes/api/qt5_qpa_genode/hash b/repos/libports/recipes/api/qt5_qpa_genode/hash new file mode 100644 index 0000000000..fb9ef10644 --- /dev/null +++ b/repos/libports/recipes/api/qt5_qpa_genode/hash @@ -0,0 +1 @@ +2020-03-25 304dd3316129751b40c6c226e98927dcc10887c4 diff --git a/repos/libports/recipes/api/qt5_qpa_nitpicker/hash b/repos/libports/recipes/api/qt5_qpa_nitpicker/hash deleted file mode 100644 index 436566c4b8..0000000000 --- a/repos/libports/recipes/api/qt5_qpa_nitpicker/hash +++ /dev/null @@ -1 +0,0 @@ -2020-03-25 f825f9eff572b58730ec3ba47e3526064e40e26f diff --git a/repos/libports/recipes/pkg/qt5_textedit/archives b/repos/libports/recipes/pkg/qt5_textedit/archives index 9b284fe4b3..c1ba9d7590 100644 --- a/repos/libports/recipes/pkg/qt5_textedit/archives +++ b/repos/libports/recipes/pkg/qt5_textedit/archives @@ -8,7 +8,7 @@ _/src/mesa _/src/qt5_core _/src/qt5_gui _/src/qt5_qjpeg -_/src/qt5_qpa_nitpicker +_/src/qt5_qpa_genode _/src/stdcxx _/src/vfs _/src/vfs_pipe diff --git a/repos/libports/recipes/pkg/qt5_textedit/runtime b/repos/libports/recipes/pkg/qt5_textedit/runtime index ecd1e75195..aeec7ff5a1 100644 --- a/repos/libports/recipes/pkg/qt5_textedit/runtime +++ b/repos/libports/recipes/pkg/qt5_textedit/runtime @@ -26,7 +26,7 @@ - + diff --git a/repos/libports/recipes/src/qt5_calculatorform/used_apis b/repos/libports/recipes/src/qt5_calculatorform/used_apis index 66d7e58b5e..7e89378d6a 100644 --- a/repos/libports/recipes/src/qt5_calculatorform/used_apis +++ b/repos/libports/recipes/src/qt5_calculatorform/used_apis @@ -4,6 +4,6 @@ qt5_component qt5_core qt5_gui qt5_qjpeg -qt5_qpa_nitpicker +qt5_qpa_genode qt5_widgets stdcxx diff --git a/repos/libports/recipes/src/qt5_launchpad/used_apis b/repos/libports/recipes/src/qt5_launchpad/used_apis index 1ccc0d6f74..33f27b1165 100644 --- a/repos/libports/recipes/src/qt5_launchpad/used_apis +++ b/repos/libports/recipes/src/qt5_launchpad/used_apis @@ -5,7 +5,7 @@ os qt5_core qt5_gui qt5_qjpeg -qt5_qpa_nitpicker +qt5_qpa_genode qt5_widgets stdcxx timer_session diff --git a/repos/libports/recipes/src/qt5_openglwindow/used_apis b/repos/libports/recipes/src/qt5_openglwindow/used_apis index 5c72618b7c..778b16b8ab 100644 --- a/repos/libports/recipes/src/qt5_openglwindow/used_apis +++ b/repos/libports/recipes/src/qt5_openglwindow/used_apis @@ -5,5 +5,5 @@ qt5_component qt5_core qt5_gui qt5_qjpeg -qt5_qpa_nitpicker +qt5_qpa_genode stdcxx diff --git a/repos/libports/recipes/src/qt5_qgenodeviewwidget/api b/repos/libports/recipes/src/qt5_qgenodeviewwidget/api new file mode 100644 index 0000000000..ff60ba5265 --- /dev/null +++ b/repos/libports/recipes/src/qt5_qgenodeviewwidget/api @@ -0,0 +1 @@ +qt5_qgenodeviewwidget diff --git a/repos/libports/recipes/src/qt5_qgenodeviewwidget/content.mk b/repos/libports/recipes/src/qt5_qgenodeviewwidget/content.mk new file mode 100644 index 0000000000..70027011ed --- /dev/null +++ b/repos/libports/recipes/src/qt5_qgenodeviewwidget/content.mk @@ -0,0 +1,14 @@ +MIRROR_FROM_REP_DIR := lib/mk/qt5_qgenodeviewwidget.mk \ + src/lib/qt5/qgenodeviewwidget + +content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qt5_qgenodeviewwidget/target.mk + +$(MIRROR_FROM_REP_DIR): + $(mirror_from_rep_dir) + +src/lib/qt5_qgenodeviewwidget/target.mk: + mkdir -p $(dir $@) + echo "LIBS = qt5_qgenodeviewwidget" > $@ + +LICENSE: + cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/src/qt5_qnitpickerviewwidget/hash b/repos/libports/recipes/src/qt5_qgenodeviewwidget/hash similarity index 100% rename from repos/libports/recipes/src/qt5_qnitpickerviewwidget/hash rename to repos/libports/recipes/src/qt5_qgenodeviewwidget/hash diff --git a/repos/libports/recipes/src/qt5_qnitpickerviewwidget/used_apis b/repos/libports/recipes/src/qt5_qgenodeviewwidget/used_apis similarity index 85% rename from repos/libports/recipes/src/qt5_qnitpickerviewwidget/used_apis rename to repos/libports/recipes/src/qt5_qgenodeviewwidget/used_apis index 866c13713b..037b3567a6 100644 --- a/repos/libports/recipes/src/qt5_qnitpickerviewwidget/used_apis +++ b/repos/libports/recipes/src/qt5_qgenodeviewwidget/used_apis @@ -8,6 +8,6 @@ os qoost qt5_core qt5_gui -qt5_qpa_nitpicker +qt5_qpa_genode qt5_widgets stdcxx diff --git a/repos/libports/recipes/src/qt5_qnitpickerviewwidget/api b/repos/libports/recipes/src/qt5_qnitpickerviewwidget/api deleted file mode 100644 index c3647c455b..0000000000 --- a/repos/libports/recipes/src/qt5_qnitpickerviewwidget/api +++ /dev/null @@ -1 +0,0 @@ -qt5_qnitpickerviewwidget diff --git a/repos/libports/recipes/src/qt5_qnitpickerviewwidget/content.mk b/repos/libports/recipes/src/qt5_qnitpickerviewwidget/content.mk deleted file mode 100644 index 2db29dc50d..0000000000 --- a/repos/libports/recipes/src/qt5_qnitpickerviewwidget/content.mk +++ /dev/null @@ -1,14 +0,0 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qnitpickerviewwidget.mk \ - src/lib/qt5/qnitpickerviewwidget - -content: $(MIRROR_FROM_REP_DIR) LICENSE src/lib/qt5_qnitpickerviewwidget/target.mk - -$(MIRROR_FROM_REP_DIR): - $(mirror_from_rep_dir) - -src/lib/qt5_qnitpickerviewwidget/target.mk: - mkdir -p $(dir $@) - echo "LIBS = qt5_qnitpickerviewwidget" > $@ - -LICENSE: - cp $(GENODE_DIR)/LICENSE $@ diff --git a/repos/libports/recipes/src/qt5_qpa_genode/api b/repos/libports/recipes/src/qt5_qpa_genode/api new file mode 100644 index 0000000000..708ec04463 --- /dev/null +++ b/repos/libports/recipes/src/qt5_qpa_genode/api @@ -0,0 +1 @@ +qt5_qpa_genode diff --git a/repos/libports/recipes/src/qt5_qpa_nitpicker/content.mk b/repos/libports/recipes/src/qt5_qpa_genode/content.mk similarity index 84% rename from repos/libports/recipes/src/qt5_qpa_nitpicker/content.mk rename to repos/libports/recipes/src/qt5_qpa_genode/content.mk index 9d124932da..700559b7a9 100644 --- a/repos/libports/recipes/src/qt5_qpa_nitpicker/content.mk +++ b/repos/libports/recipes/src/qt5_qpa_genode/content.mk @@ -1,15 +1,15 @@ -MIRROR_FROM_REP_DIR := lib/mk/qt5_qpa_nitpicker.mk \ +MIRROR_FROM_REP_DIR := lib/mk/qt5_qpa_genode.mk \ lib/mk/qt5.inc \ - src/lib/qt5/qtbase/src/plugins/platforms/nitpicker + src/lib/qt5/qtbase/src/plugins/platforms/genode -content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qpa_nitpicker/target.mk +content: $(MIRROR_FROM_REP_DIR) src/lib/qt5_qpa_genode/target.mk $(MIRROR_FROM_REP_DIR): $(mirror_from_rep_dir) -src/lib/qt5_qpa_nitpicker/target.mk: +src/lib/qt5_qpa_genode/target.mk: mkdir -p $(dir $@) - echo "LIBS = qt5_qpa_nitpicker" > $@ + echo "LIBS = qt5_qpa_genode" > $@ PORT_DIR := $(call port_dir,$(REP_DIR)/ports/qt5) diff --git a/repos/libports/recipes/src/qt5_qpa_genode/hash b/repos/libports/recipes/src/qt5_qpa_genode/hash new file mode 100644 index 0000000000..e8f8e8df3f --- /dev/null +++ b/repos/libports/recipes/src/qt5_qpa_genode/hash @@ -0,0 +1 @@ +2020-05-26 cca0a58fd1f25172965bc4f152c4506543fb812b diff --git a/repos/libports/recipes/src/qt5_qpa_nitpicker/used_apis b/repos/libports/recipes/src/qt5_qpa_genode/used_apis similarity index 100% rename from repos/libports/recipes/src/qt5_qpa_nitpicker/used_apis rename to repos/libports/recipes/src/qt5_qpa_genode/used_apis diff --git a/repos/libports/recipes/src/qt5_qpa_nitpicker/api b/repos/libports/recipes/src/qt5_qpa_nitpicker/api deleted file mode 100644 index 4ce9d6992d..0000000000 --- a/repos/libports/recipes/src/qt5_qpa_nitpicker/api +++ /dev/null @@ -1 +0,0 @@ -qt5_qpa_nitpicker diff --git a/repos/libports/recipes/src/qt5_qpa_nitpicker/hash b/repos/libports/recipes/src/qt5_qpa_nitpicker/hash deleted file mode 100644 index 13f878dbc2..0000000000 --- a/repos/libports/recipes/src/qt5_qpa_nitpicker/hash +++ /dev/null @@ -1 +0,0 @@ -2020-05-26 6e55ce071661a25898db0c99f940019bd9c1cacc diff --git a/repos/libports/recipes/src/qt5_qpluginwidget/used_apis b/repos/libports/recipes/src/qt5_qpluginwidget/used_apis index 881562e4a8..798c0c4289 100644 --- a/repos/libports/recipes/src/qt5_qpluginwidget/used_apis +++ b/repos/libports/recipes/src/qt5_qpluginwidget/used_apis @@ -10,8 +10,8 @@ qoost qt5_core qt5_gui qt5_network -qt5_qnitpickerviewwidget -qt5_qpa_nitpicker +qt5_qgenodeviewwidget +qt5_qpa_genode qt5_widgets stdcxx vfs diff --git a/repos/libports/recipes/src/qt5_samegame/used_apis b/repos/libports/recipes/src/qt5_samegame/used_apis index da6534e85b..0bfc794ec6 100644 --- a/repos/libports/recipes/src/qt5_samegame/used_apis +++ b/repos/libports/recipes/src/qt5_samegame/used_apis @@ -7,6 +7,6 @@ qt5_network qt5_gui qt5_qjpeg qt5_qml -qt5_qpa_nitpicker +qt5_qpa_genode qt5_quick stdcxx diff --git a/repos/libports/recipes/src/qt5_testqstring/used_apis b/repos/libports/recipes/src/qt5_testqstring/used_apis index 3124dfead7..4604c358f2 100644 --- a/repos/libports/recipes/src/qt5_testqstring/used_apis +++ b/repos/libports/recipes/src/qt5_testqstring/used_apis @@ -5,7 +5,7 @@ qt5_component qt5_core qt5_gui qt5_qjpeg -qt5_qpa_nitpicker +qt5_qpa_genode qt5_test qt5_widgets stdcxx diff --git a/repos/libports/recipes/src/qt5_tetrix/used_apis b/repos/libports/recipes/src/qt5_tetrix/used_apis index 3b561647ac..12a0230bc3 100644 --- a/repos/libports/recipes/src/qt5_tetrix/used_apis +++ b/repos/libports/recipes/src/qt5_tetrix/used_apis @@ -5,7 +5,7 @@ qt5_component qt5_core qt5_gui qt5_qjpeg -qt5_qpa_nitpicker +qt5_qpa_genode qt5_scriptclassic qt5_ui_tools qt5_widgets diff --git a/repos/libports/recipes/src/qt5_textedit/used_apis b/repos/libports/recipes/src/qt5_textedit/used_apis index f80e668fa6..bfbb2f50f7 100644 --- a/repos/libports/recipes/src/qt5_textedit/used_apis +++ b/repos/libports/recipes/src/qt5_textedit/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/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis b/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis index bb1959aa4d..f7bc064c3d 100644 --- a/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis +++ b/repos/libports/recipes/src/qt5_virtualkeyboard_example/used_apis @@ -7,7 +7,7 @@ qt5_network qt5_gui qt5_qjpeg qt5_qml -qt5_qpa_nitpicker +qt5_qpa_genode qt5_quick qt5_virtualkeyboard stdcxx diff --git a/repos/libports/recipes/src/test-qpluginwidget/used_apis b/repos/libports/recipes/src/test-qpluginwidget/used_apis index 928487bd0d..ffa56311d5 100644 --- a/repos/libports/recipes/src/test-qpluginwidget/used_apis +++ b/repos/libports/recipes/src/test-qpluginwidget/used_apis @@ -11,8 +11,8 @@ qt5_core qt5_gui qt5_network qt5_qjpeg -qt5_qnitpickerviewwidget -qt5_qpa_nitpicker +qt5_qgenodeviewwidget +qt5_qpa_genode qt5_qpluginwidget qt5_widgets stdcxx diff --git a/repos/libports/recipes/src/test-qt_quick/used_apis b/repos/libports/recipes/src/test-qt_quick/used_apis index 49dd92b98b..df4c718c16 100644 --- a/repos/libports/recipes/src/test-qt_quick/used_apis +++ b/repos/libports/recipes/src/test-qt_quick/used_apis @@ -7,6 +7,6 @@ qt5_gui qt5_network qt5_qjpeg qt5_qml -qt5_qpa_nitpicker +qt5_qpa_genode qt5_quick stdcxx diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc index aa428a01ab..28df487ac1 100644 --- a/repos/libports/run/qt5_common.inc +++ b/repos/libports/run/qt5_common.inc @@ -21,7 +21,7 @@ import_from_depot [depot_user]/src/[base_src] \ [depot_user]/src/qt5_core \ [depot_user]/src/qt5_gui \ [depot_user]/src/qt5_qjpeg \ - [depot_user]/src/qt5_qpa_nitpicker \ + [depot_user]/src/qt5_qpa_genode \ [depot_user]/src/report_rom \ [depot_user]/src/stdcxx \ [depot_user]/src/vfs \ diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run index 095328f4ae..f8e2d08c79 100644 --- a/repos/libports/run/qt5_qpluginwidget.run +++ b/repos/libports/run/qt5_qpluginwidget.run @@ -4,7 +4,7 @@ import_from_depot [depot_user]/src/libcrypto \ [depot_user]/src/libssl \ [depot_user]/src/qt5_component \ [depot_user]/src/qt5_network \ - [depot_user]/src/qt5_qnitpickerviewwidget \ + [depot_user]/src/qt5_qgenodeviewwidget \ [depot_user]/src/qt5_qpluginwidget \ [depot_user]/src/qt5_widgets \ [depot_user]/src/test-qpluginwidget diff --git a/repos/libports/src/app/pdf_view/main.cc b/repos/libports/src/app/pdf_view/main.cc index d2544b21c8..8f04c3e318 100644 --- a/repos/libports/src/app/pdf_view/main.cc +++ b/repos/libports/src/app/pdf_view/main.cc @@ -139,11 +139,11 @@ class Pdf_view Genode::Env &_env; - Nitpicker::Connection _nitpicker { _env }; - Framebuffer::Session &_framebuffer = *_nitpicker.framebuffer(); - Input::Session_client &_input = *_nitpicker.input(); + Gui::Connection _gui { _env }; + Framebuffer::Session &_framebuffer = *_gui.framebuffer(); + Input::Session_client &_input = *_gui.input(); - Framebuffer::Mode _nit_mode = _nitpicker.mode(); + Framebuffer::Mode _nit_mode = _gui.mode(); Framebuffer::Mode _fb_mode {}; Genode::Constructible _fb_ds { }; @@ -157,22 +157,22 @@ class Pdf_view Genode::Signal_handler _input_handler { _env.ep(), *this, &Pdf_view::_handle_input_events }; - Nitpicker::Session::View_handle _view = _nitpicker.create_view(); + Gui::Session::View_handle _view = _gui.create_view(); pixel_t *_fb_base() { return _fb_ds->local_addr(); } void _rebuffer() { - using namespace Nitpicker; + using namespace Gui; - _nit_mode = _nitpicker.mode(); + _nit_mode = _gui.mode(); int max_x = Genode::max(_nit_mode.width(), _fb_mode.width()); int max_y = Genode::max(_nit_mode.height(), _fb_mode.height()); if (max_x > _fb_mode.width() || max_y > _fb_mode.height()) { _fb_mode = Mode(max_x, max_y, _nit_mode.format()); - _nitpicker.buffer(_fb_mode, NO_ALPHA); + _gui.buffer(_fb_mode, NO_ALPHA); if (_fb_ds.constructed()) _fb_ds.destruct(); _fb_ds.construct(_env.rm(), _framebuffer.dataspace()); @@ -190,11 +190,11 @@ class Pdf_view _pdfapp.resolution = Genode::min(_nit_mode.width()/5, _nit_mode.height()/3.8); - typedef Nitpicker::Session::Command Command; - _nitpicker.enqueue( + typedef Gui::Session::Command Command; + _gui.enqueue( _view, Rect(Point(), Area(_nit_mode.width(), _nit_mode.height()))); - _nitpicker.enqueue(_view, Nitpicker::Session::View_handle()); - _nitpicker.execute(); + _gui.enqueue(_view, Gui::Session::View_handle()); + _gui.execute(); } void _handle_nit_mode() @@ -284,7 +284,7 @@ class Pdf_view */ Pdf_view(Genode::Env &env) : _env(env) { - _nitpicker.mode_sigh(_nit_mode_handler); + _gui.mode_sigh(_nit_mode_handler); _input.sigh(_input_handler); pdfapp_init(&_pdfapp); @@ -322,9 +322,9 @@ class Pdf_view void title(char const *msg) { - typedef Nitpicker::Session::Command Command; - _nitpicker.enqueue(_view, msg); - _nitpicker.execute(); + typedef Gui::Session::Command Command; + _gui.enqueue(_view, msg); + _gui.execute(); } void show(); diff --git a/repos/libports/src/app/qt5/tmpl/target_final.inc b/repos/libports/src/app/qt5/tmpl/target_final.inc index 2d5277e607..c3bb1584b2 100644 --- a/repos/libports/src/app/qt5/tmpl/target_final.inc +++ b/repos/libports/src/app/qt5/tmpl/target_final.inc @@ -31,7 +31,7 @@ endif # QtGui ifeq ($(findstring gui, $(QT)), gui) QT_DEFINES += -DQT_GUI_LIB -LIBS += qt5_gui qt5_qpa_nitpicker qt5_qjpeg +LIBS += qt5_gui qt5_qpa_genode qt5_qjpeg endif # QtWidgets diff --git a/repos/libports/src/lib/qt5/patches/qtbase_genode.patch b/repos/libports/src/lib/qt5/patches/qtbase_genode.patch index ceb8180880..837b791c66 100644 --- a/repos/libports/src/lib/qt5/patches/qtbase_genode.patch +++ b/repos/libports/src/lib/qt5/patches/qtbase_genode.patch @@ -241,7 +241,7 @@ index 7444e61..1ae740d 100644 #define QT_FEATURE_pdf 1 #define QT_FEATURE_picture 1 -#define QT_QPA_DEFAULT_PLATFORM_NAME "minimal" -+#define QT_QPA_DEFAULT_PLATFORM_NAME "nitpicker" ++#define QT_QPA_DEFAULT_PLATFORM_NAME "genode" #define QT_FEATURE_sessionmanager -1 #define QT_NO_SESSIONMANAGER #define QT_FEATURE_shortcut 1 diff --git a/repos/libports/src/lib/qt5/qnitpickerviewwidget/qnitpickerviewwidget.cpp b/repos/libports/src/lib/qt5/qgenodeviewwidget/qgenodeviewwidget.cpp similarity index 56% rename from repos/libports/src/lib/qt5/qnitpickerviewwidget/qnitpickerviewwidget.cpp rename to repos/libports/src/lib/qt5/qgenodeviewwidget/qgenodeviewwidget.cpp index f114640367..a310a298c7 100644 --- a/repos/libports/src/lib/qt5/qnitpickerviewwidget/qnitpickerviewwidget.cpp +++ b/repos/libports/src/lib/qt5/qgenodeviewwidget/qgenodeviewwidget.cpp @@ -1,5 +1,5 @@ /* - * \brief A Qt Widget that shows a nitpicker view + * \brief A Qt Widget that shows a Genode GUI view * \author Christian Prochaska * \date 2010-08-26 */ @@ -10,8 +10,8 @@ #include -#include -#include +#include +#include /************************* @@ -121,116 +121,113 @@ void QEmbeddedViewWidget::destroyed(QObject *obj) /************************** - ** QNitpickerViewWidget ** + ** QGenodeViewWidget ** **************************/ -QNitpickerViewWidget::QNitpickerViewWidget(QWidget *parent) +QGenodeViewWidget::QGenodeViewWidget(QWidget *parent) : - QEmbeddedViewWidget(parent), nitpicker(0) + QEmbeddedViewWidget(parent), gui(0) { } -void QNitpickerViewWidget::setNitpickerView(Nitpicker::Session_client *new_nitpicker, - Nitpicker::Session::View_handle new_view_handle, - int buf_x, int buf_y, int w, int h) +void QGenodeViewWidget::setGenodeView(Gui::Session_client *new_gui, + Gui::Session::View_handle new_view_handle, + int buf_x, int buf_y, int w, int h) { QEmbeddedViewWidget::_orig_geometry(w, h, buf_x, buf_y); - nitpicker = new_nitpicker; + gui = new_gui; view_handle = new_view_handle; setFixedSize(w, h); } -QNitpickerViewWidget::~QNitpickerViewWidget() { } +QGenodeViewWidget::~QGenodeViewWidget() { } -void QNitpickerViewWidget::showEvent(QShowEvent *event) +void QGenodeViewWidget::showEvent(QShowEvent *event) { QWidget::showEvent(event); } -void QNitpickerViewWidget::hideEvent(QHideEvent *event) +void QGenodeViewWidget::hideEvent(QHideEvent *event) { QWidget::hideEvent(event); - if (nitpicker) { + if (gui) { QEmbeddedViewWidget::View_geometry const view_geometry = QEmbeddedViewWidget::_calc_view_geometry(); - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; - Nitpicker::Rect const geometry(Nitpicker::Point(mapToGlobal(pos()).x(), - mapToGlobal(pos()).y()), - Nitpicker::Area(0, 0)); - nitpicker->enqueue(view_handle, geometry); + Gui::Rect const geometry(Gui::Point(mapToGlobal(pos()).x(), + mapToGlobal(pos()).y()), + Gui::Area(0, 0)); + gui->enqueue(view_handle, geometry); - Nitpicker::Point const offset(view_geometry.buf_x, view_geometry.buf_y); - nitpicker->enqueue(view_handle, offset); + Gui::Point const offset(view_geometry.buf_x, view_geometry.buf_y); + gui->enqueue(view_handle, offset); - nitpicker->execute(); + gui->execute(); } } -void QNitpickerViewWidget::paintEvent(QPaintEvent *event) +void QGenodeViewWidget::paintEvent(QPaintEvent *event) { QWidget::paintEvent(event); - if (!nitpicker) + if (!gui) return; QEmbeddedViewWidget::View_geometry const view_geometry = QEmbeddedViewWidget::_calc_view_geometry(); - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; /* argument to mapToGlobal() is relative to the Widget's origin * the plugin view starts at (0, 0) */ if (mask().isEmpty()) { - Nitpicker::Rect const geometry(Nitpicker::Point(view_geometry.x, - view_geometry.y), - Nitpicker::Area(view_geometry.w, - view_geometry.h)); - nitpicker->enqueue(view_handle, geometry); - Nitpicker::Point const offset(view_geometry.buf_x, - view_geometry.buf_y); - nitpicker->enqueue(view_handle, offset); + Gui::Rect const geometry(Gui::Point(view_geometry.x, view_geometry.y), + Gui::Area(view_geometry.w, view_geometry.h)); + gui->enqueue(view_handle, geometry); + Gui::Point const offset(view_geometry.buf_x, view_geometry.buf_y); + gui->enqueue(view_handle, offset); } else { - Nitpicker::Rect const - geometry(Nitpicker::Point(mapToGlobal(mask().boundingRect().topLeft()).x(), - mapToGlobal(mask().boundingRect().topLeft()).y()), - Nitpicker::Area(mask().boundingRect().width(), - mask().boundingRect().height())); - nitpicker->enqueue(view_handle, geometry); + Gui::Rect const + geometry(Gui::Point(mapToGlobal(mask().boundingRect().topLeft()).x(), + mapToGlobal(mask().boundingRect().topLeft()).y()), + Gui::Area(mask().boundingRect().width(), + mask().boundingRect().height())); + gui->enqueue(view_handle, geometry); - Nitpicker::Point const offset(view_geometry.buf_x, view_geometry.buf_y); - nitpicker->enqueue(view_handle, offset); + Gui::Point const offset(view_geometry.buf_x, view_geometry.buf_y); + gui->enqueue(view_handle, offset); } /* bring the plugin view to the front of the Qt window */ - QNitpickerPlatformWindow *platform_window = - dynamic_cast(window()->windowHandle()->handle()); + QGenodePlatformWindow *platform_window = + dynamic_cast(window()->windowHandle()->handle()); - Nitpicker::Session::View_handle const neighbor_handle = - nitpicker->view_handle(platform_window->view_cap()); + Gui::Session::View_handle const neighbor_handle = + gui->view_handle(platform_window->view_cap()); - nitpicker->enqueue(view_handle, neighbor_handle); - nitpicker->execute(); + gui->enqueue(view_handle, neighbor_handle); + gui->execute(); - nitpicker->release_view_handle(neighbor_handle); + gui->release_view_handle(neighbor_handle); } -void QNitpickerViewWidget::focusInEvent(QFocusEvent *) +void QGenodeViewWidget::focusInEvent(QFocusEvent *) { - QNitpickerPlatformWindow *platform_window = - dynamic_cast(window()->windowHandle()->handle()); + QGenodePlatformWindow *platform_window = + dynamic_cast(window()->windowHandle()->handle()); - platform_window->nitpicker().focus(nitpicker->rpc_cap()); + platform_window->gui_session().focus(gui->rpc_cap()); } diff --git a/repos/libports/src/lib/qt5/qpluginwidget/qpluginwidget.cpp b/repos/libports/src/lib/qt5/qpluginwidget/qpluginwidget.cpp index 2267b67b74..148008ba8b 100644 --- a/repos/libports/src/lib/qt5/qpluginwidget/qpluginwidget.cpp +++ b/repos/libports/src/lib/qt5/qpluginwidget/qpluginwidget.cpp @@ -1,5 +1,5 @@ /* - * \brief A Qt Widget that can load a plugin application and show its Nitpicker view + * \brief A Qt Widget that can load a plugin application and show its GUI view * \author Christian Prochaska * \date 2010-08-26 */ @@ -18,7 +18,7 @@ /* Qt includes */ #include -#include +#include #include @@ -38,7 +38,7 @@ const char *config = " \ \ \ \ - \ + \ \ \ \ @@ -89,7 +89,7 @@ class Signal_wait_thread : public QThread PluginStarter::PluginStarter(Libc::Env *env, QUrl plugin_url, QString &args, int max_width, int max_height, - Nitpicker::View_capability parent_view) + Gui::View_capability parent_view) : _env(env), _plugin_url(plugin_url), @@ -434,8 +434,8 @@ void QPluginWidget::showEvent(QShowEvent *event) if (!_plugin_starter_started) { - QNitpickerPlatformWindow *platform_window = - dynamic_cast(window()->windowHandle()->handle()); + QGenodePlatformWindow *platform_window = + dynamic_cast(window()->windowHandle()->handle()); assert(_env != nullptr); diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/genode.json b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/genode.json new file mode 100644 index 0000000000..604fac4842 --- /dev/null +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/genode.json @@ -0,0 +1,3 @@ +{ + "Keys": [ "genode" ] +} diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/main.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/main.cpp similarity index 53% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/main.cpp rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/main.cpp index f3b1c03cfa..c8a196ba56 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/main.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/main.cpp @@ -1,5 +1,5 @@ /* - * \brief Nitpicker QPA plugin + * \brief Genode QPA plugin * \author Christian Prochaska * \date 2013-05-08 */ @@ -15,19 +15,19 @@ #include /* Qt includes */ -#include "qnitpickerintegrationplugin.h" +#include "qgenodeintegrationplugin.h" QT_BEGIN_NAMESPACE -Genode::Env *QNitpickerIntegrationPlugin::_env = nullptr; +Genode::Env *QGenodeIntegrationPlugin::_env = nullptr; void initialize_qt_gui(Genode::Env &env) { - QNitpickerIntegrationPlugin::env(env); + QGenodeIntegrationPlugin::env(env); } -QStringList QNitpickerIntegrationPlugin::keys() const +QStringList QGenodeIntegrationPlugin::keys() const { QStringList list; list << "Gui"; @@ -35,17 +35,17 @@ QStringList QNitpickerIntegrationPlugin::keys() const } -QPlatformIntegration *QNitpickerIntegrationPlugin::create(const QString& system, const QStringList& paramList) +QPlatformIntegration *QGenodeIntegrationPlugin::create(const QString& system, const QStringList& paramList) { Q_UNUSED(paramList); - if (system.toLower() == "nitpicker") { + if (system.toLower() == "genode") { assert(_env != nullptr); - return new QNitpickerIntegration(*_env); + return new QGenodeIntegration(*_env); } return 0; } -Q_IMPORT_PLUGIN(QNitpickerIntegrationPlugin) +Q_IMPORT_PLUGIN(QGenodeIntegrationPlugin) QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qgenodeclipboard.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.cpp similarity index 100% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qgenodeclipboard.cpp rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.cpp diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qgenodeclipboard.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.h similarity index 100% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qgenodeclipboard.h rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeclipboard.h diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickercursor.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.cpp similarity index 90% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickercursor.cpp rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.cpp index 5c0cab231c..c17908c0b6 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickercursor.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.cpp @@ -1,5 +1,5 @@ /* - * \brief QNitpickerCursor + * \brief QGenodeCursor * \author Christian Prochaska * \date 2017-11-13 */ @@ -17,11 +17,11 @@ /* Qt includes */ #include -#include "qnitpickercursor.h" +#include "qgenodecursor.h" QT_BEGIN_NAMESPACE -QNitpickerCursor::QNitpickerCursor(Genode::Env &env) +QGenodeCursor::QGenodeCursor(Genode::Env &env) { try { _shape_report_connection.construct(env, "shape", sizeof(Pointer::Shape_report)); @@ -30,7 +30,7 @@ QNitpickerCursor::QNitpickerCursor(Genode::Env &env) } catch (Genode::Service_denied) { } } -void QNitpickerCursor::changeCursor(QCursor *widgetCursor, QWindow *window) +void QGenodeCursor::changeCursor(QCursor *widgetCursor, QWindow *window) { Q_UNUSED(window); diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickercursor.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.h similarity index 79% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickercursor.h rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.h index 986074a6b9..63ddc44209 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickercursor.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodecursor.h @@ -1,5 +1,5 @@ /* - * \brief QNitpickerCursor + * \brief QGenodeCursor * \author Christian Prochaska * \date 2017-11-13 */ @@ -12,8 +12,8 @@ */ -#ifndef _QNITPICKERCURSOR_H_ -#define _QNITPICKERCURSOR_H_ +#ifndef _QGENODECURSOR_H_ +#define _QGENODECURSOR_H_ /* Genode includes */ #include @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE -class QNitpickerCursor : public QPlatformCursor +class QGenodeCursor : public QPlatformCursor { private: @@ -35,11 +35,11 @@ class QNitpickerCursor : public QPlatformCursor public: - QNitpickerCursor(Genode::Env &env); + QGenodeCursor(Genode::Env &env); virtual void changeCursor(QCursor *widgetCursor, QWindow *window) override; }; QT_END_NAMESPACE -#endif /* _QNITPICKERCURSOR_H_ */ +#endif /* _QGENODECURSOR_H_ */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.cpp similarity index 82% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.cpp index b889aa79d1..03cf998f1d 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.cpp @@ -1,5 +1,5 @@ /* - * \brief QNitpickerGLContext + * \brief QGenodeGLContext * \author Christian Prochaska * \date 2013-11-18 */ @@ -25,14 +25,14 @@ #include /* local includes */ -#include "qnitpickerplatformwindow.h" -#include "qnitpickerglcontext.h" +#include "qgenodeplatformwindow.h" +#include "qgenodeglcontext.h" static const bool qnglc_verbose = false; QT_BEGIN_NAMESPACE -QNitpickerGLContext::QNitpickerGLContext(QOpenGLContext *context) +QGenodeGLContext::QGenodeGLContext(QOpenGLContext *context) : QPlatformOpenGLContext() { if (qnglc_verbose) @@ -65,14 +65,14 @@ QNitpickerGLContext::QNitpickerGLContext(QOpenGLContext *context) } -bool QNitpickerGLContext::makeCurrent(QPlatformSurface *surface) +bool QGenodeGLContext::makeCurrent(QPlatformSurface *surface) { if (qnglc_verbose) Genode::log(__func__, " called"); doneCurrent(); - QNitpickerPlatformWindow *w = static_cast(surface); + QGenodePlatformWindow *w = static_cast(surface); Genode_egl_window egl_window = { w->geometry().width(), w->geometry().height(), @@ -100,7 +100,7 @@ bool QNitpickerGLContext::makeCurrent(QPlatformSurface *surface) } -void QNitpickerGLContext::doneCurrent() +void QGenodeGLContext::doneCurrent() { if (qnglc_verbose) Genode::log(__func__, " called"); @@ -110,12 +110,12 @@ void QNitpickerGLContext::doneCurrent() } -void QNitpickerGLContext::swapBuffers(QPlatformSurface *surface) +void QGenodeGLContext::swapBuffers(QPlatformSurface *surface) { if (qnglc_verbose) Genode::log(__func__, " called"); - QNitpickerPlatformWindow *w = static_cast(surface); + QGenodePlatformWindow *w = static_cast(surface); if (!eglSwapBuffers(_egl_display, w->egl_surface())) qFatal("eglSwapBuffers() failed"); @@ -124,7 +124,7 @@ void QNitpickerGLContext::swapBuffers(QPlatformSurface *surface) } -QFunctionPointer QNitpickerGLContext::getProcAddress(const char *procName) +QFunctionPointer QGenodeGLContext::getProcAddress(const char *procName) { if (qnglc_verbose) Genode::log("procName=", Genode::Cstring(procName), " , " @@ -134,7 +134,7 @@ QFunctionPointer QNitpickerGLContext::getProcAddress(const char *procName) } -QSurfaceFormat QNitpickerGLContext::format() const +QSurfaceFormat QGenodeGLContext::format() const { return _format; } diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.h similarity index 78% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.h rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.h index 0769747141..22f3c2d3fd 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerglcontext.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeglcontext.h @@ -1,5 +1,5 @@ /* - * \brief QNitpickerGLContext + * \brief QGenodeGLContext * \author Christian Prochaska * \date 2013-11-18 */ @@ -11,8 +11,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef QNITPICKERGLCONTEXT_H -#define QNITPICKERGLCONTEXT_H +#ifndef QGENODEGLCONTEXT_H +#define QGENODEGLCONTEXT_H #include @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE -class QNitpickerGLContext : public QPlatformOpenGLContext +class QGenodeGLContext : public QPlatformOpenGLContext { private: @@ -36,7 +36,7 @@ class QNitpickerGLContext : public QPlatformOpenGLContext public: - QNitpickerGLContext(QOpenGLContext *context); + QGenodeGLContext(QOpenGLContext *context); QSurfaceFormat format() const Q_DECL_OVERRIDE; @@ -51,4 +51,4 @@ class QNitpickerGLContext : public QPlatformOpenGLContext QT_END_NAMESPACE -#endif // QNITPICKERGLCONTEXT_H +#endif // QGENODEGLCONTEXT_H diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.cpp new file mode 100644 index 0000000000..68b8ebf2e4 --- /dev/null +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.cpp @@ -0,0 +1,111 @@ +/* + * \brief QGenodeIntegration + * \author Christian Prochaska + * \date 2013-05-08 + */ + +/* + * Copyright (C) 2013-2017 Genode Labs GmbH + * + * This file is part of the Genode OS framework, which is distributed + * under the terms of the GNU Affero General Public License version 3. + */ + +/* Qt includes */ +#include +#include + +#include "qgenodeclipboard.h" +#include "qgenodeglcontext.h" +#include "qgenodeintegration.h" +#include "qgenodeplatformwindow.h" +#include "qgenodescreen.h" +#include "qgenodewindowsurface.h" +#include "QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h" +#include "QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h" + +QT_BEGIN_NAMESPACE + +static const bool verbose = false; + + +QGenodeIntegration::QGenodeIntegration(Genode::Env &env) +: _env(env), + _genode_screen(new QGenodeScreen(env)) { } + + +bool QGenodeIntegration::hasCapability(QPlatformIntegration::Capability cap) const +{ + switch (cap) { + case ThreadedPixmaps: return true; + default: return QPlatformIntegration::hasCapability(cap); + } +} + + +QPlatformWindow *QGenodeIntegration::createPlatformWindow(QWindow *window) const +{ + if (verbose) + qDebug() << "QGenodeIntegration::createPlatformWindow(" << window << ")"; + + QRect screen_geometry = _genode_screen->geometry(); + return new QGenodePlatformWindow(_env, window, + screen_geometry.width(), + screen_geometry.height()); +} + + +QPlatformBackingStore *QGenodeIntegration::createPlatformBackingStore(QWindow *window) const +{ + if (verbose) + qDebug() << "QGenodeIntegration::createPlatformBackingStore(" << window << ")"; + return new QGenodeWindowSurface(window); +} + + +QAbstractEventDispatcher *QGenodeIntegration::createEventDispatcher() const +{ + if (verbose) + qDebug() << "QGenodeIntegration::createEventDispatcher()"; + return createUnixEventDispatcher(); +} + + +void QGenodeIntegration::initialize() +{ + QWindowSystemInterface::handleScreenAdded(_genode_screen); + + QString icStr = QPlatformInputContextFactory::requested(); + if (icStr.isNull()) + icStr = QLatin1String("compose"); + m_inputContext.reset(QPlatformInputContextFactory::create(icStr)); +} + + +QPlatformFontDatabase *QGenodeIntegration::fontDatabase() const +{ + static QFreeTypeFontDatabase db; + return &db; +} + + +#ifndef QT_NO_CLIPBOARD +QPlatformClipboard *QGenodeIntegration::clipboard() const +{ + static QGenodeClipboard cb(_env); + return &cb; +} +#endif + + +QPlatformOpenGLContext *QGenodeIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const +{ + return new QGenodeGLContext(context); +} + +QPlatformInputContext *QGenodeIntegration::inputContext() const +{ + return m_inputContext.data(); +} + +QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.h similarity index 78% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.h index 615fc1a98d..f3bb695ee1 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegration.h @@ -1,5 +1,5 @@ /* - * \brief QNitpickerIntegration + * \brief QGenodeIntegration * \author Christian Prochaska * \date 2013-05-08 */ @@ -12,8 +12,8 @@ */ -#ifndef _QNITPICKERINTEGRATION_H_ -#define _QNITPICKERINTEGRATION_H_ +#ifndef _QGENODEINTEGRATION_H_ +#define _QGENODEINTEGRATION_H_ #include @@ -21,21 +21,21 @@ #include #include -#include "qnitpickerscreen.h" +#include "qgenodescreen.h" QT_BEGIN_NAMESPACE -class QNitpickerIntegration : public QPlatformIntegration +class QGenodeIntegration : public QPlatformIntegration { private: - Genode::Env &_env; - QNitpickerScreen *_nitpicker_screen; + Genode::Env &_env; + QGenodeScreen *_genode_screen; QScopedPointer m_inputContext; public: - QNitpickerIntegration(Genode::Env &env); + QGenodeIntegration(Genode::Env &env); void initialize() Q_DECL_OVERRIDE; bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; @@ -57,4 +57,4 @@ class QNitpickerIntegration : public QPlatformIntegration QT_END_NAMESPACE -#endif /* _QNITPICKERINTEGRATION_H_ */ +#endif /* _QGENODEINTEGRATION_H_ */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegrationplugin.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegrationplugin.h similarity index 70% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegrationplugin.h rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegrationplugin.h index 94ebf9a129..0d37d03b07 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegrationplugin.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeintegrationplugin.h @@ -1,5 +1,5 @@ /* - * \brief Nitpicker QPA plugin + * \brief Genode QPA plugin * \author Christian Prochaska * \date 2013-05-08 */ @@ -11,22 +11,22 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _QNITPICKERINTEGRATIONPLUGIN_H_ -#define _QNITPICKERINTEGRATIONPLUGIN_H_ +#ifndef _QGENODEINTEGRATIONPLUGIN_H_ +#define _QGENODEINTEGRATIONPLUGIN_H_ /* Genode includes */ #include /* Qt includes */ #include -#include "qnitpickerintegration.h" +#include "qgenodeintegration.h" QT_BEGIN_NAMESPACE -class QNitpickerIntegrationPlugin : public QPlatformIntegrationPlugin +class QGenodeIntegrationPlugin : public QPlatformIntegrationPlugin { Q_OBJECT - Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "nitpicker.json") + Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "genode.json") private: static Genode::Env *_env; @@ -40,4 +40,4 @@ public: QT_END_NAMESPACE -#endif /* _QNITPICKERINTEGRATIONPLUGIN_H_ */ +#endif /* _QGENODEINTEGRATIONPLUGIN_H_ */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeplatformwindow.cpp similarity index 69% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeplatformwindow.cpp index 548b252ebc..83d0264886 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerplatformwindow.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodeplatformwindow.cpp @@ -1,5 +1,5 @@ /* - * \brief QNitpickerPlatformWindow + * \brief QGenodePlatformWindow * \author Christian Prochaska * \author Christian Helmuth * \date 2013-05-08 @@ -22,15 +22,15 @@ #include #include -#include "qnitpickerplatformwindow.h" +#include "qgenodeplatformwindow.h" QT_BEGIN_NAMESPACE static const bool qnpw_verbose = false/*true*/; -QStringList QNitpickerPlatformWindow::_nitpicker_session_label_list; +QStringList QGenodePlatformWindow::_gui_session_label_list; -QTouchDevice * QNitpickerPlatformWindow::_init_touch_device() +QTouchDevice * QGenodePlatformWindow::_init_touch_device() { QVector::iterator i = _touch_points.begin(); for (unsigned n = 0; i != _touch_points.end(); ++i, ++n) { @@ -49,7 +49,7 @@ QTouchDevice * QNitpickerPlatformWindow::_init_touch_device() return dev; } -void QNitpickerPlatformWindow::_process_touch_events(QList const &events) +void QGenodePlatformWindow::_process_touch_events(QList const &events) { if (events.empty()) return; @@ -150,9 +150,9 @@ static Qt::Key key_from_unicode(unsigned unicode) } -QNitpickerPlatformWindow::Mapped_key QNitpickerPlatformWindow::_map_key(Input::Keycode key, - Codepoint codepoint, - Mapped_key::Event e) +QGenodePlatformWindow::Mapped_key QGenodePlatformWindow::_map_key(Input::Keycode key, + Codepoint codepoint, + Mapped_key::Event e) { /* non-printable key mappings */ switch (key) { @@ -257,8 +257,8 @@ QNitpickerPlatformWindow::Mapped_key QNitpickerPlatformWindow::_map_key(Input::K } -void QNitpickerPlatformWindow::_key_event(Input::Keycode key, Codepoint codepoint, - Mapped_key::Event e) +void QGenodePlatformWindow::_key_event(Input::Keycode key, Codepoint codepoint, + Mapped_key::Event e) { bool const pressed = e != Mapped_key::RELEASED; @@ -292,7 +292,7 @@ void QNitpickerPlatformWindow::_key_event(Input::Keycode key, Codepoint codepoin } -void QNitpickerPlatformWindow::_mouse_button_event(Input::Keycode button, bool press) +void QGenodePlatformWindow::_mouse_button_event(Input::Keycode button, bool press) { Qt::MouseButton current_mouse_button = Qt::NoButton; @@ -324,7 +324,7 @@ void QNitpickerPlatformWindow::_mouse_button_event(Input::Keycode button, bool p } -void QNitpickerPlatformWindow::_handle_input() +void QGenodePlatformWindow::_handle_input() { QList touch_events; @@ -377,9 +377,9 @@ void QNitpickerPlatformWindow::_handle_input() } -void QNitpickerPlatformWindow::_handle_mode_changed() +void QGenodePlatformWindow::_handle_mode_changed() { - Framebuffer::Mode mode(_nitpicker_session.mode()); + Framebuffer::Mode mode(_gui_session.mode()); if ((mode.width() == 0) && (mode.height() == 0)) { /* interpret a size of 0x0 as indication to close the window */ @@ -403,13 +403,13 @@ void QNitpickerPlatformWindow::_handle_mode_changed() } -Nitpicker::Session::View_handle QNitpickerPlatformWindow::_create_view() +Gui::Session::View_handle QGenodePlatformWindow::_create_view() { if (window()->type() == Qt::Desktop) - return Nitpicker::Session::View_handle(); + return Gui::Session::View_handle(); if (window()->type() == Qt::Dialog) - return _nitpicker_session.create_view(); + return _gui_session.create_view(); /* * Popup menus should never get a window decoration, therefore we set a top @@ -421,24 +421,24 @@ Nitpicker::Session::View_handle QNitpickerPlatformWindow::_create_view() } if (window()->transientParent()) { - QNitpickerPlatformWindow *parent_platform_window = - static_cast(window()->transientParent()->handle()); + QGenodePlatformWindow *parent_platform_window = + static_cast(window()->transientParent()->handle()); - Nitpicker::Session::View_handle parent_handle = - _nitpicker_session.view_handle(parent_platform_window->view_cap()); + Gui::Session::View_handle parent_handle = + _gui_session.view_handle(parent_platform_window->view_cap()); - Nitpicker::Session::View_handle result = - _nitpicker_session.create_view(parent_handle); + Gui::Session::View_handle result = + _gui_session.create_view(parent_handle); - _nitpicker_session.release_view_handle(parent_handle); + _gui_session.release_view_handle(parent_handle); return result; } - return _nitpicker_session.create_view(); + return _gui_session.create_view(); } -void QNitpickerPlatformWindow::_adjust_and_set_geometry(const QRect &rect) +void QGenodePlatformWindow::_adjust_and_set_geometry(const QRect &rect) { /* limit window size to screen size */ QRect adjusted_rect(rect.intersected(screen()->geometry())); @@ -451,7 +451,7 @@ void QNitpickerPlatformWindow::_adjust_and_set_geometry(const QRect &rect) Framebuffer::Mode mode(adjusted_rect.width(), adjusted_rect.height(), Framebuffer::Mode::RGB565); - _nitpicker_session.buffer(mode, false); + _gui_session.buffer(mode, false); _current_mode = mode; @@ -462,7 +462,7 @@ void QNitpickerPlatformWindow::_adjust_and_set_geometry(const QRect &rect) } -QString QNitpickerPlatformWindow::_sanitize_label(QString label) +QString QGenodePlatformWindow::_sanitize_label(QString label) { enum { MAX_LABEL = 25 }; @@ -479,10 +479,10 @@ QString QNitpickerPlatformWindow::_sanitize_label(QString label) if (label.isEmpty()) label = QString("Untitled Window"); - if (_nitpicker_session_label_list.contains(label)) + if (_gui_session_label_list.contains(label)) for (unsigned int i = 2; ; i++) { QString versioned_label = label + "." + QString::number(i); - if (!_nitpicker_session_label_list.contains(versioned_label)) { + if (!_gui_session_label_list.contains(versioned_label)) { label = versioned_label; break; } @@ -492,46 +492,46 @@ QString QNitpickerPlatformWindow::_sanitize_label(QString label) } -QNitpickerPlatformWindow::QNitpickerPlatformWindow(Genode::Env &env, QWindow *window, - int screen_width, int screen_height) +QGenodePlatformWindow::QGenodePlatformWindow(Genode::Env &env, QWindow *window, + int screen_width, int screen_height) : QPlatformWindow(window), _env(env), - _nitpicker_session_label(_sanitize_label(window->title())), - _nitpicker_session(env, _nitpicker_session_label.toStdString().c_str()), - _framebuffer_session(_nitpicker_session.framebuffer_session()), + _gui_session_label(_sanitize_label(window->title())), + _gui_session(env, _gui_session_label.toStdString().c_str()), + _framebuffer_session(_gui_session.framebuffer_session()), _framebuffer(0), _framebuffer_changed(false), _geometry_changed(false), _view_handle(_create_view()), - _input_session(env.rm(), _nitpicker_session.input_session()), + _input_session(env.rm(), _gui_session.input_session()), _ev_buf(env.rm(), _input_session.dataspace()), _resize_handle(!window->flags().testFlag(Qt::Popup)), _decoration(!window->flags().testFlag(Qt::Popup)), _egl_surface(EGL_NO_SURFACE), _input_signal_handler(_env.ep(), *this, - &QNitpickerPlatformWindow::_input), + &QGenodePlatformWindow::_input), _mode_changed_signal_handler(_env.ep(), *this, - &QNitpickerPlatformWindow::_mode_changed), + &QGenodePlatformWindow::_mode_changed), _touch_device(_init_touch_device()) { if (qnpw_verbose) if (window->transientParent()) - qDebug() << "QNitpickerPlatformWindow(): child window of" << window->transientParent(); + qDebug() << "QGenodePlatformWindow(): child window of" << window->transientParent(); - _nitpicker_session_label_list.append(_nitpicker_session_label); + _gui_session_label_list.append(_gui_session_label); _input_session.sigh(_input_signal_handler); - _nitpicker_session.mode_sigh(_mode_changed_signal_handler); + _gui_session.mode_sigh(_mode_changed_signal_handler); _adjust_and_set_geometry(geometry()); if (_view_handle.valid()) { /* bring the view to the top */ - typedef Nitpicker::Session::Command Command; - _nitpicker_session.enqueue(_view_handle); - _nitpicker_session.execute(); + typedef Gui::Session::Command Command; + _gui_session.enqueue(_view_handle); + _gui_session.execute(); } connect(this, SIGNAL(_input()), @@ -543,49 +543,49 @@ QNitpickerPlatformWindow::QNitpickerPlatformWindow(Genode::Env &env, QWindow *wi Qt::QueuedConnection); } -QNitpickerPlatformWindow::~QNitpickerPlatformWindow() +QGenodePlatformWindow::~QGenodePlatformWindow() { - _nitpicker_session_label_list.removeOne(_nitpicker_session_label); + _gui_session_label_list.removeOne(_gui_session_label); } -QSurfaceFormat QNitpickerPlatformWindow::format() const +QSurfaceFormat QGenodePlatformWindow::format() const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::format()"; + qDebug() << "QGenodePlatformWindow::format()"; return QPlatformWindow::format(); } -void QNitpickerPlatformWindow::setGeometry(const QRect &rect) +void QGenodePlatformWindow::setGeometry(const QRect &rect) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setGeometry(" << rect << ")"; + qDebug() << "QGenodePlatformWindow::setGeometry(" << rect << ")"; _adjust_and_set_geometry(rect); if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setGeometry() finished"; + qDebug() << "QGenodePlatformWindow::setGeometry() finished"; } -QRect QNitpickerPlatformWindow::geometry() const +QRect QGenodePlatformWindow::geometry() const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::geometry(): returning" << QPlatformWindow::geometry(); + qDebug() << "QGenodePlatformWindow::geometry(): returning" << QPlatformWindow::geometry(); return QPlatformWindow::geometry(); } -QMargins QNitpickerPlatformWindow::frameMargins() const +QMargins QGenodePlatformWindow::frameMargins() const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::frameMargins()"; + qDebug() << "QGenodePlatformWindow::frameMargins()"; return QPlatformWindow::frameMargins(); } -void QNitpickerPlatformWindow::setVisible(bool visible) +void QGenodePlatformWindow::setVisible(bool visible) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setVisible(" << visible << ")"; + qDebug() << "QGenodePlatformWindow::setVisible(" << visible << ")"; - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; if (visible) { QRect g(geometry()); @@ -595,40 +595,40 @@ void QNitpickerPlatformWindow::setVisible(bool visible) g.moveTo(window()->transientParent()->mapFromGlobal(g.topLeft())); } - _nitpicker_session.enqueue(_view_handle, - Nitpicker::Rect(Nitpicker::Point(g.x(), g.y()), - Nitpicker::Area(g.width(), g.height()))); + _gui_session.enqueue(_view_handle, + Gui::Rect(Gui::Point(g.x(), g.y()), + Gui::Area(g.width(), g.height()))); } else { - _nitpicker_session.enqueue(_view_handle, - Nitpicker::Rect(Nitpicker::Point(), Nitpicker::Area(0, 0))); + _gui_session.enqueue(_view_handle, + Gui::Rect(Gui::Point(), Gui::Area(0, 0))); } - _nitpicker_session.execute(); + _gui_session.execute(); QPlatformWindow::setVisible(visible); if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setVisible() finished"; + qDebug() << "QGenodePlatformWindow::setVisible() finished"; } -void QNitpickerPlatformWindow::setWindowFlags(Qt::WindowFlags flags) +void QGenodePlatformWindow::setWindowFlags(Qt::WindowFlags flags) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setWindowFlags(" << flags << ")"; + qDebug() << "QGenodePlatformWindow::setWindowFlags(" << flags << ")"; QPlatformWindow::setWindowFlags(flags); if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setWindowFlags() finished"; + qDebug() << "QGenodePlatformWindow::setWindowFlags() finished"; } -void QNitpickerPlatformWindow::setWindowState(Qt::WindowStates state) +void QGenodePlatformWindow::setWindowState(Qt::WindowStates state) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setWindowState(" << state << ")"; + qDebug() << "QGenodePlatformWindow::setWindowState(" << state << ")"; QPlatformWindow::setWindowState(state); @@ -639,206 +639,206 @@ void QNitpickerPlatformWindow::setWindowState(Qt::WindowStates state) } } -WId QNitpickerPlatformWindow::winId() const +WId QGenodePlatformWindow::winId() const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::winId()"; + qDebug() << "QGenodePlatformWindow::winId()"; return WId(this); } -void QNitpickerPlatformWindow::setParent(const QPlatformWindow *window) +void QGenodePlatformWindow::setParent(const QPlatformWindow *window) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setParent()"; + qDebug() << "QGenodePlatformWindow::setParent()"; QPlatformWindow::setParent(window); } -void QNitpickerPlatformWindow::setWindowTitle(const QString &title) +void QGenodePlatformWindow::setWindowTitle(const QString &title) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setWindowTitle(" << title << ")"; + qDebug() << "QGenodePlatformWindow::setWindowTitle(" << title << ")"; QPlatformWindow::setWindowTitle(title); _title = title.toLocal8Bit(); - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; if (_view_handle.valid()) { - _nitpicker_session.enqueue(_view_handle, _title.constData()); - _nitpicker_session.execute(); + _gui_session.enqueue(_view_handle, _title.constData()); + _gui_session.execute(); } if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setWindowTitle() finished"; + qDebug() << "QGenodePlatformWindow::setWindowTitle() finished"; } -void QNitpickerPlatformWindow::setWindowFilePath(const QString &title) +void QGenodePlatformWindow::setWindowFilePath(const QString &title) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setWindowFilePath(" << title << ")"; + qDebug() << "QGenodePlatformWindow::setWindowFilePath(" << title << ")"; QPlatformWindow::setWindowFilePath(title); } -void QNitpickerPlatformWindow::setWindowIcon(const QIcon &icon) +void QGenodePlatformWindow::setWindowIcon(const QIcon &icon) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setWindowIcon()"; + qDebug() << "QGenodePlatformWindow::setWindowIcon()"; QPlatformWindow::setWindowIcon(icon); } -void QNitpickerPlatformWindow::raise() +void QGenodePlatformWindow::raise() { /* bring the view to the top */ - _nitpicker_session.enqueue(_view_handle); - _nitpicker_session.execute(); + _gui_session.enqueue(_view_handle); + _gui_session.execute(); QPlatformWindow::raise(); } -void QNitpickerPlatformWindow::lower() +void QGenodePlatformWindow::lower() { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::lower()"; + qDebug() << "QGenodePlatformWindow::lower()"; QPlatformWindow::lower(); } -bool QNitpickerPlatformWindow::isExposed() const +bool QGenodePlatformWindow::isExposed() const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::isExposed()"; + qDebug() << "QGenodePlatformWindow::isExposed()"; return QPlatformWindow::isExposed(); } -bool QNitpickerPlatformWindow::isActive() const +bool QGenodePlatformWindow::isActive() const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::isActive()"; + qDebug() << "QGenodePlatformWindow::isActive()"; return QPlatformWindow::isActive(); } -bool QNitpickerPlatformWindow::isEmbedded() const +bool QGenodePlatformWindow::isEmbedded() const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::isEmbedded()"; + qDebug() << "QGenodePlatformWindow::isEmbedded()"; return QPlatformWindow::isEmbedded(); } -QPoint QNitpickerPlatformWindow::mapToGlobal(const QPoint &pos) const +QPoint QGenodePlatformWindow::mapToGlobal(const QPoint &pos) const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::mapToGlobal(" << pos << ")"; + qDebug() << "QGenodePlatformWindow::mapToGlobal(" << pos << ")"; return QPlatformWindow::mapToGlobal(pos); } -QPoint QNitpickerPlatformWindow::mapFromGlobal(const QPoint &pos) const +QPoint QGenodePlatformWindow::mapFromGlobal(const QPoint &pos) const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::mapFromGlobal(" << pos << ")"; + qDebug() << "QGenodePlatformWindow::mapFromGlobal(" << pos << ")"; return QPlatformWindow::mapFromGlobal(pos); } -void QNitpickerPlatformWindow::propagateSizeHints() +void QGenodePlatformWindow::propagateSizeHints() { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::propagateSizeHints()"; + qDebug() << "QGenodePlatformWindow::propagateSizeHints()"; QPlatformWindow::propagateSizeHints(); } -void QNitpickerPlatformWindow::setOpacity(qreal level) +void QGenodePlatformWindow::setOpacity(qreal level) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setOpacity(" << level << ")"; + qDebug() << "QGenodePlatformWindow::setOpacity(" << level << ")"; QPlatformWindow::setOpacity(level); } -void QNitpickerPlatformWindow::setMask(const QRegion ®ion) +void QGenodePlatformWindow::setMask(const QRegion ®ion) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setMask(" << region << ")"; + qDebug() << "QGenodePlatformWindow::setMask(" << region << ")"; QPlatformWindow::setMask(region); } -void QNitpickerPlatformWindow::requestActivateWindow() +void QGenodePlatformWindow::requestActivateWindow() { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::requestActivateWindow()"; + qDebug() << "QGenodePlatformWindow::requestActivateWindow()"; QPlatformWindow::requestActivateWindow(); } -void QNitpickerPlatformWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation) +void QGenodePlatformWindow::handleContentOrientationChange(Qt::ScreenOrientation orientation) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::handleContentOrientationChange()"; + qDebug() << "QGenodePlatformWindow::handleContentOrientationChange()"; QPlatformWindow::handleContentOrientationChange(orientation); } -qreal QNitpickerPlatformWindow::devicePixelRatio() const +qreal QGenodePlatformWindow::devicePixelRatio() const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::devicePixelRatio()"; + qDebug() << "QGenodePlatformWindow::devicePixelRatio()"; return QPlatformWindow::devicePixelRatio(); } -bool QNitpickerPlatformWindow::setKeyboardGrabEnabled(bool grab) +bool QGenodePlatformWindow::setKeyboardGrabEnabled(bool grab) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setKeyboardGrabEnabled()"; + qDebug() << "QGenodePlatformWindow::setKeyboardGrabEnabled()"; return QPlatformWindow::setKeyboardGrabEnabled(grab); } -bool QNitpickerPlatformWindow::setMouseGrabEnabled(bool grab) +bool QGenodePlatformWindow::setMouseGrabEnabled(bool grab) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setMouseGrabEnabled()"; + qDebug() << "QGenodePlatformWindow::setMouseGrabEnabled()"; return QPlatformWindow::setMouseGrabEnabled(grab); } -bool QNitpickerPlatformWindow::setWindowModified(bool modified) +bool QGenodePlatformWindow::setWindowModified(bool modified) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setWindowModified()"; + qDebug() << "QGenodePlatformWindow::setWindowModified()"; return QPlatformWindow::setWindowModified(modified); } -bool QNitpickerPlatformWindow::windowEvent(QEvent *event) +bool QGenodePlatformWindow::windowEvent(QEvent *event) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::windowEvent(" << event->type() << ")"; + qDebug() << "QGenodePlatformWindow::windowEvent(" << event->type() << ")"; return QPlatformWindow::windowEvent(event); } -bool QNitpickerPlatformWindow::startSystemResize(const QPoint &pos, Qt::Corner corner) +bool QGenodePlatformWindow::startSystemResize(const QPoint &pos, Qt::Corner corner) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::startSystemResize()"; + qDebug() << "QGenodePlatformWindow::startSystemResize()"; return QPlatformWindow::startSystemResize(pos, corner); } -void QNitpickerPlatformWindow::setFrameStrutEventsEnabled(bool enabled) +void QGenodePlatformWindow::setFrameStrutEventsEnabled(bool enabled) { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::setFrameStrutEventsEnabled()"; + qDebug() << "QGenodePlatformWindow::setFrameStrutEventsEnabled()"; QPlatformWindow::setFrameStrutEventsEnabled(enabled); } -bool QNitpickerPlatformWindow::frameStrutEventsEnabled() const +bool QGenodePlatformWindow::frameStrutEventsEnabled() const { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::frameStrutEventsEnabled()"; + qDebug() << "QGenodePlatformWindow::frameStrutEventsEnabled()"; return QPlatformWindow::frameStrutEventsEnabled(); } /* functions used by the window surface */ -unsigned char *QNitpickerPlatformWindow::framebuffer() +unsigned char *QGenodePlatformWindow::framebuffer() { if (qnpw_verbose) - qDebug() << "QNitpickerPlatformWindow::framebuffer()" << _framebuffer; + qDebug() << "QGenodePlatformWindow::framebuffer()" << _framebuffer; /* * The new framebuffer is acquired in this function to avoid a time span when - * the nitpicker buffer would be black and not refilled yet by Qt. + * the GUI buffer would be black and not refilled yet by Qt. */ if (_framebuffer_changed) { @@ -854,10 +854,10 @@ unsigned char *QNitpickerPlatformWindow::framebuffer() return _framebuffer; } -void QNitpickerPlatformWindow::refresh(int x, int y, int w, int h) +void QGenodePlatformWindow::refresh(int x, int y, int w, int h) { if (qnpw_verbose) - qDebug("QNitpickerPlatformWindow::refresh(%d, %d, %d, %d)", x, y, w, h); + qDebug("QGenodePlatformWindow::refresh(%d, %d, %d, %d)", x, y, w, h); if (_geometry_changed) { @@ -871,36 +871,36 @@ void QNitpickerPlatformWindow::refresh(int x, int y, int w, int h) g.moveTo(window()->transientParent()->mapFromGlobal(g.topLeft())); } - typedef Nitpicker::Session::Command Command; - _nitpicker_session.enqueue(_view_handle, - Nitpicker::Rect(Nitpicker::Point(g.x(), g.y()), - Nitpicker::Area(g.width(), g.height()))); - _nitpicker_session.execute(); + typedef Gui::Session::Command Command; + _gui_session.enqueue(_view_handle, + Gui::Rect(Gui::Point(g.x(), g.y()), + Gui::Area(g.width(), g.height()))); + _gui_session.execute(); } } _framebuffer_session.refresh(x, y, w, h); } -EGLSurface QNitpickerPlatformWindow::egl_surface() const +EGLSurface QGenodePlatformWindow::egl_surface() const { return _egl_surface; } -void QNitpickerPlatformWindow::egl_surface(EGLSurface egl_surface) +void QGenodePlatformWindow::egl_surface(EGLSurface egl_surface) { _egl_surface = egl_surface; } -Nitpicker::Session_client &QNitpickerPlatformWindow::nitpicker() +Gui::Session_client &QGenodePlatformWindow::gui_session() { - return _nitpicker_session; + return _gui_session; } -Nitpicker::View_capability QNitpickerPlatformWindow::view_cap() const +Gui::View_capability QGenodePlatformWindow::view_cap() const { - QNitpickerPlatformWindow *npw = const_cast(this); - return npw->_nitpicker_session.view_capability(_view_handle); + QGenodePlatformWindow *npw = const_cast(this); + return npw->_gui_session.view_capability(_view_handle); } QT_END_NAMESPACE diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerscreen.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodescreen.h similarity index 67% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerscreen.h rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodescreen.h index 6ca05e6cc3..837c7a4aa0 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerscreen.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodescreen.h @@ -1,5 +1,5 @@ /* - * \brief QNitpickerScreen + * \brief QGenodeScreen * \author Christian Prochaska * \date 2013-05-08 */ @@ -12,8 +12,8 @@ */ -#ifndef _QNITPICKERSCREEN_H_ -#define _QNITPICKERSCREEN_H_ +#ifndef _QGENODESCREEN_H_ +#define _QGENODESCREEN_H_ /* Genode includes */ #include @@ -23,11 +23,11 @@ #include -#include "qnitpickercursor.h" +#include "qgenodecursor.h" QT_BEGIN_NAMESPACE -class QNitpickerScreen : public QPlatformScreen +class QGenodeScreen : public QPlatformScreen { private: @@ -36,14 +36,14 @@ class QNitpickerScreen : public QPlatformScreen public: - QNitpickerScreen(Genode::Env &env) : _env(env) + QGenodeScreen(Genode::Env &env) : _env(env) { - Nitpicker::Connection _nitpicker(env); + Gui::Connection _gui(env); - Framebuffer::Mode const scr_mode = _nitpicker.mode(); + Framebuffer::Mode const scr_mode = _gui.mode(); if (scr_mode.format() != Framebuffer::Mode::RGB565) - qCritical() << "Nitpicker screen format is not RGB565"; + qCritical() << "GUI screen format is not RGB565"; _geometry.setRect(0, 0, scr_mode.width(), scr_mode.height()); @@ -56,11 +56,11 @@ class QNitpickerScreen : public QPlatformScreen QPlatformCursor *cursor() const { - static QNitpickerCursor instance(_env); + static QGenodeCursor instance(_env); return &instance; } }; QT_END_NAMESPACE -#endif /* _QNITPICKERSCREEN_H_ */ +#endif /* _QGENODESCREEN_H_ */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerwindowsurface.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.cpp similarity index 71% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerwindowsurface.cpp rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.cpp index 34e673dce1..e9271e0fd0 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerwindowsurface.cpp +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.cpp @@ -1,5 +1,5 @@ /* - * \brief QNitpickerWindowSurface + * \brief QGenodeWindowSurface * \author Christian Prochaska * \date 2013-05-08 */ @@ -19,9 +19,9 @@ #include -#include "qnitpickerplatformwindow.h" +#include "qgenodeplatformwindow.h" -#include "qnitpickerwindowsurface.h" +#include "qgenodewindowsurface.h" #include @@ -29,27 +29,27 @@ static const bool verbose = false; QT_BEGIN_NAMESPACE -QNitpickerWindowSurface::QNitpickerWindowSurface(QWindow *window) +QGenodeWindowSurface::QGenodeWindowSurface(QWindow *window) : QPlatformBackingStore(window), _backbuffer(0), _framebuffer_changed(true) { - //qDebug() << "QNitpickerWindowSurface::QNitpickerWindowSurface:" << (long)this; + //qDebug() << "QGenodeWindowSurface::QGenodeWindowSurface:" << (long)this; /* Calling 'QWindow::winId()' ensures that the platform window has been created */ window->winId(); - _platform_window = static_cast(window->handle()); + _platform_window = static_cast(window->handle()); connect(_platform_window, SIGNAL(framebuffer_changed()), this, SLOT(framebuffer_changed())); } -QNitpickerWindowSurface::~QNitpickerWindowSurface() +QGenodeWindowSurface::~QGenodeWindowSurface() { free(_backbuffer); } -QPaintDevice *QNitpickerWindowSurface::paintDevice() +QPaintDevice *QGenodeWindowSurface::paintDevice() { if (verbose) - qDebug() << "QNitpickerWindowSurface::paintDevice()"; + qDebug() << "QGenodeWindowSurface::paintDevice()"; if (_framebuffer_changed) { @@ -66,23 +66,23 @@ QPaintDevice *QNitpickerWindowSurface::paintDevice() _image = QImage(_backbuffer, geo.width(), geo.height(), geo.width() * bytes_per_pixel, format); if (verbose) - qDebug() << "QNitpickerWindowSurface::paintDevice(): w =" << geo.width() << ", h =" << geo.height(); + qDebug() << "QGenodeWindowSurface::paintDevice(): w =" << geo.width() << ", h =" << geo.height(); } if (verbose) - qDebug() << "QNitpickerWindowSurface::paintDevice() finished"; + qDebug() << "QGenodeWindowSurface::paintDevice() finished"; return &_image; } -void QNitpickerWindowSurface::flush(QWindow *window, const QRegion ®ion, const QPoint &offset) +void QGenodeWindowSurface::flush(QWindow *window, const QRegion ®ion, const QPoint &offset) { Q_UNUSED(window); Q_UNUSED(region); Q_UNUSED(offset); if (verbose) - qDebug() << "QNitpickerWindowSurface::flush(" + qDebug() << "QGenodeWindowSurface::flush(" << "window =" << window << ", region =" << region << ", offset =" << offset @@ -117,13 +117,13 @@ void QNitpickerWindowSurface::flush(QWindow *window, const QRegion ®ion, cons } -void QNitpickerWindowSurface::resize(const QSize &size, const QRegion &staticContents) +void QGenodeWindowSurface::resize(const QSize &size, const QRegion &staticContents) { if (verbose) - qDebug() << "QNitpickerWindowSurface::resize:" << this << size; + qDebug() << "QGenodeWindowSurface::resize:" << this << size; } -void QNitpickerWindowSurface::framebuffer_changed() +void QGenodeWindowSurface::framebuffer_changed() { _framebuffer_changed = true; } diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerwindowsurface.h b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.h similarity index 54% rename from repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerwindowsurface.h rename to repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.h index bfa789597c..870e6cc770 100644 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerwindowsurface.h +++ b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/genode/qgenodewindowsurface.h @@ -1,5 +1,5 @@ /* - * \brief QNitpickerWindowSurface + * \brief QGenodeWindowSurface * \author Christian Prochaska * \date 2013-05-08 */ @@ -12,30 +12,30 @@ */ -#ifndef _QNITPICKERWINDOWSURFACE_H_ -#define _QNITPICKERWINDOWSURFACE_H_ +#ifndef _QGENODEWINDOWSURFACE_H_ +#define _QGENODEWINDOWSURFACE_H_ #include -class QNitpickerPlatformWindow; +class QGenodePlatformWindow; QT_BEGIN_NAMESPACE -class QNitpickerWindowSurface : public QObject, public QPlatformBackingStore +class QGenodeWindowSurface : public QObject, public QPlatformBackingStore { Q_OBJECT private: - QNitpickerPlatformWindow *_platform_window; - unsigned char *_backbuffer; - QImage _image; - bool _framebuffer_changed; + QGenodePlatformWindow *_platform_window; + unsigned char *_backbuffer; + QImage _image; + bool _framebuffer_changed; public: - QNitpickerWindowSurface(QWindow *window); - ~QNitpickerWindowSurface(); + QGenodeWindowSurface(QWindow *window); + ~QGenodeWindowSurface(); QPaintDevice *paintDevice(); void flush(QWindow *window, const QRegion ®ion, const QPoint &offset); @@ -48,4 +48,4 @@ class QNitpickerWindowSurface : public QObject, public QPlatformBackingStore QT_END_NAMESPACE -#endif /* _QNITPICKERWINDOWSURFACE_H_ */ +#endif /* _QGENODEWINDOWSURFACE_H_ */ diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/nitpicker.json b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/nitpicker.json deleted file mode 100644 index 543688b74a..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/nitpicker.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "Keys": [ "nitpicker" ] -} diff --git a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp b/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp deleted file mode 100644 index 6ab2eeab28..0000000000 --- a/repos/libports/src/lib/qt5/qtbase/src/plugins/platforms/nitpicker/qnitpickerintegration.cpp +++ /dev/null @@ -1,111 +0,0 @@ -/* - * \brief QNitpickerIntegration - * \author Christian Prochaska - * \date 2013-05-08 - */ - -/* - * Copyright (C) 2013-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -/* Qt includes */ -#include -#include - -#include "qgenodeclipboard.h" -#include "qnitpickerglcontext.h" -#include "qnitpickerintegration.h" -#include "qnitpickerplatformwindow.h" -#include "qnitpickerscreen.h" -#include "qnitpickerwindowsurface.h" -#include "QtEventDispatcherSupport/private/qgenericunixeventdispatcher_p.h" -#include "QtFontDatabaseSupport/private/qfreetypefontdatabase_p.h" - -QT_BEGIN_NAMESPACE - -static const bool verbose = false; - - -QNitpickerIntegration::QNitpickerIntegration(Genode::Env &env) -: _env(env), - _nitpicker_screen(new QNitpickerScreen(env)) { } - - -bool QNitpickerIntegration::hasCapability(QPlatformIntegration::Capability cap) const -{ - switch (cap) { - case ThreadedPixmaps: return true; - default: return QPlatformIntegration::hasCapability(cap); - } -} - - -QPlatformWindow *QNitpickerIntegration::createPlatformWindow(QWindow *window) const -{ - if (verbose) - qDebug() << "QNitpickerIntegration::createPlatformWindow(" << window << ")"; - - QRect screen_geometry = _nitpicker_screen->geometry(); - return new QNitpickerPlatformWindow(_env, window, - screen_geometry.width(), - screen_geometry.height()); -} - - -QPlatformBackingStore *QNitpickerIntegration::createPlatformBackingStore(QWindow *window) const -{ - if (verbose) - qDebug() << "QNitpickerIntegration::createPlatformBackingStore(" << window << ")"; - return new QNitpickerWindowSurface(window); -} - - -QAbstractEventDispatcher *QNitpickerIntegration::createEventDispatcher() const -{ - if (verbose) - qDebug() << "QNitpickerIntegration::createEventDispatcher()"; - return createUnixEventDispatcher(); -} - - -void QNitpickerIntegration::initialize() -{ - QWindowSystemInterface::handleScreenAdded(_nitpicker_screen); - - QString icStr = QPlatformInputContextFactory::requested(); - if (icStr.isNull()) - icStr = QLatin1String("compose"); - m_inputContext.reset(QPlatformInputContextFactory::create(icStr)); -} - - -QPlatformFontDatabase *QNitpickerIntegration::fontDatabase() const -{ - static QFreeTypeFontDatabase db; - return &db; -} - - -#ifndef QT_NO_CLIPBOARD -QPlatformClipboard *QNitpickerIntegration::clipboard() const -{ - static QGenodeClipboard cb(_env); - return &cb; -} -#endif - - -QPlatformOpenGLContext *QNitpickerIntegration::createPlatformOpenGLContext(QOpenGLContext *context) const -{ - return new QNitpickerGLContext(context); -} - -QPlatformInputContext *QNitpickerIntegration::inputContext() const -{ - return m_inputContext.data(); -} - -QT_END_NAMESPACE diff --git a/repos/os/include/decorator/window.h b/repos/os/include/decorator/window.h index c4e8193be7..f07fe1c402 100644 --- a/repos/os/include/decorator/window.h +++ b/repos/os/include/decorator/window.h @@ -39,7 +39,7 @@ class Decorator::Window_base : private Genode::List_model::Element { public: - typedef Nitpicker::Session::View_handle View_handle; + typedef Gui::Session::View_handle View_handle; struct Border { @@ -178,11 +178,11 @@ class Decorator::Window_base : private Genode::List_model::Element * We do not immediately update the views as part of the update * method because at the time when updating the model, the * decorations haven't been redrawn already. If we updated the - * nitpicker views at this point, we would reveal not-yet-drawn pixels. + * GUI views at this point, we would reveal not-yet-drawn pixels. */ virtual bool update(Xml_node window_node) = 0; - virtual void update_nitpicker_views() { } + virtual void update_gui_views() { } /** * Report information about element at specified position diff --git a/repos/os/include/decorator/window_stack.h b/repos/os/include/decorator/window_stack.h index 7a2a2b8119..f99e0e88bc 100644 --- a/repos/os/include/decorator/window_stack.h +++ b/repos/os/include/decorator/window_stack.h @@ -110,10 +110,10 @@ class Decorator::Window_stack : public Window_base::Draw_behind_fn template void for_each_window(FUNC const &func) { _windows.for_each(func); } - void update_nitpicker_views() + void update_gui_views() { /* - * Update nitpicker views in reverse order (back-most first). The + * Update GUI views in reverse order (back-most first). The * reverse order is important because the stacking position of a * view is propagated by referring to the neighbor the view is in * front of. By starting with the back-most view, we make sure that @@ -123,7 +123,7 @@ class Decorator::Window_stack : public Window_base::Draw_behind_fn Reversed_windows reversed = _reversed_window_list(); while (Genode::List_element *win = reversed.first()) { - win->object()->update_nitpicker_views(); + win->object()->update_gui_views(); reversed.remove(win); } } @@ -244,7 +244,7 @@ void Decorator::Window_stack::update_model(Genode::Xml_node root_node, new_front_most_id = root_node.sub_node("window").attribute_value("id", ~0UL); /* - * Propagate changed stacking order to nitpicker + * Propagate changed stacking order to the GUI server * * First, we reverse the window list. The 'reversed' list starts with * the back-most window. We then go throuh each window back to front diff --git a/repos/os/include/gui_session/capability.h b/repos/os/include/gui_session/capability.h index a90a0437c1..a4c85e6a93 100644 --- a/repos/os/include/gui_session/capability.h +++ b/repos/os/include/gui_session/capability.h @@ -17,7 +17,7 @@ #include #include -namespace Nitpicker { +namespace Gui { typedef Genode::Capability Session_capability; } diff --git a/repos/os/include/gui_session/client.h b/repos/os/include/gui_session/client.h index eec5707992..1cc8e79c37 100644 --- a/repos/os/include/gui_session/client.h +++ b/repos/os/include/gui_session/client.h @@ -18,10 +18,10 @@ #include #include -namespace Nitpicker { struct Session_client; } +namespace Gui { struct Session_client; } -class Nitpicker::Session_client : public Genode::Rpc_client +class Gui::Session_client : public Genode::Rpc_client { private: @@ -83,7 +83,7 @@ class Nitpicker::Session_client : public Genode::Rpc_client void buffer(Framebuffer::Mode mode, bool alpha) override { call(mode, alpha); } - void focus(Nitpicker::Session_capability session) override { + void focus(Gui::Session_capability session) override { call(session); } void session_control(Label selector, Session_control operation) override { diff --git a/repos/os/include/gui_session/connection.h b/repos/os/include/gui_session/connection.h index 8f10bfcefd..91ee7ec922 100644 --- a/repos/os/include/gui_session/connection.h +++ b/repos/os/include/gui_session/connection.h @@ -1,5 +1,5 @@ /* - * \brief Connection to Nitpicker service + * \brief Connection to GUI service * \author Norman Feske * \date 2008-08-22 */ @@ -20,11 +20,11 @@ #include #include -namespace Nitpicker { class Connection; } +namespace Gui { class Connection; } -class Nitpicker::Connection : public Genode::Connection, - public Session_client +class Gui::Connection : public Genode::Connection, + public Session_client { public: @@ -89,7 +89,7 @@ class Nitpicker::Connection : public Genode::Connection, } /** - * Return sub session for Nitpicker's input service + * Return sub session for GUI's input service */ Input::Session_client *input() { return &_input; } diff --git a/repos/os/include/gui_session/gui_session.h b/repos/os/include/gui_session/gui_session.h index 9dc1118ad7..8130c045f4 100644 --- a/repos/os/include/gui_session/gui_session.h +++ b/repos/os/include/gui_session/gui_session.h @@ -20,7 +20,7 @@ #include #include -namespace Nitpicker { +namespace Gui { using Genode::size_t; @@ -39,7 +39,7 @@ namespace Nitpicker { } -struct Nitpicker::Session : Genode::Session +struct Gui::Session : Genode::Session { /** * \noapi @@ -308,7 +308,7 @@ struct Nitpicker::Session : Genode::Session * Perform control operation on one or multiple sessions * * The 'label' is used to select the sessions, on which the 'operation' is - * performed. Nitpicker creates a selector string by concatenating the + * performed. The GUI server creates a selector string by concatenating the * caller's session label with the supplied 'label' argument. A session is * selected if its label starts with the selector string. Thereby, the * operation is limited to the caller session or any child session of the diff --git a/repos/os/include/loader_session/client.h b/repos/os/include/loader_session/client.h index ddd6be9231..2ad5837aec 100644 --- a/repos/os/include/loader_session/client.h +++ b/repos/os/include/loader_session/client.h @@ -43,7 +43,7 @@ struct Loader::Session_client : Genode::Rpc_client void constrain_geometry(Area size) override { call(size); } - void parent_view(Nitpicker::View_capability view) override { + void parent_view(Gui::View_capability view) override { call(view); } void view_ready_sigh(Signal_context_capability sigh) override { diff --git a/repos/os/include/loader_session/loader_session.h b/repos/os/include/loader_session/loader_session.h index 8dd0851b2f..e8e713f255 100644 --- a/repos/os/include/loader_session/loader_session.h +++ b/repos/os/include/loader_session/loader_session.h @@ -128,7 +128,7 @@ struct Loader::Session : Genode::Session * If 'parent_view' is not called prior calling 'start', the * subsystem's view will not have a parent view. */ - virtual void parent_view(Nitpicker::View_capability view) = 0; + virtual void parent_view(Gui::View_capability view) = 0; /** * Register signal handler notified at creation time of the first view @@ -180,7 +180,7 @@ struct Loader::Session : Genode::Session GENODE_RPC(Rpc_cap_quota, void, cap_quota, Cap_quota); GENODE_RPC(Rpc_ram_quota, void, ram_quota, Ram_quota); GENODE_RPC(Rpc_constrain_geometry, void, constrain_geometry, Area); - GENODE_RPC(Rpc_parent_view, void, parent_view, Nitpicker::View_capability); + GENODE_RPC(Rpc_parent_view, void, parent_view, Gui::View_capability); GENODE_RPC(Rpc_view_ready_sigh, void, view_ready_sigh, Signal_context_capability); GENODE_RPC(Rpc_fault_sigh, void, fault_sigh, Signal_context_capability); GENODE_RPC_THROW(Rpc_start, void, start, diff --git a/repos/os/src/app/global_keys_handler/main.cc b/repos/os/src/app/global_keys_handler/main.cc index e253f0e65f..d236eba413 100644 --- a/repos/os/src/app/global_keys_handler/main.cc +++ b/repos/os/src/app/global_keys_handler/main.cc @@ -41,9 +41,9 @@ struct Global_keys_handler::Main Attached_rom_dataspace _config_ds { _env, "config" }; /** - * Nitpicker connection to obtain user input + * GUI connection to obtain user input */ - Nitpicker::Connection _nitpicker { _env, "input" }; + Gui::Connection _nitpicker { _env, "input" }; /** * Input-event buffer diff --git a/repos/os/src/app/pointer/main.cc b/repos/os/src/app/pointer/main.cc index 9e7c313071..dcfa914f85 100644 --- a/repos/os/src/app/pointer/main.cc +++ b/repos/os/src/app/pointer/main.cc @@ -35,7 +35,7 @@ namespace Pointer { class Main; } template -void convert_default_pointer_data_to_pixels(PT *pixel, Nitpicker::Area size) +void convert_default_pointer_data_to_pixels(PT *pixel, Gui::Area size) { unsigned char *alpha = (unsigned char *)(pixel + size.count()); @@ -66,17 +66,17 @@ class Pointer::Main : public Rom::Reader bool _verbose = _config.xml().attribute_value("verbose", false); - Nitpicker::Connection _nitpicker { _env }; + Gui::Connection _gui { _env }; - Nitpicker::Session::View_handle _view = _nitpicker.create_view(); + Gui::Session::View_handle _view = _gui.create_view(); bool _default_pointer_visible = false; - Nitpicker::Area _current_pointer_size { }; + Gui::Area _current_pointer_size { }; Genode::Dataspace_capability _pointer_ds { }; - void _resize_nitpicker_buffer_if_needed(Nitpicker::Area pointer_size); + void _resize_gui_buffer_if_needed(Gui::Area pointer_size); void _show_default_pointer(); void _update_pointer(); @@ -134,7 +134,7 @@ class Pointer::Main : public Rom::Reader }; -void Pointer::Main::_resize_nitpicker_buffer_if_needed(Nitpicker::Area pointer_size) +void Pointer::Main::_resize_gui_buffer_if_needed(Gui::Area pointer_size) { if (pointer_size == _current_pointer_size) return; @@ -143,9 +143,9 @@ void Pointer::Main::_resize_nitpicker_buffer_if_needed(Nitpicker::Area pointer_s (int)pointer_size.h(), Framebuffer::Mode::RGB565 }; - _nitpicker.buffer(mode, true /* use alpha */); + _gui.buffer(mode, true /* use alpha */); - _pointer_ds = _nitpicker.framebuffer()->dataspace(); + _pointer_ds = _gui.framebuffer()->dataspace(); _current_pointer_size = pointer_size; } @@ -157,10 +157,10 @@ void Pointer::Main::_show_default_pointer() if (_default_pointer_visible) return; - Nitpicker::Area const pointer_size { big_mouse.w, big_mouse.h }; + Gui::Area const pointer_size { big_mouse.w, big_mouse.h }; try { - _resize_nitpicker_buffer_if_needed(pointer_size); + _resize_gui_buffer_if_needed(pointer_size); } catch (...) { Genode::error(__func__, ": could not resize the pointer buffer " "for ", pointer_size.w(), "x", pointer_size.h(), " pixels"); @@ -171,11 +171,11 @@ void Pointer::Main::_show_default_pointer() convert_default_pointer_data_to_pixels(ds.local_addr(), pointer_size); - _nitpicker.framebuffer()->refresh(0, 0, pointer_size.w(), pointer_size.h()); + _gui.framebuffer()->refresh(0, 0, pointer_size.w(), pointer_size.h()); - Nitpicker::Rect geometry(Nitpicker::Point(0, 0), pointer_size); - _nitpicker.enqueue(_view, geometry); - _nitpicker.execute(); + Gui::Rect geometry(Gui::Point(0, 0), pointer_size); + _gui.enqueue(_view, geometry); + _gui.execute(); _default_pointer_visible = true; } @@ -183,16 +183,16 @@ void Pointer::Main::_show_default_pointer() void Pointer::Main::_show_shape_pointer(Shape_report &shape_report) { - Nitpicker::Area shape_size; - Nitpicker::Point shape_hot; + Gui::Area shape_size; + Gui::Point shape_hot; if (shape_report.visible) { - shape_size = Nitpicker::Area(shape_report.width, shape_report.height); - shape_hot = Nitpicker::Point((int)-shape_report.x_hot, (int)-shape_report.y_hot); + shape_size = Gui::Area(shape_report.width, shape_report.height); + shape_hot = Gui::Point((int)-shape_report.x_hot, (int)-shape_report.y_hot); try { - _resize_nitpicker_buffer_if_needed(shape_size); + _resize_gui_buffer_if_needed(shape_size); } catch (...) { error(__func__, ": could not resize the pointer buffer " "for ", shape_size, " pixels"); @@ -232,11 +232,11 @@ void Pointer::Main::_show_shape_pointer(Shape_report &shape_report) Dither_painter::paint(alpha_surface, texture); } - _nitpicker.framebuffer()->refresh(0, 0, shape_size.w(), shape_size.h()); + _gui.framebuffer()->refresh(0, 0, shape_size.w(), shape_size.h()); - Nitpicker::Rect geometry(shape_hot, shape_size); - _nitpicker.enqueue(_view, geometry); - _nitpicker.execute(); + Gui::Rect geometry(shape_hot, shape_size); + _gui.enqueue(_view, geometry); + _gui.execute(); _default_pointer_visible = false; } @@ -344,7 +344,7 @@ Pointer::Main::Main(Genode::Env &env) : _env(env) Framebuffer::Mode const mode { Pointer::MAX_WIDTH, Pointer::MAX_HEIGHT, Framebuffer::Mode::RGB565 }; - _nitpicker.buffer(mode, true /* use alpha */); + _gui.buffer(mode, true /* use alpha */); if (_shapes_enabled) { try { @@ -366,9 +366,9 @@ Pointer::Main::Main(Genode::Env &env) : _env(env) } } - typedef Nitpicker::Session::View_handle View_handle; - _nitpicker.enqueue(_view, View_handle()); - _nitpicker.execute(); + typedef Gui::Session::View_handle View_handle; + _gui.enqueue(_view, View_handle()); + _gui.execute(); _update_pointer(); diff --git a/repos/os/src/app/status_bar/main.cc b/repos/os/src/app/status_bar/main.cc index 39107c7e70..bb8ab1cf46 100644 --- a/repos/os/src/app/status_bar/main.cc +++ b/repos/os/src/app/status_bar/main.cc @@ -42,9 +42,9 @@ struct Status_bar::Buffer { enum { HEIGHT = 18, LABEL_GAP = 15 }; - Nitpicker::Connection &_nitpicker; + Gui::Connection &_gui; - Framebuffer::Mode const _nit_mode { _nitpicker.mode() }; + Framebuffer::Mode const _nit_mode { _gui.mode() }; /* * Dimension nitpicker buffer depending on nitpicker's screen size. @@ -55,8 +55,8 @@ struct Status_bar::Buffer Dataspace_capability _init_buffer() { - _nitpicker.buffer(_mode, false); - return _nitpicker.framebuffer()->dataspace(); + _gui.buffer(_mode, false); + return _gui.framebuffer()->dataspace(); } Attached_dataspace _fb_ds; @@ -64,9 +64,9 @@ struct Status_bar::Buffer Tff_font::Static_glyph_buffer<4096> _glyph_buffer { }; Tff_font _font { &_binary_default_tff_start, _glyph_buffer }; - Buffer(Region_map &rm, Nitpicker::Connection &nitpicker) + Buffer(Region_map &rm, Gui::Connection &gui) : - _nitpicker(nitpicker), _fb_ds(rm, _init_buffer()) + _gui(gui), _fb_ds(rm, _init_buffer()) { } template @@ -162,7 +162,7 @@ void Status_bar::Buffer::draw(Domain_name const &domain_name, _draw_label(surface, view_rect.center(_label_size(domain_name, label)), domain_name, label, color); - _nitpicker.framebuffer()->refresh(0, 0, area.w(), area.h()); + _gui.framebuffer()->refresh(0, 0, area.w(), area.h()); } @@ -182,16 +182,16 @@ struct Status_bar::Main Signal_handler
_mode_handler { _env.ep(), *this, &Main::_handle_mode }; - Nitpicker::Connection _nitpicker { _env, "status_bar" }; + Gui::Connection _gui { _env, "status_bar" }; /* status-bar attributes */ Domain_name _domain_name { }; Label _label { }; Color _color { }; - Reconstructible _buffer { _env.rm(), _nitpicker }; + Reconstructible _buffer { _env.rm(), _gui }; - Nitpicker::Session::View_handle const _view { _nitpicker.create_view() }; + Gui::Session::View_handle const _view { _gui.create_view() }; void _draw_status_bar() { @@ -202,11 +202,11 @@ struct Status_bar::Main { /* register signal handlers */ _focus_ds.sigh(_focus_handler); - _nitpicker.mode_sigh(_mode_handler); + _gui.mode_sigh(_mode_handler); /* schedule initial view-stacking command, needed only once */ - typedef Nitpicker::Session::View_handle View_handle; - _nitpicker.enqueue(_view, View_handle()); + typedef Gui::Session::View_handle View_handle; + _gui.enqueue(_view, View_handle()); /* import initial state */ _handle_mode(); @@ -244,15 +244,15 @@ void Status_bar::Main::_handle_focus() void Status_bar::Main::_handle_mode() { - _buffer.construct(_env.rm(), _nitpicker); + _buffer.construct(_env.rm(), _gui); _draw_status_bar(); Rect const geometry(Point(0, 0), Area(_buffer->mode().width(), _buffer->mode().height())); - _nitpicker.enqueue(_view, geometry); - _nitpicker.execute(); + _gui.enqueue(_view, geometry); + _gui.execute(); } diff --git a/repos/os/src/server/loader/child.h b/repos/os/src/server/loader/child.h index 6bd4dccd9e..fcba5d3433 100644 --- a/repos/os/src/server/loader/child.h +++ b/repos/os/src/server/loader/child.h @@ -49,7 +49,7 @@ class Loader::Child : public Child_policy Parent_services &_parent_services; - Service &_local_nitpicker_service; + Service &_local_gui_service; Service &_local_rom_service; Service &_local_cpu_service; Service &_local_pd_service; @@ -58,7 +58,7 @@ class Loader::Child : public Child_policy Service &_matching_service(Service::Name const &name) { - if (name == "Gui") return _local_nitpicker_service; + if (name == "Gui") return _local_gui_service; if (name == "ROM") return _local_rom_service; if (name == "CPU") return _local_cpu_service; if (name == "PD") return _local_pd_service; @@ -87,7 +87,7 @@ class Loader::Child : public Child_policy Service &local_rom_service, Service &local_cpu_service, Service &local_pd_service, - Service &local_nitpicker_service, + Service &local_gui_service, Signal_context_capability /* fault_sigh */) : _env(env), @@ -97,7 +97,7 @@ class Loader::Child : public Child_policy _cap_quota(Genode::Child::effective_quota(cap_quota)), _ram_quota(Genode::Child::effective_quota(ram_quota)), _parent_services(parent_services), - _local_nitpicker_service(local_nitpicker_service), + _local_gui_service(local_gui_service), _local_rom_service(local_rom_service), _local_cpu_service(local_cpu_service), _local_pd_service(local_pd_service), diff --git a/repos/os/src/server/loader/nitpicker.h b/repos/os/src/server/loader/gui.h similarity index 76% rename from repos/os/src/server/loader/nitpicker.h rename to repos/os/src/server/loader/gui.h index f5125b0590..a572576f89 100644 --- a/repos/os/src/server/loader/nitpicker.h +++ b/repos/os/src/server/loader/gui.h @@ -1,5 +1,5 @@ /* - * \brief Virtualized nitpicker session interface exposed to the subsystem + * \brief Virtualized GUI session interface exposed to the subsystem * \author Christian Prochaska * \author Norman Feske * \date 2009-10-05 @@ -12,8 +12,8 @@ * under the terms of the GNU Affero General Public License version 3. */ -#ifndef _NITPICKER_H_ -#define _NITPICKER_H_ +#ifndef _GUI_H_ +#define _GUI_H_ /* Genode includes */ #include @@ -25,13 +25,13 @@ /* local includes */ #include -namespace Nitpicker { +namespace Gui { using namespace Genode; class Session_component; } -class Nitpicker::Session_component : public Rpc_object +class Gui::Session_component : public Rpc_object { private: @@ -45,7 +45,7 @@ class Nitpicker::Session_component : public Rpc_object Area _max_size; - Nitpicker::Connection _nitpicker; + Gui::Connection _gui; View_handle _parent_view_handle; @@ -73,14 +73,14 @@ class Nitpicker::Session_component : public Rpc_object /* * Command buffer */ - typedef Nitpicker::Session::Command_buffer Command_buffer; + typedef Gui::Session::Command_buffer Command_buffer; Attached_ram_dataspace _command_ds; Command_buffer &_command_buffer = *_command_ds.local_addr(); void _propagate_view_offset() { - _nitpicker.enqueue(_view_handle, - _view_offset + _virt_view_offset); + _gui.enqueue(_view_handle, + _view_offset + _virt_view_offset); } void _update_motion_delta() @@ -109,14 +109,14 @@ class Nitpicker::Session_component : public Rpc_object { _virt_view_offset = command.offset.offset; _propagate_view_offset(); - _nitpicker.execute(); + _gui.execute(); return; } case Command::OP_TO_FRONT: { - _nitpicker.enqueue(_view_handle, _parent_view_handle); - _nitpicker.execute(); + _gui.enqueue(_view_handle, _parent_view_handle); + _gui.execute(); return; } @@ -134,8 +134,8 @@ class Nitpicker::Session_component : public Rpc_object case Command::OP_TITLE: { - _nitpicker.enqueue(command); - _nitpicker.execute(); + _gui.enqueue(command); + _gui.execute(); return; } @@ -154,22 +154,22 @@ class Nitpicker::Session_component : public Rpc_object Region_map &rm, Ram_allocator &ram, Area max_size, - Nitpicker::View_capability parent_view, + Gui::View_capability parent_view, Signal_context_capability view_ready_sigh, char const * /* args */) : _view_ready_sigh(view_ready_sigh), _ep(ep), _max_size(max_size), - _nitpicker(env), + _gui(env), /* import parent view */ - _parent_view_handle(_nitpicker.view_handle(parent_view)), + _parent_view_handle(_gui.view_handle(parent_view)), - /* create nitpicker view */ - _view_handle(_nitpicker.create_view(_parent_view_handle)), + /* create GUI view */ + _view_handle(_gui.create_view(_parent_view_handle)), - _proxy_input(rm, _nitpicker.input_session(), _motion_delta), + _proxy_input(rm, _gui.input_session(), _motion_delta), _command_ds(ram, env.rm(), sizeof(Command_buffer)) { @@ -184,13 +184,13 @@ class Nitpicker::Session_component : public Rpc_object } - /********************************* - ** Nitpicker session interface ** - *********************************/ + /*************************** + ** GUI session interface ** + ***************************/ Framebuffer::Session_capability framebuffer_session() override { - return _nitpicker.framebuffer_session(); + return _gui.framebuffer_session(); } Input::Session_capability input_session() override @@ -232,21 +232,21 @@ class Nitpicker::Session_component : public Rpc_object { int mode_width = _max_size.valid() ? _max_size.w() : - _nitpicker.mode().width(); + _gui.mode().width(); int mode_height = _max_size.valid() ? _max_size.h() : - _nitpicker.mode().height(); + _gui.mode().height(); return Framebuffer::Mode(mode_width, mode_height, - _nitpicker.mode().format()); + _gui.mode().format()); } void mode_sigh(Signal_context_capability) override { } void buffer(Framebuffer::Mode mode, bool use_alpha) override { - _nitpicker.buffer(mode, use_alpha); + _gui.buffer(mode, use_alpha); } void focus(Capability) override { } @@ -272,18 +272,18 @@ class Nitpicker::Session_component : public Rpc_object */ void loader_view_geometry(Rect rect, Point offset) { - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; _view_geometry = rect; _view_offset = offset; _propagate_view_offset(); - _nitpicker.enqueue(_view_handle, _view_geometry); - _nitpicker.enqueue(_view_handle, _parent_view_handle); - _nitpicker.execute(); + _gui.enqueue(_view_handle, _view_geometry); + _gui.enqueue(_view_handle, _parent_view_handle); + _gui.execute(); _update_motion_delta(); } }; -#endif /* _NITPICKER_H_ */ +#endif /* _GUI_H_ */ diff --git a/repos/os/src/server/loader/input.h b/repos/os/src/server/loader/input.h index 4c510a4770..4f440ec826 100644 --- a/repos/os/src/server/loader/input.h +++ b/repos/os/src/server/loader/input.h @@ -4,7 +4,7 @@ * \author Norman Feske * \date 2010-09-02 * - * This input service implementation is used by the virtualized nitpicker + * This input service implementation is used by the virtualized GUI * service to translate the input coordinate system from the coordinates * seen by the user of the virtualized session and the physical coordinates * dictated by the loader-session client. diff --git a/repos/os/src/server/loader/main.cc b/repos/os/src/server/loader/main.cc index 2d6e55eeb9..d2f5240c6a 100644 --- a/repos/os/src/server/loader/main.cc +++ b/repos/os/src/server/loader/main.cc @@ -21,7 +21,7 @@ /* local includes */ #include -#include +#include #include @@ -155,7 +155,7 @@ class Loader::Session_component : public Rpc_object } }; - struct Local_nitpicker_factory : Local_service::Factory + struct Local_gui_factory : Local_service::Factory { Entrypoint &_ep; Env &_env; @@ -163,27 +163,27 @@ class Loader::Session_component : public Rpc_object Ram_allocator &_ram; Area _max_size { }; - Nitpicker::View_capability _parent_view { }; + Gui::View_capability _parent_view { }; Signal_context_capability view_ready_sigh { }; - Constructible session { }; + Constructible session { }; - Local_nitpicker_factory(Entrypoint &ep, Env &env, - Region_map &rm, Ram_allocator &ram) + Local_gui_factory(Entrypoint &ep, Env &env, + Region_map &rm, Ram_allocator &ram) : _ep(ep), _env(env), _rm(rm), _ram(ram) { } void constrain_geometry(Area size) { _max_size = size; } - void parent_view(Nitpicker::View_capability view) + void parent_view(Gui::View_capability view) { _parent_view = view; } - Nitpicker::Session_component &create(Args const &args, Affinity) override + Gui::Session_component &create(Args const &args, Affinity) override { if (session.constructed()) { - warning("attempt to open more than one nitpicker session"); + warning("attempt to open more than one GUI session"); throw Service_denied(); } @@ -192,11 +192,11 @@ class Loader::Session_component : public Rpc_object return *session; } - void upgrade(Nitpicker::Session_component &, Args const &) override { } - void destroy(Nitpicker::Session_component &) override { } + void upgrade(Gui::Session_component &, Args const &) override { } + void destroy(Gui::Session_component &) override { } }; - typedef Local_service Local_nitpicker_service; + typedef Local_service Local_gui_service; enum { STACK_SIZE = 2*4096 }; @@ -217,28 +217,28 @@ class Loader::Session_component : public Rpc_object Local_rom_service _rom_service { _rom_factory }; Local_cpu_service _cpu_service { _env }; Local_pd_service _pd_service { _env }; - Local_nitpicker_factory _nitpicker_factory { _env.ep(), _env, _env.rm(), _local_ram }; - Local_nitpicker_service _nitpicker_service { _nitpicker_factory }; + Local_gui_factory _gui_factory { _env.ep(), _env, _env.rm(), _local_ram }; + Local_gui_service _gui_service { _gui_factory }; Signal_context_capability _fault_sigh { }; Constructible _child { }; /** - * Return virtual nitpicker session component + * Return virtual GUI session component */ - Nitpicker::Session_component &_virtual_nitpicker_session() + Gui::Session_component &_virtual_gui_session() { - if (!_nitpicker_factory.session.constructed()) + if (!_gui_factory.session.constructed()) throw View_does_not_exist(); - return *_nitpicker_factory.session; + return *_gui_factory.session; } - Nitpicker::Session_component const &_virtual_nitpicker_session() const + Gui::Session_component const &_virtual_gui_session() const { - if (!_nitpicker_factory.session.constructed()) + if (!_gui_factory.session.constructed()) throw View_does_not_exist(); - return *_nitpicker_factory.session; + return *_gui_factory.session; } public: @@ -303,17 +303,17 @@ class Loader::Session_component : public Rpc_object void constrain_geometry(Area size) override { - _nitpicker_factory.constrain_geometry(size); + _gui_factory.constrain_geometry(size); } - void parent_view(Nitpicker::View_capability view) override + void parent_view(Gui::View_capability view) override { - _nitpicker_factory.parent_view(view); + _gui_factory.parent_view(view); } void view_ready_sigh(Signal_context_capability sigh) override { - _nitpicker_factory.view_ready_sigh = sigh; + _gui_factory.view_ready_sigh = sigh; } void fault_sigh(Signal_context_capability sigh) override @@ -356,7 +356,7 @@ class Loader::Session_component : public Rpc_object prefixed_label(_label, Session_label(label.string())), Cap_quota{cap_quota}, Ram_quota{ram_quota}, _parent_services, _rom_service, - _cpu_service, _pd_service, _nitpicker_service, + _cpu_service, _pd_service, _gui_service, _fault_sigh); } catch (Genode::Service_denied) { @@ -365,12 +365,12 @@ class Loader::Session_component : public Rpc_object void view_geometry(Rect rect, Point offset) override { - _virtual_nitpicker_session().loader_view_geometry(rect, offset); + _virtual_gui_session().loader_view_geometry(rect, offset); } Area view_size() const override { - return _virtual_nitpicker_session().loader_view_size(); + return _virtual_gui_session().loader_view_size(); } }; diff --git a/repos/os/src/server/nit_fb/main.cc b/repos/os/src/server/nit_fb/main.cc index 04cb33ffb8..126cd8696d 100644 --- a/repos/os/src/server/nit_fb/main.cc +++ b/repos/os/src/server/nit_fb/main.cc @@ -1,5 +1,5 @@ /* - * \brief Framebuffer-to-Nitpicker adapter + * \brief Framebuffer-to-GUI adapter * \author Norman Feske * \date 2010-09-09 */ @@ -87,9 +87,9 @@ struct Framebuffer::Session_component : Genode::Rpc_object { Genode::Pd_session const &_pd; - Nitpicker::Connection &_nitpicker; + Gui::Connection &_gui; - Framebuffer::Session &_nit_fb = *_nitpicker.framebuffer(); + Framebuffer::Session &_nit_fb = *_gui.framebuffer(); Genode::Signal_context_capability _mode_sigh { }; @@ -97,11 +97,11 @@ struct Framebuffer::Session_component : Genode::Rpc_object View_updater &_view_updater; - Framebuffer::Mode::Format _format = _nitpicker.mode().format(); + Framebuffer::Mode::Format _format = _gui.mode().format(); /* * Mode as requested by the configuration or by a mode change of our - * nitpicker session. + * GUI session. */ Framebuffer::Mode _next_mode; @@ -109,7 +109,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object /* * Number of bytes used for backing the current virtual framebuffer at - * nitpicker. + * the GUI server. */ size_t _buffer_num_bytes = 0; @@ -127,7 +127,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object { /* calculation in bytes */ size_t const used = _buffer_num_bytes, - needed = Nitpicker::Session::ram_quota(mode, false), + needed = Gui::Session::ram_quota(mode, false), usable = _pd.avail_ram().value, preserved = 64*1024; @@ -139,18 +139,18 @@ struct Framebuffer::Session_component : Genode::Rpc_object * Constructor */ Session_component(Genode::Pd_session const &pd, - Nitpicker::Connection &nitpicker, + Gui::Connection &gui, View_updater &view_updater, Framebuffer::Mode initial_mode) : - _pd(pd), _nitpicker(nitpicker), _view_updater(view_updater), + _pd(pd), _gui(gui), _view_updater(view_updater), _next_mode(initial_mode) { } - void size(Nitpicker::Area size) + void size(Gui::Area size) { /* ignore calls that don't change the size */ - if (Nitpicker::Area(_next_mode.width(), _next_mode.height()) == size) + if (Gui::Area(_next_mode.width(), _next_mode.height()) == size) return; Framebuffer::Mode const mode(size.w(), size.h(), _next_mode.format()); @@ -166,9 +166,9 @@ struct Framebuffer::Session_component : Genode::Rpc_object Genode::Signal_transmitter(_mode_sigh).submit(); } - Nitpicker::Area size() const + Gui::Area size() const { - return Nitpicker::Area(_active_mode.width(), _active_mode.height()); + return Gui::Area(_active_mode.width(), _active_mode.height()); } @@ -178,11 +178,11 @@ struct Framebuffer::Session_component : Genode::Rpc_object Genode::Dataspace_capability dataspace() override { - _nitpicker.buffer(_active_mode, false); + _gui.buffer(_active_mode, false); _buffer_num_bytes = Genode::max(_buffer_num_bytes, - Nitpicker::Session::ram_quota(_active_mode, false)); + Gui::Session::ram_quota(_active_mode, false)); /* * We defer the update of the view until the client calls refresh the @@ -220,7 +220,7 @@ struct Framebuffer::Session_component : Genode::Rpc_object /* * Keep a component-local copy of the signal capability. Otherwise, * NOVA would revoke the capability from further recipients (in this - * case the nitpicker instance we are using) once we revoke the + * case the GUI-server instance we are using) once we revoke the * capability locally. */ _sync_sigh = sigh; @@ -240,17 +240,17 @@ struct Nit_fb::Main : View_updater Genode::Attached_rom_dataspace config_rom { env, "config" }; - Nitpicker::Connection nitpicker { env }; + Gui::Connection gui { env }; Point position { 0, 0 }; unsigned refresh_rate = 0; - typedef Nitpicker::Session::View_handle View_handle; + typedef Gui::Session::View_handle View_handle; - View_handle view = nitpicker.create_view(); + View_handle view = gui.create_view(); - Genode::Attached_dataspace input_ds { env.rm(), nitpicker.input()->dataspace() }; + Genode::Attached_dataspace input_ds { env.rm(), gui.input()->dataspace() }; struct Initial_size { @@ -285,16 +285,16 @@ struct Nit_fb::Main : View_updater Framebuffer::Mode _initial_mode() { - return Framebuffer::Mode(_initial_size.width (nitpicker.mode()), - _initial_size.height(nitpicker.mode()), - nitpicker.mode().format()); + return Framebuffer::Mode(_initial_size.width (gui.mode()), + _initial_size.height(gui.mode()), + gui.mode().format()); } /* * Input and framebuffer sessions provided to our client */ Input::Session_component input_session { env, env.ram() }; - Framebuffer::Session_component fb_session { env.pd(), nitpicker, *this, _initial_mode() }; + Framebuffer::Session_component fb_session { env.pd(), gui, *this, _initial_mode() }; /* * Attach root interfaces to the entry point @@ -307,11 +307,10 @@ struct Nit_fb::Main : View_updater */ void update_view() override { - typedef Nitpicker::Session::Command Command; - nitpicker.enqueue(view, Rect(position, - fb_session.size())); - nitpicker.enqueue(view, View_handle()); - nitpicker.execute(); + typedef Gui::Session::Command Command; + gui.enqueue(view, Rect(position, fb_session.size())); + gui.enqueue(view, View_handle()); + gui.execute(); } /** @@ -340,7 +339,7 @@ struct Nit_fb::Main : View_updater { Xml_node const config = config_rom.xml(); - Framebuffer::Mode const nit_mode = nitpicker.mode(); + Framebuffer::Mode const nit_mode = gui.mode(); position = _coordinate_origin(nit_mode, config) + Point(config.attribute_value("xpos", 0L), @@ -403,7 +402,7 @@ struct Nit_fb::Main : View_updater { Input::Event const * const events = input_ds.local_addr(); - unsigned const num = nitpicker.input()->flush(); + unsigned const num = gui.input()->flush(); bool update = false; for (unsigned i = 0; i < num; i++) { @@ -441,8 +440,8 @@ struct Nit_fb::Main : View_updater * Register signal handlers */ config_rom.sigh(config_update_handler); - nitpicker.mode_sigh(mode_update_handler); - nitpicker.input()->sigh(input_handler); + gui.mode_sigh(mode_update_handler); + gui.input()->sigh(input_handler); } }; diff --git a/repos/os/src/server/nitpicker/main.cc b/repos/os/src/server/nitpicker/main.cc index 17486fc366..03eedc8f06 100644 --- a/repos/os/src/server/nitpicker/main.cc +++ b/repos/os/src/server/nitpicker/main.cc @@ -172,7 +172,7 @@ class Nitpicker::Root : public Root_component, void _session_visibility(Session_label const &label, Suffix const &suffix, bool visible) { - Nitpicker::Session::Label const selector(label, suffix); + Gui::Session::Label const selector(label, suffix); for (Session_component *s = _session_list.first(); s; s = s->next()) if (s->matches_session_label(selector)) @@ -502,7 +502,7 @@ void Nitpicker::Main::_handle_focus() _focus_rom->update(); - typedef Session::Label Label; + typedef Gui::Session::Label Label; Label const label = _focus_rom->xml().attribute_value("label", Label()); /* diff --git a/repos/os/src/server/nitpicker/session_component.cc b/repos/os/src/server/nitpicker/session_component.cc index 94bec3ea48..8808b039ac 100644 --- a/repos/os/src/server/nitpicker/session_component.cc +++ b/repos/os/src/server/nitpicker/session_component.cc @@ -438,7 +438,7 @@ void Session_component::buffer(Framebuffer::Mode mode, bool use_alpha) } -void Session_component::focus(Capability session_cap) +void Session_component::focus(Capability session_cap) { if (this->cap() == session_cap) return; diff --git a/repos/os/src/server/nitpicker/session_component.h b/repos/os/src/server/nitpicker/session_component.h index 27e362b375..40fc135203 100644 --- a/repos/os/src/server/nitpicker/session_component.h +++ b/repos/os/src/server/nitpicker/session_component.h @@ -44,7 +44,7 @@ namespace Nitpicker { struct Nitpicker::Visibility_controller : Interface { - typedef Session::Label Suffix; + using Suffix = Gui::Session::Label; virtual void hide_matching_sessions(Session_label const &, Suffix const &) = 0; @@ -52,7 +52,7 @@ struct Nitpicker::Visibility_controller : Interface }; -class Nitpicker::Session_component : public Session_object, +class Nitpicker::Session_component : public Session_object, public View_owner, public Buffer_provider, private Session_list::Element @@ -61,7 +61,7 @@ class Nitpicker::Session_component : public Session_object, friend class List; - using Nitpicker::Session::Label; + using Gui::Session::Label; /* * Noncopyable @@ -390,7 +390,7 @@ class Nitpicker::Session_component : public Session_object, void buffer(Framebuffer::Mode mode, bool use_alpha) override; - void focus(Capability session_cap) override; + void focus(Capability session_cap) override; void session_control(Label suffix, Session_control control) override; diff --git a/repos/os/src/server/nitpicker/types.h b/repos/os/src/server/nitpicker/types.h index d612ae57f8..cbf5992e59 100644 --- a/repos/os/src/server/nitpicker/types.h +++ b/repos/os/src/server/nitpicker/types.h @@ -21,9 +21,12 @@ #include #include +namespace Gui { } + namespace Nitpicker { using namespace Genode; + using namespace Gui; typedef Surface_base::Point Point; typedef Surface_base::Area Area; diff --git a/repos/os/src/server/nitpicker/view_component.h b/repos/os/src/server/nitpicker/view_component.h index d130cb8f55..e2d67b710c 100644 --- a/repos/os/src/server/nitpicker/view_component.h +++ b/repos/os/src/server/nitpicker/view_component.h @@ -52,13 +52,17 @@ namespace Nitpicker { */ struct Session_view_list_elem : List::Element { }; + class View_component; +} + + +namespace Gui { + /* * We use view capabilities as mere tokens to pass views between sessions. * There is no RPC interface associated with a view. */ - struct View : Interface { GENODE_RPC_INTERFACE(); }; - - class View_component; + struct View : Genode::Interface { GENODE_RPC_INTERFACE(); }; } @@ -67,7 +71,7 @@ class Nitpicker::View_component : private Same_buffer_list_elem, private View_stack_elem, private View_parent_elem, private Weak_object, - public Rpc_object + public Rpc_object { public: diff --git a/repos/os/src/server/nitpicker/view_owner.h b/repos/os/src/server/nitpicker/view_owner.h index 4b387cea88..fdecae63bb 100644 --- a/repos/os/src/server/nitpicker/view_owner.h +++ b/repos/os/src/server/nitpicker/view_owner.h @@ -34,12 +34,14 @@ namespace Nitpicker { class View_owner; } struct Nitpicker::View_owner : Interface { + using Label = Gui::Session::Label; + /** * Return the owner's session label */ - virtual Session::Label label() const { return Session::Label(""); } + virtual Label label() const { return Label(""); } - virtual bool matches_session_label(Session::Label const &) const { return false; } + virtual bool matches_session_label(Label const &) const { return false; } virtual bool visible() const { return true; } diff --git a/repos/os/src/test/nitpicker/test.cc b/repos/os/src/test/nitpicker/test.cc index 24c6782272..623902c396 100644 --- a/repos/os/src/test/nitpicker/test.cc +++ b/repos/os/src/test/nitpicker/test.cc @@ -25,53 +25,53 @@ class Test_view : public List::Element { private: - typedef Nitpicker::Session::View_handle View_handle; - typedef Nitpicker::Session::Command Command; + using View_handle = Gui::Session::View_handle; + using Command = Gui::Session::Command; - Nitpicker::Session_client &_nitpicker; - View_handle _handle { }; - int _x, _y, _w, _h; - const char *_title; - Test_view *_parent_view; + Gui::Session_client &_gui; + View_handle _handle { }; + int _x, _y, _w, _h; + const char *_title; + Test_view *_parent_view; public: - Test_view(Nitpicker::Session_client *nitpicker, + Test_view(Gui::Session_client *gui, int x, int y, int w, int h, const char *title, Test_view *parent_view = 0) : - _nitpicker(*nitpicker), + _gui(*gui), _x(x), _y(y), _w(w), _h(h), _title(title), _parent_view(parent_view) { - using namespace Nitpicker; + using namespace Gui; View_handle parent_handle; if (_parent_view) - parent_handle = _nitpicker.view_handle(_parent_view->view_cap()); + parent_handle = _gui.view_handle(_parent_view->view_cap()); - _handle = _nitpicker.create_view(parent_handle); + _handle = _gui.create_view(parent_handle); if (parent_handle.valid()) - _nitpicker.release_view_handle(parent_handle); + _gui.release_view_handle(parent_handle); - Nitpicker::Rect rect(Nitpicker::Point(_x, _y), Nitpicker::Area(_w, _h)); - _nitpicker.enqueue(_handle, rect); - _nitpicker.enqueue(_handle, View_handle()); - _nitpicker.enqueue(_handle, _title); - _nitpicker.execute(); + Gui::Rect rect(Gui::Point(_x, _y), Gui::Area(_w, _h)); + _gui.enqueue(_handle, rect); + _gui.enqueue(_handle, View_handle()); + _gui.enqueue(_handle, _title); + _gui.execute(); } - Nitpicker::View_capability view_cap() + Gui::View_capability view_cap() { - return _nitpicker.view_capability(_handle); + return _gui.view_capability(_handle); } void top() { - _nitpicker.enqueue(_handle, View_handle()); - _nitpicker.execute(); + _gui.enqueue(_handle, View_handle()); + _gui.execute(); } /** @@ -87,9 +87,9 @@ class Test_view : public List::Element _x = _parent_view ? x - _parent_view->x() : x; _y = _parent_view ? y - _parent_view->y() : y; - Nitpicker::Rect rect(Nitpicker::Point(_x, _y), Nitpicker::Area(_w, _h)); - _nitpicker.enqueue(_handle, rect); - _nitpicker.execute(); + Gui::Rect rect(Gui::Point(_x, _y), Gui::Area(_w, _h)); + _gui.enqueue(_handle, rect); + _gui.execute(); } /** @@ -147,11 +147,11 @@ void Component::construct(Genode::Env &env) * Init sessions to the required external services */ enum { CONFIG_ALPHA = false }; - static Nitpicker::Connection nitpicker { env, "testnit" }; - static Timer::Connection timer { env }; + static Gui::Connection gui { env, "testnit" }; + static Timer::Connection timer { env }; Framebuffer::Mode const mode(256, 256, Framebuffer::Mode::RGB565); - nitpicker.buffer(mode, false); + gui.buffer(mode, false); int const scr_w = mode.width(), scr_h = mode.height(); @@ -164,13 +164,13 @@ void Component::construct(Genode::Env &env) /* bad-case test */ { /* issue #3232 */ - Nitpicker::Session::View_handle handle { nitpicker.create_view() }; - nitpicker.destroy_view(handle); - nitpicker.destroy_view(handle); + Gui::Session::View_handle handle { gui.create_view() }; + gui.destroy_view(handle); + gui.destroy_view(handle); } Genode::Attached_dataspace fb_ds( - env.rm(), nitpicker.framebuffer()->dataspace()); + env.rm(), gui.framebuffer()->dataspace()); short *pixels = fb_ds.local_addr(); unsigned char *alpha = (unsigned char *)&pixels[scr_w*scr_h]; @@ -199,9 +199,9 @@ void Component::construct(Genode::Env &env) /* * View 'v1' is used as coordinate origin of 'v2' and 'v3'. */ - static Test_view v1(&nitpicker, 150, 100, 230, 200, "Eins"); - static Test_view v2(&nitpicker, 20, 20, 230, 210, "Zwei", &v1); - static Test_view v3(&nitpicker, 40, 40, 230, 220, "Drei", &v1); + static Test_view v1(&gui, 150, 100, 230, 200, "Eins"); + static Test_view v2(&gui, 20, 20, 230, 210, "Zwei", &v1); + static Test_view v3(&gui, 40, 40, 230, 220, "Drei", &v1); tvs.insert(&v1); tvs.insert(&v2); @@ -215,9 +215,9 @@ void Component::construct(Genode::Env &env) Test_view *tv = nullptr; while (1) { - while (!nitpicker.input()->pending()) timer.msleep(20); + while (!gui.input()->pending()) timer.msleep(20); - nitpicker.input()->for_each_event([&] (Input::Event const &ev) { + gui.input()->for_each_event([&] (Input::Event const &ev) { if (ev.press()) key_cnt++; if (ev.release()) key_cnt--; diff --git a/repos/ports/recipes/pkg/arora/archives b/repos/ports/recipes/pkg/arora/archives index 48d320d53f..1c36617a16 100644 --- a/repos/ports/recipes/pkg/arora/archives +++ b/repos/ports/recipes/pkg/arora/archives @@ -8,7 +8,7 @@ _/src/mesa _/src/qt5_core _/src/qt5_gui _/src/qt5_qjpeg -_/src/qt5_qpa_nitpicker +_/src/qt5_qpa_genode _/src/stdcxx _/src/vfs _/src/vfs_pipe @@ -20,7 +20,7 @@ _/src/libcrypto _/src/libssl _/src/qt5_network _/src/qt5_printsupport -_/src/qt5_qnitpickerviewwidget +_/src/qt5_qgenodeviewwidget _/src/qt5_opengl _/src/qt5_qpluginwidget _/src/qt5_scriptclassic diff --git a/repos/ports/recipes/pkg/arora/runtime b/repos/ports/recipes/pkg/arora/runtime index ad04348461..b0c537061d 100644 --- a/repos/ports/recipes/pkg/arora/runtime +++ b/repos/ports/recipes/pkg/arora/runtime @@ -28,7 +28,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/repos/ports/recipes/src/arora/used_apis b/repos/ports/recipes/src/arora/used_apis index e31221805b..45b1b93396 100644 --- a/repos/ports/recipes/src/arora/used_apis +++ b/repos/ports/recipes/src/arora/used_apis @@ -11,8 +11,8 @@ qt5_gui qt5_printsupport qt5_qjpeg qt5_network -qt5_qnitpickerviewwidget -qt5_qpa_nitpicker +qt5_qgenodeviewwidget +qt5_qpa_genode qt5_qpluginwidget qt5_scriptclassic qt5_ui_tools diff --git a/repos/ports/run/arora.run b/repos/ports/run/arora.run index 5487167f2f..a3df79162e 100644 --- a/repos/ports/run/arora.run +++ b/repos/ports/run/arora.run @@ -8,7 +8,7 @@ import_from_depot [depot_user]/src/arora \ [depot_user]/src/libssl \ [depot_user]/src/qt5_network \ [depot_user]/src/qt5_printsupport \ - [depot_user]/src/qt5_qnitpickerviewwidget \ + [depot_user]/src/qt5_qgenodeviewwidget \ [depot_user]/src/qt5_opengl \ [depot_user]/src/qt5_qpluginwidget \ [depot_user]/src/qt5_scriptclassic \ diff --git a/repos/ports/src/app/arora/target.mk b/repos/ports/src/app/arora/target.mk index ee8a6c967c..b941aedafa 100644 --- a/repos/ports/src/app/arora/target.mk +++ b/repos/ports/src/app/arora/target.mk @@ -3,7 +3,7 @@ ARORA = arora-0.11.0 QT_TMPL_DIR = $(call select_from_repositories,src/app/qt5/tmpl) ifneq ($(QT_TMPL_DIR),) -LIBS += qt5_printsupport qt5_qpluginwidget qt5_qnitpickerviewwidget +LIBS += qt5_printsupport qt5_qpluginwidget qt5_qgenodeviewwidget else REQUIRES += qt5 endif diff --git a/repos/ports/src/app/seoul/component.cc b/repos/ports/src/app/seoul/component.cc index 2252ab14e1..0030d750e9 100644 --- a/repos/ports/src/app/seoul/component.cc +++ b/repos/ports/src/app/seoul/component.cc @@ -1387,27 +1387,25 @@ void Component::construct(Genode::Env &env) Genode::log(" framebuffer ", width, "x", height); /* setup framebuffer memory for guest */ - static Nitpicker::Connection nitpicker { env }; - nitpicker.buffer(Framebuffer::Mode(width, height, - Framebuffer::Mode::RGB565), false); + static Gui::Connection gui { env }; + gui.buffer(Framebuffer::Mode(width, height, Framebuffer::Mode::RGB565), false); - static Framebuffer::Session &framebuffer { *nitpicker.framebuffer() }; + static Framebuffer::Session &framebuffer { *gui.framebuffer() }; Framebuffer::Mode const fb_mode { framebuffer.mode() }; size_t const fb_size = Genode::align_addr(fb_mode.width() * fb_mode.height() * fb_mode.bytes_per_pixel(), 12); - typedef Nitpicker::Session::View_handle View_handle; - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::View_handle View_handle; + typedef Gui::Session::Command Command; - View_handle view = nitpicker.create_view(); - Nitpicker::Rect rect(Nitpicker::Point(0, 0), - Nitpicker::Area(fb_mode.width(), fb_mode.height())); + View_handle view = gui.create_view(); + Gui::Rect rect(Gui::Point(0, 0), Gui::Area(fb_mode.width(), fb_mode.height())); - nitpicker.enqueue(view, rect); - nitpicker.enqueue(view, View_handle()); - nitpicker.execute(); + gui.enqueue(view, rect); + gui.enqueue(view, View_handle()); + gui.execute(); /* setup guest memory */ static Seoul::Guest_memory guest_memory(env, heap, vm_con, vm_size); @@ -1450,7 +1448,7 @@ void Component::construct(Genode::Env &env) /* create console thread */ static Seoul::Console vcon(env, heap, machine.motherboard(), machine.unsynchronized_motherboard(), - nitpicker, guest_memory); + gui, guest_memory); vcon.register_host_operations(machine.unsynchronized_motherboard()); diff --git a/repos/ports/src/app/seoul/console.cc b/repos/ports/src/app/seoul/console.cc index 7bba703101..f89bba92ce 100644 --- a/repos/ports/src/app/seoul/console.cc +++ b/repos/ports/src/app/seoul/console.cc @@ -406,14 +406,14 @@ bool Seoul::Console::receive(MessageTimeout &msg) { Seoul::Console::Console(Genode::Env &env, Genode::Allocator &alloc, Synced_motherboard &mb, Motherboard &unsynchronized_motherboard, - Nitpicker::Connection &nitpicker, + Gui::Connection &gui, Seoul::Guest_memory &guest_memory) : _env(env), _unsynchronized_motherboard(unsynchronized_motherboard), _motherboard(mb), - _framebuffer(*nitpicker.framebuffer()), - _input(*nitpicker.input()), + _framebuffer(*gui.framebuffer()), + _input(*gui.input()), _memory(guest_memory), _fb_ds(_framebuffer.dataspace()), _fb_mode(_framebuffer.mode()), diff --git a/repos/ports/src/app/seoul/console.h b/repos/ports/src/app/seoul/console.h index e3ef0142e6..0fc5fa6fbe 100644 --- a/repos/ports/src/app/seoul/console.h +++ b/repos/ports/src/app/seoul/console.h @@ -108,7 +108,7 @@ class Seoul::Console : public StaticReceiver */ Console(Genode::Env &env, Genode::Allocator &alloc, Synced_motherboard &, Motherboard &, - Nitpicker::Connection &, Seoul::Guest_memory &); + Gui::Connection &, Seoul::Guest_memory &); }; #endif /* _CONSOLE_H_ */ diff --git a/repos/ports/src/virtualbox5/frontend/console.cc b/repos/ports/src/virtualbox5/frontend/console.cc index 23a01de29b..90fe58aca2 100644 --- a/repos/ports/src/virtualbox5/frontend/console.cc +++ b/repos/ports/src/virtualbox5/frontend/console.cc @@ -282,7 +282,7 @@ void GenodeConsole::_handle_mode_change() Genodefb *fb = dynamic_cast(pFramebuffer); - fb->update_mode(_nitpicker.mode()); + fb->update_mode(_gui.mode()); update_video_mode(); } @@ -331,7 +331,7 @@ void GenodeConsole::init_backends(IKeyboard * gKeyboard, IMouse * gMouse) HRESULT rc = i_getDisplay()->QueryFramebuffer(0, &pFramebuffer); Assert(SUCCEEDED(rc) && pFramebuffer); - _nitpicker.mode_sigh(_mode_change_signal_dispatcher); + _gui.mode_sigh(_mode_change_signal_dispatcher); _handle_mode_change(); } diff --git a/repos/ports/src/virtualbox5/frontend/console.h b/repos/ports/src/virtualbox5/frontend/console.h index 993b9ce4af..7520c6ed39 100644 --- a/repos/ports/src/virtualbox5/frontend/console.h +++ b/repos/ports/src/virtualbox5/frontend/console.h @@ -114,7 +114,7 @@ class GenodeConsole : public Console { private: - Nitpicker::Connection _nitpicker; + Gui::Connection _gui; Input::Session_client &_input; unsigned _ax, _ay; bool _last_received_motion_event_was_absolute; @@ -150,8 +150,8 @@ class GenodeConsole : public Console { GenodeConsole() : Console(), - _nitpicker(genode_env()), - _input(*_nitpicker.input()), + _gui(genode_env()), + _input(*_gui.input()), _ax(0), _ay(0), _last_received_motion_event_was_absolute(false), _shape_report_connection(genode_env(), "shape", @@ -182,7 +182,7 @@ class GenodeConsole : public Console { } } - Nitpicker::Connection &nitpicker() { return _nitpicker; } + Gui::Connection &gui() { return _gui; } void init_clipboard(); diff --git a/repos/ports/src/virtualbox5/frontend/fb.h b/repos/ports/src/virtualbox5/frontend/fb.h index 578f9abccd..aa4a96fcc4 100644 --- a/repos/ports/src/virtualbox5/frontend/fb.h +++ b/repos/ports/src/virtualbox5/frontend/fb.h @@ -26,18 +26,18 @@ #include "Global.h" #include "VirtualBoxBase.h" -typedef Nitpicker::Session::View_handle View_handle; +typedef Gui::Session::View_handle View_handle; class Genodefb : VBOX_SCRIPTABLE_IMPL(IFramebuffer) { private: - Genode::Env &_env; - Nitpicker::Connection &_nitpicker; - Fb_Genode::Session &_fb; - View_handle _view; - Fb_Genode::Mode _fb_mode { 1024, 768, Fb_Genode::Mode::RGB565 }; + Genode::Env &_env; + Gui::Connection &_gui; + Fb_Genode::Session &_fb; + View_handle _view; + Fb_Genode::Mode _fb_mode { 1024, 768, Fb_Genode::Mode::RGB565 }; /* * The mode currently used by the VM. Can be smaller than the @@ -60,39 +60,39 @@ class Genodefb : void _adjust_buffer() { - _nitpicker.buffer(Fb_Genode::Mode(_fb_mode.width(), _fb_mode.height(), - Fb_Genode::Mode::RGB565), false); + _gui.buffer(Fb_Genode::Mode(_fb_mode.width(), _fb_mode.height(), + Fb_Genode::Mode::RGB565), false); - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; - Nitpicker::Rect rect(Nitpicker::Point(0, 0), - Nitpicker::Area(_fb_mode.width(), _fb_mode.height())); + Gui::Rect rect(Gui::Point(0, 0), + Gui::Area(_fb_mode.width(), _fb_mode.height())); - _nitpicker.enqueue(_view, rect); - _nitpicker.execute(); + _gui.enqueue(_view, rect); + _gui.execute(); } Fb_Genode::Mode _initial_setup() { - typedef Nitpicker::Session::Command Command; + typedef Gui::Session::Command Command; - _view = _nitpicker.create_view(); + _view = _gui.create_view(); _adjust_buffer(); - _nitpicker.enqueue(_view, View_handle()); - _nitpicker.execute(); + _gui.enqueue(_view, View_handle()); + _gui.execute(); return _fb_mode; } public: - Genodefb (Genode::Env &env, Nitpicker::Connection &nitpicker) + Genodefb (Genode::Env &env, Gui::Connection &gui) : _env(env), - _nitpicker(nitpicker), - _fb(*nitpicker.framebuffer()), + _gui(gui), + _fb(*gui.framebuffer()), _virtual_fb_mode(_initial_setup()), _fb_base(env.rm().attach(_fb.dataspace())) { @@ -205,9 +205,9 @@ class Genodefb : Lock(); - Nitpicker::Area const area_fb = Nitpicker::Area(_fb_mode.width(), - _fb_mode.height()); - Nitpicker::Area const area_vm = Nitpicker::Area(width, height); + Gui::Area const area_fb = Gui::Area(_fb_mode.width(), + _fb_mode.height()); + Gui::Area const area_vm = Gui::Area(width, height); using namespace Genode; diff --git a/repos/ports/src/virtualbox5/frontend/main.cc b/repos/ports/src/virtualbox5/frontend/main.cc index ebf92d023d..2c4f1a9c93 100644 --- a/repos/ports/src/virtualbox5/frontend/main.cc +++ b/repos/ports/src/virtualbox5/frontend/main.cc @@ -169,7 +169,7 @@ HRESULT setupmachine(Genode::Env &env) for (unsigned uScreenId = 0; uScreenId < cMonitors; uScreenId++) { - Genodefb *fb = new Genodefb(env, genodeConsole->nitpicker()); + Genodefb *fb = new Genodefb(env, genodeConsole->gui()); HRESULT rc = display->AttachFramebuffer(uScreenId, fb, gaFramebufferId[uScreenId].asOutParam()); if (FAILED(rc)) return rc;