e174ec3 · unity8 · git.iko.soy

plugins/WindowManager/CMakeLists.txt+2

compare with xenial

unifiedsplit

@@ -16,10 +16,12 @@ set(WINDOWMANAGER_SRC

16 ScreenAttached.cpp

17 Screens.cpp

18 ScreenWindow.cpp

19+ WindowManagerObjects.cpp

19 Workspace.cpp

20 Workspace.cpp

20 WorkspaceManager.cpp

21 WorkspaceManager.cpp

21 WorkspaceModel.cpp

22 WorkspaceModel.cpp

22 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

23 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

24+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

23 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h

25 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h

24 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h

26 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h

25 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h

27 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h

plugins/WindowManager/Screen.cpp+7−1

@@ -39,6 +39,12 @@ void ScreenInterface::connectToScreen(qtmir::Screen *screen)

39 connect(screen, &qtmir::Screen::availableModesChanged, this, &ScreenInterface::availableModesChanged);

40}

41

42+void ScreenInterface::connectToScreen(ScreenInterface *screen)

43+{

44+ connectToScreen(screen->wrapped());

45+ connect(screen, &ScreenInterface::currentWorkspaceChanged, this, &ScreenInterface::currentWorkspaceChanged);

46+}

47+

42qtmir::OutputId ScreenInterface::outputId() const

48qtmir::OutputId ScreenInterface::outputId() const

43{

49{

44 if (!m_wrapped) return qtmir::OutputId(-1);

50 if (!m_wrapped) return qtmir::OutputId(-1);

@@ -221,7 +227,7 @@ ScreenProxy::ScreenProxy(ScreenInterface *const screen)

221 : m_workspaces(new WorkspaceModelProxy(screen->workspaces()))

227 : m_workspaces(new WorkspaceModelProxy(screen->workspaces()))

222 , m_original(screen)

228 , m_original(screen)

223{

229{

224− connectToScreen(screen->wrapped());

230+ connectToScreen(screen);

225

231

226 auto updateCurrentWorkspaceFn = [this](Workspace* realWorkspace) {

232 auto updateCurrentWorkspaceFn = [this](Workspace* realWorkspace) {

227 Q_FOREACH(Workspace* workspace, m_workspaces->list()) {

233 Q_FOREACH(Workspace* workspace, m_workspaces->list()) {

plugins/WindowManager/Screen.h+1−1

@@ -27,7 +27,6 @@ class ScreenInterface: public QObject

27 Q_PROPERTY(uint currentModeIndex READ currentModeIndex NOTIFY currentModeIndexChanged)

28 Q_PROPERTY(QQmlListProperty<qtmir::ScreenMode> availableModes READ availableModes NOTIFY availableModesChanged)

29 Q_PROPERTY(QSizeF physicalSize READ physicalSize NOTIFY physicalSizeChanged)

30−

31 Q_PROPERTY(WorkspaceModel* workspaces READ workspaces CONSTANT)

30 Q_PROPERTY(WorkspaceModel* workspaces READ workspaces CONSTANT)

32 Q_PROPERTY(Workspace* currentWorkspace READ currentWorkspace WRITE setCurrentWorkspace NOTIFY currentWorkspaceChanged)

31 Q_PROPERTY(Workspace* currentWorkspace READ currentWorkspace WRITE setCurrentWorkspace NOTIFY currentWorkspaceChanged)

33public:

32public:

@@ -80,6 +79,7 @@ protected:

80 ScreenInterface(QObject* parent = 0);

79 ScreenInterface(QObject* parent = 0);

81

80

82 void connectToScreen(qtmir::Screen* screen);

81 void connectToScreen(qtmir::Screen* screen);

82+ void connectToScreen(ScreenInterface* screen);

83

84protected:

85 QPointer<qtmir::Screen> m_wrapped;

plugins/WindowManager/ScreenAttached.cpp+1−1

@@ -140,7 +140,7 @@ void ScreenAttached::screenChanged2(ScreenInterface* screen)

140 Q_EMIT availableModesChanged();

141 }

142

143− connectToScreen(screen->wrapped());

143+ connectToScreen(screen);

144}

145

146ScreenAttached *WMScreen::qmlAttachedProperties(QObject *owner)

plugins/WindowManager/TopLevelWindowModel.cpp+10−29

@@ -15,6 +15,7 @@

15 */

16

17#include "TopLevelWindowModel.h"

18+#include "WindowManagerObjects.h"

18

19

19// unity-api

20// unity-api

20#include <unity/shell/application/ApplicationInfoInterface.h>

21#include <unity/shell/application/ApplicationInfoInterface.h>

@@ -42,8 +43,16 @@ Q_LOGGING_CATEGORY(TOPLEVELWINDOWMODEL, "toplevelwindowmodel", QtInfoMsg)

42

43

43namespace unityapi = unity::shell::application;

44namespace unityapi = unity::shell::application;

44

45

45−TopLevelWindowModel::TopLevelWindowModel()

46+TopLevelWindowModel::TopLevelWindowModel(Workspace* workspace)

47+ : m_workspace(workspace)

46{

48{

49+ connect(WindowManagerObjects::instance(), &WindowManagerObjects::applicationManagerChanged,

50+ this, &TopLevelWindowModel::setApplicationManager);

51+ connect(WindowManagerObjects::instance(), &WindowManagerObjects::surfaceManagerChanged,

52+ this, &TopLevelWindowModel::setSurfaceManager);

53+

54+ setApplicationManager(WindowManagerObjects::instance()->applicationManager());

55+ setSurfaceManager(WindowManagerObjects::instance()->surfaceManager());

47}

56}

48

57

49void TopLevelWindowModel::setApplicationManager(unityapi::ApplicationManagerInterface* value)

58void TopLevelWindowModel::setApplicationManager(unityapi::ApplicationManagerInterface* value)

@@ -86,7 +95,6 @@ void TopLevelWindowModel::setApplicationManager(unityapi::ApplicationManagerInte

86 });

95 });

87 }

96 }

88

97

89− Q_EMIT applicationManagerChanged(m_applicationManager);

90 refreshWindows();

98 refreshWindows();

91

99

92 endResetModel();

100 endResetModel();

@@ -125,33 +133,6 @@ void TopLevelWindowModel::setSurfaceManager(unityapi::SurfaceManagerInterface *s

125 }

133 }

126

134

127 refreshWindows();

135 refreshWindows();

128− Q_EMIT surfaceManagerChanged(m_surfaceManager);

129−

130− endResetModel();

131− m_modelState = IdleState;

132−}

133−

134−void TopLevelWindowModel::setWorkspace(Workspace *workspace)

135−{

136− if (workspace == m_workspace) {

137− return;

138− }

139−

140− DEBUG_MSG << "(" << workspace << ")";

141−

142− Q_ASSERT(m_modelState == IdleState);

143− m_modelState = ResettingState;

144−

145− beginResetModel();

146−

147− if (m_workspace) {

148− disconnect(m_workspace, 0, this, 0);

149− }

150−

151− m_workspace = workspace;

152−

153− refreshWindows();

154− Q_EMIT workspaceChanged(workspace);

155

136

156 endResetModel();

137 endResetModel();

157 m_modelState = IdleState;

138 m_modelState = IdleState;

plugins/WindowManager/TopLevelWindowModel.h+5−30

@@ -75,21 +75,6 @@ class TopLevelWindowModel : public QAbstractListModel

75 */

76 Q_PROPERTY(Window* focusedWindow READ focusedWindow NOTIFY focusedWindowChanged)

77

78− Q_PROPERTY(Workspace* workspace

79− READ workspace

80− WRITE setWorkspace

81− NOTIFY workspaceChanged)

82−

83− Q_PROPERTY(unity::shell::application::SurfaceManagerInterface* surfaceManager

84− READ surfaceManager

85− WRITE setSurfaceManager

86− NOTIFY surfaceManagerChanged)

87−

88− Q_PROPERTY(unity::shell::application::ApplicationManagerInterface* applicationManager

89− READ applicationManager

90− WRITE setApplicationManager

91− NOTIFY applicationManagerChanged)

92−

93 /**

78 /**

94 The id to be used on the next entry created

79 The id to be used on the next entry created

95 Useful for tests

80 Useful for tests

@@ -108,7 +93,7 @@ public:

108 ApplicationRole = Qt::UserRole + 1,

93 ApplicationRole = Qt::UserRole + 1,

109 };

94 };

110

95

111− TopLevelWindowModel();

96+ TopLevelWindowModel(Workspace* workspace);

112

97

113 // From QAbstractItemModel

98 // From QAbstractItemModel

114 int rowCount(const QModelIndex &parent = QModelIndex()) const override;

99 int rowCount(const QModelIndex &parent = QModelIndex()) const override;

@@ -119,20 +104,11 @@ public:

119 return roleNames;

104 return roleNames;

120 }

105 }

121

106

122− // Own API

107+ // Own API;

123−

124− Workspace* workspace() const { return m_workspace; }

125− void setWorkspace(Workspace* workspace);

126

108

127 unity::shell::application::MirSurfaceInterface* inputMethodSurface() const;

109 unity::shell::application::MirSurfaceInterface* inputMethodSurface() const;

128 Window* focusedWindow() const;

110 Window* focusedWindow() const;

129

111

130− unity::shell::application::ApplicationManagerInterface *applicationManager() const { return m_applicationManager; }

131− void setApplicationManager(unity::shell::application::ApplicationManagerInterface*);

132−

133− unity::shell::application::SurfaceManagerInterface *surfaceManager() const { return m_surfaceManager; }

134− void setSurfaceManager(unity::shell::application::SurfaceManagerInterface*);

135−

136 int nextId() const { return m_nextId; }

112 int nextId() const { return m_nextId; }

137

113

138public:

114public:

@@ -179,8 +155,6 @@ Q_SIGNALS:

179 void countChanged();

155 void countChanged();

180 void inputMethodSurfaceChanged(unity::shell::application::MirSurfaceInterface* inputMethodSurface);

156 void inputMethodSurfaceChanged(unity::shell::application::MirSurfaceInterface* inputMethodSurface);

181 void focusedWindowChanged(Window *focusedWindow);

157 void focusedWindowChanged(Window *focusedWindow);

182− void applicationManagerChanged(unity::shell::application::ApplicationManagerInterface*);

183− void surfaceManagerChanged(unity::shell::application::SurfaceManagerInterface*);

184

158

185 /**

159 /**

186 * @brief Emitted when the list changes

160 * @brief Emitted when the list changes

@@ -191,9 +165,10 @@ Q_SIGNALS:

191

165

192 void nextIdChanged();

166 void nextIdChanged();

193

167

194− void workspaceChanged(Workspace*);

195−

196private Q_SLOTS:

168private Q_SLOTS:

169+ void setApplicationManager(unity::shell::application::ApplicationManagerInterface*);

170+ void setSurfaceManager(unity::shell::application::SurfaceManagerInterface*);

171+

197 void onSurfaceCreated(unity::shell::application::MirSurfaceInterface *surface);

172 void onSurfaceCreated(unity::shell::application::MirSurfaceInterface *surface);

198 void onSurfacesAddedToWorkspace(const std::shared_ptr<miral::Workspace>& workspace,

173 void onSurfacesAddedToWorkspace(const std::shared_ptr<miral::Workspace>& workspace,

199 const QVector<unity::shell::application::MirSurfaceInterface*> surfaces);

174 const QVector<unity::shell::application::MirSurfaceInterface*> surfaces);

plugins/WindowManager/WindowManagerObjects.cppnew file+47

@@ -0,0 +1,47 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#include "WindowManagerObjects.h"

18+

19+WindowManagerObjects::WindowManagerObjects(QObject *parent)

20+ : QObject(parent)

21+ , m_surfaceManager(nullptr)

22+ , m_applicationManager(nullptr)

23+{

24+}

25+

26+WindowManagerObjects *WindowManagerObjects::instance()

27+{

28+ static WindowManagerObjects* objects(new WindowManagerObjects());

29+ return objects;

30+}

31+

32+

33+void WindowManagerObjects::setSurfaceManager(unity::shell::application::SurfaceManagerInterface *surfaceManager)

34+{

35+ if (m_surfaceManager == surfaceManager) return;

36+

37+ m_surfaceManager = surfaceManager;

38+ Q_EMIT surfaceManagerChanged(surfaceManager);

39+}

40+

41+void WindowManagerObjects::setApplicationManager(unity::shell::application::ApplicationManagerInterface *applicationManager)

42+{

43+ if (m_applicationManager == applicationManager) return;

44+

45+ m_applicationManager = applicationManager;

46+ Q_EMIT applicationManagerChanged(applicationManager);

47+}

plugins/WindowManager/WindowManagerObjects.hnew file+64

@@ -0,0 +1,64 @@

1+/*

3+ *

4+ * This program is free software; you can redistribute it and/or modify

5+ * it under the terms of the GNU General Public License as published by

6+ * the Free Software Foundation; version 3.

7+ *

8+ * This program is distributed in the hope that it will be useful,

9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of

10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the

11+ * GNU General Public License for more details.

12+ *

13+ * You should have received a copy of the GNU General Public License

14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.

15+ */

16+

17+#ifndef WINDOWMANAGEROBJECTS_H

18+#define WINDOWMANAGEROBJECTS_H

19+

20+#include <QObject>

21+

22+namespace unity {

23+ namespace shell {

24+ namespace application {

25+ class SurfaceManagerInterface;

26+ class ApplicationManagerInterface;

27+ }

28+ }

29+}

30+

31+class WindowManagerObjects : public QObject

32+{

33+ Q_OBJECT

34+

35+ Q_PROPERTY(unity::shell::application::SurfaceManagerInterface* surfaceManager

36+ READ surfaceManager

37+ WRITE setSurfaceManager

38+ NOTIFY surfaceManagerChanged)

39+

40+ Q_PROPERTY(unity::shell::application::ApplicationManagerInterface* applicationManager

41+ READ applicationManager

42+ WRITE setApplicationManager

43+ NOTIFY applicationManagerChanged)

44+public:

45+ explicit WindowManagerObjects(QObject *parent = 0);

46+

47+ static WindowManagerObjects *instance();

48+

49+ unity::shell::application::SurfaceManagerInterface *surfaceManager() const { return m_surfaceManager; }

50+ void setSurfaceManager(unity::shell::application::SurfaceManagerInterface*);

51+

52+ unity::shell::application::ApplicationManagerInterface *applicationManager() const { return m_applicationManager; }

53+ void setApplicationManager(unity::shell::application::ApplicationManagerInterface*);

54+

55+Q_SIGNALS:

56+ void surfaceManagerChanged(unity::shell::application::SurfaceManagerInterface*);

57+ void applicationManagerChanged(unity::shell::application::ApplicationManagerInterface*);

58+

59+private:

60+ unity::shell::application::SurfaceManagerInterface* m_surfaceManager;

61+ unity::shell::application::ApplicationManagerInterface* m_applicationManager;

62+};

63+

64+#endif // WINDOWMANAGEROBJECTS_H

plugins/WindowManager/WindowManagerPlugin.cpp+8−1

@@ -22,6 +22,7 @@

22#include "ScreenWindow.h"

23#include "TopLevelWindowModel.h"

24#include "Window.h"

25+#include "WindowManagerObjects.h"

25#include "WorkspaceManager.h"

26#include "WorkspaceManager.h"

26#include "Workspace.h"

27#include "Workspace.h"

27#include "WorkspaceModel.h"

28#include "WorkspaceModel.h"

@@ -42,19 +43,25 @@ QObject* screensSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

42 Q_UNUSED(scriptEngine);

43 Q_UNUSED(scriptEngine);

43 return new Screens(qtmir::get_screen_model());

44 return new Screens(qtmir::get_screen_model());

44}

45}

46+QObject* objectsSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

47+ Q_UNUSED(engine);

48+ Q_UNUSED(scriptEngine);

49+ return WindowManagerObjects::instance();

50+}

45

51

46void WindowManagerPlugin::registerTypes(const char *uri)

52void WindowManagerPlugin::registerTypes(const char *uri)

47{

53{

48− qmlRegisterType<TopLevelWindowModel>(uri, 1, 0, "TopLevelWindowModel");

49 qmlRegisterSingletonType<WorkspaceManager>(uri, 1, 0, "WorkspaceManager", workspace_manager);

54 qmlRegisterSingletonType<WorkspaceManager>(uri, 1, 0, "WorkspaceManager", workspace_manager);

50 qmlRegisterUncreatableType<WorkspaceModel>(uri, 1, 0, "WorkspaceModel", notInstantiatable);

55 qmlRegisterUncreatableType<WorkspaceModel>(uri, 1, 0, "WorkspaceModel", notInstantiatable);

51 qmlRegisterSingletonType<Screens>(uri, 1, 0, "Screens", screensSingleton);

56 qmlRegisterSingletonType<Screens>(uri, 1, 0, "Screens", screensSingleton);

52 qmlRegisterUncreatableType<qtmir::ScreenMode>(uri, 1, 0, "ScreenMode", notInstantiatable);

57 qmlRegisterUncreatableType<qtmir::ScreenMode>(uri, 1, 0, "ScreenMode", notInstantiatable);

53 qmlRegisterUncreatableType<Workspace>(uri, 1, 0, "Workspace", notInstantiatable);

58 qmlRegisterUncreatableType<Workspace>(uri, 1, 0, "Workspace", notInstantiatable);

59+ qmlRegisterSingletonType<WindowManagerObjects>(uri, 1, 0, "WindowManagerObjects", objectsSingleton);

54

60

55 qRegisterMetaType<Screen*>("Screen*");

61 qRegisterMetaType<Screen*>("Screen*");

56 qRegisterMetaType<ScreensProxy*>("ScreensProxy*");

62 qRegisterMetaType<ScreensProxy*>("ScreensProxy*");

57 qRegisterMetaType<Workspace*>("Workspace*");

63 qRegisterMetaType<Workspace*>("Workspace*");

64+ qRegisterMetaType<TopLevelWindowModel*>("TopLevelWindowModel*");

58

65

59 qRegisterMetaType<Window*>("Window*");

66 qRegisterMetaType<Window*>("Window*");

60 qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");

67 qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");

plugins/WindowManager/Workspace.cpp+2

@@ -27,6 +27,7 @@ Workspace::Workspace(QObject *parent)

27 : QObject(parent)

28 , m_workspace(WMPolicyInterface::instance()->createWorkspace())

29 , m_model(nullptr)

30+ , m_windowModel(new TopLevelWindowModel(this))

30 , m_active(false)

31 , m_active(false)

31{

32{

32 setObjectName((QString("Wks%1").arg(nextWorkspace++)));

33 setObjectName((QString("Wks%1").arg(nextWorkspace++)));

@@ -48,6 +49,7 @@ Workspace::Workspace(const Workspace &other)

48 : QObject(nullptr)

49 : QObject(nullptr)

49 , m_workspace(other.m_workspace)

50 , m_workspace(other.m_workspace)

50 , m_model(nullptr)

51 , m_model(nullptr)

52+ , m_windowModel(other.m_windowModel)

51 , m_active(other.m_active)

53 , m_active(other.m_active)

52{

54{

53 setObjectName(other.objectName());

55 setObjectName(other.objectName());

plugins/WindowManager/Workspace.h+5−3

@@ -41,6 +41,7 @@ class Workspace : public QObject

41{

42 Q_OBJECT

43 Q_PROPERTY(bool active READ isActive NOTIFY activeChanged)

44+ Q_PROPERTY(TopLevelWindowModel* windowModel READ windowModel NOTIFY windowModelChanged)

44public:

45public:

45 ~Workspace();

46 ~Workspace();

46

47

@@ -49,10 +50,10 @@ public:

49 void release();

50 void release();

50

51

51 virtual bool isActive() const { return m_active; }

52 virtual bool isActive() const { return m_active; }

52− bool isAssigned() const;

53

54+ TopLevelWindowModel *windowModel() const { return m_windowModel; }

54 std::shared_ptr<miral::Workspace> workspace() const { return m_workspace; }

55 std::shared_ptr<miral::Workspace> workspace() const { return m_workspace; }

55−

56+ bool isAssigned() const;

56

57

57public Q_SLOTS:

58public Q_SLOTS:

58 virtual void activate();

59 virtual void activate();

@@ -62,6 +63,7 @@ Q_SIGNALS:

62 void unassigned();

63 void unassigned();

63

64

64 void activeChanged(bool);

65 void activeChanged(bool);

66+ void windowModelChanged();

65

67

66protected:

68protected:

67 Workspace(QObject *parent = 0);

69 Workspace(QObject *parent = 0);

@@ -69,6 +71,7 @@ protected:

69

71

70 std::shared_ptr<miral::Workspace> m_workspace;

72 std::shared_ptr<miral::Workspace> m_workspace;

71 WorkspaceModel* m_model;

73 WorkspaceModel* m_model;

74+ TopLevelWindowModel* m_windowModel;

72 bool m_active;

75 bool m_active;

73

76

74 friend class WorkspaceManager;

77 friend class WorkspaceManager;

@@ -83,7 +86,6 @@ public:

83 Q_INVOKABLE void assign(WorkspaceModel* model, const QVariant& index = QVariant()) override;

86 Q_INVOKABLE void assign(WorkspaceModel* model, const QVariant& index = QVariant()) override;

84

87

85 bool isActive() const override;

88 bool isActive() const override;

86−

87 void activate() override;

89 void activate() override;

88

90

89 Workspace* proxyObject() const { return m_original.data(); }

91 Workspace* proxyObject() const { return m_original.data(); }

plugins/WindowManager/WorkspaceManager.cpp+7−13

@@ -17,6 +17,7 @@

17#include "WorkspaceManager.h"

18#include "Workspace.h"

19#include "TopLevelWindowModel.h"

20+#include "WindowManagerObjects.h"

20#include <unity/shell/application/SurfaceManagerInterface.h>

21#include <unity/shell/application/SurfaceManagerInterface.h>

21

22

22// Qt

23// Qt

@@ -32,7 +33,6 @@ WorkspaceManager *WorkspaceManager::instance()

32

33

33WorkspaceManager::WorkspaceManager()

34WorkspaceManager::WorkspaceManager()

34 : m_activeWorkspace(nullptr)

35 : m_activeWorkspace(nullptr)

35− , m_surfaceManager(nullptr)

36{

37}

38

@@ -99,25 +99,19 @@ void WorkspaceManager::destroyFloatingWorkspaces()

99 }

100}

101

102−void WorkspaceManager::setSurfaceManager(unity::shell::application::SurfaceManagerInterface *surfaceManager)

103−{

104− if (m_surfaceManager == surfaceManager) return;

105−

106− m_surfaceManager = surfaceManager;

107− Q_EMIT surfaceManagerChanged();

108−}

109−

110void WorkspaceManager::moveSurfaceToWorkspace(unity::shell::application::MirSurfaceInterface *surface, Workspace *workspace)

102void WorkspaceManager::moveSurfaceToWorkspace(unity::shell::application::MirSurfaceInterface *surface, Workspace *workspace)

111{

103{

112− if (m_surfaceManager) {

104+ auto surfaceManager = WindowManagerObjects::instance()->surfaceManager();

105+ if (surfaceManager) {

113− m_surfaceManager->moveSurfaceToWorkspace(surface, workspace->workspace());

106+ surfaceManager->moveSurfaceToWorkspace(surface, workspace->workspace());

114 }

107 }

115}

108}

116

109

117void WorkspaceManager::moveWorkspaceContentToWorkspace(Workspace *from, Workspace *to)

110void WorkspaceManager::moveWorkspaceContentToWorkspace(Workspace *from, Workspace *to)

118{

111{

119− if (m_surfaceManager) {

112+ auto surfaceManager = WindowManagerObjects::instance()->surfaceManager();

113+ if (surfaceManager) {

120− m_surfaceManager->moveWorkspaceContentToWorkspace(from->workspace(), to->workspace());

114+ surfaceManager->moveWorkspaceContentToWorkspace(from->workspace(), to->workspace());

121 }

115 }

122}

116}

123

117

plugins/WindowManager/WorkspaceManager.h−9

@@ -37,11 +37,6 @@ class WorkspaceManager : public QObject

37 Q_OBJECT

38 Q_PROPERTY(Workspace* activeWorkspace READ activeWorkspace WRITE setActiveWorkspace2 NOTIFY activeWorkspaceChanged)

39

40− Q_PROPERTY(unity::shell::application::SurfaceManagerInterface* surfaceManager

41− READ surfaceManager

42− WRITE setSurfaceManager

43− NOTIFY surfaceManagerChanged)

44−

45public:

40public:

46 static WorkspaceManager* instance();

41 static WorkspaceManager* instance();

47

42

@@ -54,9 +49,6 @@ public:

54 QQmlListProperty<Workspace> floatingWorkspaces();

49 QQmlListProperty<Workspace> floatingWorkspaces();

55 void destroyFloatingWorkspaces();

50 void destroyFloatingWorkspaces();

56

51

57− unity::shell::application::SurfaceManagerInterface *surfaceManager() const { return m_surfaceManager; }

58− void setSurfaceManager(unity::shell::application::SurfaceManagerInterface*);

59−

60 Q_INVOKABLE void moveSurfaceToWorkspace(unity::shell::application::MirSurfaceInterface* surface,

52 Q_INVOKABLE void moveSurfaceToWorkspace(unity::shell::application::MirSurfaceInterface* surface,

61 Workspace* workspace);

53 Workspace* workspace);

62

54

@@ -65,7 +57,6 @@ public:

65Q_SIGNALS:

57Q_SIGNALS:

66 void activeWorkspaceChanged();

58 void activeWorkspaceChanged();

67 void floatingWorkspacesChanged();

59 void floatingWorkspacesChanged();

68− void surfaceManagerChanged();

69

60

70private:

61private:

71 WorkspaceManager();

62 WorkspaceManager();

qml/Shell.qml+10−13

@@ -98,6 +98,11 @@ StyledItem {

98

99 readonly property var mainApp: stage.mainApp

100

101+ readonly property var topLevelSurfaceList: {

102+ if (!WMScreen.currentWorkspace) return null;

103+ return WMScreen.currentWorkspace.windowModel

104+ }

105+

101 onMainAppChanged: {

106 onMainAppChanged: {

102 if (mainApp) {

107 if (mainApp) {

103 _onMainAppChanged(mainApp.appId);

108 _onMainAppChanged(mainApp.appId);

@@ -273,14 +278,6 @@ StyledItem {

273 width: parent.width

278 width: parent.width

274 height: parent.height

279 height: parent.height

275

280

276− TopLevelWindowModel {

277− id: topLevelSurfaceList

278− objectName: "topLevelSurfaceList"

279− applicationManager: ApplicationManager // it's a singleton

280− surfaceManager: SurfaceManager

281− workspace: screenWindow.screen.currentWorkspace

282− }

283−

284 Stage {

281 Stage {

285 id: stage

282 id: stage

286 objectName: "stage"

283 objectName: "stage"

@@ -291,7 +288,7 @@ StyledItem {

291 background: wallpaperResolver.background

288 background: wallpaperResolver.background

292

289

293 applicationManager: ApplicationManager

290 applicationManager: ApplicationManager

294− topLevelSurfaceList: topLevelSurfaceList

291+ topLevelSurfaceList: shell.topLevelSurfaceList

295 inputMethodRect: inputMethod.visibleRect

292 inputMethodRect: inputMethod.visibleRect

296 rightEdgePushProgress: rightEdgeBarrier.progress

293 rightEdgePushProgress: rightEdgeBarrier.progress

297

294

@@ -361,7 +358,7 @@ StyledItem {

361 InputMethod {

358 InputMethod {

362 id: inputMethod

359 id: inputMethod

363 objectName: "inputMethod"

360 objectName: "inputMethod"

364− surface: topLevelSurfaceList.inputMethodSurface

361+ surface: shell.topLevelSurfaceList.inputMethodSurface

365 anchors {

362 anchors {

366 fill: parent

363 fill: parent

367 topMargin: panel.panelHeight

364 topMargin: panel.panelHeight

@@ -545,8 +542,8 @@ StyledItem {

545 && !stage.spreadShown

542 && !stage.spreadShown

546 }

543 }

547

544

548− readonly property bool focusedSurfaceIsFullscreen: topLevelSurfaceList.focusedWindow

545+ readonly property bool focusedSurfaceIsFullscreen: shell.topLevelSurfaceList.focusedWindow

549− ? topLevelSurfaceList.focusedWindow.state === Mir.FullscreenState

546+ ? shell.topLevelSurfaceList.focusedWindow.state === Mir.FullscreenState

550 : false

547 : false

551 fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0 && !stage.spreadShown)

548 fullscreenMode: (focusedSurfaceIsFullscreen && !LightDMService.greeter.active && launcher.progress == 0 && !stage.spreadShown)

552 || greeter.hasLockedApp

549 || greeter.hasLockedApp

@@ -875,7 +872,7 @@ StyledItem {

875

872

876 // non-visual objects

873 // non-visual objects

877 KeymapSwitcher {

874 KeymapSwitcher {

878− focusedSurface: topLevelSurfaceList.focusedWindow ? topLevelSurfaceList.focusedWindow.surface : null

875+ focusedSurface: shell.topLevelSurfaceList.focusedWindow ? shell.topLevelSurfaceList.focusedWindow.surface : null

879 }

876 }

880 BrightnessControl {}

877 BrightnessControl {}

881

878

qml/ShellApplication.qml+12

@@ -17,6 +17,7 @@

17import QtQuick 2.4

18import QtQuick.Window 2.2

19import WindowManager 1.0

20+import Unity.Application 0.1

20

21

21Instantiator {

22Instantiator {

22 id: root

23 id: root

@@ -45,4 +46,15 @@ Instantiator {

45 Component.onCompleted: screen.active = primary

46 Component.onCompleted: screen.active = primary

46 primary: index == 0

47 primary: index == 0

47 }

48 }

49+

50+ property var windowManagerSurfaceManagerBinding: Binding {

51+ target: WindowManagerObjects

52+ property: "surfaceManager"

53+ value: SurfaceManager

54+ }

55+ property var windowManagerApplicationManagerBinding: Binding {

56+ target: WindowManagerObjects

57+ property: "applicationManager"

58+ value: ApplicationManager

59+ }

48}

60}

tests/mocks/WindowManager/CMakeLists.txt+2

@@ -26,6 +26,7 @@ set(WINDOWMANAGER_SRC

26 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/ScreenWindow.cpp

27 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/TopLevelWindowModel.cpp

28 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/Window.cpp

29+ ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WindowManagerObjects.cpp

29 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WorkspaceManager.cpp

30 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WorkspaceManager.cpp

30 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WorkspaceModel.cpp

31 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/WorkspaceModel.cpp

31 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/Workspace.cpp

32 ${CMAKE_SOURCE_DIR}/plugins/WindowManager/Workspace.cpp

@@ -33,6 +34,7 @@ set(WINDOWMANAGER_SRC

33 MockScreenWindow.cpp

34 MockScreenWindow.cpp

34 WindowManagerPlugin.cpp

35 WindowManagerPlugin.cpp

35 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

36 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationInfoInterface.h

37+ ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/ApplicationManagerInterface.h

36 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h

38 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/Mir.h

37 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h

39 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceInterface.h

38 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h

40 ${APPLICATION_API_INCLUDEDIR}/unity/shell/application/MirSurfaceListInterface.h

tests/mocks/WindowManager/WindowManagerPlugin.cpp+8−1

@@ -27,6 +27,7 @@

27#include "Workspace.h"

28#include "WorkspaceModel.h"

29#include "WindowManagementPolicy.h"

30+#include "WindowManagerObjects.h"

30

31

31#include <QtQml>

32#include <QtQml>

32

33

@@ -43,19 +44,25 @@ QObject* screensSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

43 Q_UNUSED(scriptEngine);

44 Q_UNUSED(scriptEngine);

44 return new Screens(MockScreens::instance());

45 return new Screens(MockScreens::instance());

45}

46}

47+QObject* objectsSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {

48+ Q_UNUSED(engine);

49+ Q_UNUSED(scriptEngine);

50+ return WindowManagerObjects::instance();

51+}

46

52

47void WindowManagerPlugin::registerTypes(const char *uri)

53void WindowManagerPlugin::registerTypes(const char *uri)

48{

54{

49− qmlRegisterType<TopLevelWindowModel>(uri, 1, 0, "TopLevelWindowModel");

50 qmlRegisterSingletonType<WorkspaceManager>(uri, 1, 0, "WorkspaceManager", workspace_manager);

55 qmlRegisterSingletonType<WorkspaceManager>(uri, 1, 0, "WorkspaceManager", workspace_manager);

51 qmlRegisterUncreatableType<WorkspaceModel>(uri, 1, 0, "WorkspaceModel", notInstantiatable);

56 qmlRegisterUncreatableType<WorkspaceModel>(uri, 1, 0, "WorkspaceModel", notInstantiatable);

52 qmlRegisterSingletonType<Screens>(uri, 1, 0, "Screens", screensSingleton);

57 qmlRegisterSingletonType<Screens>(uri, 1, 0, "Screens", screensSingleton);

53 qmlRegisterUncreatableType<qtmir::ScreenMode>(uri, 1, 0, "ScreenMode", notInstantiatable);

58 qmlRegisterUncreatableType<qtmir::ScreenMode>(uri, 1, 0, "ScreenMode", notInstantiatable);

54 qmlRegisterUncreatableType<Workspace>(uri, 1, 0, "Workspace", notInstantiatable);

59 qmlRegisterUncreatableType<Workspace>(uri, 1, 0, "Workspace", notInstantiatable);

60+ qmlRegisterSingletonType<WindowManagerObjects>(uri, 1, 0, "WindowManagerObjects", objectsSingleton);

55

61

56 qRegisterMetaType<Screen*>("Screen*");

62 qRegisterMetaType<Screen*>("Screen*");

57 qRegisterMetaType<ScreensProxy*>("ScreensProxy*");

63 qRegisterMetaType<ScreensProxy*>("ScreensProxy*");

58 qRegisterMetaType<Workspace*>("Workspace*");

64 qRegisterMetaType<Workspace*>("Workspace*");

65+ qRegisterMetaType<TopLevelWindowModel*>("TopLevelWindowModel*");

59

66

60 qRegisterMetaType<Window*>("Window*");

67 qRegisterMetaType<Window*>("Window*");

61 qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");

68 qRegisterMetaType<QAbstractListModel*>("QAbstractListModel*");