Merge lp:~alan-griffiths/miral/hide-streams-from-Window-Management-API into lp:miral

[Alan Griffiths]

Don't expose BufferStreams to window management when creating or modifying windows.

[Chris Halse Rogers (raof)]

It's not clear why you're removing pixel_format(), buffer_usage(), and content_id() at the same time. Is that deliberate?

[Alan Griffiths (alan-griffiths)]

> It's not clear why you're removing pixel_format(), buffer_usage(), and
> content_id() at the same time. Is that deliberate?

Well, it could have been a separate MP, but they are also properties that WM shouldn't be (and AFAICS isn't) messing with.

[Chris Halse Rogers (raof)]

Hm. My understanding is that those *are* things the shell might want to mess with or, rather, to deny creating a window with certain properties.

So the WM doesn't need to deal with them, no, but something in MirAL might?

[lp:~alan-griffiths/miral/hide-streams-from-Window-Management-API]

310. By Alan Griffiths on 2016-09-05

Remove dead file from CMakeLists.txt

[Gerry Boland (gerboland)]

I don't need this yet - perhaps I never will. Ok to remove

review: Approve

=== modified file 'debian/libmiral1.symbols'
--- debian/libmiral1.symbols	2016-08-29 09:19:00 +0000
+++ debian/libmiral1.symbols	2016-09-05 10:38:36 +0000
@@ -229,8 +229,6 @@
  (c++)"miral::WindowSpecification::size()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::state() const@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::state()@MIRAL_0.1" 0.1.0
- (c++)"miral::WindowSpecification::streams() const@MIRAL_0.1" 0.1.0
- (c++)"miral::WindowSpecification::streams()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::top_left() const@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::top_left()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::type() const@MIRAL_0.1" 0.1.0

=== removed file 'include/miral/stream_specification.h'
--- include/miral/stream_specification.h	2016-04-29 13:34:54 +0000
+++ include/miral/stream_specification.h	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-/*
- * Copyright © 2016 Canonical Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 3,
- * as published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Alan Griffiths <[e-mail]>
- */
-
-#ifndef MIRAL_STREAM_SPECIFICATION_H
-#define MIRAL_STREAM_SPECIFICATION_H
-
-#include <mir/int_wrapper.h>
-#include <mir/geometry/displacement.h>
-#include <mir/geometry/size.h>
-#include <mir/optional_value.h>
-
-namespace miral
-{
-using namespace mir::geometry;
-
-namespace detail { struct SessionsBufferStreamIdTag; }
-typedef mir::IntWrapper<detail::SessionsBufferStreamIdTag> BufferStreamId;
-
-struct StreamSpecification
-{
-    BufferStreamId stream_id;
-    Displacement displacement;
-    mir::optional_value<mir::geometry::Size> size;
-};
-}
-
-#endif //MIRAL_STREAM_SPECIFICATION_H

=== modified file 'include/miral/window_specification.h'
--- include/miral/window_specification.h	2016-08-29 14:26:01 +0000
+++ include/miral/window_specification.h	2016-09-05 10:38:36 +0000
@@ -19,12 +19,13 @@
 #ifndef MIRAL_WINDOW_SPECIFICATION_H
 #define MIRAL_WINDOW_SPECIFICATION_H
 
-#include "miral/stream_specification.h"
-
 #include <mir_toolkit/common.h>
 #include <mir_toolkit/version.h>
+
+#include <mir/geometry/displacement.h>
+#include <mir/geometry/rectangles.h>
 #include <mir/optional_value.h>
-#include <mir/geometry/rectangles.h>
+#include <mir/int_wrapper.h>
 
 #include <memory>
 
@@ -100,6 +101,8 @@
 namespace miral
 {
 using namespace mir::geometry;
+namespace detail { struct SessionsBufferStreamIdTag; }
+typedef mir::IntWrapper<detail::SessionsBufferStreamIdTag> BufferStreamId;
 
 class WindowSpecification
 {
@@ -153,7 +156,7 @@
     auto height_inc() const -> mir::optional_value<DeltaY> const&;
     auto min_aspect() const -> mir::optional_value<AspectRatio> const&;
     auto max_aspect() const -> mir::optional_value<AspectRatio> const&;
-    auto streams() const -> mir::optional_value<std::vector<StreamSpecification>> const&;
+
     auto parent() const -> mir::optional_value<std::weak_ptr<mir::scene::Surface>> const&;
     auto input_shape() const -> mir::optional_value<std::vector<Rectangle>> const&;
     auto input_mode() const -> mir::optional_value<InputReceptionMode> const&;
@@ -182,7 +185,6 @@
     auto height_inc() -> mir::optional_value<DeltaY>&;
     auto min_aspect() -> mir::optional_value<AspectRatio>&;
     auto max_aspect() -> mir::optional_value<AspectRatio>&;
-    auto streams() -> mir::optional_value<std::vector<StreamSpecification>>&;
     auto parent() -> mir::optional_value<std::weak_ptr<mir::scene::Surface>>&;
     auto input_shape() -> mir::optional_value<std::vector<Rectangle>>&;
     auto input_mode() -> mir::optional_value<InputReceptionMode>&;

=== modified file 'miral/CMakeLists.txt'
--- miral/CMakeLists.txt	2016-08-29 22:21:17 +0000
+++ miral/CMakeLists.txt	2016-09-05 10:38:36 +0000
@@ -40,7 +40,6 @@
     set_window_managment_policy.cpp     ${CMAKE_SOURCE_DIR}/include/miral/set_window_managment_policy.h
     window_management_policy.cpp        ${CMAKE_SOURCE_DIR}/include/miral/window_management_policy.h
     window_manager_tools.cpp            ${CMAKE_SOURCE_DIR}/include/miral/window_manager_tools.h
-                                        ${CMAKE_SOURCE_DIR}/include/miral/stream_specification.h
                                         ${CMAKE_SOURCE_DIR}/include/miral/toolkit/surface_spec.h
                                         ${CMAKE_SOURCE_DIR}/include/miral/toolkit/persistent_id.h
                                         ${CMAKE_SOURCE_DIR}/include/miral/toolkit/connection.h

=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2016-08-29 16:17:16 +0000
+++ miral/basic_window_manager.cpp	2016-09-05 10:38:36 +0000
@@ -586,31 +586,6 @@
     if (modifications.name().is_set())
         std::shared_ptr<scene::Surface>(window)->rename(modifications.name().value());
 
-    if (modifications.streams().is_set())
-    {
-        auto const& config = modifications.streams().value();
-
-        std::vector<shell::StreamSpecification> dest;
-        dest.reserve(config.size());
-
-#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 22, 0)
-        for (auto const& stream : config)
-            dest.push_back(
-                shell::StreamSpecification{frontend::BufferStreamId{stream.stream_id.as_value()}, stream.displacement});
-#else
-        for (auto const& stream : config)
-            {
-                dest.push_back(
-                    mir::shell::StreamSpecification{
-                        mir::frontend::BufferStreamId{stream.stream_id.as_value()},
-                        stream.displacement,
-                        stream.size
-                    });
-            }
-#endif
-        window.application()->configure_streams(*std::shared_ptr<scene::Surface>(window), dest);
-    }
-
     if (modifications.input_shape().is_set())
         std::shared_ptr<scene::Surface>(window)->set_input_region(modifications.input_shape().value());
 

=== modified file 'miral/symbols.map'
--- miral/symbols.map	2016-08-29 09:19:00 +0000
+++ miral/symbols.map	2016-09-05 10:38:36 +0000
@@ -186,7 +186,6 @@
     miral::WindowSpecification::shell_chrome*;
     miral::WindowSpecification::size*;
     miral::WindowSpecification::state*;
-    miral::WindowSpecification::streams*;
     miral::WindowSpecification::top_left*;
     miral::WindowSpecification::type*;
     miral::WindowSpecification::update*;

=== modified file 'miral/window_specification.cpp'
--- miral/window_specification.cpp	2016-08-29 11:17:18 +0000
+++ miral/window_specification.cpp	2016-09-05 10:38:36 +0000
@@ -54,7 +54,7 @@
     mir::optional_value<DeltaY> height_inc;
     mir::optional_value<AspectRatio> min_aspect;
     mir::optional_value<AspectRatio> max_aspect;
-    mir::optional_value<std::vector<StreamSpecification>> streams;
+    mir::optional_value<std::vector<mir::shell::StreamSpecification>> streams;
     mir::optional_value<std::weak_ptr<mir::scene::Surface>> parent;
     mir::optional_value<std::vector<Rectangle>> input_shape;
     mir::optional_value<InputReceptionMode> input_mode;
@@ -80,7 +80,7 @@
     height_inc(spec.height_inc),
     min_aspect(),
     max_aspect(),
-    streams(),
+    streams(spec.streams),
     parent(spec.parent),
     input_shape(spec.input_shape),
     input_mode(),
@@ -124,36 +124,6 @@
 
     if (spec.max_aspect.is_set())
         max_aspect = AspectRatio{spec.max_aspect.value().width, spec.max_aspect.value().height};
-
-    if (spec.streams.is_set())
-    {
-        auto const& source = spec.streams.value();
-        std::vector<StreamSpecification> dest;
-        dest.reserve(source.size());
-
-#if MIR_SERVER_VERSION < MIR_VERSION_NUMBER(0, 22, 0)
-        for (auto const& stream : source)
-        {
-            dest.push_back(
-                StreamSpecification{
-                    BufferStreamId{stream.stream_id.as_value()},
-                    stream.displacement,
-                    mir::optional_value<mir::geometry::Size>{}
-                });
-        }
-#else
-        for (auto const& stream : source)
-        {
-            dest.push_back(
-                StreamSpecification{
-                    BufferStreamId{stream.stream_id.as_value()},
-                    stream.displacement,
-                    stream.size
-                });
-        }
-#endif
-        streams = std::move(dest);
-    }
 }
 
 namespace
@@ -242,7 +212,11 @@
     height_inc(params.height_inc),
     min_aspect(),
     max_aspect(),
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 22, 0)
+    streams(params.streams),
+#else
     streams(),
+#endif
     parent(params.parent),
     input_shape(params.input_shape),
     input_mode(static_cast<InputReceptionMode>(params.input_mode)),
@@ -280,27 +254,6 @@
 
     if (params.max_aspect.is_set())
         max_aspect = AspectRatio{params.max_aspect.value().width, params.max_aspect.value().height};
-
-#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 22, 0)
-    if (params.streams.is_set())
-    {
-        auto const& source = params.streams.value();
-        std::vector<StreamSpecification> dest;
-        dest.reserve(source.size());
-
-        for (auto const& stream : source)
-        {
-            dest.push_back(
-                StreamSpecification{
-                    BufferStreamId{stream.stream_id.as_value()},
-                    stream.displacement,
-                    stream.size
-                });
-        }
-
-        streams = std::move(dest);
-    }
-#endif
 }
 
 void miral::WindowSpecification::Self::update(mir::scene::SurfaceCreationParameters& params) const
@@ -324,31 +277,13 @@
     copy_if_set(params.height_inc, height_inc);
     copy_if_set(params.min_aspect, min_aspect);
     copy_if_set(params.max_aspect, max_aspect);
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 22, 0)
+    copy_if_set(params.streams, streams);
+#endif
     copy_if_set(params.parent, parent);
     copy_if_set(params.input_shape, input_shape);
     copy_if_set(params.input_mode, input_mode);
     copy_if_set(params.shell_chrome, shell_chrome);
-
-#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 22, 0)
-    if (streams.is_set())
-    {
-        auto const& source = streams.value();
-        std::vector<mir::shell::StreamSpecification> dest;
-        dest.reserve(source.size());
-
-        for (auto const& stream : source)
-        {
-            dest.push_back(
-                mir::shell::StreamSpecification{
-                    mir::frontend::BufferStreamId{stream.stream_id.as_value()},
-                    stream.displacement,
-                    stream.size
-                });
-        }
-
-        params.streams = std::move(dest);
-    }
-#endif
 }
 
 miral::WindowSpecification::WindowSpecification() :
@@ -494,11 +429,6 @@
     return self->max_aspect;
 }
 
-auto miral::WindowSpecification::streams() const -> mir::optional_value<std::vector<StreamSpecification>> const&
-{
-    return self->streams;
-}
-
 auto miral::WindowSpecification::parent() const -> mir::optional_value<std::weak_ptr<mir::scene::Surface>> const&
 {
     return self->parent;
@@ -634,11 +564,6 @@
     return self->max_aspect;
 }
 
-auto miral::WindowSpecification::streams() -> mir::optional_value<std::vector<StreamSpecification>>&
-{
-    return self->streams;
-}
-
 auto miral::WindowSpecification::parent() -> mir::optional_value<std::weak_ptr<mir::scene::Surface>>&
 {
     return self->parent;