git.iko.soy/unity8
on xenial help sign in
check for surfaces
commit7d9e47dc2cb1410406fd5f17bf3e59991c573e81 authorNick Dedekind <nick.dedekind@canonical.com> dateThu 2 Mar 2017, 16:04 (10 years ago) parent2a2e38c
4 files changed+22−15
compare with xenial
unifiedsplit
plugins/WindowManager/TopLevelWindowModel.cpp+10−2 plugins/WindowManager/TopLevelWindowModel.h+3−1 src/libunity8-private/windowmanagementpolicy.cpp+7−6 src/libunity8-private/windowmanagementpolicy.h+2−6
plugins/WindowManager/TopLevelWindowModel.cpp+10−2
@@ -35,7 +35,7 @@
3535#include <qtmir/mirserverapplication.h>
3636#include <qtmir/windowmodelnotifier.h>
3737
38−Q_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL, "toplevelwindowmodel", QtInfoMsg)
38+Q_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL, "toplevelwindowmodel")
3939
4040#define DEBUG_MSG qCDebug(TOPLEVELWINDOWMODEL).nospace().noquote() << __func__
4141#define INFO_MSG qCInfo(TOPLEVELWINDOWMODEL).nospace().noquote() << __func__
@@ -136,6 +136,7 @@ void TopLevelWindowModel::setWorkspace(Workspace *workspace)
136136
137137 if (m_workspace) {
138138 m_windowModel.clear();
139+ m_allSurfaces.clear();
139140 if (m_applicationManager) {
140141 disconnect(m_applicationManager, 0, this, 0);
141142 }
@@ -237,6 +238,7 @@ void TopLevelWindowModel::prependSurfaceHelper(unityapi::MirSurfaceInterface *su
237238 Window *window = createWindow(surface);
238239
239240 m_windowModel.prepend(ModelEntry(window, application));
241+ m_allSurfaces.insert(surface);
240242 if (surface) {
241243 connectSurface(surface);
242244 }
@@ -371,6 +373,7 @@ void TopLevelWindowModel::onSurfaceDestroyed(unityapi::MirSurfaceInterface *surf
371373 auto window = m_windowModel[i].window;
372374 window->setSurface(nullptr);
373375 window->setFocused(false);
376+ m_allSurfaces.remove(surface);
374377 INFO_MSG << " Removed surface from entry. After: " << toString();
375378 }
376379}
@@ -397,7 +400,7 @@ void TopLevelWindowModel::onSurfacesAddedToWorkspace(const std::shared_ptr<miral
397400 if (workspace != m_workspace->workspace()) return;
398401
399402 Q_FOREACH(auto surface, surfaces) {
400− DEBUG_MSG << "(" << surface << ")";
403+ if (m_allSurfaces.contains(surface)) continue;
401404
402405 if (surface->parentSurface()) {
403406 // Wrap it in a Window so that we keep focusedWindow() up to date.
@@ -444,6 +447,7 @@ void TopLevelWindowModel::removeAt(int index)
444447 window->setFocused(false);
445448
446449 m_windowModel.removeAt(index);
450+ m_allSurfaces.remove(window->surface());
447451
448452 if (m_modelState == RemovingState) {
449453 endRemoveRows();
@@ -765,7 +769,11 @@ void TopLevelWindowModel::activateTopMostWindowWithoutId(int forbiddenId)
765769
766770void TopLevelWindowModel::refreshWindows()
767771{
772+ DEBUG_MSG << "()";
773+
768774 m_windowModel.clear();
775+ m_allSurfaces.clear();
776+
769777 WindowManagementPolicy::instance()->forEachWindowInWorkspace(m_workspace->workspace(), [this](const miral::Window &window) {
770778 auto surface = m_surfaceManager->surfaceFor(window);
771779 if (surface) {
plugins/WindowManager/TopLevelWindowModel.h+3−1
@@ -250,10 +250,12 @@ private:
250250 bool removeOnceSurfaceDestroyed{false};
251251 };
252252
253− Workspace* m_workspace{nullptr};
254253 QVector<ModelEntry> m_windowModel;
255254 Window* m_inputMethodWindow{nullptr};
256255 Window* m_focusedWindow{nullptr};
256+ Workspace* m_workspace{nullptr};
257+ // track all the surfaces we've been told about.
258+ QSet<unity::shell::application::MirSurfaceInterface*> m_allSurfaces;
257259
258260 int m_nextId{1};
259261 // Just something big enough that we don't risk running out of unused id numbers.
src/libunity8-private/windowmanagementpolicy.cpp+7−6
@@ -41,8 +41,9 @@ void WindowManagementPolicy::advise_new_window(miral::WindowInfo const& window_i
4141
4242 auto const parent = window_info.parent();
4343
44− if (!parent && m_activeWorkspace)
45− tools.add_tree_to_workspace(window_info.window(), m_activeWorkspace);
44+ auto activeWorkspace = m_activeWorkspace.lock();
45+ if (!parent && activeWorkspace)
46+ tools.add_tree_to_workspace(window_info.window(), activeWorkspace);
4647}
4748
4849std::shared_ptr<miral::Workspace> WindowManagementPolicy::createWorkspace()
@@ -50,8 +51,8 @@ std::shared_ptr<miral::Workspace> WindowManagementPolicy::createWorkspace()
5051 auto workspace = tools.create_workspace();
5152 m_workspaces.insert(workspace);
5253
53− if (m_activeWorkspace == m_dummyWorkspace) {
54− tools.move_workspace_content_to_workspace(workspace, m_dummyWorkspace);
54+ if (m_activeWorkspace.lock() == m_dummyWorkspace) {
55+ moveWorkspaceContentToWorkspace(workspace, m_dummyWorkspace);
5556 m_activeWorkspace = workspace;
5657 }
5758 return workspace;
@@ -64,7 +65,7 @@ void WindowManagementPolicy::releaseWorkspace(const std::shared_ptr<miral::Works
6465
6566 if (m_workspaces.size() == 0) {
6667 m_activeWorkspace = m_dummyWorkspace;
67− tools.move_workspace_content_to_workspace(m_dummyWorkspace, workspace);
68+ moveWorkspaceContentToWorkspace(m_dummyWorkspace, workspace);
6869 }
6970}
7071
@@ -80,7 +81,7 @@ void WindowManagementPolicy::moveWorkspaceContentToWorkspace(const std::shared_p
8081
8182void WindowManagementPolicy::setActiveWorkspace(const std::shared_ptr<miral::Workspace> &workspace)
8283{
83− if (workspace == m_activeWorkspace)
84+ if (m_activeWorkspace.lock() == workspace)
8485 return;
8586 m_activeWorkspace = workspace ? workspace : m_dummyWorkspace;
8687}
src/libunity8-private/windowmanagementpolicy.h+2−6
@@ -17,15 +17,12 @@
1717#ifndef UNITY_WINDOWMANAGEMENTPOLICY_H
1818#define UNITY_WINDOWMANAGEMENTPOLICY_H
1919
20−#include <QObject>
2120#include <qtmir/windowmanagementpolicy.h>
2221
2322#include <unordered_set>
2423
25−class Q_DECL_EXPORT WindowManagementPolicy : public QObject,
26− public qtmir::WindowManagementPolicy
24+class Q_DECL_EXPORT WindowManagementPolicy : public qtmir::WindowManagementPolicy
2725{
28− Q_OBJECT
2926public:
3027 WindowManagementPolicy(const miral::WindowManagerTools &tools, qtmir::WindowManagementPolicyPrivate& dd);
3128
@@ -43,12 +40,11 @@ public:
4340 void moveWorkspaceContentToWorkspace(const std::shared_ptr<miral::Workspace> &toWorkspace,
4441 const std::shared_ptr<miral::Workspace> &fromWorkspace);
4542
46−public Q_SLOTS:
4743 void setActiveWorkspace(const std::shared_ptr<miral::Workspace>& workspace);
4844
4945private:
5046 static WindowManagementPolicy* m_self;
51− std::shared_ptr<miral::Workspace> m_activeWorkspace;
47+ std::weak_ptr<miral::Workspace> m_activeWorkspace;
5248
5349 std::unordered_set<std::shared_ptr<miral::Workspace>> m_workspaces;
5450 const std::shared_ptr<miral::Workspace> m_dummyWorkspace;