Merge lp:~3v1n0/unity/show-shell-on-menu-open into lp:unity

[Marco Trevisan (Treviño)]

UnityScreen: force shell to be on top when there's a window fullscreen and we've a menu open.

This allows to see the panel and control menus properly. Added support for fullscreen
windows to WindowsManager, in order to handle properly the LIM mode.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3969
http://jenkins.qa.ubuntu.com/job/unity-ci/1250/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/26

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1250/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

This breaks many AP tests:

unity.tests.test_panel.PanelHoverTests.test_hovering_indicators_open_menus(Single Monitor,Global Menus)
unity.tests.test_wm_keybindings.WindowManagerKeybindingsForWindowHandling.test_minimize_restored_window(Restored Window)
unity.tests.test_wm_keybindings.WindowManagerKeybindingsForWindowHandling.test_minimize_restored_window(Maximized Window)
unity.tests.test_panel.PanelMenuTests.test_menus_dont_show_if_a_new_application_window_is_opened(Single Monitor,Global Menus)
unity.tests.test_wm_keybindings.WindowManagerKeybindingsForWindowHandling.test_restore_maximized_window(Restored Window)
unity.tests.test_wm_keybindings.WindowManagerKeybindingsForWindowHandling.test_restore_maximized_window(Maximized Window)
unity.tests.test_panel.PanelKeyNavigationTests.test_panel_menu_accelerators_work(Single Monitor,Global Menus)
unity.tests.test_panel.PanelKeyNavigationTests.test_panel_hold_show_menu_works(Single Monitor,Global Menus)
unity.tests.test_wm_keybindings.WindowManagerKeybindingsForWindowHandling.test_restore_vertically_maximized_window(Restored Window)
unity.tests.test_wm_keybindings.WindowManagerKeybindingsForWindowHandling.test_restore_vertically_maximized_window(Maximized Window)
unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_closes_on_new_focused_application(Single Monitor,Locally Integrated Menus)
unity.tests.test_panel.PanelTitleTests.test_panel_title_doesnt_change_with_switcher(Single Monitor,Locally Integrated Menus)
unity.tests.test_panel.PanelTitleTests.test_panel_title_doesnt_change_with_switcher(Single Monitor,Global Menus)
unity.tests.test_switcher.SwitcherWindowsManagementTests.test_switcher_raises_only_last_focused_window(show_desktop_icon_true)
unity.tests.test_switcher.SwitcherWindowsManagementTests.test_switcher_raises_only_last_focused_window(show_desktop_icon_false)

review: Needs Fixing

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

So, I've been trying to run these tests again one-by-one, but None failed, except for:

unity.tests.test_panel.PanelIndicatorEntryTests.test_menu_closes_on_new_focused_application

That I've fixed (in LIM mode should behave differently).

unity.tests.test_switcher.SwitcherWindowsManagementTests.test_switcher_raises_only_last_focused_window

Which failed because after some time, it seems that AP stresses the Alt+F4 keybinding too much and compiz gets confused... But I don't see any of these failures to be related to this branch.

Can you please check if the failures were accidental (or provide me more precise logs)?

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3970
http://jenkins.qa.ubuntu.com/job/unity-ci/1251/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/29/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/27/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1251/rebuild

review: Needs Fixing (continuous-integration)

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

New build failures are caused by new gtk in Wily, I'll fix this in a new branch.

[Christopher Townsend (townsend)]

Actually, upon further investigation and testing, I had the new bamf from the ci-train silo installed, I'm 99% sure this is what is causing the slew of failures.

I'm going to remove that bamf and rebuild and see if it looks better.

[Christopher Townsend (townsend)]

Ok, this MP is not the culprit of the AP failures, so going to approve.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3970
http://jenkins.qa.ubuntu.com/job/unity-ci/1268/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/46/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/44/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/44/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1268/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3971
http://jenkins.qa.ubuntu.com/job/unity-ci/1273/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-amd64-ci/51/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-armhf-ci/49/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-wily-i386-ci/49/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1273/rebuild

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Setting this to WiP since it doesn't compile.

=== modified file 'UnityCore/Indicators.cpp'
--- UnityCore/Indicators.cpp	2015-01-29 18:23:24 +0000
+++ UnityCore/Indicators.cpp	2015-09-10 12:07:57 +0000
@@ -27,9 +27,8 @@
 namespace indicator
 {
 
-class Indicators::Impl
+struct Indicators::Impl
 {
-public:
   typedef std::unordered_map<std::string, Indicator::Ptr> IndicatorMap;
 
   Impl(Indicators* owner)
@@ -49,7 +48,6 @@
 
   Entry::Ptr GetEntry(std::string const& entry_id);
 
-private:
   Indicators* owner_;
   IndicatorMap indicators_;
   Entry::Ptr active_entry_;
@@ -93,6 +91,11 @@
   return pimpl->RemoveIndicator(name);
 }
 
+Entry::Ptr const& Indicators::GetActiveEntry() const
+{
+  return pimpl->active_entry_;
+}
+
 void Indicators::Impl::ActivateEntry(std::string const& panel, std::string const& entry_id, nux::Rect const& geometry)
 {
   if (active_entry_)
 
=== modified file 'UnityCore/Indicators.h'
--- UnityCore/Indicators.h	2014-09-19 18:48:04 +0000
+++ UnityCore/Indicators.h	2015-09-10 12:07:57 +0000
@@ -40,6 +40,7 @@
   virtual ~Indicators();
 
   IndicatorsList GetIndicators() const;
+  Entry::Ptr const& GetActiveEntry() const;
   virtual std::vector<std::string> const& IconPaths() const = 0;
 
   virtual void SyncGeometries(std::string const& panel, EntryLocationMap const&) = 0;
 
=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2015-07-07 16:10:29 +0000
+++ panel/PanelMenuView.cpp	2015-09-10 12:07:57 +0000
@@ -222,6 +222,8 @@
   wm.window_unminimized.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowUnminimized));
   wm.window_maximized.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowMaximized));
   wm.window_restored.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowRestored));
+  wm.window_fullscreen.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowMaximized));
+  wm.window_unfullscreen.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowUnFullscreen));
   wm.window_unmapped.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowUnmapped));
   wm.window_mapped.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowMapped));
   wm.window_moved.connect(sigc::mem_fun(this, &PanelMenuView::OnWindowMoved));
@@ -231,6 +233,7 @@
   wm.initiate_expo.connect(sigc::mem_fun(this, &PanelMenuView::RefreshAndRedraw));
   wm.terminate_expo.connect(sigc::mem_fun(this, &PanelMenuView::RefreshAndRedraw));
   wm.screen_viewport_switch_ended.connect(sigc::mem_fun(this, &PanelMenuView::RefreshAndRedraw));
+  wm.show_desktop_changed.connect(sigc::mem_fun(this, &PanelMenuView::OnShowDesktopChanged));
 }
 
 void PanelMenuView::SetupUBusManagerInterests()
@@ -1098,7 +1101,8 @@
   if (new_win)
   {
     active_xid = new_win->window_id();
-    is_maximized_ = new_win->maximized();
+    is_maximized_ = (new_win->maximized() ||
+                     WindowManager::Default().IsWindowFullscreen(active_xid));
 
     if (new_win->type() == WindowType::DESKTOP)
     {
@@ -1254,6 +1258,17 @@
   }
 }
 
+void PanelMenuView::OnWindowUnFullscreen(Window xid)
+{
+  if (!WindowManager::Default().IsWindowMaximized(xid))
+    OnWindowRestored(xid);
+}
+
+void PanelMenuView::OnShowDesktopChanged()
+{
+  UpdateMaximizedWindow();
+}
+
 bool PanelMenuView::UpdateActiveWindowPosition()
 {
   bool we_control_window = IsWindowUnderOurControl(active_window);
@@ -1736,7 +1751,7 @@
     if (win->active())
       active_window = xid;
 
-    if (win->maximized())
+    if (win->maximized() || WindowManager::Default().IsWindowFullscreen(xid))
     {
       if (win->active())
         maximized_wins_.push_front(xid);
 
=== modified file 'panel/PanelMenuView.h'
--- panel/PanelMenuView.h	2015-07-07 16:10:29 +0000
+++ panel/PanelMenuView.h	2015-09-10 12:07:57 +0000
@@ -105,7 +105,9 @@
   void OnWindowMapped(Window xid);
   void OnWindowMaximized(Window xid);
   void OnWindowRestored(Window xid);
+  void OnWindowUnFullscreen(Window xid);
   void OnWindowMoved(Window xid);
+  void OnShowDesktopChanged();
 
   void OnMaximizedActivate(int x, int y);
   void OnMaximizedDoubleClicked(int x, int y);
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2015-05-22 13:20:44 +0000
+++ plugins/unityshell/src/unityshell.cpp	2015-09-10 12:07:57 +0000
@@ -986,14 +986,28 @@
 
 bool UnityScreen::forcePaintOnTop()
 {
-  return !allowWindowPaint ||
-         lockscreen_controller_->IsLocked() ||
-         (dash_controller_->IsVisible() && !nux::GetGraphicsDisplay()->PointerIsGrabbed()) ||
-         hud_controller_->IsVisible() ||
-         session_controller_->Visible() ||
-          ((switcher_controller_->Visible() ||
-            WM.IsExpoActive())
-           && !fullscreen_windows_.empty () && (!(screen->grabbed () && !screen->otherGrabExist (NULL))));
+  if (!allowWindowPaint ||
+      lockscreen_controller_->IsLocked() ||
+      (dash_controller_->IsVisible() && !nux::GetGraphicsDisplay()->PointerIsGrabbed()) ||
+      hud_controller_->IsVisible() ||
+      session_controller_->Visible())
+  {
+    return true;
+  }
+
+  if (!fullscreen_windows_.empty())
+  {
+    if (menus_->menu_open())
+      return true;
+
+    if (switcher_controller_->Visible() || WM.IsExpoActive())
+    {
+      if (!screen->grabbed() || screen->otherGrabExist(nullptr))
+        return true;
+    }
+  }
+
+  return false;
 }
 
 void UnityScreen::EnableCancelAction(CancelActionTarget target, bool enabled, int modifiers)
@@ -1255,7 +1269,6 @@
 
   window->updateFrameRegionSetCurrentIndex(MAXSHORT);
   window->updateFrameRegion(region);
-  deco_win_->UpdateFrameRegion(region);
   window->updateFrameRegionSetCurrentIndex(oldUpdateFrameRegionIndex);
 }
 
 
=== modified file 'tests/autopilot/unity/emulators/launcher.py'
--- tests/autopilot/unity/emulators/launcher.py	2015-08-18 15:07:31 +0000
+++ tests/autopilot/unity/emulators/launcher.py	2015-09-10 12:07:57 +0000
@@ -378,11 +378,11 @@
 
         self.move_mouse_to_icon(icon)
         self._mouse.press()
-        sleep(2)
+        sleep(1)
 
         if drag_type == IconDragType.OUTSIDE:
             shift_over = self._mouse.x + (icon_height * 2)
-            self._mouse.move(shift_over, self._mouse.y)
+            self._mouse.move(shift_over, self._mouse.y, rate=20, time_between_events=0.005)
             sleep(0.5)
 
         self.move_mouse_to_icon(target)
@@ -393,8 +393,8 @@
         if pos == IconDragType.BEFORE:
             target_y -= icon_height + (icon_height / 2)
 
-        self._mouse.move(self._mouse.x, target_y)
-        sleep(0.5)
+        self._mouse.move(self._mouse.x, target_y, rate=20, time_between_events=0.005)
+        sleep(1)
         self._mouse.release()
         self.move_mouse_to_right_of_launcher()
 
 
=== modified file 'tests/autopilot/unity/tests/launcher/test_icon_behavior.py'
--- tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2015-08-18 10:08:57 +0000
+++ tests/autopilot/unity/tests/launcher/test_icon_behavior.py	2015-09-10 12:07:57 +0000
@@ -60,6 +60,11 @@
         self.assertThat(lambda: self.process_manager.app_is_running("Calculator"), Eventually(Equals(False)))
         return calc_icon
 
+    def get_running_application_by_desktop_file(self, desktop_id):
+        get_app_fn = lambda: self.process_manager.get_running_applications_by_desktop_file(desktop_id)
+        self.assertThat(lambda: len(get_app_fn()), Eventually(Equals(1)))
+        return get_app_fn()[0]
+
     def test_bfb_tooltip_disappear_when_dash_is_opened(self):
         """Tests that the bfb tooltip disappear when the dash is opened."""
         bfb = self.unity.launcher.model.get_bfb_icon()
@@ -139,7 +144,7 @@
         self.addCleanup(self.process_manager.close_all_app, "Calculator")
         self.launcher_instance.click_launcher_icon(calc_icon)
 
-        calc_app = self.process_manager.get_running_applications_by_desktop_file(calc_icon.desktop_id)[0]
+        calc_app = self.get_running_application_by_desktop_file(calc_icon.desktop_id)
         calc_window = calc_app.get_windows()[0]
 
         self.assertThat(lambda: self.get_startup_notification_timestamp(calc_window), Eventually(Equals(calc_icon.startup_notification_timestamp)))
@@ -197,8 +202,8 @@
         self.addCleanup(self.launcher_instance.keyboard_unreveal_launcher)
         self.keyboard.press_and_release("1");
 
-        calc_app = self.process_manager.get_running_applications_by_desktop_file(calc_icon.desktop_id)[0]
-        calc_window = calc_app.get_windows()[0]
+        calc_app = self.get_running_application_by_desktop_file(calc_icon.desktop_id)
+        [calc_window] = calc_app.get_windows()
 
         self.assertThat(lambda: calc_window.is_focused, Eventually(Equals(True)))
 
@@ -411,7 +416,8 @@
             self.drag_type)
 
         # Must be the last bamf icon - not necessarily the third-from-end icon.
-        refresh_fn = lambda: self.unity.launcher.model.get_launcher_icons()[-2].id
+        expected_pos = -2 if self.workspace.num_workspaces < 2 else -1
+        refresh_fn = lambda: self.unity.launcher.model.get_launcher_icons()[expected_pos].id
         self.assertThat(refresh_fn,
             Eventually(Equals(calc_icon.id)),
             "Launcher icons are: %r" % self.unity.launcher.model.get_launcher_icons())
 
=== modified file 'tests/autopilot/unity/tests/test_panel.py'
--- tests/autopilot/unity/tests/test_panel.py	2015-08-19 11:15:42 +0000
+++ tests/autopilot/unity/tests/test_panel.py	2015-09-10 12:07:57 +0000
@@ -1033,7 +1033,7 @@
         self.assertThat(menu_entry.menu_y, Eventually(Equals(0)))
 
     def test_menu_closes_on_new_focused_application(self):
-        """Clicking outside an open menu must close it."""
+        """When a new app is focused, open menu should be closed only when using Global Menus."""
         menu_entry = self.open_app_and_get_menu_entry()
         self.mouse_open_indicator(menu_entry)
 
@@ -1042,7 +1042,7 @@
 
         self.open_new_application_window("Text Editor")
         get_active_indicator_fn = lambda: self.unity.panels.get_active_indicator()
-        self.assertThat(get_active_indicator_fn, Eventually(Equals(None)))
+        self.assertThat(get_active_indicator_fn, Eventually(NotEquals(None) if self.lim else Equals(None)))
 
     def test_indicator_opens_when_dash_is_open(self):
         """When the dash is open and a click is on an indicator the dash
 
=== modified file 'tests/test_indicators.cpp'
--- tests/test_indicators.cpp	2014-12-19 17:26:43 +0000
+++ tests/test_indicators.cpp	2015-09-10 12:07:57 +0000
@@ -216,6 +216,7 @@
 
   // Activating Entries from the Indicators class to see if they get updated
   ASSERT_THAT(indicators.GetIndicator("indicator-test-1"), NotNull());
+  ASSERT_THAT(indicators.GetActiveEntry(), IsNull());
 
   Entry::Ptr entry12(indicators.GetIndicator("indicator-test-1")->GetEntry("indicator-test-1|entry-2"));
   ASSERT_THAT(entry12, NotNull());
@@ -227,6 +228,7 @@
 
   EXPECT_EQ(entry12->active(), true);
   EXPECT_EQ(entry12->geometry(), nux::Rect(1, 2, 3, 4));
+  EXPECT_EQ(indicators.GetActiveEntry(), entry12);
 }
 
 TEST_F(TestIndicators, ActivateEntryShouldDisactivatePrevious)
 
=== modified file 'unity-shared/CompizUtils.cpp'
--- unity-shared/CompizUtils.cpp	2014-10-22 13:58:46 +0000
+++ unity-shared/CompizUtils.cpp	2015-09-10 12:07:57 +0000
@@ -190,9 +190,6 @@
   if (win->wmType() & (CompWindowTypeDockMask | CompWindowTypeDesktopMask))
     return elements;
 
-  if (win->inShowDesktopMode())
-    return elements;
-
   auto const& region = win->region();
   bool rectangular = (region.numRects() == 1);
   bool alpha = win->alpha();
 
=== modified file 'unity-shared/MenuManager.cpp'
--- unity-shared/MenuManager.cpp	2015-04-20 14:50:48 +0000
+++ unity-shared/MenuManager.cpp	2015-09-10 12:07:57 +0000
@@ -61,6 +61,7 @@
     indicators_->on_object_added.connect(sigc::mem_fun(this, &Impl::AddIndicator));
     indicators_->on_object_removed.connect(sigc::mem_fun(this, &Impl::RemoveIndicator));
     indicators_->on_entry_activate_request.connect(sigc::mem_fun(this, &Impl::ActivateRequest));
+    indicators_->on_entry_activated.connect(sigc::mem_fun(this, &Impl::EntryActivated));
     indicators_->icon_paths_changed.connect(sigc::mem_fun(this, &Impl::IconPathsChanged));
     WindowManager::Default().window_focus_changed.connect(sigc::hide(sigc::mem_fun(this, &Impl::GrabMnemonicsForActiveWindow)));
 
@@ -73,6 +74,7 @@
 
     parent_->integrated_menus = g_settings_get_boolean(settings_, LIM_KEY.c_str());
     parent_->always_show_menus = g_settings_get_boolean(settings_, ALWAYS_SHOW_MENUS_KEY.c_str());
+    parent_->menu_open = indicators_->GetActiveEntry() != nullptr;
   }
 
   ~Impl()
@@ -175,6 +177,11 @@
     parent_->key_activate_entry.emit(entry_id);
   }
 
+  void EntryActivated(std::string const&, std::string const&, nux::Rect const& geo)
+  {
+    parent_->menu_open = !geo.IsNull();
+  }
+
   void SetShowNowForWindow(Window xid, bool show)
   {
     if (!appmenu_)
 
=== modified file 'unity-shared/MenuManager.h'
--- unity-shared/MenuManager.h	2014-12-19 13:03:44 +0000
+++ unity-shared/MenuManager.h	2015-09-10 12:07:57 +0000
@@ -46,6 +46,7 @@
   typedef std::shared_ptr<Manager> Ptr;
 
   nux::Property<bool> show_menus;
+  nux::Property<bool> menu_open;
 
   nux::Property<bool> integrated_menus;
   nux::Property<unsigned> show_menus_wait;
 
=== modified file 'unity-shared/PluginAdapter.cpp'
--- unity-shared/PluginAdapter.cpp	2015-05-29 12:30:36 +0000
+++ unity-shared/PluginAdapter.cpp	2015-09-10 12:07:57 +0000
@@ -145,6 +145,16 @@
   {
     window_restored.emit(window->id());
   }
+
+  if ((state & CompWindowStateFullscreenMask) == CompWindowStateFullscreenMask)
+  {
+    window_fullscreen.emit(window->id());
+  }
+  else if (((last_state & CompWindowStateFullscreenMask) == CompWindowStateFullscreenMask) &&
+           !((state & CompWindowStateFullscreenMask) == CompWindowStateFullscreenMask))
+  {
+    window_unfullscreen.emit(window->id());
+  }
 }
 
 void PluginAdapter::Notify(CompWindow* window, CompWindowNotify notify)
@@ -530,6 +540,14 @@
   return false;
 }
 
+bool PluginAdapter::IsWindowFullscreen(Window window_id) const
+{
+  if (CompWindow* window = m_Screen->findWindow(window_id))
+    return ((window->state() & CompWindowStateFullscreenMask) == CompWindowStateFullscreenMask);
+
+  return false;
+}
+
 bool PluginAdapter::HasWindowDecorations(Window window_id) const
 {
   return compiz_utils::IsWindowFullyDecorable(m_Screen->findWindow(window_id));
 
=== modified file 'unity-shared/PluginAdapter.h'
--- unity-shared/PluginAdapter.h	2015-02-03 09:46:48 +0000
+++ unity-shared/PluginAdapter.h	2015-09-10 12:07:57 +0000
@@ -122,6 +122,7 @@
   bool IsWindowMaximized(Window window_id) const;
   bool IsWindowVerticallyMaximized(Window window_id) const;
   bool IsWindowHorizontallyMaximized(Window window_id) const;
+  bool IsWindowFullscreen(Window window_id) const;
   bool IsWindowDecorated(Window window_id) const;
   bool IsWindowOnCurrentDesktop(Window window_id) const;
   bool IsWindowObscured(Window window_id) const;
 
=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2015-02-27 15:38:11 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2015-09-10 12:07:57 +0000
@@ -128,7 +128,7 @@
 
   return ret;
 }
-  
+
 int StandaloneWindowManager::MonitorGeometryIn(nux::Geometry const& geo) const
 {
   // TODO
@@ -168,6 +168,15 @@
   return false;
 }
 
+bool StandaloneWindowManager::IsWindowFullscreen(Window window_id) const
+{
+  auto window = GetWindowByXid(window_id);
+  if (window)
+    return window->fullscreen;
+
+  return false;
+}
+
 bool StandaloneWindowManager::IsWindowDecorated(Window window_id) const
 {
   auto window = GetWindowByXid(window_id);
@@ -708,6 +717,7 @@
   window->visible.changed.connect([this, xid] (bool v) {v ? window_shown(xid) : window_hidden(xid);});
   window->maximized.changed.connect([this, xid] (bool v) {v ? window_maximized(xid) : window_restored(xid);});
   window->minimized.changed.connect([this, xid] (bool v) {v ? window_minimized(xid) : window_unminimized(xid);});
+  window->fullscreen.changed.connect([this, xid] (bool v) {v ? window_fullscreen(xid) : window_unfullscreen(xid);});
   window->geo.changed.connect([this, xid] (nux::Geometry const&) { window_resized(xid); window_moved(xid); });
   window->resized.connect([this, xid] { window_resized(xid); });
   window->moved.connect([this, xid] { window_moved(xid); });
 
=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2015-01-21 15:28:59 +0000
+++ unity-shared/StandaloneWindowManager.h	2015-09-10 12:07:57 +0000
@@ -51,6 +51,7 @@
   nux::RWProperty<bool> maximized;
   nux::Property<bool> v_maximized;
   nux::Property<bool> h_maximized;
+  nux::Property<bool> fullscreen;
   nux::Property<bool> minimized;
   nux::Property<bool> shaded;
   nux::Property<bool> decorated;
@@ -78,6 +79,7 @@
   virtual bool IsWindowMaximized(Window window_id) const;
   virtual bool IsWindowVerticallyMaximized(Window window_id) const;
   virtual bool IsWindowHorizontallyMaximized(Window window_id) const;
+  virtual bool IsWindowFullscreen(Window window_id) const;
   virtual bool IsWindowDecorated(Window window_id) const;
   virtual bool IsWindowOnCurrentDesktop(Window window_id) const;
   virtual bool IsWindowObscured(Window window_id) const;
 
=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2015-01-21 15:28:59 +0000
+++ unity-shared/WindowManager.h	2015-09-10 12:07:57 +0000
@@ -83,6 +83,7 @@
   virtual bool IsWindowMaximized(Window window_id) const = 0;
   virtual bool IsWindowVerticallyMaximized(Window window_id) const = 0;
   virtual bool IsWindowHorizontallyMaximized(Window window_id) const = 0;
+  virtual bool IsWindowFullscreen(Window window_id) const = 0;
   virtual bool IsWindowDecorated(Window window_id) const = 0;
   virtual bool IsWindowOnCurrentDesktop(Window window_id) const = 0;
   virtual bool IsWindowObscured(Window window_id) const = 0;
@@ -185,6 +186,8 @@
   sigc::signal<void, Window> window_restored;
   sigc::signal<void, Window> window_minimized;
   sigc::signal<void, Window> window_unminimized;
+  sigc::signal<void, Window> window_fullscreen;
+  sigc::signal<void, Window> window_unfullscreen;
   sigc::signal<void, Window> window_shaded;
   sigc::signal<void, Window> window_unshaded;
   sigc::signal<void, Window> window_shown;