From 818840ca6a0e6a66ea8b1e4ddbea74329041f221 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Wed, 30 Sep 2015 17:03:41 +0200 Subject: [PATCH] wm: provide physical screen mode to layouter --- repos/gems/src/server/wm/layouter_nitpicker.h | 20 +++++++++++-------- repos/gems/src/server/wm/nitpicker.h | 3 ++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/repos/gems/src/server/wm/layouter_nitpicker.h b/repos/gems/src/server/wm/layouter_nitpicker.h index 7a6268183..6b8cbf0cc 100644 --- a/repos/gems/src/server/wm/layouter_nitpicker.h +++ b/repos/gems/src/server/wm/layouter_nitpicker.h @@ -32,15 +32,19 @@ struct Wm::Layouter_nitpicker_session : Genode::Rpc_object typedef Nitpicker::View_capability View_capability; typedef Nitpicker::Session::View_handle View_handle; - Input::Session_capability input_session_cap; + Input::Session_capability _input_session_cap; - Attached_ram_dataspace command_ds; + Attached_ram_dataspace _command_ds; + + Framebuffer::Mode const _mode; Layouter_nitpicker_session(Genode::Ram_session &ram, - Input::Session_capability input_session_cap) + Input::Session_capability input_session_cap, + Framebuffer::Mode mode) : - input_session_cap(input_session_cap), - command_ds(&ram, 4096) + _input_session_cap(input_session_cap), + _command_ds(&ram, 4096), + _mode(mode) { } @@ -55,7 +59,7 @@ struct Wm::Layouter_nitpicker_session : Genode::Rpc_object Input::Session_capability input_session() override { - return input_session_cap; + return _input_session_cap; } View_handle create_view(View_handle) override { return View_handle(); } @@ -76,12 +80,12 @@ struct Wm::Layouter_nitpicker_session : Genode::Rpc_object Genode::Dataspace_capability command_dataspace() override { - return command_ds.cap(); + return _command_ds.cap(); } void execute() override { } - Framebuffer::Mode mode() override { return Framebuffer::Mode(); } + Framebuffer::Mode mode() override { return _mode; } void mode_sigh(Genode::Signal_context_capability) override { } diff --git a/repos/gems/src/server/wm/nitpicker.h b/repos/gems/src/server/wm/nitpicker.h index 9b882531c..46f22c877 100644 --- a/repos/gems/src/server/wm/nitpicker.h +++ b/repos/gems/src/server/wm/nitpicker.h @@ -1140,7 +1140,8 @@ class Wm::Nitpicker::Root : public Genode::Rpc_objectram_session(), - _window_layouter_input_cap); + _window_layouter_input_cap, + _focus_nitpicker_session.mode()); return _ep.manage(*_layouter_session); }