Merge lp:~brandontschaefer/unity/disable-switcher-when-wall-active into lp:unity

[Brandon Schaefer]

Switcher is now disabled when the Wall plugin is Active.

=== Problem ===
When the wall plugin is active (while switching workspaces) Alt+Tab would pick up the wrong workspace.

=== Fix ===
When the wall plugin is active the switcher must be disabled. It is now.

=== Test ===
AP test

[Thomi Richards (thomir-deactivatedaccount)]

Hi,

10 + return (!(results.size() == 1 &&
11 + results[0]->GetIconType() == AbstractLauncherIcon::IconType::TYPE_DESKTOP) &&
12 + !WindowManager::Default()->IsWallActive() &&
13 + !results.empty());

Can we please change this to be a bit more sane? First of all, you're checking both "results.size() == 1" and then later checking "!results.empty()". If the first is true, the second will always be true. I'm also not a fn of multi-line code that requires you to write "(!(".

71 + self.workspace.switch_to(0)
72 + sleep(1)
73 + self.keyboard.press("Ctrl+Alt+Right")
74 + sleep(1)
75 + self.keybinding_hold_part_then_tap("switcher/reveal_normal")
76 + self.addCleanup(self.switcher.terminate)
77 + self.keyboard.release("Ctrl+Alt")

This will leave keys in a pressed state. Please add cleanup actions to release the Ctrl+Alt+Right keys.

Other than that, looks good!

review: Needs Fixing (quality)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve (quality)

[Marco Trevisan (Treviño) (3v1n0)]

Fine for me.

review: Approve

[Unity Merger (unity-merger)]

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/unityshell.cpp
text conflict in tests/autopilot/unity/tests/test_switcher.py

=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2012-08-10 09:58:49 +0000
+++ launcher/SwitcherController.cpp	2012-08-10 23:01:11 +0000
@@ -70,6 +70,13 @@
     view_->background_color = bg_color_;
 }
 
+bool Controller::CanShowSwitcher(const std::vector<AbstractLauncherIcon::Ptr>& results) const
+{
+  bool empty = (show_desktop_disabled_ ? results.empty() : results.size() == 1);
+
+  return (!empty && !WindowManager::Default()->IsWallActive());
+}
+
 void Controller::Show(ShowMode show, SortMode sort, bool reverse,
                       std::vector<AbstractLauncherIcon::Ptr> results)
 {

=== modified file 'launcher/SwitcherController.h'
--- launcher/SwitcherController.h	2012-07-27 01:06:27 +0000
+++ launcher/SwitcherController.h	2012-08-10 23:01:11 +0000
@@ -70,6 +70,8 @@
   void Show(ShowMode show, SortMode sort, bool reverse, std::vector<launcher::AbstractLauncherIcon::Ptr> results);
   void Hide(bool accept_state=true);
 
+  bool CanShowSwitcher(const std::vector<launcher::AbstractLauncherIcon::Ptr>& resutls) const;
+
   bool Visible();
 
   void Next();

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-08-10 09:58:49 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-08-10 23:01:11 +0000
@@ -1895,7 +1895,7 @@
   auto results = launcher_controller_->GetAltTabIcons(show_mode == switcher::ShowMode::CURRENT_VIEWPORT,
                                                       switcher_controller_->IsShowDesktopDisabled());
 
-  if (!(results.size() == 1 && results[0]->GetIconType() == AbstractLauncherIcon::IconType::DESKTOP) && !results.empty())
+  if (switcher_controller_->CanShowSwitcher(results))
     switcher_controller_->Show(show_mode, switcher::SortMode::FOCUS_ORDER, false, results);
 
   return true;
@@ -1949,7 +1949,9 @@
                                         CompAction::State state,
                                         CompOption::Vector& options)
 {
-  if (switcher_controller_->Visible())
+  if (WindowManager::Default()->IsWallActive())
+    return false;
+  else if (switcher_controller_->Visible())
     switcher_controller_->Next();
   else
     altTabInitiateCommon(action, switcher::ShowMode::ALL);

=== modified file 'tests/autopilot/unity/tests/test_switcher.py'
--- tests/autopilot/unity/tests/test_switcher.py	2012-08-09 01:37:02 +0000
+++ tests/autopilot/unity/tests/test_switcher.py	2012-08-10 23:01:11 +0000
@@ -417,3 +417,19 @@
         self.switcher.select()
 
         self.assertProperty(char_win2, is_hidden=False)
+
+    def test_switcher_is_disabled_when_wall_plugin_active(self):
+        """The switcher must not open when the wall plugin is active using ctrl+alt+<direction>."""
+
+        initial_workspace = self.workspace.current_workspace
+        self.addCleanup(self.workspace.switch_to, initial_workspace)
+
+        self.workspace.switch_to(0)
+        sleep(1)
+        self.keyboard.press("Ctrl+Alt+Right")
+        self.addCleanup(self.keyboard.release, "Ctrl+Alt+Right")
+        sleep(1)
+        self.keybinding_hold_part_then_tap("switcher/reveal_normal")
+        self.addCleanup(self.switcher.terminate)
+
+        self.assertThat(self.switcher.visible, Eventually(Equals(False)))

=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2012-05-07 00:49:31 +0000
+++ unity-shared/PluginAdapter.h	2012-08-10 23:01:11 +0000
@@ -92,11 +92,13 @@
   void OnLeaveDesktop ();
 
   void TerminateScale();
-  bool IsScaleActive();
-  bool IsScaleActiveForGroup();
+  bool IsScaleActive() const;
+  bool IsScaleActiveForGroup() const;
 
   void InitiateExpo();
-  bool IsExpoActive();
+  bool IsExpoActive() const;
+
+  bool IsWallActive() const;
 
   void ShowGrabHandles(CompWindow* window, bool use_timer);
   void HideGrabHandles(CompWindow* window);
@@ -109,22 +111,22 @@
   void NotifyCompizEvent(const char* plugin, const char* event, CompOption::Vector& option);
   void NotifyNewDecorationState(guint32 xid);
 
-  guint32 GetActiveWindow();
+  guint32 GetActiveWindow() const;
 
   void Decorate(guint32 xid);
   void Undecorate(guint32 xid);
 
   // WindowManager implementation
-  bool IsWindowMaximized(guint xid);
+  bool IsWindowMaximized(guint xid) const;
   bool IsWindowDecorated(guint xid);
-  bool IsWindowOnCurrentDesktop(guint xid);
-  bool IsWindowObscured(guint xid);
-  bool IsWindowMapped(guint xid);
-  bool IsWindowVisible(guint32 xid);
-  bool IsWindowOnTop(guint32 xid);
-  bool IsWindowClosable(guint32 xid);
-  bool IsWindowMinimizable(guint32 xid);
-  bool IsWindowMaximizable(guint32 xid);
+  bool IsWindowOnCurrentDesktop(guint xid) const;
+  bool IsWindowObscured(guint xid) const;
+  bool IsWindowMapped(guint xid) const;
+  bool IsWindowVisible(guint32 xid) const;
+  bool IsWindowOnTop(guint32 xid) const;
+  bool IsWindowClosable(guint32 xid) const;
+  bool IsWindowMinimizable(guint32 xid) const;
+  bool IsWindowMaximizable(guint32 xid) const;
 
   void Restore(guint32 xid);
   void RestoreAt(guint32 xid, int x, int y);
@@ -140,12 +142,12 @@
   void FocusWindowGroup(std::vector<Window> windows, FocusVisibility, int monitor = -1, bool only_top_win = true);
   bool ScaleWindowGroup(std::vector<Window> windows, int state, bool force);
 
-  bool IsScreenGrabbed();
-  bool IsViewPortSwitchStarted();
-
-  unsigned long long GetWindowActiveNumber (guint32 xid);
-
-  bool MaximizeIfBigEnough(CompWindow* window);
+  bool IsScreenGrabbed() const;
+  bool IsViewPortSwitchStarted() const;
+
+  unsigned long long GetWindowActiveNumber (guint32 xid) const;
+
+  bool MaximizeIfBigEnough(CompWindow* window) const;
 
   int GetWindowMonitor(guint32 xid) const;
   nux::Geometry GetWindowGeometry(guint32 xid) const;
@@ -155,7 +157,7 @@
 
   void CheckWindowIntersections(nux::Geometry const& region, bool &active, bool &any);
 
-  int WorkspaceCount();
+  int WorkspaceCount() const;
 
   void SetCoverageAreaBeforeAutomaximize(float area);
 
@@ -172,7 +174,7 @@
   std::string MatchStringForXids(std::vector<Window> *windows);
   void InitiateScale(std::string const& match, int state = 0);
 
-  bool CheckWindowIntersection(nux::Geometry const& region, CompWindow* window);
+  bool CheckWindowIntersection(nux::Geometry const& region, CompWindow* window) const;
   void SetMwmWindowHints(Window xid, MotifWmHints* new_hints);
 
   CompScreen* m_Screen;

=== modified file 'unity-shared/PluginAdapterCompiz.cpp'
--- unity-shared/PluginAdapterCompiz.cpp	2012-07-30 16:47:33 +0000
+++ unity-shared/PluginAdapterCompiz.cpp	2012-08-10 23:01:11 +0000
@@ -298,7 +298,7 @@
 }
 
 unsigned long long
-PluginAdapter::GetWindowActiveNumber (guint32 xid)
+PluginAdapter::GetWindowActiveNumber (guint32 xid) const
 {
   Window win = xid;
   CompWindow* window;
@@ -368,23 +368,29 @@
 }
 
 bool
-PluginAdapter::IsScaleActive()
+PluginAdapter::IsScaleActive() const
 {
   return m_Screen->grabExist("scale");
 }
 
 bool
-PluginAdapter::IsScaleActiveForGroup()
+PluginAdapter::IsScaleActiveForGroup() const
 {
   return _spread_windows_state && m_Screen->grabExist("scale");
 }
 
 bool
-PluginAdapter::IsExpoActive()
+PluginAdapter::IsExpoActive() const
 {
   return m_Screen->grabExist("expo");
 }
 
+bool
+PluginAdapter::IsWallActive() const
+{
+  return m_Screen->grabExist("wall");
+}
+
 void
 PluginAdapter::InitiateExpo()
 {
@@ -395,13 +401,13 @@
 
 // WindowManager implementation
 guint32
-PluginAdapter::GetActiveWindow()
+PluginAdapter::GetActiveWindow() const
 {
   return m_Screen->activeWindow();
 }
 
 bool
-PluginAdapter::IsWindowMaximized(guint xid)
+PluginAdapter::IsWindowMaximized(guint xid) const
 {
   Window win = xid;
   CompWindow* window;
@@ -456,7 +462,7 @@
 }
 
 bool
-PluginAdapter::IsWindowOnCurrentDesktop(guint32 xid)
+PluginAdapter::IsWindowOnCurrentDesktop(guint32 xid) const
 {
   Window win = xid;
   CompWindow* window;
@@ -472,7 +478,7 @@
 }
 
 bool
-PluginAdapter::IsWindowObscured(guint32 xid)
+PluginAdapter::IsWindowObscured(guint32 xid) const
 {
   Window win = xid;
   CompWindow* window;
@@ -505,7 +511,7 @@
 }
 
 bool
-PluginAdapter::IsWindowMapped(guint32 xid)
+PluginAdapter::IsWindowMapped(guint32 xid) const
 {
   Window win = xid;
   CompWindow* window;
@@ -517,7 +523,7 @@
 }
 
 bool
-PluginAdapter::IsWindowVisible(guint32 xid)
+PluginAdapter::IsWindowVisible(guint32 xid) const
 {
   Window win = xid;
   CompWindow* window;
@@ -530,7 +536,7 @@
 }
 
 bool
-PluginAdapter::IsWindowOnTop(guint32 xid)
+PluginAdapter::IsWindowOnTop(guint32 xid) const
 {
   Window win = xid;
   CompWindow* window = m_Screen->findWindow(win);
@@ -569,7 +575,7 @@
 }
 
 bool
-PluginAdapter::IsWindowClosable(guint32 xid)
+PluginAdapter::IsWindowClosable(guint32 xid) const
 {
   Window win = xid;
   CompWindow* window;
@@ -582,7 +588,7 @@
 }
 
 bool
-PluginAdapter::IsWindowMinimizable(guint32 xid)
+PluginAdapter::IsWindowMinimizable(guint32 xid) const
 {
   Window win = xid;
   CompWindow* window;
@@ -595,7 +601,7 @@
 }
 
 bool
-PluginAdapter::IsWindowMaximizable(guint32 xid)
+PluginAdapter::IsWindowMaximizable(guint32 xid) const
 {
   Window win = xid;
   CompWindow* window;
@@ -965,7 +971,7 @@
 }
 
 bool
-PluginAdapter::CheckWindowIntersection(nux::Geometry const& region, CompWindow* window)
+PluginAdapter::CheckWindowIntersection(nux::Geometry const& region, CompWindow* window) const
 {
   int intersect_types = CompWindowTypeNormalMask | CompWindowTypeDialogMask |
                         CompWindowTypeModalDialogMask | CompWindowTypeUtilMask;
@@ -1022,7 +1028,7 @@
 }
 
 int
-PluginAdapter::WorkspaceCount()
+PluginAdapter::WorkspaceCount() const
 {
   return m_Screen->vpSize().width() * m_Screen->vpSize().height();
 }
@@ -1105,19 +1111,19 @@
 }
 
 bool
-PluginAdapter::IsScreenGrabbed()
+PluginAdapter::IsScreenGrabbed() const
 {
   return m_Screen->grabbed();
 }
 
 bool
-PluginAdapter::IsViewPortSwitchStarted()
+PluginAdapter::IsViewPortSwitchStarted() const
 {
   return _vp_switch_started;
 }
 
 /* Returns true if the window was maximized */
-bool PluginAdapter::MaximizeIfBigEnough(CompWindow* window)
+bool PluginAdapter::MaximizeIfBigEnough(CompWindow* window) const
 {
   XClassHint   classHint;
   Status       status;

=== modified file 'unity-shared/PluginAdapterStandalone.cpp'
--- unity-shared/PluginAdapterStandalone.cpp	2012-07-16 18:43:20 +0000
+++ unity-shared/PluginAdapterStandalone.cpp	2012-08-10 23:01:11 +0000
@@ -125,7 +125,7 @@
 }
 
 unsigned long long
-PluginAdapter::GetWindowActiveNumber (guint32 xid)
+PluginAdapter::GetWindowActiveNumber (guint32 xid) const
 {
   return 0;
 }
@@ -157,19 +157,19 @@
 }
 
 bool
-PluginAdapter::IsScaleActive()
-{
-  return false;
-}
-
-bool
-PluginAdapter::IsScaleActiveForGroup()
-{
-  return false;
-}
-
-bool
-PluginAdapter::IsExpoActive()
+PluginAdapter::IsScaleActive() const
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsScaleActiveForGroup() const
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsExpoActive() const
 {
   return false;
 }
@@ -179,15 +179,21 @@
 {
 }
 
+bool
+PluginAdapter::IsWallActive() const
+{
+  return false;
+}
+
 // WindowManager implementation
 guint32
-PluginAdapter::GetActiveWindow()
+PluginAdapter::GetActiveWindow() const
 {
   return 0;
 }
 
 bool
-PluginAdapter::IsWindowMaximized(guint xid)
+PluginAdapter::IsWindowMaximized(guint xid) const
 {
   return false;
 }
@@ -199,49 +205,49 @@
 }
 
 bool
-PluginAdapter::IsWindowOnCurrentDesktop(guint32 xid)
-{
-  return false;
-}
-
-bool
-PluginAdapter::IsWindowObscured(guint32 xid)
-{
-  return false;
-}
-
-bool
-PluginAdapter::IsWindowMapped(guint32 xid)
-{
-  return false;
-}
-
-bool
-PluginAdapter::IsWindowVisible(guint32 xid)
-{
-  return false;
-}
-
-bool
-PluginAdapter::IsWindowOnTop(guint32 xid)
-{
-  return false;
-}
-
-bool
-PluginAdapter::IsWindowClosable(guint32 xid)
-{
-  return false;
-}
-
-bool
-PluginAdapter::IsWindowMinimizable(guint32 xid)
-{
-  return false;
-}
-
-bool
-PluginAdapter::IsWindowMaximizable(guint32 xid)
+PluginAdapter::IsWindowOnCurrentDesktop(guint32 xid) const
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowObscured(guint32 xid) const
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowMapped(guint32 xid) const
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowVisible(guint32 xid) const
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowOnTop(guint32 xid) const
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowClosable(guint32 xid) const
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowMinimizable(guint32 xid) const
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowMaximizable(guint32 xid) const
 {
   return false;
 }
@@ -347,7 +353,7 @@
 }
 
 bool
-PluginAdapter::CheckWindowIntersection(nux::Geometry const& region, CompWindow* window)
+PluginAdapter::CheckWindowIntersection(nux::Geometry const& region, CompWindow* window) const
 {
   return false;
 }
@@ -358,7 +364,7 @@
 }
 
 int
-PluginAdapter::WorkspaceCount()
+PluginAdapter::WorkspaceCount() const
 {
   return 4;
 }
@@ -379,19 +385,19 @@
 }
 
 bool
-PluginAdapter::IsScreenGrabbed()
+PluginAdapter::IsScreenGrabbed() const
 {
   return false;
 }
 
 bool
-PluginAdapter::IsViewPortSwitchStarted()
+PluginAdapter::IsViewPortSwitchStarted() const
 {
   return false;
 }
 
 /* Returns true if the window was maximized */
-bool PluginAdapter::MaximizeIfBigEnough(CompWindow* window)
+bool PluginAdapter::MaximizeIfBigEnough(CompWindow* window) const
 {
   return true;
 }

=== modified file 'unity-shared/WindowManager.cpp'
--- unity-shared/WindowManager.cpp	2012-06-18 02:57:23 +0000
+++ unity-shared/WindowManager.cpp	2012-08-10 23:01:11 +0000
@@ -23,22 +23,22 @@
 
 class WindowManagerDummy : public WindowManager
 {
-  guint32 GetActiveWindow()
-  {
-    return 0;
-  }
-
-  unsigned long long GetWindowActiveNumber (guint32 xid)
-  {
-    return 0;
-  }
-
-  bool IsScreenGrabbed()
+  guint32 GetActiveWindow() const
+  {
+    return 0;
+  }
+
+  unsigned long long GetWindowActiveNumber (guint32 xid) const
+  {
+    return 0;
+  }
+
+  bool IsScreenGrabbed() const
   {
     return false;
   }
 
-  bool IsViewPortSwitchStarted()
+  bool IsViewPortSwitchStarted() const
   {
     return false;
   }
@@ -48,7 +48,7 @@
     g_debug("%s", G_STRFUNC);
   }
 
-  bool IsWindowMaximized(guint32 xid)
+  bool IsWindowMaximized(guint32 xid) const
   {
     return false;
   }
@@ -58,42 +58,42 @@
     return true;
   }
 
-  bool IsWindowOnCurrentDesktop(guint32 xid)
-  {
-    return true;
-  }
-
-  bool IsWindowObscured(guint32 xid)
-  {
-    return false;
-  }
-
-  bool IsWindowMapped(guint32 xid)
-  {
-    return true;
-  }
-
-  bool IsWindowVisible(guint32 xid)
-  {
-    return true;
-  }
-
-  bool IsWindowOnTop(guint32 xid)
-  {
-    return false;
-  }
-
-  bool IsWindowClosable(guint32 xid)
-  {
-    return true;
-  }
-
-  bool IsWindowMinimizable(guint32 xid)
-  {
-    return true;
-  }
-
-  bool IsWindowMaximizable(guint32 xid)
+  bool IsWindowOnCurrentDesktop(guint32 xid) const
+  {
+    return true;
+  }
+
+  bool IsWindowObscured(guint32 xid) const
+  {
+    return false;
+  }
+
+  bool IsWindowMapped(guint32 xid) const
+  {
+    return true;
+  }
+
+  bool IsWindowVisible(guint32 xid) const
+  {
+    return true;
+  }
+
+  bool IsWindowOnTop(guint32 xid) const
+  {
+    return false;
+  }
+
+  bool IsWindowClosable(guint32 xid) const
+  {
+    return true;
+  }
+
+  bool IsWindowMinimizable(guint32 xid) const
+  {
+    return true;
+  }
+
+  bool IsWindowMaximizable(guint32 xid) const
   {
     return true;
   }
@@ -182,7 +182,7 @@
     any = false;
   }
 
-  int WorkspaceCount ()
+  int WorkspaceCount () const
   {
     return 1;
   }
@@ -192,13 +192,13 @@
     g_debug("%s", G_STRFUNC);
   }
 
-  bool IsScaleActive()
+  bool IsScaleActive() const
   {
     g_debug("%s", G_STRFUNC);
     return false;
   }
 
-  bool IsScaleActiveForGroup()
+  bool IsScaleActiveForGroup() const
   {
     g_debug("%s", G_STRFUNC);
     return false;
@@ -209,7 +209,13 @@
     g_debug("%s", G_STRFUNC);
   }
 
-  bool IsExpoActive()
+  bool IsExpoActive() const
+  {
+    g_debug("%s", G_STRFUNC);
+    return false;
+  }
+
+  bool IsWallActive() const
   {
     g_debug("%s", G_STRFUNC);
     return false;

=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2012-06-18 02:57:23 +0000
+++ unity-shared/WindowManager.h	2012-08-10 23:01:11 +0000
@@ -49,18 +49,18 @@
   static WindowManager* Default();
   static void           SetDefault(WindowManager* manager);
 
-  virtual guint32 GetActiveWindow() = 0;
+  virtual guint32 GetActiveWindow() const = 0;
 
-  virtual bool IsWindowMaximized(guint32 xid) = 0;
+  virtual bool IsWindowMaximized(guint32 xid) const = 0;
   virtual bool IsWindowDecorated(guint32 xid) = 0;
-  virtual bool IsWindowOnCurrentDesktop(guint32 xid) = 0;
-  virtual bool IsWindowObscured(guint32 xid) = 0;
-  virtual bool IsWindowMapped(guint32 xid) = 0;
-  virtual bool IsWindowVisible(guint32 xid) = 0;
-  virtual bool IsWindowOnTop(guint32 xid) = 0;
-  virtual bool IsWindowClosable(guint32 xid) = 0;
-  virtual bool IsWindowMinimizable(guint32 xid) = 0;
-  virtual bool IsWindowMaximizable(guint32 xid) = 0;
+  virtual bool IsWindowOnCurrentDesktop(guint32 xid) const = 0;
+  virtual bool IsWindowObscured(guint32 xid) const = 0;
+  virtual bool IsWindowMapped(guint32 xid) const = 0;
+  virtual bool IsWindowVisible(guint32 xid) const = 0;
+  virtual bool IsWindowOnTop(guint32 xid) const = 0;
+  virtual bool IsWindowClosable(guint32 xid) const = 0;
+  virtual bool IsWindowMinimizable(guint32 xid) const = 0;
+  virtual bool IsWindowMaximizable(guint32 xid) const = 0;
 
   virtual void ShowDesktop() = 0;
 
@@ -74,11 +74,13 @@
   virtual void Lower(guint32 xid) = 0;
 
   virtual void TerminateScale() = 0;
-  virtual bool IsScaleActive() = 0;
-  virtual bool IsScaleActiveForGroup() = 0;
+  virtual bool IsScaleActive() const = 0;
+  virtual bool IsScaleActiveForGroup() const = 0;
 
   virtual void InitiateExpo() = 0;
-  virtual bool IsExpoActive() = 0;
+  virtual bool IsExpoActive() const = 0;
+
+  virtual bool IsWallActive() const = 0;
 
   virtual void FocusWindowGroup(std::vector<Window> windows, FocusVisibility, int monitor = -1, bool only_top_win = true) = 0;
   virtual bool ScaleWindowGroup(std::vector<Window> windows, int state, bool force) = 0;
@@ -86,8 +88,8 @@
   virtual void Decorate(guint32 xid) {};
   virtual void Undecorate(guint32 xid) {};
 
-  virtual bool IsScreenGrabbed() = 0;
-  virtual bool IsViewPortSwitchStarted() = 0;
+  virtual bool IsScreenGrabbed() const = 0;
+  virtual bool IsViewPortSwitchStarted() const = 0;
 
   virtual void MoveResizeWindow(guint32 xid, nux::Geometry geometry) = 0;
   void StartMove(guint32 xid, int, int);
@@ -98,13 +100,13 @@
   virtual nux::Geometry GetScreenGeometry() const = 0;
   virtual nux::Geometry GetWorkAreaGeometry(guint32 xid = 0) const = 0;
 
-  virtual unsigned long long GetWindowActiveNumber(guint32 xid) = 0;
+  virtual unsigned long long GetWindowActiveNumber(guint32 xid) const = 0;
 
   virtual void SetWindowIconGeometry(Window window, nux::Geometry const& geo) = 0;
 
   virtual void CheckWindowIntersections (nux::Geometry const& region, bool &active, bool &any) = 0;
 
-  virtual int WorkspaceCount() = 0;
+  virtual int WorkspaceCount() const = 0;
 
   virtual bool saveInputFocus() = 0;
   virtual bool restoreInputFocus() = 0;