Merge lp:~alan-griffiths/miral/fix-1629349 into lp:miral

[Alan Griffiths]

Add userdata property to WindowSpecification and copy it to WindowInfo

[Gerry Boland (gerboland)]

Thank you!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-30 09:54:02 +0000
+++ debian/changelog	2016-09-30 16:32:33 +0000
@@ -1,3 +1,9 @@
+miral (0.3.0) UNRELEASED; urgency=medium
+
+  * TBD
+
+ -- Alan Griffiths <[e-mail]>  Fri, 30 Sep 2016 17:25:31 +0100
+
 miral (0.2.0) UNRELEASED; urgency=medium
 
   * New upstream release 0.2.0 (https://launchpad.net/miral/+milestone/0.2)

=== modified file 'debian/libmiral1.symbols'
--- debian/libmiral1.symbols	2016-09-29 14:41:11 +0000
+++ debian/libmiral1.symbols	2016-09-30 16:32:33 +0000
@@ -1,6 +1,7 @@
 libmiral.so.1 libmiral1 #MINVER#
  MIRAL_0.1@MIRAL_0.1 0.1.0
  MIRAL_0.2@MIRAL_0.2 0.2.0
+ MIRAL_0.3@MIRAL_0.3 0.3.0
  (c++)"miral::ActiveOutputsListener::advise_output_begin()@MIRAL_0.1" 0.1.0
  (c++)"miral::ActiveOutputsListener::advise_output_create(miral::Output const&)@MIRAL_0.1" 0.1.0
  (c++)"miral::ActiveOutputsListener::advise_output_delete(miral::Output const&)@MIRAL_0.1" 0.1.0
@@ -241,6 +242,8 @@
  (c++)"miral::WindowSpecification::type() const@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::type()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::update(mir::scene::SurfaceCreationParameters&) const@MIRAL_0.1" 0.1.0
+ (c++)"miral::WindowSpecification::userdata()@MIRAL_0.3" 0.3.0
+ (c++)"miral::WindowSpecification::userdata() const@MIRAL_0.3" 0.3.0
  (c++)"miral::WindowSpecification::width_inc() const@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::width_inc()@MIRAL_0.1" 0.1.0
  (c++)"miral::WindowSpecification::window_placement_gravity() const@MIRAL_0.1" 0.1.0

=== modified file 'include/miral/window_specification.h'
--- include/miral/window_specification.h	2016-09-23 13:59:34 +0000
+++ include/miral/window_specification.h	2016-09-30 16:32:33 +0000
@@ -98,6 +98,7 @@
     auto input_mode() const -> mir::optional_value<InputReceptionMode> const&;
     auto shell_chrome() const -> mir::optional_value<MirShellChrome> const&;
     auto confine_pointer() const -> mir::optional_value<MirPointerConfinementState> const&;
+    auto userdata() const -> mir::optional_value<std::shared_ptr<void>> const&;
 
     auto top_left() -> mir::optional_value<Point>&;
     auto size() -> mir::optional_value<Size>&;
@@ -124,6 +125,7 @@
     auto input_mode() -> mir::optional_value<InputReceptionMode>&;
     auto shell_chrome() -> mir::optional_value<MirShellChrome>&;
     auto confine_pointer() -> mir::optional_value<MirPointerConfinementState>&;
+    auto userdata() -> mir::optional_value<std::shared_ptr<void>>&;
 
 private:
     struct Self;

=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2016-09-30 09:47:05 +0000
+++ miral/basic_window_manager.cpp	2016-09-30 16:32:33 +0000
@@ -102,6 +102,9 @@
     if (spec.parent().is_set() && spec.parent().value().lock())
         window_info.parent(info_for(spec.parent().value()).window());
 
+    if (spec.userdata().is_set())
+        window_info.userdata() = spec.userdata().value();
+
     session_info.add_window(window);
 
     auto const parent = window_info.parent();
@@ -547,6 +550,7 @@
     COPY_IF_SET(output_id);
     COPY_IF_SET(preferred_orientation);
     COPY_IF_SET(confine_pointer);
+    COPY_IF_SET(userdata);
 
 #undef COPY_IF_SET
 

=== modified file 'miral/symbols.map'
--- miral/symbols.map	2016-09-29 14:41:11 +0000
+++ miral/symbols.map	2016-09-30 16:32:33 +0000
@@ -295,3 +295,10 @@
     vtable?for?miral::CursorTheme;
   };
 } MIRAL_0.1;
+
+MIRAL_0.3 {
+global:
+  extern "C++" {
+    miral::WindowSpecification::userdata*;
+  };
+} MIRAL_0.2;

=== modified file 'miral/window_specification.cpp'
--- miral/window_specification.cpp	2016-09-23 13:59:34 +0000
+++ miral/window_specification.cpp	2016-09-30 16:32:33 +0000
@@ -60,6 +60,7 @@
     mir::optional_value<InputReceptionMode> input_mode;
     mir::optional_value<MirShellChrome> shell_chrome;
     mir::optional_value<MirPointerConfinementState> confine_pointer;
+    mir::optional_value<std::shared_ptr<void>> userdata;
 };
 
 miral::WindowSpecification::Self::Self(mir::shell::SurfaceSpecification const& spec) :
@@ -487,6 +488,11 @@
     return self->confine_pointer;
 }
 
+auto miral::WindowSpecification::userdata() const -> mir::optional_value<std::shared_ptr<void>> const&
+{
+    return self->userdata;
+}
+
 auto miral::WindowSpecification::top_left() -> mir::optional_value<Point>&
 {
     return self->top_left;
@@ -611,3 +617,8 @@
 {
     return self->confine_pointer;
 }
+
+auto miral::WindowSpecification::userdata() -> mir::optional_value<std::shared_ptr<void>>&
+{
+    return self->userdata;
+}

=== modified file 'scripts/process_doxygen_xml.py'
--- scripts/process_doxygen_xml.py	2016-09-27 15:59:15 +0000
+++ scripts/process_doxygen_xml.py	2016-09-30 16:32:33 +0000
@@ -362,6 +362,20 @@
 
 MIRAL_0.2 {
 global:
+  extern "C++" {
+    miral::CursorTheme::?CursorTheme*;
+    miral::CursorTheme::CursorTheme*;
+    miral::CursorTheme::operator*;
+    miral::WindowInfo::confine_pointer*;
+    miral::WindowManagerTools::place_and_size_for_state*;
+    miral::WindowSpecification::confine_pointer*;
+    typeinfo?for?miral::CursorTheme;
+    vtable?for?miral::CursorTheme;
+  };
+} MIRAL_0.1;
+
+MIRAL_0.3 {
+global:
   extern "C++" {'''
 
 def print_report():
@@ -371,7 +385,7 @@
         if not formatted_symbol in old_stanzas:
             print formatted_symbol
     print '  };'
-    print '} MIRAL_0.1;'
+    print '} MIRAL_0.2;'
 
 def print_debug_info(node, attributes):
     if not debug: return