Merge lp:~aacid/qtmir/drag_and_drop into lp:qtmir

[Albert Astals Cid]

WiP

WiP

[Unity8 CI Bot (unity8-ci-bot)]

FAILED: Continuous integration, rev:630
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/640/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/4739/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4767
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4590/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4590/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4590/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4590/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4590/console
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4590/console

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtmir-ci/640/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

632. By Albert Astals Cid on 2017-03-31

Merge

631. By Albert Astals Cid on 2017-03-30

Merge lp:~aacid/qtmir/dont_reuse_stale_cookies

630. By Albert Astals Cid on 2017-03-28

Implement handle_request_drag_and_drop

629. By Albert Astals Cid on 2017-03-28

Merge lp:~andreas-pokorny/qtmir/keep-mir-types-alive

=== modified file 'src/platforms/mirserver/eventbuilder.cpp'
--- src/platforms/mirserver/eventbuilder.cpp	2017-03-03 10:39:24 +0000
+++ src/platforms/mirserver/eventbuilder.cpp	2017-03-31 09:38:38 +0000
@@ -293,6 +293,8 @@
         cookie.resize(mir_cookie_buffer_size(cookie_ptr));
         mir_cookie_to_buffer(cookie_ptr, cookie.data(), cookie.size());
         mir_cookie_release(cookie_ptr);
+    } else {
+        cookie.resize(0);
     }
     if (mir_input_event_type_pointer == mir_input_event_get_type(iev))
     {

=== modified file 'src/platforms/mirserver/windowmanagementpolicy.cpp'
--- src/platforms/mirserver/windowmanagementpolicy.cpp	2017-03-24 11:29:56 +0000
+++ src/platforms/mirserver/windowmanagementpolicy.cpp	2017-03-31 09:38:38 +0000
@@ -27,6 +27,10 @@
 #include "mirqtconversion.h"
 #include "tracepoints.h"
 
+#include <uuid/uuid.h>
+
+#include <QDebug>
+
 namespace qtmir {
     std::shared_ptr<ExtraWindowInfo> getExtraInfo(const miral::WindowInfo &windowInfo) {
         return std::static_pointer_cast<ExtraWindowInfo>(windowInfo.userdata());
@@ -379,6 +383,16 @@
     }
 }
 
+void WindowManagementPolicy::handle_request_drag_and_drop(miral::WindowInfo& window_info)
+{
+        // TODO should we check for window_info being the focused one here?
+    uuid_t uuid;
+    uuid_generate(uuid);
+    std::vector<uint8_t> const handle{std::begin(uuid), std::end(uuid)};
+
+    tools.start_drag_and_drop(window_info, handle);
+}
+
 Rectangle WindowManagementPolicy::confirm_inherited_move(miral::WindowInfo const& windowInfo, Displacement movement)
 {
     if (m_confinementRegions.isEmpty()) {

=== modified file 'src/platforms/mirserver/windowmanagementpolicy.h'
--- src/platforms/mirserver/windowmanagementpolicy.h	2017-03-22 14:04:23 +0000
+++ src/platforms/mirserver/windowmanagementpolicy.h	2017-03-31 09:38:38 +0000
@@ -18,6 +18,7 @@
 #define WINDOWMANAGEMENTPOLICY_H
 
 #include "miral/canonical_window_manager.h"
+#include "miral/window_management_policy_addendum2.h"
 
 #include "appnotifier.h"
 #include "qteventfeeder.h"
@@ -30,7 +31,7 @@
 
 class ScreensModel;
 
-class WindowManagementPolicy : public miral::CanonicalWindowManagerPolicy
+class WindowManagementPolicy : public miral::CanonicalWindowManagerPolicy, public miral::WindowManagementPolicyAddendum2
 {
 public:
     WindowManagementPolicy(const miral::WindowManagerTools &tools,
@@ -86,6 +87,9 @@
     void ask_client_to_close(const miral::Window &window);
     void forceClose(const miral::Window &window);
 
+    void handle_request_drag_and_drop(miral::WindowInfo& window_info) override;
+
+Q_SIGNALS:
     void set_window_confinement_regions(const QVector<QRect> &regions);
     void set_window_margins(MirWindowType windowType, const QMargins &margins);