Merge lp:~alan-griffiths/miral/1.3 into lp:miral/release

[Alan Griffiths]

1.3.1 release

[Alan Griffiths (alan-griffiths)]

Seen this twice in bileto:

[ RUN ] Workspaces.with_two_applications_when_a_window_in_a_workspace_hides_focus_remains_in_workspace
[2017-03-30 07:31:06.592649] mirserver: Starting
[2017-03-30 07:31:06.592873] mirserver: Selected driver: mir:stub-graphics (version 0.26.2)
[2017-03-30 07:31:06.593742] mirserver: Using software cursor
[2017-03-30 07:31:06.624258] mirserver: Selected input driver: mir:stub-input (version: 0.26.2)
[2017-03-30 07:31:06.634376] mirserver: Mir version 0.26.2
[2017-03-30 07:31:06.638238] mirserver: Initial display configuration:
[2017-03-30 07:31:06.651197] mirserver: Output 1: VGA connected, used
[2017-03-30 07:31:06.651288] mirserver: Physical size 0.0" 0x0mm
[2017-03-30 07:31:06.651306] mirserver: Power is on
[2017-03-30 07:31:06.651328] mirserver: Current mode 1600x1600 60.00Hz
[2017-03-30 07:31:06.651346] mirserver: Preferred mode 1600x1600 60.00Hz
[2017-03-30 07:31:06.651362] mirserver: Orientation normal
[2017-03-30 07:31:06.651379] mirserver: Logical size 1600x1600
[2017-03-30 07:31:06.651394] mirserver: Logical position +0+0
/<<BUILDDIR>>/miral-1.3.2+16.04.20170330/test/workspaces.cpp:534: Failure
Value of: tools.active_window()
Expected: is equal to 1
  Actual: 1 (of type miral::Window)
tools.active_window(): a window
server_window(dialog): dialog

GMOCK WARNING:
Uninteresting mock function call - returning directly.
    Function call: advise_focus_gained(@0x7f80003200 8-byte object <80-4A 00-80 7F-00 00-00>)
Stack trace:

GMOCK WARNING:
Uninteresting mock function call - returning directly.
    Function call: advise_removing_from_workspace(@0x7f8000ac30 16-byte object <50-6A 9F-0D 00-00 00-00 40-6A 9F-0D 00-00 00-00>, @0x7f977fd800 { 1 })
Stack trace:

GMOCK WARNING:
Uninteresting mock function call - returning directly.
    Function call: advise_focus_gained(@0x7f80007940 8-byte object <50-8A 00-80 7F-00 00-00>)
Stack trace:
[2017-03-30 07:31:06.925379] mirserver: Stopping
[ FAILED ] Workspaces.with_two_applications_when_a_window_in_a_workspace_hides_focus_remains_in_workspace (344 ms)

review: Needs Fixing

[Alan Griffiths (alan-griffiths)]

review: Approve

[lp:~alan-griffiths/miral/1.3]

359. By CI Train Bot Account on 2017-03-30

* New upstream release 1.3.2 (https://launchpad.net/miral/+milestone/1.3.2)
  - ABI summary:
    . miral ABI unchanged at 2
  - Enhancements:
    . [miral-shell] Add a keyboard shortcut for forcing fullscreen
  - Bugs fixed:
    . [miral-examples] With latest zesty's libstdc++-6-dev miral-shell will
      crash when trying to draw its background text. (LP: #1677550)
    . [miral-examples] Update miral-xrun to match GDK changes (LP: #1675115)
    . [miral-examples] change the server and client launch scripts to avoid
      using the default Mir socket (LP: #1675794)
    . [libmiral] Fix FTBFS against Mir < 0.26 (Xenial, Yakkety)
    . [libmiral] correct spelling of miral/set_window_management_policy.h
    . Update to fix FTBFS against lp:mir (and clang)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-15 17:44:36 +0000
+++ CMakeLists.txt	2017-03-30 14:15:54 +0000
@@ -42,7 +42,7 @@
 
 set(MIRAL_VERSION_MAJOR 1)
 set(MIRAL_VERSION_MINOR 3)
-set(MIRAL_VERSION_PATCH 1)
+set(MIRAL_VERSION_PATCH 2)
 
 set(MIRAL_VERSION ${MIRAL_VERSION_MAJOR}.${MIRAL_VERSION_MINOR}.${MIRAL_VERSION_PATCH})
 
 
=== modified file 'debian/changelog'
--- debian/changelog	2017-03-16 18:17:41 +0000
+++ debian/changelog	2017-03-30 14:15:54 +0000
@@ -1,3 +1,22 @@
+miral (1.3.2) UNRELEASED; urgency=medium
+
+  * New upstream release 1.3.2 (https://launchpad.net/miral/+milestone/1.3.2)
+    - ABI summary:
+      . miral ABI unchanged at 2
+    - Enhancements:
+      . [miral-shell] Add a keyboard shortcut for forcing fullscreen
+    - Bugs fixed:
+      . [miral-examples] With latest zesty's libstdc++-6-dev miral-shell will
+        crash when trying to draw its background text. (LP: #1677550)
+      . [miral-examples] Update miral-xrun to match GDK changes (LP: #1675115)
+      . [miral-examples] change the server and client launch scripts to avoid
+        using the default Mir socket (LP: #1675794)
+      . [libmiral] Fix FTBFS against Mir < 0.26 (Xenial, Yakkety)
+      . [libmiral] correct spelling of miral/set_window_management_policy.h
+      . Update to fix FTBFS against lp:mir (and clang)
+
+ -- Alan Griffiths <[e-mail]>  Mon, 24 Mar 2017 10:00:20 +0000
+
 miral (1.3.1+17.04.20170316.1-0ubuntu1) zesty; urgency=medium
 
   * New upstream release 1.3.1 (https://launchpad.net/miral/+milestone/1.3.1)
 
=== renamed file 'include/miral/set_window_managment_policy.h' => 'include/miral/set_window_management_policy.h'
--- include/miral/set_window_managment_policy.h	2017-03-06 10:50:19 +0000
+++ include/miral/set_window_management_policy.h	2017-03-30 14:15:54 +0000
@@ -16,8 +16,8 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#ifndef MIRAL_SET_WINDOW_MANAGER_H
-#define MIRAL_SET_WINDOW_MANAGER_H
+#ifndef MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H
+#define MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H
 
 #include <memory>
 
@@ -51,4 +51,4 @@
 }
 }
 
-#endif //MIRAL_SET_WINDOW_MANAGER_H
+#endif //MIRAL_SET_WINDOW_MANAGEMENT_POLICY_H
 
=== modified file 'miral-kiosk/kiosk_main.cpp'
--- miral-kiosk/kiosk_main.cpp	2017-03-06 10:50:19 +0000
+++ miral-kiosk/kiosk_main.cpp	2017-03-30 14:15:54 +0000
@@ -22,7 +22,7 @@
 #include <miral/application_authorizer.h>
 #include <miral/command_line_option.h>
 #include <miral/keymap.h>
-#include <miral/set_window_managment_policy.h>
+#include <miral/set_window_management_policy.h>
 #include <miral/internal_client.h>
 
 #include <unistd.h>
 
=== modified file 'miral-shell/decoration_provider.cpp'
--- miral-shell/decoration_provider.cpp	2017-03-15 12:36:17 +0000
+++ miral-shell/decoration_provider.cpp	2017-03-30 14:15:54 +0000
@@ -42,6 +42,12 @@
 
 void null_window_callback(MirWindow*, void*) {}
 
+struct preferred_codecvt : std::codecvt_byname<wchar_t, char, std::mbstate_t>
+{
+    preferred_codecvt() : std::codecvt_byname<wchar_t, char, std::mbstate_t>("") {}
+    ~preferred_codecvt() = default;
+};
+
 struct Printer
 {
     Printer();
@@ -53,7 +59,7 @@
     void printhelp(MirGraphicsRegion const& region);
 
 private:
-    std::wstring_convert<std::codecvt_utf16<wchar_t>> converter;
+    std::wstring_convert<preferred_codecvt> converter;
 
     bool working = false;
     FT_Library lib;
@@ -112,6 +118,7 @@
 }
 
 void Printer::print(MirGraphicsRegion const& region, std::string const& title_, int const intensity)
+try
 {
     if (!working)
         return;
@@ -151,6 +158,10 @@
         base_y += glyph->advance.y >> 6;
     }
 }
+catch (...)
+{
+    std::cerr << "WARNING: failed render title: \"" <<  title_ << "\"\n";
+}
 
 void Printer::printhelp(MirGraphicsRegion const& region)
 {
 
=== modified file 'miral-shell/miral-app.sh'
--- miral-shell/miral-app.sh	2017-02-01 11:11:20 +0000
+++ miral-shell/miral-app.sh	2017-03-30 14:15:54 +0000
@@ -11,13 +11,11 @@
   then
     echo "Error: Host endpoint '${MIR_SOCKET}' does not exists"; exit 1
   fi
-  i=0; while [ -e "${XDG_RUNTIME_DIR}/mir_socket${i}" ]; do let i+=1 ;done
-  socket=${XDG_RUNTIME_DIR}/mir_socket${i}
   hostsocket='--host-socket ${MIR_SOCKET}'
-else
-  socket=${XDG_RUNTIME_DIR}/mir_socket
 fi
 
+socket=${XDG_RUNTIME_DIR}/miral_socket
+
 while [ $# -gt 0 ]
 do
   if [ "$1" == "--help" -o "$1" == "-h" ]
 
=== modified file 'miral-shell/miral-desktop.sh'
--- miral-shell/miral-desktop.sh	2017-02-01 11:11:20 +0000
+++ miral-shell/miral-desktop.sh	2017-03-30 14:15:54 +0000
@@ -1,6 +1,6 @@
 #! /bin/bash
 
-socket=${XDG_RUNTIME_DIR}/mir_socket
+socket=${XDG_RUNTIME_DIR}/miral_socket
 miral_server=miral-shell
 launcher='gnome-terminal --app-id com.canonical.miral.Terminal'
 bindir=$(dirname $0)
 
=== modified file 'miral-shell/miral-run.sh'
--- miral-shell/miral-run.sh	2016-10-06 15:36:15 +0000
+++ miral-shell/miral-run.sh	2017-03-30 14:15:54 +0000
@@ -3,4 +3,4 @@
 then extras='--app-id com.canonical.miral.Terminal'
 fi
 unset QT_QPA_PLATFORMTHEME
-GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}&
+MIR_SOCKET=${XDG_RUNTIME_DIR}/miral_socket GDK_BACKEND=mir QT_QPA_PLATFORM=ubuntumirclient SDL_VIDEODRIVER=mir "$@" ${extras}&
 
=== modified file 'miral-shell/miral-xrun.sh'
--- miral-shell/miral-xrun.sh	2016-10-06 15:36:15 +0000
+++ miral-shell/miral-xrun.sh	2017-03-30 14:15:54 +0000
@@ -9,6 +9,26 @@
 unset GDK_BACKEND
 unset QT_QPA_PLATFORM
 unset SDL_VIDEODRIVER
-Xmir -rootless :${port} & pid=$!
+
+while [ $# -gt 0 ]
+do
+  if [ "$1" == "--help" -o "$1" == "-h" ]
+  then
+    echo "$(basename $0) - Handy launch script for providing an Xmir X11 server"
+    echo "Usage: $(basename $0) [options] command"
+    echo "Options are:"
+    echo "    -force  set toolkit environment variables to force X11 use"
+    exit 0
+  elif [ "$1" == "-force" ];
+  then
+    export GDK_BACKEND=x11
+    export QT_QPA_PLATFORM=xcb
+    export SDL_VIDEODRIVER=x11
+  else break
+  fi
+  shift
+done
+
+MIR_SOCKET=${XDG_RUNTIME_DIR}/miral_socket Xmir -rootless :${port} & pid=$!
 DISPLAY=:${port} "$@"
 kill ${pid}
 
=== modified file 'miral-shell/titlebar_window_manager.cpp'
--- miral-shell/titlebar_window_manager.cpp	2017-03-02 17:40:20 +0000
+++ miral-shell/titlebar_window_manager.cpp	2017-03-30 14:15:54 +0000
@@ -413,6 +413,10 @@
             toggle(mir_window_state_horizmaximized);
             return true;
 
+        case mir_input_event_modifier_meta:
+            toggle(mir_window_state_fullscreen);
+            return true;
+
         default:
             break;
         }
 
=== modified file 'miral/CMakeLists.txt'
--- miral/CMakeLists.txt	2017-03-07 16:35:29 +0000
+++ miral/CMakeLists.txt	2017-03-30 14:15:54 +0000
@@ -49,7 +49,7 @@
     internal_client.cpp                 ${CMAKE_SOURCE_DIR}/include/miral/internal_client.h
     set_command_line_handler.cpp        ${CMAKE_SOURCE_DIR}/include/miral/set_command_line_handler.h
     set_terminator.cpp                  ${CMAKE_SOURCE_DIR}/include/miral/set_terminator.h
-    set_window_managment_policy.cpp     ${CMAKE_SOURCE_DIR}/include/miral/set_window_managment_policy.h
+    set_window_management_policy.cpp    ${CMAKE_SOURCE_DIR}/include/miral/set_window_management_policy.h
     workspace_policy.cpp                ${CMAKE_SOURCE_DIR}/include/miral/workspace_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
 
=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2017-03-16 17:00:18 +0000
+++ miral/basic_window_manager.cpp	2017-03-30 14:15:54 +0000
@@ -359,6 +359,16 @@
         policy->handle_raise_window(info_for(surface));
 }
 
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+void miral::BasicWindowManager::handle_request_drag_and_drop(
+    std::shared_ptr<mir::scene::Session> const& /*session*/,
+    std::shared_ptr<mir::scene::Surface> const& /*surface*/,
+    uint64_t /*timestamp*/)
+{
+    // TODO
+}
+#endif
+
 int miral::BasicWindowManager::set_surface_attribute(
     std::shared_ptr<scene::Session> const& /*application*/,
     std::shared_ptr<scene::Surface> const& surface,
 
=== modified file 'miral/basic_window_manager.h'
--- miral/basic_window_manager.h	2017-03-02 14:29:04 +0000
+++ miral/basic_window_manager.h	2017-03-30 14:15:54 +0000
@@ -30,6 +30,7 @@
 #include <mir/geometry/rectangles.h>
 #include <mir/shell/abstract_shell.h>
 #include <mir/shell/window_manager.h>
+#include <mir/version.h>
 
 #include <boost/bimap.hpp>
 #include <boost/bimap/multiset_of.hpp>
@@ -95,6 +96,13 @@
         std::shared_ptr<mir::scene::Surface> const& surface,
         uint64_t timestamp) override;
 
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+    void handle_request_drag_and_drop(
+        std::shared_ptr<mir::scene::Session> const& session,
+        std::shared_ptr<mir::scene::Surface> const& surface,
+        uint64_t timestamp) override;
+#endif
+
     int set_surface_attribute(
         std::shared_ptr<mir::scene::Session> const& /*application*/,
         std::shared_ptr<mir::scene::Surface> const& surface,
@@ -109,7 +117,7 @@
 
     void move_workspace_content_to_workspace(
         std::shared_ptr<Workspace> const& to_workspace,
-        std::shared_ptr<Workspace> const& from_workspace);
+        std::shared_ptr<Workspace> const& from_workspace) override;
 
     void for_each_workspace_containing(
         Window const& window,
 
=== renamed file 'miral/set_window_managment_policy.cpp' => 'miral/set_window_management_policy.cpp'
--- miral/set_window_managment_policy.cpp	2017-03-06 10:48:02 +0000
+++ miral/set_window_management_policy.cpp	2017-03-30 14:15:54 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "miral/set_window_managment_policy.h"
+#include "miral/set_window_management_policy.h"
 #include "basic_window_manager.h"
 #include "window_management_trace.h"
 #include "both_versions.h"
@@ -32,19 +32,19 @@
 char const* const trace_option = "window-management-trace";
 }
 
-MIRAL_BOTH_VERSIONS(
+MIRAL_FAKE_OLD_SYMBOL(
     _ZN5miral24SetWindowManagmentPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE,
     _ZN5miral25SetWindowManagementPolicyC1ERKSt8functionIFSt10unique_ptrINS_22WindowManagementPolicyESt14default_deleteIS3_EERKNS_18WindowManagerToolsEEE)
 
-MIRAL_BOTH_VERSIONS(
+MIRAL_FAKE_OLD_SYMBOL(
     _ZNK5miral24SetWindowManagmentPolicyclERN3mir6ServerE,
     _ZNK5miral25SetWindowManagementPolicyclERN3mir6ServerE)
 
-MIRAL_BOTH_VERSIONS(
+MIRAL_FAKE_OLD_SYMBOL(
     _ZN5miral24SetWindowManagmentPolicyD1Ev,
     _ZN5miral25SetWindowManagementPolicyD1Ev)
 
-MIRAL_BOTH_VERSIONS(
+MIRAL_FAKE_OLD_SYMBOL(
     _ZN5miral24SetWindowManagmentPolicyD2Ev,
     _ZN5miral25SetWindowManagementPolicyD2Ev)
 
 
=== modified file 'test/test_server.cpp'
--- test/test_server.cpp	2017-02-14 17:11:07 +0000
+++ test/test_server.cpp	2017-03-30 14:15:54 +0000
@@ -19,7 +19,7 @@
 #include "test_server.h"
 #include "../miral/basic_window_manager.h"
 
-#include <miral/set_window_managment_policy.h>
+#include <miral/set_window_management_policy.h>
 
 #include <mir_test_framework/executable_path.h>
 #include <mir_test_framework/stub_server_platform_factory.h>
 
=== modified file 'test/test_window_manager_tools.h'
--- test/test_window_manager_tools.h	2017-02-02 11:31:52 +0000
+++ test/test_window_manager_tools.h	2017-03-30 14:15:54 +0000
@@ -27,6 +27,7 @@
 #include <mir/shell/display_layout.h>
 #include <mir/shell/focus_controller.h>
 #include <mir/shell/persistent_surface_store.h>
+#include <mir/version.h>
 
 #include <mir/test/doubles/stub_session.h>
 #include <mir/test/doubles/stub_surface.h>
@@ -53,6 +54,12 @@
 
     virtual auto surface_at(mir::geometry::Point /*cursor*/) const -> std::shared_ptr<mir::scene::Surface> override
         { return {}; }
+
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 27, 0)
+    void set_drag_and_drop_handle(std::vector<uint8_t> const& /*handle*/) override {}
+
+    void clear_drag_and_drop_handle() override {}
+#endif
 };
 
 struct StubDisplayLayout : mir::shell::DisplayLayout
 
=== modified file 'test/workspaces.cpp'
--- test/workspaces.cpp	2017-03-03 12:31:47 +0000
+++ test/workspaces.cpp	2017-03-30 14:15:54 +0000
@@ -49,7 +49,8 @@
     WorkspacesWindowManagerPolicy(WindowManagerTools const& tools, Workspaces& test_fixture);
     ~WorkspacesWindowManagerPolicy();
 
-    void advise_new_window(miral::WindowInfo const& window_info) override;
+    void advise_new_window(miral::WindowInfo const& window_info);
+    void handle_window_ready(miral::WindowInfo& window_info);
 
     MOCK_METHOD2(advise_adding_to_workspace,
                  void(std::shared_ptr<miral::Workspace> const&, std::vector<miral::Window> const&));
@@ -59,6 +60,8 @@
 
     MOCK_METHOD1(advise_focus_gained, void(miral::WindowInfo const&));
 
+    MOCK_METHOD1(advise_window_ready, void(miral::WindowInfo const&));
+
     Workspaces& test_fixture;
 };
 
@@ -72,9 +75,19 @@
             .create_window();
 
         client_windows[name] = window;
+        init_window(window);
+
+        return window;
+    }
+
+    void init_window(Window const& window)
+    {
+        mir::test::Signal window_ready;
+        EXPECT_CALL(policy(), advise_window_ready(_)).WillOnce(InvokeWithoutArgs([&]{ window_ready.raise(); }));
+
         mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
 
-        return window;
+        EXPECT_TRUE(window_ready.wait_for(1s));
     }
 
     auto create_tip(std::string const& name, Window const& parent) -> Window
@@ -87,7 +100,7 @@
             .create_window();
 
         client_windows[name] = window;
-        mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+        init_window(window);
 
         return window;
     }
@@ -100,7 +113,7 @@
             .create_window();
 
         client_windows[name] = window;
-        mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+        init_window(window);
 
         return window;
     }
@@ -221,6 +234,12 @@
     std::lock_guard<decltype(test_fixture.mutex)> lock{test_fixture.mutex};
     test_fixture.server_windows[window_info.name()] = window_info.window();
 }
+
+void WorkspacesWindowManagerPolicy::handle_window_ready(miral::WindowInfo& window_info)
+{
+    miral::CanonicalWindowManagerPolicy::handle_window_ready(window_info);
+    advise_window_ready(window_info);
+}
 }
 
 TEST_F(Workspaces, before_a_tree_is_added_to_workspace_it_is_empty)
@@ -452,7 +471,7 @@
             .set_name(a_window.c_str())
             .create_window();
 
-        mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+        init_window(window);
 
         invoke_tools([&, this](WindowManagerTools& tools)
             {
@@ -513,7 +532,7 @@
         .set_name(a_window.c_str())
         .create_window();
 
-    mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+    init_window(window);
 
     invoke_tools([&, this](WindowManagerTools& tools)
         {
@@ -576,7 +595,7 @@
         .set_name(a_window.c_str())
         .create_window();
 
-    mir_buffer_stream_swap_buffers_sync(mir_window_get_buffer_stream(window));
+    init_window(window);
 
     invoke_tools([&, this](WindowManagerTools& tools)
         {