Merge lp:~alan-griffiths/miral/more-kiosk-options into lp:miral

[Alan Griffiths]

Provide configuration options for kiosk: --keymap --kiosk-maximize-root-windows & --kiosk-startup-apps-only

[lp:~alan-griffiths/miral/more-kiosk-options]

440. By Alan Griffiths on 2016-11-08

Only apply maximize_root_windows to restored windows

[Gerry Boland (gerboland)]

Why would a kiosk not have a fullscreen root client window? It's how I understood the "kiosk" idea - has a single fullscreen client window

review: Needs Information

[Alan Griffiths (alan-griffiths)]

> Why would a kiosk not have a fullscreen root client window? It's how I
> understood the "kiosk" idea - has a single fullscreen client window

We don't have a real "usecase" for kiosk yet. So, pending feedback from kg I'm allowing the current behaviour (but changing the default).

[Gerry Boland (gerboland)]

Ok, looks fine to me

+ // We do this here, not in place_new_surface() so that clients get a resize event.
+ // This shouldn't be necessary, but works better with the gtk-mir backend.
You consider this a gtk-mir bug? It smells like one to me

review: Approve

[Alan Griffiths (alan-griffiths)]

> + // This shouldn't be necessary, but works better with the gtk-mir backend.
> You consider this a gtk-mir bug? It smells like one to me

I do, but the workaround gets immediate results.

=== modified file 'miral-kiosk/kiosk_main.cpp'
--- miral-kiosk/kiosk_main.cpp	2016-06-10 19:23:40 +0000
+++ miral-kiosk/kiosk_main.cpp	2016-11-08 11:18:13 +0000
@@ -20,16 +20,16 @@
 
 #include <miral/runner.h>
 #include <miral/application_authorizer.h>
+#include <miral/command_line_option.h>
+#include <miral/keymap.h>
 #include <miral/set_window_managment_policy.h>
 #include <miral/internal_client.h>
 
 #include <unistd.h>
-#include <cstdlib>
+#include <atomic>
 
 namespace
 {
-bool const startup_only = getenv("MIRAL_KIOSK_STARTUP_ONLY");
-
 struct KioskAuthorizer : miral::ApplicationAuthorizer
 {
     KioskAuthorizer(SwSplash const& splash) : splash{splash}{}
@@ -61,8 +61,12 @@
         return false;
     }
 
+    static std::atomic<bool> startup_only;
+
     SwSplash splash;
 };
+
+std::atomic<bool> KioskAuthorizer::startup_only{false};
 }
 
 int main(int argc, char const* argv[])
@@ -71,10 +75,25 @@
 
     SwSplash splash;
 
+    CommandLineOption maximise_roots{
+        [&](bool maximize_root_windows) {KioskWindowManagerPolicy::maximize_root_windows = maximize_root_windows; },
+        "kiosk-maximize-root-windows",
+        "Force root windows to maximized",
+        KioskWindowManagerPolicy::maximize_root_windows};
+
+    CommandLineOption startup_only{
+        [&](bool startup_only) {KioskAuthorizer::startup_only = startup_only; },
+        "kiosk-startup-apps-only",
+        "Only allow applications to connect during startup",
+        KioskAuthorizer::startup_only};
+
     return MirRunner{argc, argv}.run_with(
         {
             set_window_managment_policy<KioskWindowManagerPolicy>(splash),
             SetApplicationAuthorizer<KioskAuthorizer>{splash},
+            Keymap{},
+            maximise_roots,
+            startup_only,
             StartupInternalClient{"Intro", splash}
         });
 }

=== modified file 'miral-kiosk/kiosk_window_manager.cpp'
--- miral-kiosk/kiosk_window_manager.cpp	2016-08-04 16:05:00 +0000
+++ miral-kiosk/kiosk_window_manager.cpp	2016-11-08 11:18:13 +0000
@@ -27,6 +27,9 @@
 namespace ms = mir::scene;
 using namespace miral;
 
+std::atomic<bool> KioskWindowManagerPolicy::maximize_root_windows{true};
+
+
 KioskWindowManagerPolicy::KioskWindowManagerPolicy(WindowManagerTools const& tools, SwSplash const& splash) :
     CanonicalWindowManagerPolicy{tools},
     splash{splash}
@@ -119,3 +122,23 @@
             tools.raise_tree(s);
     }
 }
+
+void KioskWindowManagerPolicy::advise_new_window(WindowInfo const& window_info)
+{
+    // We do this here, not in place_new_surface() so that clients get a resize event.
+    // This shouldn't be necessary, but works better with the gtk-mir backend.
+    if (maximize_root_windows &&
+        window_info.type() == mir_surface_type_normal &&
+        !window_info.parent() &&
+        window_info.state() == mir_surface_state_restored)
+    {
+        WindowSpecification specification;
+
+        specification.state() = mir_surface_state_maximized;
+
+        tools.place_and_size_for_state(specification, window_info);
+        tools.modify_window(window_info.window(), specification);
+    }
+
+    CanonicalWindowManagerPolicy::advise_new_window(window_info);
+}

=== modified file 'miral-kiosk/kiosk_window_manager.h'
--- miral-kiosk/kiosk_window_manager.h	2016-07-27 15:43:19 +0000
+++ miral-kiosk/kiosk_window_manager.h	2016-11-08 11:18:13 +0000
@@ -23,6 +23,8 @@
 
 #include <miral/canonical_window_manager.h>
 
+#include <atomic>
+
 using namespace mir::geometry;
 
 class KioskWindowManagerPolicy : public miral::CanonicalWindowManagerPolicy
@@ -32,10 +34,14 @@
 
     void advise_focus_gained(miral::WindowInfo const& info) override;
 
+    virtual void advise_new_window(miral::WindowInfo const& window_info) override;
+
     bool handle_keyboard_event(MirKeyboardEvent const* event) override;
     bool handle_touch_event(MirTouchEvent const* event) override;
     bool handle_pointer_event(MirPointerEvent const* event) override;
 
+    static std::atomic<bool> maximize_root_windows;
+
 private:
     static const int modifier_mask =
         mir_input_event_modifier_alt |