From 23399d2388918320cebbda7576da02d50c3507d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Sat, 28 Jan 2012 18:12:50 +0100
Subject: WindowManager (PluginAdapter): support methods to
 (right/left)-maximize and check the status

They allow to maximize a window, or to vertically maximize it and put on a side of
the screen.

(bzr r1820.4.1)
---
 plugins/unityshell/src/PluginAdapter.cpp | 146 ++++++++++++++++++++++++++++++-
 plugins/unityshell/src/PluginAdapter.h   |  14 ++-
 plugins/unityshell/src/WindowManager.cpp |  30 +++++++
 plugins/unityshell/src/WindowManager.h   |   7 ++
 4 files changed, 195 insertions(+), 2 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/PluginAdapter.cpp b/plugins/unityshell/src/PluginAdapter.cpp
index 82e18fd92..ed064c795 100644
--- a/plugins/unityshell/src/PluginAdapter.cpp
+++ b/plugins/unityshell/src/PluginAdapter.cpp
@@ -293,6 +293,12 @@ MultiActionList::TerminateAll(CompOption::Vector& extraArgs)
   }
 }
 
+guint32
+PluginAdapter::GetActiveWindow()
+{
+  return m_Screen->activeWindow();
+}
+
 unsigned long long 
 PluginAdapter::GetWindowActiveNumber (guint32 xid)
 {
@@ -399,6 +405,33 @@ PluginAdapter::IsWindowMaximized(guint xid)
   return false;
 }
 
+bool
+PluginAdapter::IsWindowVerticallyMaximized(guint32 xid)
+{
+  Window win = (Window)xid;
+  CompWindow* window;
+
+  window = m_Screen->findWindow(win);
+  if (window)
+    return (window->state() & CompWindowStateMaximizedVertMask);
+
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowHorizontallyMaximized(guint32 xid)
+{
+  Window win = (Window)xid;
+  CompWindow* window;
+
+  window = m_Screen->findWindow(win);
+  if (window)
+    return (window->state() & CompWindowStateMaximizedHorzMask);
+
+  return false;
+}
+
+
 bool
 PluginAdapter::IsWindowDecorated(guint32 xid)
 {
@@ -505,6 +538,81 @@ PluginAdapter::IsWindowVisible(guint32 xid)
   return true;
 }
 
+void
+PluginAdapter::Maximize(guint32 xid)
+{
+  Window win = (Window)xid;
+  CompWindow* window;
+
+  window = m_Screen->findWindow(win);
+  if (window && ((window->type() & CompWindowTypeNormalMask) ||
+                 (window->actions() & MAXIMIZABLE)))
+  {
+    window->maximize(MAXIMIZE_STATE);
+  }
+}
+
+void
+PluginAdapter::VerticallyMaximizeWindowAt(CompWindow* window, nux::Geometry const& geo)
+{
+  if (window && ((window->type() & CompWindowTypeNormalMask) ||
+      ((window->actions() & CompWindowActionMaximizeVertMask) &&
+        window->actions() & CompWindowActionResizeMask)))
+  {
+    /* First we unmaximize the Window */
+    if (window->state() & MAXIMIZE_STATE)
+      window->maximize(0);
+
+    /* Then we vertically maximize the it so it can be unminimized correctly */
+    if (!(window->state() & CompWindowStateMaximizedVertMask))
+      window->maximize(CompWindowStateMaximizedVertMask);
+
+    /* Then we resize and move it on the requested place */
+    MoveResizeWindow(window->id(), geo);
+  }
+}
+
+
+void
+PluginAdapter::LeftMaximize(guint32 xid)
+{
+  Window win = (Window)xid;
+  CompWindow* window;
+
+  window = m_Screen->findWindow(win);
+  if (!window)
+    return;
+
+  /* Let's compute the area where the window should be put */
+  CompRect workarea = m_Screen->getWorkareaForOutput(window->outputDevice());
+  nux::Geometry win_geo(workarea.x() + window->border().left,
+                        workarea.y() + window->border().top,
+                        workarea.width() / 2 - (window->border().left + window->border().right),
+                        workarea.height() - (window->border().top + window->border().bottom));
+
+  VerticallyMaximizeWindowAt(window, win_geo);
+}
+
+void
+PluginAdapter::RightMaximize(guint32 xid)
+{
+  Window win = (Window)xid;
+  CompWindow* window;
+
+  window = m_Screen->findWindow(win);
+  if (!window)
+    return;
+
+  /* Let's compute the area where the window should be put */
+  CompRect workarea = m_Screen->getWorkareaForOutput(window->outputDevice());
+  nux::Geometry win_geo(workarea.x() + workarea.width() / 2 + window->border().left,
+                        workarea.y() + window->border().top,
+                        workarea.width() / 2 - (window->border().left + window->border().right),
+                        workarea.height() - (window->border().top + window->border().bottom));
+
+  VerticallyMaximizeWindowAt(window, win_geo);
+}
+
 void
 PluginAdapter::Restore(guint32 xid)
 {
@@ -523,7 +631,7 @@ PluginAdapter::Minimize(guint32 xid)
   CompWindow* window;
 
   window = m_Screen->findWindow(win);
-  if (window)
+  if (window && (window->actions() & CompWindowActionMinimizeMask))
     window->minimize();
 }
 
@@ -1049,6 +1157,42 @@ PluginAdapter::restoreInputFocus()
   return false;
 }
 
+void
+PluginAdapter::MoveResizeWindow(guint32 xid, nux::Geometry geometry)
+{
+  int w, h;
+  CompWindow* window = m_Screen->findWindow(xid);
+
+  if (!window)
+    return;
+
+  if (window->constrainNewWindowSize(geometry.width, geometry.height, &w, &h))
+  {
+    CompRect workarea = m_Screen->getWorkareaForOutput(window->outputDevice());
+    int dx = geometry.x + w - workarea.right() + window->border().right;
+    int dy = geometry.y + h - workarea.bottom() + window->border().bottom;
+
+    if (dx > 0)
+      geometry.x -= dx;
+    if (dy > 0)
+      geometry.y -= dy;
+
+    geometry.SetWidth(w);
+    geometry.SetHeight(h);
+  }
+
+  XWindowChanges xwc;
+  xwc.x = geometry.x;
+	xwc.y = geometry.y;
+	xwc.width = geometry.width;
+	xwc.height = geometry.height;
+
+	if (window->mapNum())
+    window->sendSyncRequest();
+
+  window->configureXWindow(CWX | CWY | CWWidth | CWHeight, &xwc);
+}
+
 void
 PluginAdapter::OnWindowClosed(CompWindow *w)
 {
diff --git a/plugins/unityshell/src/PluginAdapter.h b/plugins/unityshell/src/PluginAdapter.h
index 8071a3a4a..1b75c3dde 100644
--- a/plugins/unityshell/src/PluginAdapter.h
+++ b/plugins/unityshell/src/PluginAdapter.h
@@ -108,19 +108,27 @@ public:
   void NotifyCompizEvent(const char* plugin, const char* event, CompOption::Vector& option);
   void NotifyNewDecorationState(guint32 xid);
 
+  guint32 GetActiveWindow();
+
   void Decorate(guint32 xid);
   void Undecorate(guint32 xid);
 
   // WindowManager implementation
   bool IsWindowMaximized(guint xid);
+  bool IsWindowVerticallyMaximized(guint32 xid);
+  bool IsWindowHorizontallyMaximized(guint32 xid);
   bool IsWindowDecorated(guint xid);
   bool IsWindowOnCurrentDesktop(guint xid);
   bool IsWindowObscured(guint xid);
   bool IsWindowMapped(guint xid);
   bool IsWindowVisible(guint32 xid);
+
+  void Maximize(guint32 xid);
   void Restore(guint32 xid);
   void Minimize(guint32 xid);
   void Close(guint32 xid);
+  void LeftMaximize(guint32 xid);
+  void RightMaximize(guint32 xid);
   void Activate(guint32 xid);
   void Raise(guint32 xid);
   void Lower(guint32 xid);
@@ -140,7 +148,7 @@ public:
 
   nux::Geometry GetWindowGeometry(guint32 xid);
   nux::Geometry GetScreenGeometry();
-  
+
   void CheckWindowIntersections(nux::Geometry const& region, bool &active, bool &any);
 
   int WorkspaceCount();
@@ -150,6 +158,8 @@ public:
   bool saveInputFocus ();
   bool restoreInputFocus ();
 
+  void MoveResizeWindow(guint32 xid, nux::Geometry geometry);
+
 protected:
   PluginAdapter(CompScreen* screen);
 
@@ -160,6 +170,8 @@ private:
   bool CheckWindowIntersection(nux::Geometry const& region, CompWindow* window);
   void SetMwmWindowHints(Window xid, MotifWmHints* new_hints);
 
+  void VerticallyMaximizeWindowAt(CompWindow* window, nux::Geometry const& geo);
+
   CompScreen* m_Screen;
   MultiActionList m_ExpoActionList;
   MultiActionList m_ScaleActionList;
diff --git a/plugins/unityshell/src/WindowManager.cpp b/plugins/unityshell/src/WindowManager.cpp
index 39c66de6a..6abac6670 100644
--- a/plugins/unityshell/src/WindowManager.cpp
+++ b/plugins/unityshell/src/WindowManager.cpp
@@ -23,6 +23,11 @@ static WindowManager* window_manager = NULL;
 
 class WindowManagerDummy : public WindowManager
 {
+  guint32 GetActiveWindow()
+  {
+    return 0;
+  }
+
   unsigned long long GetWindowActiveNumber (guint32 xid)
   {
     return 0;
@@ -48,6 +53,16 @@ class WindowManagerDummy : public WindowManager
     return false;
   }
 
+  bool IsWindowVerticallyMaximized(guint32 xid)
+  {
+    return false;
+  }
+
+  bool IsWindowHorizontallyMaximized(guint32 xid)
+  {
+    return false;
+  }
+
   bool IsWindowDecorated(guint32 xid)
   {
     return true;
@@ -73,6 +88,11 @@ class WindowManagerDummy : public WindowManager
     return true;
   }
 
+  void Maximize(guint32 xid)
+  {
+    g_debug("%s", G_STRFUNC);
+  }
+
   void Restore(guint32 xid)
   {
     g_debug("%s", G_STRFUNC);
@@ -88,6 +108,16 @@ class WindowManagerDummy : public WindowManager
     g_debug("%s", G_STRFUNC);
   }
 
+  void RightMaximize(guint32 xid)
+  {
+    g_debug("%s", G_STRFUNC);
+  }
+
+  void LeftMaximize(guint32 xid)
+  {
+    g_debug("%s", G_STRFUNC);
+  }
+
   void Activate(guint32 xid)
   {
     g_debug("%s", G_STRFUNC);
diff --git a/plugins/unityshell/src/WindowManager.h b/plugins/unityshell/src/WindowManager.h
index 5663483b7..df20c9dea 100644
--- a/plugins/unityshell/src/WindowManager.h
+++ b/plugins/unityshell/src/WindowManager.h
@@ -55,7 +55,11 @@ public:
   static WindowManager* Default();
   static void            SetDefault(WindowManager* manager);
 
+  virtual guint32 GetActiveWindow() = 0;
+
   virtual bool IsWindowMaximized(guint32 xid) = 0;
+  virtual bool IsWindowVerticallyMaximized(guint32 xid) = 0;
+  virtual bool IsWindowHorizontallyMaximized(guint32 xid) = 0;
   virtual bool IsWindowDecorated(guint32 xid) = 0;
   virtual bool IsWindowOnCurrentDesktop(guint32 xid) = 0;
   virtual bool IsWindowObscured(guint32 xid) = 0;
@@ -64,9 +68,12 @@ public:
 
   virtual void ShowDesktop() = 0;
 
+  virtual void Maximize(guint32 xid) = 0;
   virtual void Restore(guint32 xid) = 0;
   virtual void Minimize(guint32 xid) = 0;
   virtual void Close(guint32 xid) = 0;
+  virtual void RightMaximize(guint32 xid) = 0;
+  virtual void LeftMaximize(guint32 xid) = 0;
 
   virtual void Activate(guint32 xid) = 0;
   virtual void Raise(guint32 xid) = 0;
-- 
cgit v1.2.3


From d69c5d74da29c7d28a91aee902c5c67f05e9c17c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Sat, 28 Jan 2012 18:13:52 +0100
Subject: UnityScreen: add support for Super+Arrows shortcuts to manage the
 focused window

Super+Arrows shortcut allows to move and maximize / restore / minimize
the focused window on the screen.

(bzr r1820.4.2)
---
 plugins/unityshell/src/unityshell.cpp | 49 +++++++++++++++++++++++++++++++++++
 plugins/unityshell/src/unityshell.h   |  5 ++++
 plugins/unityshell/unityshell_xml.in  | 20 ++++++++++++++
 3 files changed, 74 insertions(+)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index de1c5a629..c86800af9 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -307,6 +307,11 @@ UnityScreen::UnityScreen(CompScreen* screen)
      optionSetLauncherSwitcherPrevInitiate(boost::bind(&UnityScreen::launcherSwitcherPrevInitiate, this, _1, _2, _3));
      optionSetLauncherSwitcherForwardTerminate(boost::bind(&UnityScreen::launcherSwitcherTerminate, this, _1, _2, _3));
 
+     optionSetWindowMaximizeInitiate(boost::bind(&UnityScreen::maximizeKeyInitate, this, _1, _2, _3));
+     optionSetWindowRestoreMinimizeInitiate(boost::bind(&UnityScreen::restoreMinimizeKeyInitiate, this, _1, _2, _3));
+     optionSetWindowRightMaximizeInitiate(boost::bind(&UnityScreen::rightMaximizeKeyInitiate, this, _1, _2, _3));
+     optionSetWindowLeftMaximizeInitiate(boost::bind(&UnityScreen::leftMaximizeKeyInitiate, this, _1, _2, _3));
+
      optionSetStopVelocityNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetRevealPressureNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetOvercomePressureNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -1712,12 +1717,14 @@ bool UnityScreen::launcherSwitcherForwardInitiate(CompAction* action, CompAction
   action->setState(action->state() | CompAction::StateTermKey);
   return false;
 }
+
 bool UnityScreen::launcherSwitcherPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
 {
   launcher_controller_->KeyNavPrevious();
 
   return false;
 }
+
 bool UnityScreen::launcherSwitcherTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options)
 {
   bool accept_state = (state & CompAction::StateCancel) == 0;
@@ -1728,6 +1735,48 @@ bool UnityScreen::launcherSwitcherTerminate(CompAction* action, CompAction::Stat
   return false;
 }
 
+bool UnityScreen::maximizeKeyInitate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+{
+  WindowManager* wm = PluginAdapter::Default();
+  wm->Maximize(wm->GetActiveWindow());
+
+  return false;
+}
+
+bool UnityScreen::restoreMinimizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+{
+  WindowManager* wm = PluginAdapter::Default();
+  guint32 focused_win = wm->GetActiveWindow();
+
+  if (wm->IsWindowVerticallyMaximized(focused_win) ||
+      wm->IsWindowHorizontallyMaximized(focused_win))
+  {
+    wm->Restore(focused_win);
+  }
+  else
+  {
+    wm->Minimize(focused_win);
+  }
+
+  return false;
+}
+
+bool UnityScreen::rightMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+{
+  WindowManager* wm = PluginAdapter::Default();
+  wm->RightMaximize(wm->GetActiveWindow());
+
+  return false;
+}
+
+bool UnityScreen::leftMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
+{
+  WindowManager* wm = PluginAdapter::Default();
+  wm->LeftMaximize(wm->GetActiveWindow());
+
+  return false;
+}
+
 void UnityScreen::OnLauncherStartKeyNav(GVariant* data)
 {
   startLauncherKeyNav();
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 8fa44f8ab..e547a6bed 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -206,6 +206,11 @@ public:
   bool launcherSwitcherPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool launcherSwitcherTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
+  bool maximizeKeyInitate(CompAction* action, CompAction::State state, CompOption::Vector& options);
+  bool restoreMinimizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
+  bool rightMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
+  bool leftMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
+
   /* handle option changes and change settings inside of the
    * panel and dock views */
   void optionChanged(CompOption*, Options num);
diff --git a/plugins/unityshell/unityshell_xml.in b/plugins/unityshell/unityshell_xml.in
index 6de5a413a..0e8256116 100644
--- a/plugins/unityshell/unityshell_xml.in
+++ b/plugins/unityshell/unityshell_xml.in
@@ -95,6 +95,26 @@
                     <_long>Switch the applications using the launcher, in reverse order</_long>
                     <default>&lt;Super&gt;&lt;Shift&gt;Tab</default>
                   </option>
+                  <option name="window_maximize" type="key">
+                    <_short>Key to maximize the focused window</_short>
+                    <_long>Maximize the focused window</_long>
+                    <default>&lt;Super&gt;Up</default>
+                  </option>
+                  <option name="window_restore_minimize" type="key">
+                    <_short>Key to restore or minimize the focused window</_short>
+                    <_long>Restore the maximized window on focus or minimize the focused window</_long>
+                    <default>&lt;Super&gt;Down</default>
+                  </option>
+                  <option name="window_right_maximize" type="key">
+                    <_short>Key to vertically maximize the focused window to the right</_short>
+                    <_long>Semi-maximize vertically the focused window on the half right width of the screen</_long>
+                    <default>&lt;Super&gt;Right</default>
+                  </option>
+                  <option name="window_left_maximize" type="key">
+                    <_short>Key to vertically maximize the focused window to the left</_short>
+                    <_long>Semi-maximize vertically the focused window to the half left width of the screen</_long>
+                    <default>&lt;Super&gt;Left</default>
+                  </option>
               </group>
               <group>
                 <_short>Switcher</_short>
-- 
cgit v1.2.3


From f6d246c46060ab8bf854ab928512ccd8e21b554b Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandon.schaefer@canonical.com>
Date: Mon, 15 Jul 2013 18:08:36 -0700
Subject: * You can use the mouse now in the switcher :)

(bzr r3426.1.1)
---
 plugins/unityshell/src/unityshell.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index ffcec742e..76483d3d4 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1703,8 +1703,9 @@ void UnityScreen::handleEvent(XEvent* event)
       break;
   }
 
-  if (!skip_other_plugins &&
-      screen->otherGrabExist("deco", "move", "switcher", "resize", "unity-switcher", nullptr))
+  if ((!skip_other_plugins &&
+      screen->otherGrabExist("deco", "move", "switcher", "resize", "unity-switcher", nullptr)) ||
+      switcher_controller_->Visible())
   {
     wt->ProcessForeignEvent(event, nullptr);
   }
@@ -1901,7 +1902,7 @@ bool UnityScreen::setKeyboardFocusKeyInitiate(CompAction* action,
 bool UnityScreen::altTabInitiateCommon(CompAction* action, switcher::ShowMode show_mode)
 {
   if (!grab_index_)
-    grab_index_ = screen->pushGrab (screen->invisibleCursor(), "unity-switcher");
+    grab_index_ = screen->pushGrab (screen->normalCursor(), "unity-switcher");
 
   screen->addAction(&optionGetAltTabRight());
   screen->addAction(&optionGetAltTabDetailStart());
-- 
cgit v1.2.3


From 9f9e10aa844376ca10a30eadbe3bbe24b4dab7eb Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandon.schaefer@canonical.com>
Date: Tue, 16 Jul 2013 13:18:14 -0700
Subject: * Add right clicking to toggle detail mode. * Refactor lambda
 funciton into a CB functions

(bzr r3426.1.2)
---
 plugins/unityshell/src/unityshell.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 76483d3d4..83dc72c8b 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1703,9 +1703,8 @@ void UnityScreen::handleEvent(XEvent* event)
       break;
   }
 
-  if ((!skip_other_plugins &&
-      screen->otherGrabExist("deco", "move", "switcher", "resize", "unity-switcher", nullptr)) ||
-      switcher_controller_->Visible())
+  if (!skip_other_plugins &&
+      screen->otherGrabExist("deco", "move", "switcher", "resize", nullptr))
   {
     wt->ProcessForeignEvent(event, nullptr);
   }
-- 
cgit v1.2.3


From a5ec5795633a416a472fdb6e62bc179b555934ee Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandon.schaefer@canonical.com>
Date: Thu, 18 Jul 2013 16:10:43 -0700
Subject: * Moves scrolling event handing inside SwitcherView

(bzr r3426.1.8)
---
 plugins/unityshell/src/unityshell.cpp | 38 +++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 83dc72c8b..89934c2dc 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1510,6 +1510,14 @@ void UnityScreen::handleEvent(XEvent* event)
         if (CompWindow *w = screen->findWindow(ss->getSelectedWindow()))
           skip_other_plugins = UnityWindow::get(w)->handleEvent(event);
       }
+      else if (switcher_controller_->IsDetailViewShown())
+      {
+        Window win = switcher_controller_->GetCurrentSelection().window_;
+        CompWindow* w = screen->findWindow(win);
+
+        if (w)
+          skip_other_plugins = UnityWindow::get(w)->handleEvent(event);
+      }
       break;
     case ButtonPress:
       if (super_keypressed_)
@@ -1523,6 +1531,14 @@ void UnityScreen::handleEvent(XEvent* event)
         if (CompWindow *w = screen->findWindow(ss->getSelectedWindow()))
           skip_other_plugins = UnityWindow::get(w)->handleEvent(event);
       }
+      else if (switcher_controller_->IsDetailViewShown())
+      {
+        Window win = switcher_controller_->GetCurrentSelection().window_;
+        CompWindow* w = screen->findWindow(win);
+
+        if (w)
+          skip_other_plugins = UnityWindow::get(w)->handleEvent(event);
+      }
 
       if (dash_controller_->IsVisible())
       {
@@ -1567,22 +1583,14 @@ void UnityScreen::handleEvent(XEvent* event)
       }
       break;
     case ButtonRelease:
-      if (switcher_controller_ && switcher_controller_->Visible())
+
+      if (switcher_controller_->IsDetailViewShown())
       {
-        XButtonEvent *bev = reinterpret_cast<XButtonEvent*>(event);
-        if (bev->time - last_scroll_event_ > 150)
-        {
-          if (bev->button == Button4 || bev->button == local::SCROLL_UP_BUTTON)
-          {
-            switcher_controller_->Prev();
-            last_scroll_event_ = bev->time;
-          }
-          else if (bev->button == Button5 || bev->button == local::SCROLL_DOWN_BUTTON)
-          {
-            switcher_controller_->Next();
-            last_scroll_event_ = bev->time;
-          }
-        }
+        Window win = switcher_controller_->GetCurrentSelection().window_;
+        CompWindow* w = screen->findWindow(win);
+
+        if (w)
+          skip_other_plugins = UnityWindow::get(w)->handleEvent(event);
       }
       else if (wm.IsScaleActive())
       {
-- 
cgit v1.2.3


From d8b5ce771cb9bfd3ffddf89d990a238dc0faf11d Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandon.schaefer@canonical.com>
Date: Mon, 22 Jul 2013 17:11:11 -0700
Subject: * Fixed based on reviewers comment   - Click outside closes switcher 
  - Multi-monitor works in detail mode   - Magic numbers fixed up (hopefully
 better names!)   - Better signal names.   - Flipped the scroll direction   -
 Middle click now closes   - Possibly something else!

(bzr r3426.1.10)
---
 plugins/unityshell/src/unityshell.cpp | 85 ++++++++++++++++++++++++++---------
 plugins/unityshell/src/unityshell.h   |  3 ++
 2 files changed, 66 insertions(+), 22 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 89934c2dc..9f1c3b17a 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -987,7 +987,24 @@ CompWindow * GetTopVisibleWindow()
 
   return top_visible_window;
 }
-  
+
+LayoutWindow::Ptr UnityScreen::GetSwitcherDetailLayoutWindow(Window window) const
+{
+  LayoutWindow::Vector const& targets = switcher_controller_->ExternalRenderTargets();
+  LayoutWindow::Ptr layout_window(0);
+
+  for (LayoutWindow::Ptr const& target : targets)
+  {
+    if (target->xid == window)
+    {
+      layout_window = target;
+      break;
+    }
+  }
+
+  return layout_window;
+}
+
 void UnityWindow::enterShowDesktop ()
 {
   if (!mShowdesktopHandler)
@@ -1185,11 +1202,21 @@ bool UnityWindow::handleEvent(XEvent *event)
         cWindow->addDamageRect(CompRect(g.x, g.y, g.width, g.height));
         handled = true;
       }
-      else if (event->xbutton.button == Button2 &&
-               GetScaledGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
+      else if (event->xbutton.button == Button2)
       {
-        middle_clicked_ = true;
-        handled = true;
+        if (UnityScreen::get (screen)->switcher_controller_->Visible())
+        {
+          if (GetLayoutWindowGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
+          {
+            middle_clicked_ = true;
+            handled = true;
+          }
+        }
+        else if (GetScaledGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
+        {
+          middle_clicked_ = true;
+          handled = true;
+        }
       }
       break;
 
@@ -1214,10 +1241,19 @@ bool UnityWindow::handleEvent(XEvent *event)
 
         if (middle_clicked_)
         {
-          if (event->xbutton.button == Button2 &&
-              GetScaledGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
+          if (event->xbutton.button == Button2)
           {
-            window->close(0);
+            if (UnityScreen::get (screen)->switcher_controller_->Visible())
+            {
+              if (GetLayoutWindowGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
+              {
+                window->close(0);
+              }
+            }
+            else if (GetScaledGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
+            {
+              window->close(0);
+            }
           }
 
           middle_clicked_ = false;
@@ -1566,8 +1602,7 @@ void UnityScreen::handleEvent(XEvent* event)
           }
         }
       }
-
-      if (hud_controller_->IsVisible())
+      else if (hud_controller_->IsVisible())
       {
         nux::Point pt(event->xbutton.x_root, event->xbutton.y_root);
         nux::Geometry const& hud_geo = hud_controller_->GetInputWindowGeometry();
@@ -1581,6 +1616,16 @@ void UnityScreen::handleEvent(XEvent* event)
           hud_controller_->HideHud(false);
         }
       }
+      else if (switcher_controller_->Visible())
+      {
+        nux::Point pt(event->xbutton.x_root, event->xbutton.y_root);
+        nux::Geometry const& switcher_geo = switcher_controller_->GetInputWindowGeometry();
+
+        if (!switcher_geo.IsInside(pt))
+        {
+          switcher_controller_->Hide(false);
+        }
+      }
       break;
     case ButtonRelease:
 
@@ -1940,18 +1985,6 @@ bool UnityScreen::altTabInitiateCommon(CompAction* action, switcher::ShowMode sh
 
 void UnityScreen::SetUpAndShowSwitcher(switcher::ShowMode show_mode)
 {
-  // maybe check launcher position/hide state?
-
-  auto uscreen = UScreen::GetDefault();
-  int monitor = uscreen->GetMonitorWithMouse();
-  auto monitor_geo = uscreen->GetMonitorGeometry(monitor);
-
-  monitor_geo.x += 100;
-  monitor_geo.y += 100;
-  monitor_geo.width -= 200;
-  monitor_geo.height -= 200;
-  switcher_controller_->SetWorkspace(monitor_geo, monitor);
-
   RaiseInputWindows();
 
   auto results = launcher_controller_->GetAltTabIcons(show_mode == switcher::ShowMode::CURRENT_VIEWPORT,
@@ -3850,6 +3883,14 @@ void UnityWindow::scalePaintDecoration(GLWindowPaintAttrib const& attrib,
   paintFakeDecoration(scaled_geo, attrib, transform, mask, highlighted, pos.scale);
 }
 
+nux::Geometry UnityWindow::GetLayoutWindowGeometry()
+{
+  LayoutWindow::Ptr const &layout_window = UnityScreen::get(screen)->
+                                             GetSwitcherDetailLayoutWindow(window->id());
+
+  return layout_window->result;
+}
+
 nux::Geometry UnityWindow::GetScaledGeometry()
 {
   ScaleWindow* scale_win = ScaleWindow::get(window);
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 2c35604d1..c96d91939 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -192,6 +192,8 @@ public:
 
   bool DoesPointIntersectUnityGeos(nux::Point const& pt);
 
+  ui::LayoutWindow::Ptr GetSwitcherDetailLayoutWindow(Window window) const;
+
 protected:
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
@@ -392,6 +394,7 @@ public:
   bool place(CompPoint& pos);
   CompPoint tryNotIntersectUI(CompPoint& pos);
   nux::Geometry GetScaledGeometry();
+  nux::Geometry GetLayoutWindowGeometry();
 
   void paintThumbnail(nux::Geometry const& bounding, float parent_alpha, float alpha, float scale_ratio, unsigned deco_height, bool selected);
 
-- 
cgit v1.2.3


From d5db2b86692e30e40ff4e598263680ab49cac359 Mon Sep 17 00:00:00 2001
From: Chris Townsend <christopher.townsend@canonical.com>
Date: Tue, 23 Jul 2013 09:54:51 -0400
Subject: Fix yet another regression in revno. 3381 where the Panel shadow is
 not drawn when in Show Desktop mode.

Fixes LP: #1203097

(bzr r3431.1.1)
---
 plugins/unityshell/src/unityshell.cpp | 9 +++++++--
 plugins/unityshell/src/unityshell.h   | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index ffcec742e..7daf220e1 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -150,6 +150,7 @@ UnityScreen::UnityScreen(CompScreen* screen)
   , big_tick_(0)
   , screen_introspection_(screen)
   , is_desktop_active_(false)
+  , in_show_desktop_(false)
 {
   Timer timer;
 #ifndef USE_GLES
@@ -856,6 +857,8 @@ void UnityScreen::EnableCancelAction(CancelActionTarget target, bool enabled, in
 
 void UnityScreen::enterShowDesktopMode ()
 {
+  in_show_desktop_ = true;
+
   for (CompWindow *w : screen->windows ())
   {
     CompPoint const& viewport = w->defaultViewport();
@@ -940,6 +943,7 @@ void UnityScreen::leaveShowDesktopMode (CompWindow *w)
       }
     }
   }
+  in_show_desktop_ = false;
 }
 
 bool UnityScreen::DoesPointIntersectUnityGeos(nux::Point const& pt)
@@ -2642,7 +2646,8 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
       {
         top_visible_window = GetTopVisibleWindow();
 
-        if (top_visible_window && (window->id() == top_visible_window->id()))
+        if ((top_visible_window && (window->id() == top_visible_window->id())) ||
+            uScreen->in_show_desktop_)
         {
           draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
         }
@@ -2670,7 +2675,7 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
       }
       else
       {
-        if (uScreen->is_desktop_active_)
+        if (uScreen->is_desktop_active_ && !uScreen->in_show_desktop_)
         {
           top_visible_window = GetTopVisibleWindow();
 
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 2c35604d1..d08268c72 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -344,6 +344,7 @@ private:
   glib::SourceManager sources_;
 
   bool is_desktop_active_;
+  bool in_show_desktop_;
 
   friend class UnityWindow;
 };
-- 
cgit v1.2.3


From 742ea950038fa727ae95f059107fffd7c48b5429 Mon Sep 17 00:00:00 2001
From: Andrea Azzarone <azzaronea@gmail.com>
Date: Wed, 24 Jul 2013 22:23:49 +0200
Subject: Add show_desktop_key shortcut.

(bzr r3439.2.1)
---
 plugins/unityshell/src/unityshell.cpp | 8 ++++++++
 plugins/unityshell/src/unityshell.h   | 1 +
 plugins/unityshell/unityshell_xml.in  | 6 ++++++
 3 files changed, 15 insertions(+)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 01f446aa8..a5b5752a3 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -307,6 +307,7 @@ UnityScreen::UnityScreen(CompScreen* screen)
      optionSetKeyboardFocusInitiate(boost::bind(&UnityScreen::setKeyboardFocusKeyInitiate, this, _1, _2, _3));
      //optionSetKeyboardFocusTerminate (boost::bind (&UnityScreen::setKeyboardFocusKeyTerminate, this, _1, _2, _3));
      optionSetExecuteCommandInitiate(boost::bind(&UnityScreen::executeCommand, this, _1, _2, _3));
+     optionSetShowDesktopKeyInitiate(boost::bind(&UnityScreen::showDesktopKeyInitiate, this, _1, _2, _3));
      optionSetPanelFirstMenuInitiate(boost::bind(&UnityScreen::showPanelFirstMenuKeyInitiate, this, _1, _2, _3));
      optionSetPanelFirstMenuTerminate(boost::bind(&UnityScreen::showPanelFirstMenuKeyTerminate, this, _1, _2, _3));
      optionSetAutomaximizeValueNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
@@ -1889,6 +1890,13 @@ bool UnityScreen::executeCommand(CompAction* action,
   return true;
 }
 
+bool UnityScreen::showDesktopKeyInitiate(CompAction* action,
+                                         CompAction::State state,
+                                         CompOption::Vector& options)
+{
+  WindowManager::Default().ShowDesktop();
+  return true;
+}
 
 bool UnityScreen::setKeyboardFocusKeyInitiate(CompAction* action,
                                               CompAction::State state,
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index b9a0248c1..7684ae4ca 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -141,6 +141,7 @@ public:
   bool showPanelFirstMenuKeyTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
   bool executeCommand(CompAction* action, CompAction::State state, CompOption::Vector& options);
+  bool showDesktopKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool setKeyboardFocusKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
   bool altTabInitiateCommon(CompAction* action, switcher::ShowMode mode);
diff --git a/plugins/unityshell/unityshell_xml.in b/plugins/unityshell/unityshell_xml.in
index 95bacd191..9fa3f5ea3 100644
--- a/plugins/unityshell/unityshell_xml.in
+++ b/plugins/unityshell/unityshell_xml.in
@@ -56,6 +56,12 @@
                     <default>&lt;Alt&gt;F2</default>
                 </option>
 
+                <option name="show_desktop_key" type="key">
+                    <_short>Show Desktop</_short>
+                    <_long>Hide all windows and focus desktop.</_long>
+                    <default>&lt;Control&gt;&lt;Alt&gt;d</default>
+                </option>
+
                 <option name="panel_first_menu" type="key">
                     <_short>Key to open the first panel menu</_short>
                     <_long>Opens the first indicator menu of the Panel, allowing keyboard navigation thereafter.</_long>
-- 
cgit v1.2.3


From 71b23c559d5fad980cd8fe75935f213ed7cf5ca8 Mon Sep 17 00:00:00 2001
From: Andrea Azzarone <azzaronea@gmail.com>
Date: Wed, 24 Jul 2013 23:25:50 +0200
Subject: Contol + super+ D not control + alt + d.

(bzr r3439.2.2)
---
 plugins/unityshell/unityshell_xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/unityshell_xml.in b/plugins/unityshell/unityshell_xml.in
index 9fa3f5ea3..4e46a3db3 100644
--- a/plugins/unityshell/unityshell_xml.in
+++ b/plugins/unityshell/unityshell_xml.in
@@ -59,7 +59,7 @@
                 <option name="show_desktop_key" type="key">
                     <_short>Show Desktop</_short>
                     <_long>Hide all windows and focus desktop.</_long>
-                    <default>&lt;Control&gt;&lt;Alt&gt;d</default>
+                    <default>&lt;Control&gt;&lt;Super&gt;d</default>
                 </option>
 
                 <option name="panel_first_menu" type="key">
-- 
cgit v1.2.3


From 580fc7acbdf7aabe41fd2433fd66070156b27801 Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandon.schaefer@canonical.com>
Date: Thu, 25 Jul 2013 13:10:10 -0700
Subject: * Fixed up reviewers comment

(bzr r3426.1.11)
---
 plugins/unityshell/src/unityshell.cpp | 70 +++++++++++++++++------------------
 1 file changed, 33 insertions(+), 37 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 9f1c3b17a..bdf4d65f8 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -991,18 +991,14 @@ CompWindow * GetTopVisibleWindow()
 LayoutWindow::Ptr UnityScreen::GetSwitcherDetailLayoutWindow(Window window) const
 {
   LayoutWindow::Vector const& targets = switcher_controller_->ExternalRenderTargets();
-  LayoutWindow::Ptr layout_window(0);
 
   for (LayoutWindow::Ptr const& target : targets)
   {
     if (target->xid == window)
-    {
-      layout_window = target;
-      break;
-    }
+      return target;
   }
 
-  return layout_window;
+  return nullptr;
 }
 
 void UnityWindow::enterShowDesktop ()
@@ -1202,21 +1198,12 @@ bool UnityWindow::handleEvent(XEvent *event)
         cWindow->addDamageRect(CompRect(g.x, g.y, g.width, g.height));
         handled = true;
       }
-      else if (event->xbutton.button == Button2)
+      else if (event->xbutton.button == Button2 &&
+              (GetScaledGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root) ||
+               GetLayoutWindowGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root)))
       {
-        if (UnityScreen::get (screen)->switcher_controller_->Visible())
-        {
-          if (GetLayoutWindowGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
-          {
-            middle_clicked_ = true;
-            handled = true;
-          }
-        }
-        else if (GetScaledGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
-        {
-          middle_clicked_ = true;
-          handled = true;
-        }
+        middle_clicked_ = true;
+        handled = true;
       }
       break;
 
@@ -1241,19 +1228,11 @@ bool UnityWindow::handleEvent(XEvent *event)
 
         if (middle_clicked_)
         {
-          if (event->xbutton.button == Button2)
+          if (event->xbutton.button == Button2 &&
+             (GetScaledGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root) ||
+              GetLayoutWindowGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root)))
           {
-            if (UnityScreen::get (screen)->switcher_controller_->Visible())
-            {
-              if (GetLayoutWindowGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
-              {
-                window->close(0);
-              }
-            }
-            else if (GetScaledGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
-            {
-              window->close(0);
-            }
+            window->close(0);
           }
 
           middle_clicked_ = false;
@@ -3876,23 +3855,40 @@ void UnityWindow::scalePaintDecoration(GLWindowPaintAttrib const& attrib,
   if (state != ScaleScreen::Wait && state != ScaleScreen::Out)
     return;
 
-  auto const& scaled_geo = GetScaledGeometry();
+  WindowManager& wm = WindowManager::Default();
+
+  nux::Geometry geo;
+
+  // The layout window is not really a compiz window...
+  // so this is a cheap way to draw the decor
+  if (!wm.IsScaleActive())
+    geo = GetLayoutWindowGeometry();
+  else if (UnityScreen::get(screen)->switcher_controller_->Visible())
+    geo = GetScaledGeometry();
+
   auto const& pos = scale_win->getCurrentPosition();
 
   bool highlighted = (ss->getSelectedWindow() == window->id());
-  paintFakeDecoration(scaled_geo, attrib, transform, mask, highlighted, pos.scale);
+  paintFakeDecoration(geo, attrib, transform, mask, highlighted, pos.scale);
 }
 
 nux::Geometry UnityWindow::GetLayoutWindowGeometry()
 {
-  LayoutWindow::Ptr const &layout_window = UnityScreen::get(screen)->
-                                             GetSwitcherDetailLayoutWindow(window->id());
+  auto const& layout_window = UnityScreen::get(screen)->GetSwitcherDetailLayoutWindow(window->id());
+
+  if (layout_window)
+    return layout_window->result;
 
-  return layout_window->result;
+  return nux::Geometry();
 }
 
 nux::Geometry UnityWindow::GetScaledGeometry()
 {
+  WindowManager& wm = WindowManager::Default();
+
+  if (!wm.IsScaleActive())
+    return nux::Geometry();
+
   ScaleWindow* scale_win = ScaleWindow::get(window);
 
   ScalePosition const& pos = scale_win->getCurrentPosition();
-- 
cgit v1.2.3


From 506bed8e4de9ed9bc4eba18fc6c0d1019d91ffc7 Mon Sep 17 00:00:00 2001
From: Chris Townsend <christopher.townsend@canonical.com>
Date: Fri, 26 Jul 2013 10:45:52 -0400
Subject: Use the already available PluginAdapter::IsWindowOnTop() instead of
 the new Get TopVisibleWindow() to remove code duplication.

(bzr r3431.1.2)
---
 plugins/unityshell/src/unityshell.cpp | 30 ++----------------------------
 plugins/unityshell/src/unityshell.h   |  2 --
 2 files changed, 2 insertions(+), 30 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 7daf220e1..e3669b103 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -973,25 +973,6 @@ bool UnityScreen::DoesPointIntersectUnityGeos(nux::Point const& pt)
   return false;
 }
 
-CompWindow * GetTopVisibleWindow()
-{
-  CompWindow *top_visible_window = NULL;
-
-  for (CompWindow *w : screen->windows ())
-  {
-    if (w->isViewable() && 
-        !w->minimized() && 
-        !w->resName().empty() && 
-        (w->resName() != "unity-panel-service") &&
-        (w->resName() != "notify-osd"))
-    {
-      top_visible_window = w;
-    }
-  }
-
-  return top_visible_window;
-}
-  
 void UnityWindow::enterShowDesktop ()
 {
   if (!mShowdesktopHandler)
@@ -2636,18 +2617,13 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
   {
     Window active_window = screen->activeWindow();
 
-    CompWindow *top_visible_window;
-
     if (G_UNLIKELY(window->type() == CompWindowTypeDesktopMask))
     {
       uScreen->setPanelShadowMatrix(matrix);
 
       if (active_window == 0 || active_window == window->id())
       {
-        top_visible_window = GetTopVisibleWindow();
-
-        if ((top_visible_window && (window->id() == top_visible_window->id())) ||
-            uScreen->in_show_desktop_)
+        if (PluginAdapter::Default().IsWindowOnTop(window->id()))
         {
           draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
         }
@@ -2677,9 +2653,7 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
       {
         if (uScreen->is_desktop_active_ && !uScreen->in_show_desktop_)
         {
-          top_visible_window = GetTopVisibleWindow();
-
-          if (top_visible_window && (window->id() == top_visible_window->id()))
+          if (PluginAdapter::Default().IsWindowOnTop(window->id()))
           {
             draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
             uScreen->panelShadowPainted = CompRegion();
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index d08268c72..b4d0ba00c 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -250,8 +250,6 @@ private:
 
   void UpdateCloseWindowKey(CompAction::KeyBinding const&);
 
-  CompWindow * GetTopVisibleWindow();
-
   std::unique_ptr<na::TickSource> tick_source_;
   std::unique_ptr<na::AnimationController> animation_controller_;
 
-- 
cgit v1.2.3


From 0dcb5c8b6413b1b5270c4b576c9ef014c6f720e1 Mon Sep 17 00:00:00 2001
From: Chris Townsend <christopher.townsend@canonical.com>
Date: Fri, 26 Jul 2013 10:58:20 -0400
Subject: Remove the "in_show_desktop_" logic since the
 PluginAdapter::IsWindowOnTop() can account for in Show Desktop mode.

(bzr r3431.1.3)
---
 plugins/unityshell/src/unityshell.cpp | 6 +-----
 plugins/unityshell/src/unityshell.h   | 1 -
 2 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index e3669b103..53f4e8d09 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -150,7 +150,6 @@ UnityScreen::UnityScreen(CompScreen* screen)
   , big_tick_(0)
   , screen_introspection_(screen)
   , is_desktop_active_(false)
-  , in_show_desktop_(false)
 {
   Timer timer;
 #ifndef USE_GLES
@@ -857,8 +856,6 @@ void UnityScreen::EnableCancelAction(CancelActionTarget target, bool enabled, in
 
 void UnityScreen::enterShowDesktopMode ()
 {
-  in_show_desktop_ = true;
-
   for (CompWindow *w : screen->windows ())
   {
     CompPoint const& viewport = w->defaultViewport();
@@ -943,7 +940,6 @@ void UnityScreen::leaveShowDesktopMode (CompWindow *w)
       }
     }
   }
-  in_show_desktop_ = false;
 }
 
 bool UnityScreen::DoesPointIntersectUnityGeos(nux::Point const& pt)
@@ -2651,7 +2647,7 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
       }
       else
       {
-        if (uScreen->is_desktop_active_ && !uScreen->in_show_desktop_)
+        if (uScreen->is_desktop_active_)
         {
           if (PluginAdapter::Default().IsWindowOnTop(window->id()))
           {
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index b4d0ba00c..c2d95ce25 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -342,7 +342,6 @@ private:
   glib::SourceManager sources_;
 
   bool is_desktop_active_;
-  bool in_show_desktop_;
 
   friend class UnityWindow;
 };
-- 
cgit v1.2.3


From d7bef43dd7a9086ad5cd5fd9d2e074075023d4ba Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandon.schaefer@canonical.com>
Date: Fri, 26 Jul 2013 11:06:19 -0700
Subject: * When you close all the detail windows we close the switcher.   As
 we can't safely add/remove icons from the application list,   as iterators
 can be exposed. Aslo getting a crash when removing the last one   needs to be
 looked at a bit more.

(bzr r3426.1.12)
---
 plugins/unityshell/src/unityshell.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index bdf4d65f8..4d13d1735 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1221,7 +1221,9 @@ bool UnityWindow::handleEvent(XEvent *event)
         if (was_pressed)
         {
           if (close_button_geo_.IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
+          {
             window->close(0);
+          }
 
           handled = true;
         }
-- 
cgit v1.2.3


From 384eb10814d63fe0cdf4fdc652443a67f0e9103c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 29 Jul 2013 19:17:43 +0200
Subject: MultiMonitor: remove the ugly max_num_monitors var, put it inside
 proper namespace

(bzr r3440.1.13)
---
 plugins/unityshell/src/MultiMonitor.h | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/MultiMonitor.h b/plugins/unityshell/src/MultiMonitor.h
index e93881334..f647f36dd 100644
--- a/plugins/unityshell/src/MultiMonitor.h
+++ b/plugins/unityshell/src/MultiMonitor.h
@@ -20,6 +20,12 @@
 #ifndef MULTIMONITOR_H
 #define MULTIMONITOR_H
 
-const int max_num_monitors = 6;
+namespace unity
+{
+namespace monitors
+{
+const unsigned MAX = 6;
+}
+}
 
 #endif
\ No newline at end of file
-- 
cgit v1.2.3


From 5a347e7b709dec3799dde1a26be0fb55f58e686c Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandon.schaefer@canonical.com>
Date: Wed, 31 Jul 2013 15:36:25 -0700
Subject: * Fix up reviewers comment

(bzr r3426.1.13)
---
 plugins/unityshell/src/unityshell.cpp | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 4d13d1735..3e6d5081d 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -3857,21 +3857,12 @@ void UnityWindow::scalePaintDecoration(GLWindowPaintAttrib const& attrib,
   if (state != ScaleScreen::Wait && state != ScaleScreen::Out)
     return;
 
-  WindowManager& wm = WindowManager::Default();
-
-  nux::Geometry geo;
-
-  // The layout window is not really a compiz window...
-  // so this is a cheap way to draw the decor
-  if (!wm.IsScaleActive())
-    geo = GetLayoutWindowGeometry();
-  else if (UnityScreen::get(screen)->switcher_controller_->Visible())
-    geo = GetScaledGeometry();
+  nux::Geometry const& scale_geo = GetScaledGeometry();
 
   auto const& pos = scale_win->getCurrentPosition();
 
   bool highlighted = (ss->getSelectedWindow() == window->id());
-  paintFakeDecoration(geo, attrib, transform, mask, highlighted, pos.scale);
+  paintFakeDecoration(scale_geo, attrib, transform, mask, highlighted, pos.scale);
 }
 
 nux::Geometry UnityWindow::GetLayoutWindowGeometry()
-- 
cgit v1.2.3


From 39861ab1b9f76929274735657be7a82de592d3ec Mon Sep 17 00:00:00 2001
From: Andrea Azzarone <azzaronea@gmail.com>
Date: Thu, 1 Aug 2013 07:01:01 +0200
Subject: Refactor unity::panel::Controller and add tests for it.

(bzr r3444.2.1)
---
 plugins/unityshell/src/unityshell.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index a5b5752a3..846e8ec93 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -36,6 +36,7 @@
 #include "LauncherController.h"
 #include "SwitcherController.h"
 #include "SwitcherView.h"
+#include "PanelView.h"
 #include "PluginAdapter.h"
 #include "QuicklistManager.h"
 #include "StartupNotifyService.h"
@@ -1413,15 +1414,14 @@ void UnityScreen::compizDamageNux(CompRegion const& damage)
     }
   }
 
-  std::vector<nux::View*> const& panels(panel_controller_->GetPanelViews());
-  for (nux::View* view : panels)
+  for (auto const& panel : panel_controller_->panels())
   {
-    nux::Geometry const& geo = view->GetAbsoluteGeometry();
+    nux::Geometry const& geo = panel->GetAbsoluteGeometry();
 
     CompRegion panel_region(geo.x, geo.y, geo.width, geo.height);
 
     if (damage.intersects(panel_region))
-      view->QueueDraw();
+      panel->QueueDraw();
   }
 
   QuicklistManager* qm = QuicklistManager::Default();
-- 
cgit v1.2.3


From 4921a5a741a9579582769cdd90eb159829f710eb Mon Sep 17 00:00:00 2001
From: Andrea Azzarone <azzaronea@gmail.com>
Date: Wed, 7 Aug 2013 21:47:00 +0200
Subject: Inject the EdgeBarrierController in launcher controller.

(bzr r3456.2.2)
---
 plugins/unityshell/src/unityshell.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index cdf254c46..7b4656a28 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -46,6 +46,7 @@
 #include "unityshell.h"
 #include "BackgroundEffectHelper.h"
 #include "UnityGestureBroker.h"
+#include "launcher/EdgeBarrierController.h"
 #include "launcher/XdndCollectionWindowImp.h"
 #include "launcher/XdndManagerImp.h"
 #include "launcher/XdndStartStopNotifierImp.h"
@@ -3247,8 +3248,9 @@ void UnityScreen::initLauncher()
   auto xdnd_collection_window = std::make_shared<XdndCollectionWindowImp>();
   auto xdnd_start_stop_notifier = std::make_shared<XdndStartStopNotifierImp>();
   auto xdnd_manager = std::make_shared<XdndManagerImp>(xdnd_start_stop_notifier, xdnd_collection_window);
+  auto edge_barriers = std::make_shared<ui::EdgeBarrierController>();
 
-  launcher_controller_ = std::make_shared<launcher::Controller>(xdnd_manager);
+  launcher_controller_ = std::make_shared<launcher::Controller>(xdnd_manager, edge_barriers);
   AddChild(launcher_controller_.get());
 
   switcher_controller_ = std::make_shared<switcher::Controller>();
-- 
cgit v1.2.3


From f926e5e220f4084e0c5e9bf655c1b72902be2cce Mon Sep 17 00:00:00 2001
From: Andrea Azzarone <azzaronea@gmail.com>
Date: Thu, 8 Aug 2013 16:43:50 +0200
Subject: Add edge barriers to panels too. Unit tests added.

(bzr r3456.2.3)
---
 plugins/unityshell/src/unityshell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 7b4656a28..99c62c322 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -3260,7 +3260,7 @@ void UnityScreen::initLauncher()
 
   /* Setup panel */
   timer.Reset();
-  panel_controller_ = std::make_shared<panel::Controller>();
+  panel_controller_ = std::make_shared<panel::Controller>(edge_barriers);
   AddChild(panel_controller_.get());
   panel_controller_->SetMenuShowTimings(optionGetMenusFadein(),
                                         optionGetMenusFadeout(),
-- 
cgit v1.2.3


From 237ef395996912be6fce127eb54d0dbe06fcba2e Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandon.schaefer@canonical.com>
Date: Tue, 27 Aug 2013 14:43:12 -0700
Subject: * Only say we have handled a mouse up event if we are inside the
 close button..

(bzr r3477.4.2)
---
 plugins/unityshell/src/unityshell.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 481d6cf2d..4699b472a 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1207,9 +1207,8 @@ bool UnityWindow::handleEvent(XEvent *event)
           if (close_button_geo_.IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
           {
             window->close(0);
+            handled = true;
           }
-
-          handled = true;
         }
 
         if (middle_clicked_)
@@ -1219,10 +1218,10 @@ bool UnityWindow::handleEvent(XEvent *event)
               GetLayoutWindowGeometry().IsPointInside(event->xbutton.x_root, event->xbutton.y_root)))
           {
             window->close(0);
+            handled = true;
           }
 
           middle_clicked_ = false;
-          handled = true;
         }
       }
       break;
-- 
cgit v1.2.3


From da21bc141a7294aa6360eb5a071a72b5b44c5d7d Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandontschaefer@gmail.com>
Date: Tue, 10 Sep 2013 16:11:32 -0700
Subject: * If a button/key is pressed and the shortcut hint is open close it!

(bzr r3494.4.1)
---
 plugins/unityshell/src/unityshell.cpp | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 4699b472a..d739f9dec 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1519,6 +1519,11 @@ void UnityScreen::handleEvent(XEvent* event)
       }
       break;
     case ButtonPress:
+      if (shortcut_controller_->Visible())
+      {
+        shortcut_controller_->Hide();
+      }
+
       if (super_keypressed_)
       {
         launcher_controller_->KeyNavTerminate(false);
@@ -1609,6 +1614,11 @@ void UnityScreen::handleEvent(XEvent* event)
       break;
     case KeyPress:
     {
+      if (shortcut_controller_->Visible())
+      {
+        shortcut_controller_->Hide();
+      }
+
       if (super_keypressed_)
       {
         /* We need an idle to postpone this action, after the current event
-- 
cgit v1.2.3


From ebfcdace4a9037673aa11a88917da9dfdbb41a93 Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandontschaefer@gmail.com>
Date: Wed, 11 Sep 2013 12:32:34 -0700
Subject: * Add option to disable the mouse from the switcher

(bzr r3495.1.1)
---
 plugins/unityshell/src/unityshell.cpp | 17 +++++++++++++++--
 plugins/unityshell/unityshell_xml.in  |  6 ++++++
 2 files changed, 21 insertions(+), 2 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 4699b472a..1a9f2fc36 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -317,6 +317,7 @@ UnityScreen::UnityScreen(CompScreen* screen)
      optionSetAltTabTimeoutNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetAltTabBiasViewportNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetDisableShowDesktopNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
+     optionSetDisableMouseNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
 
      optionSetAltTabForwardAllInitiate(boost::bind(&UnityScreen::altTabForwardAllInitiate, this, _1, _2, _3));
      optionSetAltTabForwardInitiate(boost::bind(&UnityScreen::altTabForwardInitiate, this, _1, _2, _3));
@@ -1719,7 +1720,7 @@ void UnityScreen::handleEvent(XEvent* event)
       break;
   }
 
-  if (!skip_other_plugins &&
+  if (!skip_other_plugins && !switcher_controller_->IsMouseDisabled() &&
       screen->otherGrabExist("deco", "move", "switcher", "resize", nullptr))
   {
     wt->ProcessForeignEvent(event, nullptr);
@@ -1924,7 +1925,16 @@ bool UnityScreen::setKeyboardFocusKeyInitiate(CompAction* action,
 bool UnityScreen::altTabInitiateCommon(CompAction* action, switcher::ShowMode show_mode)
 {
   if (!grab_index_)
-    grab_index_ = screen->pushGrab (screen->normalCursor(), "unity-switcher");
+  {
+    if (switcher_controller_->IsMouseDisabled())
+    {
+      grab_index_ = screen->pushGrab (screen->invisibleCursor(), "unity-switcher");
+    }
+    else
+    {
+      grab_index_ = screen->pushGrab (screen->normalCursor(), "unity-switcher");
+    }
+  }
 
   screen->addAction(&optionGetAltTabRight());
   screen->addAction(&optionGetAltTabDetailStart());
@@ -3141,6 +3151,9 @@ void UnityScreen::optionChanged(CompOption* opt, UnityshellOptions::Options num)
     case UnityshellOptions::DisableShowDesktop:
       switcher_controller_->SetShowDesktopDisabled(optionGetDisableShowDesktop());
       break;
+    case UnityshellOptions::DisableMouse:
+      switcher_controller_->SetMouseDisabled(optionGetDisableMouse());
+      break;
     case UnityshellOptions::ShowMinimizedWindows:
       compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow>::setFunctions (optionGetShowMinimizedWindows ());
       screen->enterShowDesktopModeSetEnabled (this, optionGetShowMinimizedWindows ());
diff --git a/plugins/unityshell/unityshell_xml.in b/plugins/unityshell/unityshell_xml.in
index 4e46a3db3..d4357bc91 100644
--- a/plugins/unityshell/unityshell_xml.in
+++ b/plugins/unityshell/unityshell_xml.in
@@ -526,6 +526,12 @@
                     <default>false</default>
                 </option>
 
+                <option name="disable_mouse" type="bool">
+                    <_short>Disable the mouse in the Switcher</_short>
+                    <_long>Disables the mouse in the Switcher.</_long>
+                    <default>false</default>
+                </option>
+
             </group>
 
         </options>
-- 
cgit v1.2.3


From bad5999cc1393740e0f7de3e89e35b2e6c355f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 12 Sep 2013 23:46:23 +0200
Subject: Launcher: remove useless member variables and add some internal const

(bzr r3494.5.9)
---
 plugins/unityshell/src/unityshell.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 4b052125e..08e58dd14 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -2979,11 +2979,11 @@ CompPoint UnityWindow::tryNotIntersectUI(CompPoint& pos)
 
   for (auto const& launcher : launchers)
   {
-    nux::Geometry geo = launcher->GetAbsoluteGeometry();
-
     if (launcher->options()->hide_mode == LAUNCHER_HIDE_AUTOHIDE && launcher->Hidden())
       continue;
 
+    auto const& geo = launcher->GetAbsoluteGeometry();
+
     if (geo.IsInside(result))
     {
       if (geo.x + geo.width + 1 + window_geo.width() < target_monitor.x + target_monitor.width)
-- 
cgit v1.2.3


From b66527337c02f837e1a49f9ff7eb94b4b1377bce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Sat, 14 Sep 2013 11:58:26 +0200
Subject: UnityScreen: consume the key actions or they will be repeated around

(bzr r1820.4.6)
---
 plugins/unityshell/src/unityshell.cpp | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 856c88e05..4c7ca7aba 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -2175,8 +2175,7 @@ bool UnityScreen::maximizeKeyInitate(CompAction* action, CompAction::State state
 {
   auto& WM = WindowManager::Default();
   WM.Maximize(WM.GetActiveWindow());
-
-  return false;
+  return true;
 }
 
 bool UnityScreen::restoreMinimizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
@@ -2194,23 +2193,21 @@ bool UnityScreen::restoreMinimizeKeyInitiate(CompAction* action, CompAction::Sta
     WM.Minimize(focused_win);
   }
 
-  return false;
+  return true;
 }
 
 bool UnityScreen::rightMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
 {
   auto& WM = WindowManager::Default();
   WM.RightMaximize(WM.GetActiveWindow());
-
-  return false;
+  return true;
 }
 
 bool UnityScreen::leftMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
 {
   auto& WM = WindowManager::Default();
   WM.LeftMaximize(WM.GetActiveWindow());
-
-  return false;
+  return true;
 }
 
 void UnityScreen::OnLauncherStartKeyNav(GVariant* data)
-- 
cgit v1.2.3


From 9fc52146c32b70cb651f3a22c435bd5c669b3256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Sat, 14 Sep 2013 13:36:32 +0200
Subject: UnityShell_xml: adapt the default window management keybindings to
 new values

(bzr r1820.4.8)
---
 plugins/unityshell/unityshell_xml.in | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/unityshell_xml.in b/plugins/unityshell/unityshell_xml.in
index e3817f476..b1f9ffc23 100644
--- a/plugins/unityshell/unityshell_xml.in
+++ b/plugins/unityshell/unityshell_xml.in
@@ -71,25 +71,25 @@
                 <option name="window_maximize" type="key">
                     <_short>Key to maximize the focused window</_short>
                     <_long>Maximize the focused window</_long>
-                    <default>&lt;Super&gt;Up</default>
+                    <default>&lt;Control&gt;&lt;Super&gt;Up</default>
                 </option>
 
                 <option name="window_restore_minimize" type="key">
                     <_short>Key to restore or minimize the focused window</_short>
                     <_long>Restore the maximized window on focus or minimize the focused window</_long>
-                    <default>&lt;Super&gt;Down</default>
+                    <default>&lt;Control&gt;&lt;Super&gt;Down</default>
                 </option>
 
                 <option name="window_right_maximize" type="key">
                     <_short>Key to vertically maximize the focused window to the right</_short>
                     <_long>Semi-maximize vertically the focused window on the half right width of the screen</_long>
-                    <default>&lt;Super&gt;Right</default>
+                    <default>&lt;Control&gt;&lt;Super&gt;Right</default>
                 </option>
 
                 <option name="window_left_maximize" type="key">
                     <_short>Key to vertically maximize the focused window to the left</_short>
                     <_long>Semi-maximize vertically the focused window to the half left width of the screen</_long>
-                    <default>&lt;Super&gt;Left</default>
+                    <default>&lt;Control&gt;&lt;Super&gt;Left</default>
                 </option>
 
                 <option name="panel_opacity" type="float">
-- 
cgit v1.2.3


From b8f3fdcc25c50bde1baa6827be870ef8e50f791c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 16 Sep 2013 14:55:36 +0200
Subject: UnityWindow: add more introspectable data about the window state for
 AP

(bzr r1820.4.9)
---
 plugins/unityshell/src/unityshell.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 4c7ca7aba..3df02d0b7 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -3600,6 +3600,10 @@ void UnityWindow::AddProperties(GVariantBuilder* builder)
     .add("xid", (uint64_t)xid)
     .add("title", wm.GetWindowName(xid))
     .add("fake_decorated", uScreen->fake_decorated_windows_.find(this) != uScreen->fake_decorated_windows_.end())
+    .add("maximized", wm.IsWindowVerticallyMaximized(xid))
+    .add("horizontally_maximized", wm.IsWindowHorizontallyMaximized(xid))
+    .add("vertically_maximized", wm.IsWindowVerticallyMaximized(xid))
+    .add("minimized", wm.IsWindowMinimized(xid))
     .add("scaled", scaled)
     .add("scaled_close_x", close_button_geo_.x)
     .add("scaled_close_y", close_button_geo_.y)
-- 
cgit v1.2.3


From 50a389703d127643680eb466d21741807f7c65e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 16 Sep 2013 16:18:57 +0200
Subject: UnityScreen, CompizShortcutModeller: remove the custom keys to
 maximize or restore/minimize

We already have them defined in compiz core nowadays, it's better not to create even more
fragmentation, but reusing what we can. Sadly I've to remove code :'(

(bzr r1820.4.15)
---
 plugins/unityshell/src/unityshell.cpp | 27 ---------------------------
 plugins/unityshell/src/unityshell.h   |  3 ---
 plugins/unityshell/unityshell_xml.in  | 12 ------------
 3 files changed, 42 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 3df02d0b7..f014ca326 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -349,8 +349,6 @@ UnityScreen::UnityScreen(CompScreen* screen)
      optionSetLauncherSwitcherPrevInitiate(boost::bind(&UnityScreen::launcherSwitcherPrevInitiate, this, _1, _2, _3));
      optionSetLauncherSwitcherForwardTerminate(boost::bind(&UnityScreen::launcherSwitcherTerminate, this, _1, _2, _3));
 
-     optionSetWindowMaximizeInitiate(boost::bind(&UnityScreen::maximizeKeyInitate, this, _1, _2, _3));
-     optionSetWindowRestoreMinimizeInitiate(boost::bind(&UnityScreen::restoreMinimizeKeyInitiate, this, _1, _2, _3));
      optionSetWindowRightMaximizeInitiate(boost::bind(&UnityScreen::rightMaximizeKeyInitiate, this, _1, _2, _3));
      optionSetWindowLeftMaximizeInitiate(boost::bind(&UnityScreen::leftMaximizeKeyInitiate, this, _1, _2, _3));
 
@@ -2171,31 +2169,6 @@ bool UnityScreen::launcherSwitcherTerminate(CompAction* action, CompAction::Stat
   return true;
 }
 
-bool UnityScreen::maximizeKeyInitate(CompAction* action, CompAction::State state, CompOption::Vector& options)
-{
-  auto& WM = WindowManager::Default();
-  WM.Maximize(WM.GetActiveWindow());
-  return true;
-}
-
-bool UnityScreen::restoreMinimizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
-{
-  auto& WM = WindowManager::Default();
-  Window focused_win = WM.GetActiveWindow();
-
-  if (WM.IsWindowVerticallyMaximized(focused_win) ||
-      WM.IsWindowHorizontallyMaximized(focused_win))
-  {
-    WM.Restore(focused_win);
-  }
-  else
-  {
-    WM.Minimize(focused_win);
-  }
-
-  return true;
-}
-
 bool UnityScreen::rightMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
 {
   auto& WM = WindowManager::Default();
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 09ff0361b..01e1a2089 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -165,9 +165,6 @@ public:
   bool launcherSwitcherForwardInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool launcherSwitcherPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool launcherSwitcherTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options);
-
-  bool maximizeKeyInitate(CompAction* action, CompAction::State state, CompOption::Vector& options);
-  bool restoreMinimizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool rightMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool leftMaximizeKeyInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
diff --git a/plugins/unityshell/unityshell_xml.in b/plugins/unityshell/unityshell_xml.in
index b1f9ffc23..f5ed1b656 100644
--- a/plugins/unityshell/unityshell_xml.in
+++ b/plugins/unityshell/unityshell_xml.in
@@ -68,18 +68,6 @@
                     <default>&lt;Alt&gt;F10</default>
                 </option>
 
-                <option name="window_maximize" type="key">
-                    <_short>Key to maximize the focused window</_short>
-                    <_long>Maximize the focused window</_long>
-                    <default>&lt;Control&gt;&lt;Super&gt;Up</default>
-                </option>
-
-                <option name="window_restore_minimize" type="key">
-                    <_short>Key to restore or minimize the focused window</_short>
-                    <_long>Restore the maximized window on focus or minimize the focused window</_long>
-                    <default>&lt;Control&gt;&lt;Super&gt;Down</default>
-                </option>
-
                 <option name="window_right_maximize" type="key">
                     <_short>Key to vertically maximize the focused window to the right</_short>
                     <_long>Semi-maximize vertically the focused window on the half right width of the screen</_long>
-- 
cgit v1.2.3


From ddd53b3970925478d2b3648259a2789bddd127d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 16 Sep 2013 19:45:43 +0200
Subject: UnityShell: redraw the dash also if a non-blurred area is damaged

If the dash is damaged, but not the blurred area, it won't redraw. We need
to draw it, in order to avoid flickering of its border.

Also, add the redraw_view_if_damaged utility function to redraw a view if
really needed.

Fixes LP: #1224340

(bzr r3506.4.2)
---
 plugins/unityshell/src/unityshell.cpp | 85 ++++++++++-------------------------
 1 file changed, 23 insertions(+), 62 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 4b052125e..848586b29 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1354,6 +1354,18 @@ void UnityScreen::donePaint()
   cScreen->donePaint ();
 }
 
+void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion const& damage)
+{
+  if (!view || view->IsRedrawNeeded())
+    return;
+
+  auto const& geo = view->GetAbsoluteGeometry();
+  CompRegion region(geo.x, geo.y, geo.width, geo.height);
+
+  if (damage.intersects(region))
+    view->NeedSoftRedraw();
+}
+
 void UnityScreen::compizDamageNux(CompRegion const& damage)
 {
   if (!launcher_controller_)
@@ -1378,79 +1390,28 @@ void UnityScreen::compizDamageNux(CompRegion const& damage)
     }
   }
 
+  if (dash_controller_->IsVisible())
+    redraw_view_if_damaged(dash_controller_->Dash(), damage);
+
   auto const& launchers = launcher_controller_->launchers();
   for (auto const& launcher : launchers)
   {
     if (!launcher->Hidden())
     {
-      nux::Geometry const& geo = launcher->GetAbsoluteGeometry();
-      CompRegion launcher_region(geo.x, geo.y, geo.width, geo.height);
-
-      if (damage.intersects(launcher_region))
-        launcher->QueueDraw();
-
-      nux::ObjectPtr<nux::View> const& tooltip = launcher->GetActiveTooltip();
-
-      if (tooltip)
-      {
-        nux::Geometry const& g = tooltip->GetAbsoluteGeometry();
-        CompRegion tip_region(g.x, g.y, g.width, g.height);
-
-        if (damage.intersects(tip_region))
-          tooltip->QueueDraw();
-      }
-
-      nux::ObjectPtr<LauncherDragWindow> const& dragged_icon = launcher->GetDraggedIcon();
-
-      if (dragged_icon)
-      {
-        nux::Geometry const& g = dragged_icon->GetAbsoluteGeometry();
-        CompRegion icon_region(g.x, g.y, g.width, g.height);
-
-        if (damage.intersects(icon_region))
-          dragged_icon->QueueDraw();
-      }
+      redraw_view_if_damaged(launcher, damage);
+      redraw_view_if_damaged(launcher->GetActiveTooltip(), damage);
+      redraw_view_if_damaged(launcher->GetDraggedIcon(), damage);
     }
   }
 
   for (auto const& panel : panel_controller_->panels())
-  {
-    nux::Geometry const& geo = panel->GetAbsoluteGeometry();
-
-    CompRegion panel_region(geo.x, geo.y, geo.width, geo.height);
+    redraw_view_if_damaged(panel, damage);
 
-    if (damage.intersects(panel_region))
-      panel->QueueDraw();
-  }
-
-  QuicklistManager* qm = QuicklistManager::Default();
-  if (qm)
-  {
-    auto const& view = qm->Current();
+  if (QuicklistManager* qm = QuicklistManager::Default())
+    redraw_view_if_damaged(qm->Current(), damage);
 
-    if (view)
-    {
-      nux::Geometry const& geo = view->GetAbsoluteGeometry();
-      CompRegion quicklist_region(geo.x, geo.y, geo.width, geo.height);
-
-      if (damage.intersects(quicklist_region))
-        view->QueueDraw();
-    }
-  }
-
-  if (switcher_controller_ && switcher_controller_->Visible())
-  {
-    auto const& view = switcher_controller_->GetView();
-
-    if (G_LIKELY(view))
-    {
-      nux::Geometry const& geo = view->GetAbsoluteGeometry();
-      CompRegion switcher_region(geo.x, geo.y, geo.width, geo.height);
-
-      if (damage.intersects(switcher_region))
-        view->QueueDraw();
-    }
-  }
+  if (switcher_controller_->Visible())
+    redraw_view_if_damaged(switcher_controller_->GetView(), damage);
 }
 
 /* Grab changed nux regions and add damage rects for them */
-- 
cgit v1.2.3


From a162655badd2c32341fbdd35211bb9c8b73eb056 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 16 Sep 2013 19:47:54 +0200
Subject: UnityScreen: remove while iterating the animating show-desktop
 windows

As this is done in donePaint, it's better to optimize things the most we can.

(bzr r3506.4.3)
---
 plugins/unityshell/src/unityshell.cpp | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 848586b29..fc6e4ff86 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1334,21 +1334,22 @@ void UnityScreen::donePaint()
   if (animation_controller_->HasRunningAnimations())
     nuxDamageCompiz();
 
-  std::list <ShowdesktopHandlerWindowInterface *> remove_windows;
-
-  for (ShowdesktopHandlerWindowInterface *wi : ShowdesktopHandler::animating_windows)
+  for (auto it = ShowdesktopHandler::animating_windows.begin(); it != ShowdesktopHandler::animating_windows.end();)
   {
-    ShowdesktopHandlerWindowInterface::PostPaintAction action = wi->HandleAnimations (0);
+    auto const& wi = *it;
+    auto action = wi->HandleAnimations(0);
+
     if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Remove)
-      remove_windows.push_back(wi);
+    {
+      it = ShowdesktopHandler::animating_windows.erase(it);
+      continue;
+    }
     else if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Damage)
+    {
       wi->AddDamage ();
-  }
+    }
 
-  for (ShowdesktopHandlerWindowInterface *wi : remove_windows)
-  {
-    wi->DeleteHandler ();
-    ShowdesktopHandler::animating_windows.remove (wi);
+    ++it;
   }
 
   cScreen->donePaint ();
-- 
cgit v1.2.3


From 4ab3aa187443543adfb80d7e287bb2e46ea0719e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 18 Sep 2013 16:41:08 +0200
Subject: Unity: use the new BuildWrapper features in AddProperties methods

(bzr r3506.5.11)
---
 plugins/unityshell/src/unityshell.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 4b052125e..847890297 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -3555,6 +3555,7 @@ void UnityWindow::AddProperties(GVariantBuilder* builder)
     .add("title", wm.GetWindowName(xid))
     .add("fake_decorated", uScreen->fake_decorated_windows_.find(this) != uScreen->fake_decorated_windows_.end())
     .add("scaled", scaled)
+    .add("scaled_close_geo", close_button_geo_)
     .add("scaled_close_x", close_button_geo_.x)
     .add("scaled_close_y", close_button_geo_.y)
     .add("scaled_close_width", close_button_geo_.width)
-- 
cgit v1.2.3


From 0f01491e5d92f038b908f2bf206713f9fdfed4a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 18 Sep 2013 16:41:59 +0200
Subject: AggregateMonitor, ElapsedTimeMonitor: remove useless files

(bzr r3506.5.12)
---
 plugins/unityshell/src/AggregateMonitor.cpp   | 63 ---------------------------
 plugins/unityshell/src/AggregateMonitor.h     | 50 ---------------------
 plugins/unityshell/src/ElapsedTimeMonitor.cpp | 49 ---------------------
 plugins/unityshell/src/ElapsedTimeMonitor.h   | 47 --------------------
 4 files changed, 209 deletions(-)
 delete mode 100644 plugins/unityshell/src/AggregateMonitor.cpp
 delete mode 100644 plugins/unityshell/src/AggregateMonitor.h
 delete mode 100644 plugins/unityshell/src/ElapsedTimeMonitor.cpp
 delete mode 100644 plugins/unityshell/src/ElapsedTimeMonitor.h

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/AggregateMonitor.cpp b/plugins/unityshell/src/AggregateMonitor.cpp
deleted file mode 100644
index 62eb5c2e8..000000000
--- a/plugins/unityshell/src/AggregateMonitor.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
-/*
-* Copyright (C) 2011 Canonical Ltd
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License version 3 as
-* published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* Authored by: Alex Launi <alex.launi@canonical.com>
-*/
-
-#include "AggregateMonitor.h"
-#include "ElapsedTimeMonitor.h"
-#include <UnityCore/Variant.h>
-
-namespace unity {
-namespace performance {
-
-AggregateMonitor::AggregateMonitor()
-{
-  _monitors.push_back(new ElapsedTimeMonitor());
-}
-
-AggregateMonitor::~AggregateMonitor()
-{
-}
-
-std::string AggregateMonitor::GetName() const
-{
-  return "AggregateMonitor";
-}
-
-void AggregateMonitor::StartMonitor()
-{
-  for (std::list<Monitor*>::iterator iter = _monitors.begin(), end = _monitors.end();
-       iter != end; ++iter)
-  {
-    Monitor* monitor = *iter;
-    monitor->Start();
-  }
-}
-
-void AggregateMonitor::StopMonitor(GVariantBuilder* builder)
-{
-  variant::BuilderWrapper wrapper(builder);
-  for (std::list<Monitor*>::iterator iter = _monitors.begin(), end = _monitors.end();
-       iter != end; ++iter)
-  {
-    Monitor* monitor = *iter;
-    wrapper.add(monitor->GetName().c_str(), monitor->Stop());
-  }
-}
-
-}
-}
diff --git a/plugins/unityshell/src/AggregateMonitor.h b/plugins/unityshell/src/AggregateMonitor.h
deleted file mode 100644
index 251f8158d..000000000
--- a/plugins/unityshell/src/AggregateMonitor.h
+++ /dev/null
@@ -1,50 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
-/*
-* Copyright (C) 2011 Canonical Ltd
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License version 3 as
-* published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* Authored by: Alex Launi <alex.launi@canonical.com>
-*/
-
-#ifndef UNITY_PERFORMANCE_AGGREGATE_MONITOR
-#define UNITY_PERFORMANCE_AGGREGATE_MONITOR
-
-#include <list>
-#include <string>
-#include <gio/gio.h>
-
-#include "Monitor.h"
-
-namespace unity {
-namespace performance {
-
-class AggregateMonitor : public Monitor
-{
-public:
-  AggregateMonitor();
-  ~AggregateMonitor();
-  std::string GetName() const;
-
-protected:
-  void StartMonitor();
-  void StopMonitor(GVariantBuilder* builder);
-
-private:
-  std::list<Monitor*> _monitors;
-};
-
-}
-}
-
-#endif // UNITY_PERFORMANCE_AGGREGATE_MONITOR
diff --git a/plugins/unityshell/src/ElapsedTimeMonitor.cpp b/plugins/unityshell/src/ElapsedTimeMonitor.cpp
deleted file mode 100644
index 586ab6368..000000000
--- a/plugins/unityshell/src/ElapsedTimeMonitor.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
-/*
-* Copyright (C) 2011 Canonical Ltd
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License version 3 as
-* published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* Authored by: Alex Launi <alex.launi@canonical.com>
-*/
-
-#include <UnityCore/Variant.h>
-
-#include "ElapsedTimeMonitor.h"
-#include "TimeUtil.h"
-
-namespace unity{
-namespace performance {
-
-std::string ElapsedTimeMonitor::GetName() const
-{
-  return "ElapsedTimeMonitor";
-}
-
-void ElapsedTimeMonitor::StartMonitor()
-{
-  clock_gettime(CLOCK_MONOTONIC, &_start);
-}
-
-void ElapsedTimeMonitor::StopMonitor(GVariantBuilder* builder)
-{
-  struct timespec current;
-  clock_gettime(CLOCK_MONOTONIC, &current);
-  DeltaTime diff = TimeUtil::TimeDelta(&current, &_start);
-
-  variant::BuilderWrapper(builder)
-    .add("elapsed-time", diff);
-}
-
-}
-}
diff --git a/plugins/unityshell/src/ElapsedTimeMonitor.h b/plugins/unityshell/src/ElapsedTimeMonitor.h
deleted file mode 100644
index 55f6d9d83..000000000
--- a/plugins/unityshell/src/ElapsedTimeMonitor.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
-/*
-* Copyright (C) 2011 Canonical Ltd
-*
-* This program is free software: you can redistribute it and/or modify
-* it under the terms of the GNU General Public License version 3 as
-* published by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU General Public License for more details.
-*
-* You should have received a copy of the GNU General Public License
-* along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*
-* Authored by: Alex Launi <alex.launi@canonical.com>
-*/
-
-#ifndef UNITY_PERFORMANCE_ELAPSED_TIME_MONITOR
-#define UNITY_PERFORMANCE_ELAPSED_TIME_MONITOR
-
-#include <glib.h>
-#include <time.h>
-
-#include "Monitor.h"
-
-namespace unity {
-namespace performance {
-
-class ElapsedTimeMonitor : public Monitor
-{
-public:
-  std::string GetName() const;
-
-protected:
-  void StartMonitor();
-  void StopMonitor(GVariantBuilder* builder);
-
-private:
-  struct timespec _start;
-};
-
-}
-}
-
-#endif // UNITY_PERFORMANCE_ELAPSED_TIME_MONITOR
-- 
cgit v1.2.3


From 55236335daa8be93ff280510e2d2caf278476f2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 19 Sep 2013 01:44:39 +0200
Subject: UnityShell: fix compilation due to evil compiz #define's

(bzr r3506.5.18)
---
 plugins/unityshell/src/unityshell.cpp |  6 +++---
 plugins/unityshell/src/unityshell.h   | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 847890297..3d2dc0e71 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -760,9 +760,9 @@ void UnityScreen::paintDisplay()
         unsigned int oldGlAddGeometryIndex = uTrayWindow->gWindow->glAddGeometryGetCurrentIndex ();
         unsigned int oldGlDrawIndex = uTrayWindow->gWindow->glDrawGetCurrentIndex ();
 
-        attrib.opacity = OPAQUE;
-        attrib.brightness = BRIGHT;
-        attrib.saturation = COLOR;
+        attrib.opacity = COMPIZ_COMPOSITE_OPAQUE;
+        attrib.brightness = COMPIZ_COMPOSITE_BRIGHT;
+        attrib.saturation = COMPIZ_COMPOSITE_COLOR;
 
         oTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
 
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index aa04b242b..e2b50badf 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -31,9 +31,22 @@
 #include <scale/scale.h>
 #include <core/core.h>
 #include <core/pluginclasshandler.h>
-#include <composite/composite.h>
 #include <opengl/opengl.h>
 
+// These fixes some definitions from the composite header
+#ifdef COLOR
+#define COMPIZ_COMPOSITE_COLOR 0xffff
+#undef COLOR
+#endif
+#ifdef OPAQUE
+#define COMPIZ_COMPOSITE_OPAQUE 0xffff
+#undef OPAQUE
+#endif
+#ifdef BRIGHT
+#define COMPIZ_COMPOSITE_BRIGHT 0xffff
+#undef BRIGHT
+#endif
+
 #include "unityshell_options.h"
 
 #include "Introspectable.h"
-- 
cgit v1.2.3


From e74b5d87018e3ebb975add99b7a31fb4e3304ec4 Mon Sep 17 00:00:00 2001
From: Chris Townsend <christopher.townsend@canonical.com>
Date: Fri, 20 Sep 2013 14:25:21 -0400
Subject: A regression caused by revno. 3515 breaks the recently fixed
 Quicklist and Tooltip active blur.  This fixes it by checking if the View is
 a ViewWindow and if so, use QueueDraw() instead of NeedSoftRedraw().

Fixes LP: #1228308

(bzr r3526.1.1)
---
 plugins/unityshell/src/unityshell.cpp | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index fa001e05b..77963cb46 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1367,7 +1367,12 @@ void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion co
   CompRegion region(geo.x, geo.y, geo.width, geo.height);
 
   if (damage.intersects(region))
-    view->NeedSoftRedraw();
+  {
+    if (view->IsViewWindow())
+      view->QueueDraw();
+    else
+      view->NeedSoftRedraw();
+  }
 }
 
 void UnityScreen::compizDamageNux(CompRegion const& damage)
-- 
cgit v1.2.3


From 0557edfd3b29004bb6be7520ffd43a1d857da709 Mon Sep 17 00:00:00 2001
From: Chris Townsend <christopher.townsend@canonical.com>
Date: Mon, 23 Sep 2013 17:08:23 -0400
Subject: The ShowDesktopHandleWindowInterface teardown was missing it's call
 to DeleteHandler() in a recent commit that refactored the handling of some
 Show Desktop code.

Fixes LP: #1228915

(bzr r3527.1.1)
---
 plugins/unityshell/src/unityshell.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 77963cb46..f59313844 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1344,6 +1344,7 @@ void UnityScreen::donePaint()
 
     if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Remove)
     {
+      wi->DeleteHandler ();
       it = ShowdesktopHandler::animating_windows.erase(it);
       continue;
     }
-- 
cgit v1.2.3


From 29cd90d3d1fd0fe5165902b449e60de7c77388a1 Mon Sep 17 00:00:00 2001
From: Chris Townsend <christopher.townsend@canonical.com>
Date: Mon, 23 Sep 2013 17:16:59 -0400
Subject: Fix some formatting.

(bzr r3527.1.2)
---
 plugins/unityshell/src/unityshell.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index f59313844..7389119d6 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1344,19 +1344,19 @@ void UnityScreen::donePaint()
 
     if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Remove)
     {
-      wi->DeleteHandler ();
+      wi->DeleteHandler();
       it = ShowdesktopHandler::animating_windows.erase(it);
       continue;
     }
     else if (action == ShowdesktopHandlerWindowInterface::PostPaintAction::Damage)
     {
-      wi->AddDamage ();
+      wi->AddDamage();
     }
 
     ++it;
   }
 
-  cScreen->donePaint ();
+  cScreen->donePaint();
 }
 
 void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion const& damage)
-- 
cgit v1.2.3


From bc7056c056ffe1d8a5ca2d5ad35506dbfa9f2925 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Tue, 24 Sep 2013 22:18:42 +0200
Subject: Unity: Use WindowManager average_color property for getting the
 desktop color

Having to deal with UBus here was a mess and caused us to re-store the same value
too many times. Using a nux property gives us all the features we need easily
while WindowManager is already enough shared to be used for this task.

(bzr r3530.1.3)
---
 plugins/unityshell/src/unityshell.cpp | 29 +++++++++++------------------
 plugins/unityshell/src/unityshell.h   |  5 +----
 2 files changed, 12 insertions(+), 22 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 7389119d6..28b98e9a5 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -270,11 +270,6 @@ UnityScreen::UnityScreen(CompScreen* screen)
 
      wt->RedrawRequested.connect(sigc::mem_fun(this, &UnityScreen::onRedrawRequested));
 
-    // _bghash is a pointer. We don't want it to be created before Nux system has had a chance
-    // to start. BGHash relies on animations. Nux animation system starts after the WindowThread
-    // has been created.
-    _bghash.reset(new BGHash());
-
      unity_a11y_init(wt.get());
 
      /* i18n init */
@@ -1659,11 +1654,10 @@ void UnityScreen::handleEvent(XEvent* event)
       ShowdesktopHandler::InhibitLeaveShowdesktopMode (event->xmaprequest.window);
       break;
     case PropertyNotify:
-      if (event->xproperty.window == GDK_ROOT_WINDOW() &&
-          event->xproperty.atom == gdk_x11_get_xatom_by_name("_GNOME_BACKGROUND_REPRESENTATIVE_COLORS"))
+      if (bghash_ && event->xproperty.window == GDK_ROOT_WINDOW() &&
+          event->xproperty.atom == bghash_->ColorAtomId())
       {
-        if (_bghash)
-          _bghash->RefreshColor();
+        bghash_->RefreshColor();
       }
       break;
     default:
@@ -3058,8 +3052,7 @@ void UnityScreen::optionChanged(CompOption* opt, UnityshellOptions::Options num)
       override_color.red = override_color.red / override_color.alpha;
       override_color.green = override_color.green / override_color.alpha;
       override_color.blue = override_color.blue / override_color.alpha;
-      if (_bghash)
-        _bghash->OverrideColor(override_color);
+      bghash_->OverrideColor(override_color);
       break;
     }
     case UnityshellOptions::LauncherHideMode:
@@ -3211,16 +3204,14 @@ void UnityScreen::Relayout()
 
   UScreen *uscreen = UScreen::GetDefault();
   int primary_monitor = uscreen->GetPrimaryMonitor();
-  auto geo = uscreen->GetMonitorGeometry(primary_monitor);
-
-  primary_monitor_ = nux::Geometry(geo.x, geo.y, geo.width, geo.height);
+  auto const& geo = uscreen->GetMonitorGeometry(primary_monitor);
   wt->SetWindowSize(geo.width, geo.height);
 
   LOG_DEBUG(logger) << "Setting to primary screen rect:"
-                    << " x=" << primary_monitor_().x
-                    << " y=" << primary_monitor_().y
-                    << " w=" << primary_monitor_().width
-                    << " h=" << primary_monitor_().height;
+                    << " x=" << geo.x
+                    << " y=" << geo.y
+                    << " w=" << geo.width
+                    << " h=" << geo.height;
 
   needsRelayout = false;
 }
@@ -3276,6 +3267,8 @@ void UnityScreen::initLauncher()
 {
   Timer timer;
 
+  bghash_.reset(new BGHash());
+
   auto xdnd_collection_window = std::make_shared<XdndCollectionWindowImp>();
   auto xdnd_start_stop_notifier = std::make_shared<XdndStartStopNotifierImp>();
   auto xdnd_manager = std::make_shared<XdndManagerImp>(xdnd_start_stop_notifier, xdnd_collection_window);
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 01e1a2089..5cdba628d 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -278,6 +278,7 @@ private:
   shortcut::Controller::Ptr shortcut_controller_;
   session::Controller::Ptr  session_controller_;
   debug::DebugDBusInterface debugger_;
+  std::unique_ptr<BGHash>   bghash_;
 
   /* Subscription for gestures that manipulate Unity launcher */
   std::unique_ptr<nux::GesturesSubscription> gestures_sub_launcher_;
@@ -314,10 +315,6 @@ private:
   CompRegion fullscreenRegion;
   CompWindow* firstWindowAboveShell;
 
-  nux::Property<nux::Geometry> primary_monitor_;
-
-  std::unique_ptr<BGHash> _bghash;
-
   ::GLFramebufferObject *oldFbo;
 
   bool   queryForShader ();
-- 
cgit v1.2.3


From ce4591e42bce36db23ca0424486dc93c9344fb6d Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandontschaefer@gmail.com>
Date: Thu, 26 Sep 2013 13:39:01 -0700
Subject: * When switching viewports make sure we are telling nux to keep track
 of the mouse!

(bzr r3536.1.1)
---
 plugins/unityshell/src/unityshell.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 28b98e9a5..9b1d9ff35 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1695,7 +1695,8 @@ void UnityScreen::handleEvent(XEvent* event)
       break;
   }
 
-  if (!skip_other_plugins && !switcher_controller_->IsMouseDisabled() &&
+  if (!skip_other_plugins &&
+     (!switcher_controller_->IsMouseDisabled() || wm.IsViewPortSwitchStarted()) &&
       screen->otherGrabExist("deco", "move", "switcher", "resize", nullptr))
   {
     wt->ProcessForeignEvent(event, nullptr);
-- 
cgit v1.2.3


From 460de65fca93954f9c6bb7c188a4fe1d98d959a4 Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandontschaefer@gmail.com>
Date: Thu, 26 Sep 2013 15:45:58 -0700
Subject: * Better

(bzr r3536.2.2)
---
 plugins/unityshell/src/unityshell.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index c0251beb1..cfdbf5b71 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1696,14 +1696,12 @@ void UnityScreen::handleEvent(XEvent* event)
   }
 
   if (switcher_controller_->IsMouseDisabled() && switcher_controller_->Visible())
-  {
-    return;
-  }
+    skip_other_plugins = true;
 
   if (!skip_other_plugins &&
       screen->otherGrabExist("deco", "move", "switcher", "resize", nullptr))
   {
-     wt->ProcessForeignEvent(event, nullptr);
+    wt->ProcessForeignEvent(event, nullptr);
   }
 }
 
-- 
cgit v1.2.3


From d2ddd5bc73ad606868b31f1493a42a01bd3f0f14 Mon Sep 17 00:00:00 2001
From: Brandon Schaefer <brandontschaefer@gmail.com>
Date: Sun, 29 Sep 2013 16:26:29 -0700
Subject: * Move AltTab arrow key handling into nux vs having compiz use
 shortcuts which was ungrabbing the arrow keys.   Causing alt+<arrow_key> to
 show the hud! This is how the switcher should handle arrow keys anyway.

(bzr r3536.5.1)
---
 plugins/unityshell/src/unityshell.cpp | 34 ----------------------------------
 plugins/unityshell/src/unityshell.h   |  2 --
 plugins/unityshell/unityshell_xml.in  | 32 --------------------------------
 3 files changed, 68 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 28b98e9a5..54f2eaba8 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -321,25 +321,11 @@ UnityScreen::UnityScreen(CompScreen* screen)
      optionSetAltTabPrevAllInitiate(boost::bind(&UnityScreen::altTabPrevAllInitiate, this, _1, _2, _3));
      optionSetAltTabPrevInitiate(boost::bind(&UnityScreen::altTabPrevInitiate, this, _1, _2, _3));
 
-     optionSetAltTabDetailStartInitiate(boost::bind(&UnityScreen::altTabDetailStart, this, _1, _2, _3));
-     optionSetAltTabDetailStopInitiate(boost::bind(&UnityScreen::altTabDetailStop, this, _1, _2, _3));
-
      optionSetAltTabNextWindowInitiate(boost::bind(&UnityScreen::altTabNextWindowInitiate, this, _1, _2, _3));
      optionSetAltTabNextWindowTerminate(boost::bind(&UnityScreen::altTabTerminateCommon, this, _1, _2, _3));
 
      optionSetAltTabPrevWindowInitiate(boost::bind(&UnityScreen::altTabPrevWindowInitiate, this, _1, _2, _3));
 
-     optionSetAltTabLeftInitiate(boost::bind (&UnityScreen::altTabPrevInitiate, this, _1, _2, _3));
-     optionSetAltTabRightInitiate([&](CompAction* action, CompAction::State state, CompOption::Vector& options) -> bool
-     {
-      if (switcher_controller_->Visible())
-      {
-        switcher_controller_->Next();
-        return true;
-      }
-      return false;
-     });
-
      optionSetLauncherSwitcherForwardInitiate(boost::bind(&UnityScreen::launcherSwitcherForwardInitiate, this, _1, _2, _3));
      optionSetLauncherSwitcherPrevInitiate(boost::bind(&UnityScreen::launcherSwitcherPrevInitiate, this, _1, _2, _3));
      optionSetLauncherSwitcherForwardTerminate(boost::bind(&UnityScreen::launcherSwitcherTerminate, this, _1, _2, _3));
@@ -1911,11 +1897,6 @@ bool UnityScreen::altTabInitiateCommon(CompAction* action, switcher::ShowMode sh
     }
   }
 
-  screen->addAction(&optionGetAltTabRight());
-  screen->addAction(&optionGetAltTabDetailStart());
-  screen->addAction(&optionGetAltTabDetailStop());
-  screen->addAction(&optionGetAltTabLeft());
-
   /* Create a new keybinding for scroll buttons and current modifiers */
   CompAction scroll_up;
   CompAction scroll_down;
@@ -1960,11 +1941,6 @@ bool UnityScreen::altTabTerminateCommon(CompAction* action,
     grab_index_ = 0;
   }
 
-  screen->removeAction(&optionGetAltTabRight ());
-  screen->removeAction(&optionGetAltTabDetailStart ());
-  screen->removeAction(&optionGetAltTabDetailStop ());
-  screen->removeAction(&optionGetAltTabLeft ());
-
   /* Removing the scroll actions */
   CompAction scroll_up;
   CompAction scroll_down;
@@ -2030,16 +2006,6 @@ bool UnityScreen::altTabPrevInitiate(CompAction* action, CompAction::State state
   return false;
 }
 
-bool UnityScreen::altTabDetailStart(CompAction* action, CompAction::State state, CompOption::Vector& options)
-{
-  return switcher_controller_->StartDetailMode();
-}
-
-bool UnityScreen::altTabDetailStop(CompAction* action, CompAction::State state, CompOption::Vector& options)
-{
-  return switcher_controller_->StopDetailMode();
-}
-
 bool UnityScreen::altTabNextWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
 {
   if (!switcher_controller_->Visible())
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 5cdba628d..5b57218d3 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -153,8 +153,6 @@ public:
   bool altTabPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool altTabForwardAllInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool altTabPrevAllInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
-  bool altTabDetailStart(CompAction* action, CompAction::State state, CompOption::Vector& options);
-  bool altTabDetailStop(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool altTabNextWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
   bool altTabPrevWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options);
 
diff --git a/plugins/unityshell/unityshell_xml.in b/plugins/unityshell/unityshell_xml.in
index f5ed1b656..3afe0bdf8 100644
--- a/plugins/unityshell/unityshell_xml.in
+++ b/plugins/unityshell/unityshell_xml.in
@@ -470,38 +470,6 @@
                     <default>&lt;Control&gt;&lt;Alt&gt;&lt;Shift&gt;Tab</default>
                 </option>
 
-                <option name="alt_tab_right" type="key">
-                    <_short>Key to move to the right in the Switcher</_short>
-                    <_long>Navigates one window to the right in the Switcher.</_long>
-                    <default>&lt;Alt&gt;Right</default>
-                    <passive_grab>false</passive_grab>
-                    <internal/>
-                </option>
-
-                <option name="alt_tab_left" type="key">
-                    <_short>Key to move to the left in the Switcher</_short>
-                    <_long>Navigates one window to the left in the Switcher.</_long>
-                    <default>&lt;Alt&gt;Left</default>
-                    <passive_grab>false</passive_grab>
-                    <internal/>
-                </option>
-
-                <option name="alt_tab_detail_start" type="key">
-                    <_short>Key to expose windows in the Switcher</_short>
-                    <_long>Displays a live preview of the selected window; a grid if multiple windows of the selected application are open.</_long>
-                    <default>&lt;Alt&gt;Down</default>
-                    <passive_grab>false</passive_grab>
-                    <internal/>
-                </option>
-
-                <option name="alt_tab_detail_stop" type="key">
-                    <_short>Key to collapse windows in the Switcher</_short>
-                    <_long>Closes the live previews and returns to icons in the Switcher.</_long>
-                    <default>&lt;Alt&gt;Up</default>
-                    <passive_grab>false</passive_grab>
-                    <internal/>
-                </option>
-
                 <option name="alt_tab_next_window" type="key">
                     <_short>Key to flip through windows in the Switcher</_short>
                     <_long>Flips through all the windows present in the Switcher.</_long>
-- 
cgit v1.2.3


From 40bd8bbbef602bb7afb9a5e94c95047cf52d3733 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 30 Sep 2013 13:24:44 +0200
Subject: CairoBaseWindow: only regenerate blur texture on visible and when
 damaged

Fixes LP: #1233109

(bzr r3536.3.4)
---
 plugins/unityshell/src/unityshell.cpp | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 28b98e9a5..d388492a0 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1363,12 +1363,7 @@ void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion co
   CompRegion region(geo.x, geo.y, geo.width, geo.height);
 
   if (damage.intersects(region))
-  {
-    if (view->IsViewWindow())
-      view->QueueDraw();
-    else
-      view->NeedSoftRedraw();
-  }
+    view->NeedSoftRedraw();
 }
 
 void UnityScreen::compizDamageNux(CompRegion const& damage)
-- 
cgit v1.2.3


From b84f8414a5b88731bd5d40fbdf5cf2c49180d729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 3 Oct 2013 15:09:29 +0200
Subject: HudController: always restore the input focus when hidden, no need to
 add a parameter

(bzr r3550.1.4)
---
 plugins/unityshell/src/unityshell.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 10060dbda..54f685d2a 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1514,7 +1514,7 @@ void UnityScreen::handleEvent(XEvent* event)
           }
           else
           {
-            dash_controller_->HideDash(false);
+            dash_controller_->HideDash();
           }
         }
       }
@@ -1529,7 +1529,7 @@ void UnityScreen::handleEvent(XEvent* event)
 
         if (!hud_geo.IsInside(pt) && !DoesPointIntersectUnityGeos(pt) && !on_top_geo.IsInside(pt))
         {
-          hud_controller_->HideHud(false);
+          hud_controller_->HideHud();
         }
       }
       else if (switcher_controller_->Visible())
-- 
cgit v1.2.3


From fd1bafb61df10f56842465106772917f78fe7e89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 14 Oct 2013 00:29:36 +0200
Subject: UnityScreen: use unordered_map for decorated windows

(bzr r3566.3.10)
---
 plugins/unityshell/src/unityshell.cpp | 2 +-
 plugins/unityshell/src/unityshell.h   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 54f685d2a..2854a360c 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -3421,7 +3421,7 @@ bool WindowHasInconsistentShapeRects (Display *d,
 }
 
 UnityWindow::UnityWindow(CompWindow* window)
-  : BaseSwitchWindow (dynamic_cast<BaseSwitchScreen *> (UnityScreen::get (screen)), window)
+  : BaseSwitchWindow(static_cast<BaseSwitchScreen*>(UnityScreen::get(screen)), window)
   , PluginClassHandler<UnityWindow, CompWindow>(window)
   , window(window)
   , cWindow(CompositeWindow::get(window))
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 5b57218d3..69a25b636 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -27,6 +27,7 @@
 #include <Nux/WindowThread.h>
 #include <NuxCore/Property.h>
 #include <sigc++/sigc++.h>
+#include <unordered_set>
 
 #include <scale/scale.h>
 #include <core/core.h>
@@ -329,7 +330,7 @@ private:
   GLMatrix panel_shadow_matrix_;
 
   bool paint_panel_under_dash_;
-  std::set<UnityWindow*> fake_decorated_windows_;
+  std::unordered_set<UnityWindow*> fake_decorated_windows_;
 
   bool scale_just_activated_;
   WindowMinimizeSpeedController minimize_speed_controller_;
-- 
cgit v1.2.3


From 67b7c16bd1448ed5964de62cc5e4462fd9e52d79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 16 Oct 2013 05:42:35 +0200
Subject: UnityScreen: also redraw the HudView if it has not been fully damaged

Fixes LP: #1240322

(bzr r3566.2.2)
---
 plugins/unityshell/src/unityshell.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 54f685d2a..441e0810c 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1379,6 +1379,9 @@ void UnityScreen::compizDamageNux(CompRegion const& damage)
   if (dash_controller_->IsVisible())
     redraw_view_if_damaged(dash_controller_->Dash(), damage);
 
+  if (hud_controller_->IsVisible())
+    redraw_view_if_damaged(hud_controller_->HudView(), damage);
+
   auto const& launchers = launcher_controller_->launchers();
   for (auto const& launcher : launchers)
   {
-- 
cgit v1.2.3


From c54c9b273052f8d2376f7e2ec81b4563e5be22fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 17 Oct 2013 07:24:55 +0200
Subject: UnityshellPrivate: allow to create Shift+Numpad super keybindings

(bzr r3566.4.1)
---
 plugins/unityshell/src/UnityshellPrivate.cpp | 4 ++--
 plugins/unityshell/src/UnityshellPrivate.h   | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/UnityshellPrivate.cpp b/plugins/unityshell/src/UnityshellPrivate.cpp
index 029fb1c1d..984a163a4 100644
--- a/plugins/unityshell/src/UnityshellPrivate.cpp
+++ b/plugins/unityshell/src/UnityshellPrivate.cpp
@@ -30,9 +30,9 @@ std::string CreateActionString(std::string const& modifiers,
 {
   std::string ret(modifiers);
 
-  if (flag == ActionModifiers::USE_SHIFT)
+  if (flag == ActionModifiers::USE_SHIFT || flag == ActionModifiers::USE_SHIFT_NUMPAD)
     ret += "<Shift>";
-  else if (flag == ActionModifiers::USE_NUMPAD)
+  if (flag == ActionModifiers::USE_NUMPAD || flag == ActionModifiers::USE_SHIFT_NUMPAD)
     ret += "KP_";
 
   ret += shortcut;
diff --git a/plugins/unityshell/src/UnityshellPrivate.h b/plugins/unityshell/src/UnityshellPrivate.h
index 5ba395710..70c630fa3 100644
--- a/plugins/unityshell/src/UnityshellPrivate.h
+++ b/plugins/unityshell/src/UnityshellPrivate.h
@@ -30,12 +30,13 @@ namespace impl
 enum class ActionModifiers
 {
   NONE = 0,
-  
+
   USE_NUMPAD,
-  USE_SHIFT
+  USE_SHIFT,
+  USE_SHIFT_NUMPAD
 };
 
-std::string CreateActionString(std::string const& modifiers, 
+std::string CreateActionString(std::string const& modifiers,
                                char shortcut,
                                ActionModifiers flag = ActionModifiers::NONE);
 
-- 
cgit v1.2.3


From cdd147c4a5cf8ab86b8682f96fc1e7934cb768a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 17 Oct 2013 07:27:07 +0200
Subject: UnityScreen: CreateSuperNewAction with Shift and Numpad for launcher

This fixes the bug that caused Super+Shift+KP_x not to work as it should.

Fixes LP: #1240806

(bzr r3566.4.3)
---
 plugins/unityshell/src/unityshell.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 2854a360c..83efb9497 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -489,6 +489,7 @@ void UnityScreen::EnsureSuperKeybindings()
     CreateSuperNewAction(shortcut, impl::ActionModifiers::NONE);
     CreateSuperNewAction(shortcut, impl::ActionModifiers::USE_NUMPAD);
     CreateSuperNewAction(shortcut, impl::ActionModifiers::USE_SHIFT);
+    CreateSuperNewAction(shortcut, impl::ActionModifiers::USE_SHIFT_NUMPAD);
   }
 
   for (auto shortcut : dash_controller_->GetAllShortcuts())
-- 
cgit v1.2.3


From d8a66ec63c83d53a97ae0e4504c93b572b3aee4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 21 Oct 2013 20:31:20 +0200
Subject: UnityScreen: use better way to parse the unity digit keybindings

(bzr r3566.4.25)
---
 plugins/unityshell/src/unityshell.cpp | 35 ++++++++++++++++-------------------
 plugins/unityshell/src/unityshell.h   |  2 ++
 2 files changed, 18 insertions(+), 19 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index cf1820fba..8912eb7ce 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1575,7 +1575,7 @@ void UnityScreen::handleEvent(XEvent* event)
       {
         /* We need an idle to postpone this action, after the current event
          * has been processed */
-        sources_.AddIdle([&] {
+        sources_.AddIdle([this] {
           shortcut_controller_->SetEnabled(false);
           shortcut_controller_->Hide();
           LOG_DEBUG(logger) << "Hiding shortcut controller due to keypress event.";
@@ -1585,9 +1585,7 @@ void UnityScreen::handleEvent(XEvent* event)
         });
       }
 
-      KeySym key_sym;
-      char key_string[2];
-      int result = XLookupString(&(event->xkey), key_string, 2, &key_sym, 0);
+      KeySym key_sym = XkbKeycodeToKeysym(event->xany.display, event->xkey.keycode, 0, 0);
 
       if (launcher_controller_->KeyNavIsActive())
       {
@@ -1610,27 +1608,26 @@ void UnityScreen::handleEvent(XEvent* event)
         {
           switcher_controller_->Hide(false);
           skip_other_plugins = true;
+          break;
         }
       }
 
-      if (result > 0)
+      if (super_keypressed_)
       {
-        // NOTE: does this have the potential to do an invalid write?  Perhaps
-        // we should just say "key_string[1] = 0" because that is the only
-        // thing that could possibly make sense here.
-        key_string[result] = 0;
-
-        if (super_keypressed_)
+        if (IsKeypadKey(key_sym))
         {
-          skip_other_plugins = launcher_controller_->HandleLauncherKeyEvent(screen->dpy(), key_sym, event->xkey.keycode, event->xkey.state, key_string, event->xkey.time);
-          if (!skip_other_plugins)
-            skip_other_plugins = dash_controller_->CheckShortcutActivation(key_string);
+          key_sym = XkbKeycodeToKeysym(event->xany.display, event->xkey.keycode, 0, 1);
+          key_sym = key_sym - XK_KP_0 + XK_0;
+        }
 
-          if (skip_other_plugins && launcher_controller_->KeyNavIsActive())
-          {
-            launcher_controller_->KeyNavTerminate(false);
-            EnableCancelAction(CancelActionTarget::LAUNCHER_SWITCHER, false);
-          }
+        skip_other_plugins = launcher_controller_->HandleLauncherKeyEvent(XModifiersToNux(event->xkey.state), key_sym, event->xkey.time);
+        if (!skip_other_plugins)
+          skip_other_plugins = dash_controller_->CheckShortcutActivation(glib:gchar_to_string(XKeysymToString(key_sym)));
+
+        if (skip_other_plugins && launcher_controller_->KeyNavIsActive())
+        {
+          launcher_controller_->KeyNavTerminate(false);
+          EnableCancelAction(CancelActionTarget::LAUNCHER_SWITCHER, false);
         }
       }
       break;
diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index 69a25b636..d9f5c4958 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -254,6 +254,8 @@ private:
 
   void UpdateCloseWindowKey(CompAction::KeyBinding const&);
 
+  bool getMipmap () override { return true; }
+
   std::unique_ptr<na::TickSource> tick_source_;
   std::unique_ptr<na::AnimationController> animation_controller_;
 
-- 
cgit v1.2.3


From 33f78b121aefa626c984677575da5f6415acf97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 21 Oct 2013 21:14:44 +0200
Subject: DashController: check for invalid (null) keybindings

(bzr r3566.4.27)
---
 plugins/unityshell/src/unityshell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 8912eb7ce..6a6bc5c22 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1622,7 +1622,7 @@ void UnityScreen::handleEvent(XEvent* event)
 
         skip_other_plugins = launcher_controller_->HandleLauncherKeyEvent(XModifiersToNux(event->xkey.state), key_sym, event->xkey.time);
         if (!skip_other_plugins)
-          skip_other_plugins = dash_controller_->CheckShortcutActivation(glib:gchar_to_string(XKeysymToString(key_sym)));
+          skip_other_plugins = dash_controller_->CheckShortcutActivation(XKeysymToString(key_sym));
 
         if (skip_other_plugins && launcher_controller_->KeyNavIsActive())
         {
-- 
cgit v1.2.3


From 554f41bac8f170ff62a2125d48f95bdcfff698be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Mon, 21 Oct 2013 23:57:54 +0200
Subject: UnityScreen: remove getMipmap override

(bzr r3566.4.30)
---
 plugins/unityshell/src/unityshell.h | 2 --
 1 file changed, 2 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.h b/plugins/unityshell/src/unityshell.h
index d9f5c4958..69a25b636 100644
--- a/plugins/unityshell/src/unityshell.h
+++ b/plugins/unityshell/src/unityshell.h
@@ -254,8 +254,6 @@ private:
 
   void UpdateCloseWindowKey(CompAction::KeyBinding const&);
 
-  bool getMipmap () override { return true; }
-
   std::unique_ptr<na::TickSource> tick_source_;
   std::unique_ptr<na::AnimationController> animation_controller_;
 
-- 
cgit v1.2.3


From 907f522ce0eee15328ca7b67c03c43e0a960773e Mon Sep 17 00:00:00 2001
From: Chris Townsend <christopher.townsend@canonical.com>
Date: Tue, 29 Oct 2013 18:39:42 -0400
Subject: Remove redraw_view_if_damaged/NeedSoftRedraw() combo as it's no
 longer needed due to the changes introduced for performance.

(bzr r3347.3.9)
---
 plugins/unityshell/src/unityshell.cpp | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index e91739d14..d5667fcdd 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1544,18 +1544,6 @@ void UnityScreen::donePaint()
   cScreen->donePaint();
 }
 
-void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion const& damage)
-{
-  if (!view || view->IsRedrawNeeded())
-    return;
-
-  auto const& geo = view->GetAbsoluteGeometry();
-  CompRegion region(geo.x, geo.y, geo.width, geo.height);
-
-  if (damage.intersects(region))
-    view->NeedSoftRedraw();
-}
-
 void UnityScreen::compizDamageNux(CompRegion const& damage)
 {
   /* Ask nux to present anything in our damage region
-- 
cgit v1.2.3


From 7cbfff7580b694f2fee5f54cde267ac10bca8398 Mon Sep 17 00:00:00 2001
From: Chris Townsend <christopher.townsend@canonical.com>
Date: Wed, 30 Oct 2013 14:09:44 -0400
Subject: Remove reference to variable in the call to
 RenderInterfaceFromForeignCmd().

(bzr r3347.3.11)
---
 plugins/unityshell/src/unityshell.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index d5667fcdd..1089b9576 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -788,7 +788,7 @@ void UnityScreen::paintDisplay()
                                                     outputGeo);
 
   nuxPrologue();
-  wt->RenderInterfaceFromForeignCmd (&outputGeo);
+  wt->RenderInterfaceFromForeignCmd (outputGeo);
   nuxEpilogue();
 
   for (Window tray_xid : panel_controller_->GetTrayXids())
-- 
cgit v1.2.3


From e4b01bd782e1c4adf7e3a7e950c723fa3a8b9b1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Wed, 30 Oct 2013 15:25:11 -0700
Subject: UnityScreen: use new ForEachBaseWindow

(bzr r3347.3.14)
---
 plugins/unityshell/src/unityshell.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 1089b9576..a7c471809 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1426,8 +1426,7 @@ void UnityScreen::damageCutoff()
     /* We have to force-redraw the whole scene because
      * of a bug in the nvidia driver that causes framebuffers
      * to be trashed on resume for a few swaps */
-    wt->GetWindowCompositor()
-        .OnAllBaseWindows([](WeakBaseWindowPtr const &w) {
+    wt->GetWindowCompositor().ForEachBaseWindow([](WeakBaseWindowPtr const &w) {
       w->QueueDraw();
     });
 
-- 
cgit v1.2.3


From 88e5c64a0ee1044d3ffa887fb4b22b2156f10890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Fri, 1 Nov 2013 12:02:41 -0700
Subject: UnityShell: some code cleanup, add functions to convert CompRect <->
 nux::Geometry

(bzr r3347.4.1)
---
 plugins/unityshell/src/unityshell.cpp | 101 +++++++++++++++-------------------
 1 file changed, 44 insertions(+), 57 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index a7c471809..a1c65d6bd 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -105,12 +105,24 @@ void capture_g_log_calls(const gchar* log_domain,
 gboolean is_extension_supported(const gchar* extensions, const gchar* extension);
 gfloat get_opengl_version_f32(const gchar* version_string);
 
+inline CompRegion CompRegionFromNuxGeo(nux::Geometry const& geo)
+{
+  return CompRegion(geo.x, geo.y, geo.width, geo.height);
+}
+
+inline nux::Geometry NuxGeometryFromCompRect(CompRect const& rect)
+{
+  return nux::Geometry(rect.x(), rect.y(), rect.width(), rect.height());
+}
+
 namespace local
 {
 // Tap duration in milliseconds.
 const int ALT_TAP_DURATION = 250;
 const unsigned int SCROLL_DOWN_BUTTON = 6;
 const unsigned int SCROLL_UP_BUTTON = 7;
+const int MAX_BUFFER_AGE = 11;
+const int FRAMES_TO_REDRAW_ON_RESUME = 10;
 
 const std::string RELAYOUT_TIMEOUT = "relayout-timeout";
 } // namespace local
@@ -144,8 +156,8 @@ UnityScreen::UnityScreen(CompScreen* screen)
   , allowWindowPaint(false)
   , _key_nav_mode_requested(false)
   , _last_output(nullptr)
-  , force_draw_countdown_ (0)
-  , grab_index_ (0)
+  , force_draw_countdown_(0)
+  , grab_index_(0)
   , painting_tray_ (false)
   , last_scroll_event_(0)
   , hud_keypress_time_(0)
@@ -398,15 +410,15 @@ UnityScreen::UnityScreen(CompScreen* screen)
     XSelectInput(display, GDK_ROOT_WINDOW(), PropertyChangeMask);
     LOG_INFO(logger) << "UnityScreen constructed: " << timer.ElapsedSeconds() << "s";
 
-    UScreen::GetDefault()->resuming.connect([this]() {
-      /* Force paint 10 frames on resume */
-      this->force_draw_countdown_ += 10;
+    UScreen::GetDefault()->resuming.connect([this] {
+      /* Force paint local::FRAMES_TO_REDRAW_ON_RESUME frames on resume */
+      force_draw_countdown_ += local::FRAMES_TO_REDRAW_ON_RESUME;
     });
 
     panel::Style::Instance().changed.connect(sigc::mem_fun(this, &UnityScreen::OnPanelStyleChanged));
 
     minimize_speed_controller_.DurationChanged.connect(
-        sigc::mem_fun(this, &UnityScreen::OnMinimizeDurationChanged)
+      sigc::mem_fun(this, &UnityScreen::OnMinimizeDurationChanged)
     );
 
     WindowManager& wm = WindowManager::Default();
@@ -507,11 +519,8 @@ void UnityScreen::DamagePanelShadow()
 void UnityScreen::OnViewHidden(nux::BaseWindow *bw)
 {
   /* Count this as regular damage */
-  nux::Geometry geometry(bw->GetAbsoluteGeometry());
-  cScreen->damageRegion(CompRegion (geometry.x,
-                                    geometry.y,
-                                    geometry.width,
-                                    geometry.height));
+  auto const& geo = bw->GetAbsoluteGeometry();
+  cScreen->damageRegion(CompRegionFromNuxGeo(geo));
 }
 
 void UnityScreen::EnsureSuperKeybindings()
@@ -606,8 +615,7 @@ void UnityScreen::setPanelShadowMatrix(GLMatrix const& matrix)
   panel_shadow_matrix_ = matrix;
 }
 
-void UnityScreen::FillShadowRectForOutput(CompRect         &shadowRect,
-                                          CompOutput const &output)
+void UnityScreen::FillShadowRectForOutput(CompRect& shadowRect, CompOutput const& output)
 {
   if (_shadow_texture.empty ())
     return;
@@ -724,12 +732,7 @@ void UnityScreen::paintPanelShadow(CompRegion const& clip)
 }
 
 void
-UnityWindow::updateIconPos (int   &wx,
-                            int   &wy,
-                            int   x,
-                            int   y,
-                            float width,
-                            float height)
+UnityWindow::updateIconPos(int &wx, int &wy, int x, int y, float width, float height)
 {
   wx = x + (last_bound.width - width) / 2;
   wy = y + (last_bound.height - height) / 2;
@@ -780,15 +783,13 @@ void UnityScreen::paintDisplay()
     back_buffer_age_ = 0;
   }
 
-  nux::Geometry outputGeo(output->x (), output->y (), output->width (), output->height ());
+  nux::Geometry const& outputGeo = NuxGeometryFromCompRect(*output);
   BackgroundEffectHelper::monitor_rect_.Set(0, 0, screen->width(), screen->height());
 
-  wt->GetWindowCompositor().SetReferenceFramebuffer(current_draw_binding,
-                                                    old_read_binding,
-                                                    outputGeo);
+  wt->GetWindowCompositor().SetReferenceFramebuffer(current_draw_binding, old_read_binding, outputGeo);
 
   nuxPrologue();
-  wt->RenderInterfaceFromForeignCmd (outputGeo);
+  wt->RenderInterfaceFromForeignCmd(outputGeo);
   nuxEpilogue();
 
   for (Window tray_xid : panel_controller_->GetTrayXids())
@@ -1410,8 +1411,7 @@ void UnityScreen::updateBlurDamage()
       CompRect::vector const& rects(buffered_compiz_damage_this_frame_.rects());
       for (CompRect const& r : rects)
       {
-        nux::Geometry geo(r.x(), r.y(), r.width(), r.height());
-        BackgroundEffectHelper::ProcessDamage(geo);
+        BackgroundEffectHelper::ProcessDamage(NuxGeometryFromCompRect(r));
       }
     }
   }
@@ -1419,18 +1419,18 @@ void UnityScreen::updateBlurDamage()
 
 void UnityScreen::damageCutoff()
 {
-  if (force_draw_countdown_)
+  if (force_draw_countdown_ > 0)
   {
     typedef nux::WindowCompositor::WeakBaseWindowPtr WeakBaseWindowPtr;
 
     /* We have to force-redraw the whole scene because
      * of a bug in the nvidia driver that causes framebuffers
      * to be trashed on resume for a few swaps */
-    wt->GetWindowCompositor().ForEachBaseWindow([](WeakBaseWindowPtr const &w) {
+    wt->GetWindowCompositor().ForEachBaseWindow([] (WeakBaseWindowPtr const& w) {
       w->QueueDraw();
     });
 
-    force_draw_countdown_--;
+    --force_draw_countdown_;
   }
 
   /* At this point we want to take all of the compiz damage
@@ -1507,8 +1507,8 @@ void UnityScreen::donePaint()
 
   /* To prevent any potential overflow problems, we are assuming here
    * that compiz caps the maximum number of frames tracked at 10, so
-   * don't increment the age any more than 11 */
-  if (back_buffer_age_ < 11)
+   * don't increment the age any more than local::MAX_BUFFER_AGE */
+  if (back_buffer_age_ < local::MAX_BUFFER_AGE)
     ++back_buffer_age_;
 
   if (didShellRepaint)
@@ -1555,12 +1555,10 @@ void UnityScreen::compizDamageNux(CompRegion const& damage)
    * The former is a lot faster, do not use QueueDraw unless the contents
    * of the window need to be re-drawn.
    */
-  CompRect::vector rects (damage.rects());
-  for (const CompRect &r : rects)
-  {
-    nux::Geometry g(r.x(), r.y(), r.width(), r.height());
-    wt->PresentWindowsIntersectingGeometryOnThisFrame(g);
-  }
+  auto const& rects = damage.rects();
+
+  for (CompRect const& r : rects)
+    wt->PresentWindowsIntersectingGeometryOnThisFrame(NuxGeometryFromCompRect(r));
 }
 
 /* Grab changed nux regions and add damage rects for them */
@@ -1570,15 +1568,12 @@ void UnityScreen::determineNuxDamage(CompRegion &nux_damage)
   std::vector<nux::Geometry> dirty = wt->GetPresentationListGeometries();
 
   for (auto const& geo : dirty)
-    nux_damage += CompRegion(geo.x, geo.y, geo.width, geo.height);
+    nux_damage += CompRegionFromNuxGeo(geo);
 
   /* Special case, we need to redraw the panel shadow on panel updates */
   for (auto const& panel_geo : panel_controller_->GetGeometries())
   {
-    CompRect panel_rect(panel_geo.x,
-                        panel_geo.y,
-                        panel_geo.width,
-                        panel_geo.height);
+    CompRect panel_rect(panel_geo.x, panel_geo.y, panel_geo.width, panel_geo.height);
 
     if (nux_damage.intersects(panel_rect))
     {
@@ -2785,7 +2780,7 @@ bool UnityWindow::glDraw(const GLMatrix& matrix,
           draw_panel_shadow = DrawPanelShadow::OVER_WINDOW;
         }
         uScreen->is_desktop_active_ = true;
-      } 
+      }
     }
     else
     {
@@ -2843,7 +2838,7 @@ UnityScreen::OnMinimizeDurationChanged ()
 
     for (CompOption &o : opts)
     {
-      if (o.name () == std::string ("minimize_durations"))
+      if (o.name() == std::string("minimize_durations"))
       {
         /* minimize_durations is a list value, but minimize applies only to
          * normal windows, so there's always one value */
@@ -2860,7 +2855,8 @@ UnityScreen::OnMinimizeDurationChanged ()
       }
     }
   }
-  else {
+  else
+  {
     LOG_WARN(logger) << "Animation plugin not found. Can't set minimize speed.";
   }
 }
@@ -3151,9 +3147,7 @@ void UnityScreen::initUnity(nux::NThread* thread, void* InitData)
   static_cast<nux::WindowThread*>(thread)->SetWindowBackgroundPaintLayer(&background);
   LOG_INFO(logger) << "UnityScreen::initUnity: " << timer.ElapsedSeconds() << "s";
 
-  nux::GetWindowCompositor()
-    .sigHiddenViewWindow.connect(sigc::mem_fun(self,
-                                               &UnityScreen::OnViewHidden));
+  nux::GetWindowCompositor().sigHiddenViewWindow.connect(sigc::mem_fun(self, &UnityScreen::OnViewHidden));
 }
 
 void UnityScreen::onRedrawRequested()
@@ -3332,8 +3326,6 @@ void UnityScreen::ScheduleRelayout(guint timeout)
 
 void UnityScreen::Relayout()
 {
-  nux::Geometry geometry (0, 0, screen->width (), screen->height ());
-
   if (!needsRelayout)
     return;
 
@@ -3342,12 +3334,7 @@ void UnityScreen::Relayout()
   auto const& geo = uscreen->GetMonitorGeometry(primary_monitor);
   wt->SetWindowSize(geo.width, geo.height);
 
-  LOG_DEBUG(logger) << "Setting to primary screen rect:"
-                    << " x=" << geo.x
-                    << " y=" << geo.y
-                    << " w=" << geo.width
-                    << " h=" << geo.height;
-
+  LOG_DEBUG(logger) << "Setting to primary screen rect; " << geo;
   needsRelayout = false;
 
   DamagePanelShadow();
@@ -3932,7 +3919,7 @@ void UnityWindow::paintFakeDecoration(nux::Geometry const& geo, GLWindowPaintAtt
         int text_x = win::decoration::ITEMS_PADDING * 2 + win::decoration::CLOSE_SIZE;
         RenderText(context, text_x, 0.0, width - win::decoration::ITEMS_PADDING, height);
         decoration_selected_tex_ = context.pixmap_texture_;
-        uScreen->damageRegion(CompRegion(geo.x, geo.y, width, height));
+        uScreen->damageRegion(CompRegionFromNuxGeo(geo));
       }
       else
       {
-- 
cgit v1.2.3


From af35ad62b397dba94aeeeefe3a060c8928c098c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Fri, 1 Nov 2013 15:54:05 -0400
Subject: UnityShell: add and use CompRectFromNuxGeo as well

(bzr r3347.4.2)
---
 plugins/unityshell/src/unityshell.cpp | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index a1c65d6bd..9d11b4491 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -110,6 +110,11 @@ inline CompRegion CompRegionFromNuxGeo(nux::Geometry const& geo)
   return CompRegion(geo.x, geo.y, geo.width, geo.height);
 }
 
+inline CompRect CompRectFromNuxGeo(nux::Geometry const& geo)
+{
+  return CompRect(geo.x, geo.y, geo.width, geo.height);
+}
+
 inline nux::Geometry NuxGeometryFromCompRect(CompRect const& rect)
 {
   return nux::Geometry(rect.x(), rect.y(), rect.width(), rect.height());
@@ -1214,8 +1219,7 @@ bool UnityWindow::handleEvent(XEvent *event)
 
         if (old_state != close_icon_state_)
         {
-          auto const& g = close_button_geo_;
-          cWindow->addDamageRect(CompRect(g.x, g.y, g.width, g.height));
+          cWindow->addDamageRect(CompRectFromNuxGeo(close_button_geo_));
         }
       }
       break;
@@ -1225,8 +1229,7 @@ bool UnityWindow::handleEvent(XEvent *event)
           close_button_geo_.IsPointInside(event->xbutton.x_root, event->xbutton.y_root))
       {
         close_icon_state_ = panel::WindowState::PRESSED;
-        auto const& g = close_button_geo_;
-        cWindow->addDamageRect(CompRect(g.x, g.y, g.width, g.height));
+        cWindow->addDamageRect(CompRectFromNuxGeo(close_button_geo_));
         handled = true;
       }
       else if (event->xbutton.button == Button2 &&
@@ -1245,8 +1248,7 @@ bool UnityWindow::handleEvent(XEvent *event)
         if (close_icon_state_ != panel::WindowState::NORMAL)
         {
           close_icon_state_ = panel::WindowState::NORMAL;
-          auto const& g = close_button_geo_;
-          cWindow->addDamageRect(CompRect(g.x, g.y, g.width, g.height));
+          cWindow->addDamageRect(CompRectFromNuxGeo(close_button_geo_));
         }
 
         if (was_pressed)
@@ -1558,7 +1560,10 @@ void UnityScreen::compizDamageNux(CompRegion const& damage)
   auto const& rects = damage.rects();
 
   for (CompRect const& r : rects)
-    wt->PresentWindowsIntersectingGeometryOnThisFrame(NuxGeometryFromCompRect(r));
+  {
+    auto const& geo = NuxGeometryFromCompRect(r);
+    wt->PresentWindowsIntersectingGeometryOnThisFrame(geo);
+  }
 }
 
 /* Grab changed nux regions and add damage rects for them */
@@ -1573,11 +1578,11 @@ void UnityScreen::determineNuxDamage(CompRegion &nux_damage)
   /* Special case, we need to redraw the panel shadow on panel updates */
   for (auto const& panel_geo : panel_controller_->GetGeometries())
   {
-    CompRect panel_rect(panel_geo.x, panel_geo.y, panel_geo.width, panel_geo.height);
+    auto const& panel_rect = CompRectFromNuxGeo(panel_geo);
 
     if (nux_damage.intersects(panel_rect))
     {
-      foreach (CompOutput const& o, screen->outputDevs())
+      for (CompOutput const& o : screen->outputDevs())
       {
         CompRect shadowRect;
         FillShadowRectForOutput(shadowRect, o);
-- 
cgit v1.2.3


From c21a132eb401327433d6c27cb6198217f846fc6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Fri, 1 Nov 2013 16:23:07 -0400
Subject: UnityShell: just verify wether the dirty areas hit the panel in a
 single loop

(bzr r3347.4.3)
---
 plugins/unityshell/src/unityshell.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 9d11b4491..76e73531e 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1572,16 +1572,16 @@ void UnityScreen::determineNuxDamage(CompRegion &nux_damage)
   /* Fetch all the dirty geometry from nux and aggregate it */
   std::vector<nux::Geometry> dirty = wt->GetPresentationListGeometries();
 
-  for (auto const& geo : dirty)
-    nux_damage += CompRegionFromNuxGeo(geo);
-
-  /* Special case, we need to redraw the panel shadow on panel updates */
-  for (auto const& panel_geo : panel_controller_->GetGeometries())
+  for (auto const& dirty_geo : dirty)
   {
-    auto const& panel_rect = CompRectFromNuxGeo(panel_geo);
+    nux_damage += CompRegionFromNuxGeo(dirty_geo);
 
-    if (nux_damage.intersects(panel_rect))
+    /* Special case, we need to redraw the panel shadow on panel updates */
+    for (auto const& panel_geo : panel_controller_->GetGeometries())
     {
+      if (!dirty_geo.IsIntersecting(panel_geo))
+        continue;
+
       for (CompOutput const& o : screen->outputDevs())
       {
         CompRect shadowRect;
-- 
cgit v1.2.3


From 2db4c077aa10defa2c7433ba33298e1eb60544d9 Mon Sep 17 00:00:00 2001
From: Timo Jyrinki <timo.jyrinki@canonical.com>
Date: Wed, 6 Nov 2013 08:15:35 +0000
Subject: Remove the double redraw_view_if_damaged function.

(bzr r3587.1.2)
---
 plugins/unityshell/src/unityshell.cpp | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 91709faaa..f2db18a2a 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1353,18 +1353,6 @@ void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion co
     view->NeedSoftRedraw();
 }
 
-void redraw_view_if_damaged(nux::ObjectPtr<nux::View> const& view, CompRegion const& damage)
-{
-  if (!view || view->IsRedrawNeeded())
-    return;
-
-  auto const& geo = view->GetAbsoluteGeometry();
-  CompRegion region(geo.x, geo.y, geo.width, geo.height);
-
-  if (damage.intersects(region))
-    view->NeedSoftRedraw();
-}
-
 void UnityScreen::compizDamageNux(CompRegion const& damage)
 {
   if (!launcher_controller_)
-- 
cgit v1.2.3


From ce8729e97b405293f58405691466db4693e70244 Mon Sep 17 00:00:00 2001
From: Eleni Maria Stea <elenimaria.stea@canonical.com>
Date: Thu, 7 Nov 2013 13:45:40 +0200
Subject: fixed unity compile errors: 1. SetReferenceFramebuffer function gets
 3 parameters (Nux/WindowCompositor.h) 2. RenderInterfaceFromForeignCmd gets
 const reference not pointer as argument (Nux/WindowThread.h)

(bzr r3589.1.1)
---
 plugins/unityshell/src/unityshell.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index f2db18a2a..2bd808162 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -725,10 +725,10 @@ void UnityScreen::paintDisplay()
   GLint fboID;
   // Nux renders to the referenceFramebuffer when it's embedded.
   glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fboID);
-  wt->GetWindowCompositor().SetReferenceFramebuffer(fboID, outputGeo);
+  wt->GetWindowCompositor().SetReferenceFramebuffer(fboID, fboID, outputGeo);
 
   nuxPrologue();
-  wt->RenderInterfaceFromForeignCmd (&outputGeo);
+  wt->RenderInterfaceFromForeignCmd (outputGeo);
   nuxEpilogue();
 
   for (Window tray_xid : panel_controller_->GetTrayXids())
-- 
cgit v1.2.3


From f425707dcf2c5b728f0b33a8214fbc3e4b7e1834 Mon Sep 17 00:00:00 2001
From: Chris Townsend <christopher.townsend@canonical.com>
Date: Thu, 7 Nov 2013 10:18:06 -0500
Subject: Account for unused variables for armhf builds.

(bzr r3347.3.19)
---
 plugins/unityshell/src/unityshell.cpp | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 87a2dc9f5..e5f880ba8 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -764,6 +764,9 @@ void UnityScreen::paintDisplay()
   glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING_EXT, &current_draw_binding);
   if (old_read_binding != current_draw_binding)
     (*GL::bindFramebuffer) (GL_READ_FRAMEBUFFER_BINDING_EXT, current_draw_binding);
+#else
+  glGetIntegerv(GL_FRAMEBUFFER_BINDING, &current_draw_binding);
+  glGetIntegerv(GL_FRAMEBUFFER_BINDING, &old_read_binding);
 #endif
 
   /* If we have dirty helpers re-copy the backbuffer
-- 
cgit v1.2.3


From 69f3a52e1dfe060cce6b4d25a215db789d2dc38f Mon Sep 17 00:00:00 2001
From: Chris Townsend <christopher.townsend@canonical.com>
Date: Thu, 7 Nov 2013 11:26:10 -0500
Subject: Initialize variables to 0 since the compiler for armhf seems to not
 understand the #ifdef block and throws a "variable is uninitialized" error.

(bzr r3347.3.20)
---
 plugins/unityshell/src/unityshell.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index e5f880ba8..da44c28bb 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -758,7 +758,8 @@ void UnityScreen::paintDisplay()
   /* Bind the currently bound draw framebuffer to the read framebuffer binding.
    * The reason being that we want to use the results of nux images being
    * drawn to this framebuffer in glCopyTexSubImage2D operations */
-  GLint current_draw_binding, old_read_binding;
+  GLint current_draw_binding = 0,
+        old_read_binding = 0;
 #ifndef USE_GLES
   glGetIntegerv(GL_READ_FRAMEBUFFER_BINDING_EXT, &old_read_binding);
   glGetIntegerv(GL_DRAW_FRAMEBUFFER_BINDING_EXT, &current_draw_binding);
-- 
cgit v1.2.3


From ff9cbb9596f4f63a6cea19e7e7b149bb2fc55c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 14 Nov 2013 16:06:27 +0100
Subject: UnityScreen: remove the useless and expensive gl{Push,Pop}Attrib
 calls

For some reasons this code was copied by the opengl plugin as a workaround
to fix the state of our screen after that nux has drawn.
Actually this is not needed, the only thing we really need to do is to fix the
current Viewport, because nux seems to leave it in a bad state which would
lead to flickering menus, fullscreen windows, tooltip and missing windows
thumbnails in switcher.

Thanks to Sam Spilsbury for his precious support.

(bzr r3592.1.1)
---
 plugins/unityshell/src/unityshell.cpp | 34 ++++++----------------------------
 1 file changed, 6 insertions(+), 28 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 54547125a..eddec6e74 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -570,16 +570,6 @@ void UnityScreen::nuxPrologue()
    * bit, but we do that here in order to workaround a bug (?) in the NVIDIA
    * drivers (lp:703140). */
   glDisable(GL_LIGHTING);
-
-  /* reset matrices */
-  glPushAttrib(GL_VIEWPORT_BIT | GL_ENABLE_BIT |
-               GL_TEXTURE_BIT | GL_COLOR_BUFFER_BIT | GL_SCISSOR_BIT);
-
-  glMatrixMode(GL_PROJECTION);
-  glPushMatrix();
-
-  glMatrixMode(GL_MODELVIEW);
-  glPushMatrix();
 #endif
 
   glGetError();
@@ -588,30 +578,18 @@ void UnityScreen::nuxPrologue()
 void UnityScreen::nuxEpilogue()
 {
 #ifndef USE_GLES
-
-  glMatrixMode(GL_PROJECTION);
-  glLoadIdentity();
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-  glDepthRange(0, 1);
-  glViewport(-1, -1, 2, 2);
-  glRasterPos2f(0, 0);
-
-  gScreen->resetRasterPos();
-
-  glMatrixMode(GL_PROJECTION);
-  glPopMatrix();
-  glMatrixMode(GL_MODELVIEW);
-  glPopMatrix();
-
-  glPopAttrib();
+  /* In some unknown place inside nux drawing we change the viewport without
+   * setting it back to the default one, so we need to restore it before allowing
+   * compiz to take the scene */
+  auto* o = _last_output;
+  glViewport(o->x(), screen->height() - o->y2(), o->width(), o->height());
 
   glDepthRange(0, 1);
 #else
   glDepthRangef(0, 1);
-  gScreen->resetRasterPos();
 #endif
 
+  gScreen->resetRasterPos();
   glDisable(GL_SCISSOR_TEST);
 }
 
-- 
cgit v1.2.3


From c3e0cbb86dd4c594c317fd2cb20e2909775513ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 14 Nov 2013 16:06:44 +0100
Subject: UnityScreen: indentation fix

(bzr r3592.1.2)
---
 plugins/unityshell/src/unityshell.cpp | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index eddec6e74..e6c3bd57b 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -549,16 +549,16 @@ void UnityScreen::EnsureSuperKeybindings()
 
 void UnityScreen::CreateSuperNewAction(char shortcut, impl::ActionModifiers flag)
 {
-    CompActionPtr action(new CompAction());
-    const std::string key(optionGetShowLauncher().keyToString());
+  CompActionPtr action(new CompAction());
+  const std::string key(optionGetShowLauncher().keyToString());
 
-    CompAction::KeyBinding binding;
-    binding.fromString(impl::CreateActionString(key, shortcut, flag));
+  CompAction::KeyBinding binding;
+  binding.fromString(impl::CreateActionString(key, shortcut, flag));
 
-    action->setKey(binding);
+  action->setKey(binding);
 
-    screen->addAction(action.get());
-    _shortcut_actions.push_back(action);
+  screen->addAction(action.get());
+  _shortcut_actions.push_back(action);
 }
 
 void UnityScreen::nuxPrologue()
-- 
cgit v1.2.3


From 4b8083b12cdfc680c4465476090bbabe7607b729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 14 Nov 2013 16:51:03 +0100
Subject: UnityShell: initialize panel geometries vector outside the loop

(bzr r3592.1.3)
---
 plugins/unityshell/src/unityshell.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index e6c3bd57b..aab320ac7 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -995,7 +995,7 @@ bool UnityScreen::DoesPointIntersectUnityGeos(nux::Point const& pt)
     }
   }
 
-  for (nux::Geometry &panel_geo : panel_controller_->GetGeometries ())
+  for (nux::Geometry const& panel_geo : panel_controller_->GetGeometries ())
   {
     if (panel_geo.IsInside(pt))
     {
@@ -1549,17 +1549,18 @@ void UnityScreen::compizDamageNux(CompRegion const& damage)
 }
 
 /* Grab changed nux regions and add damage rects for them */
-void UnityScreen::determineNuxDamage(CompRegion &nux_damage)
+void UnityScreen::determineNuxDamage(CompRegion& nux_damage)
 {
   /* Fetch all the dirty geometry from nux and aggregate it */
-  std::vector<nux::Geometry> dirty = wt->GetPresentationListGeometries();
+  auto const& dirty = wt->GetPresentationListGeometries();
+  auto const& panels_geometries = panel_controller_->GetGeometries();
 
   for (auto const& dirty_geo : dirty)
   {
     nux_damage += CompRegionFromNuxGeo(dirty_geo);
 
     /* Special case, we need to redraw the panel shadow on panel updates */
-    for (auto const& panel_geo : panel_controller_->GetGeometries())
+    for (auto const& panel_geo : panels_geometries)
     {
       if (!dirty_geo.IsIntersecting(panel_geo))
         continue;
-- 
cgit v1.2.3


From 2beb9acbf61af0ab83c36722fb489d1875606f65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= <mail@3v1n0.net>
Date: Thu, 14 Nov 2013 16:56:08 +0100
Subject: UnityShell: remove the useless call to GetPresentationListGeometries
 in glPaintTransformedOutput

(bzr r3592.1.4)
---
 plugins/unityshell/src/unityshell.cpp | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'plugins/unityshell')

diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index aab320ac7..a0d754d12 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1351,10 +1351,6 @@ void UnityScreen::glPaintTransformedOutput(const GLScreenPaintAttrib& attrib,
     ignore_redraw_request_ = true;
     compizDamageNux(CompRegionRef(output->region()));
     ignore_redraw_request_ = false;
-
-    /* Fetch all the presentation list geometries - this will have the side
-     * effect of clearing any built-up damage state */
-    std::vector<nux::Geometry> dirty = wt->GetPresentationListGeometries();
   }
 
   gScreen->glPaintTransformedOutput(attrib, transform, region, output, mask);
-- 
cgit v1.2.3