Merge lp:~smspillaz/unity/unity.fix_859885 into lp:unity

[Sam Spilsbury]

Fix bug 859885

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.h'
--- plugins/unityshell/src/BamfLauncherIcon.h	2011-09-27 03:41:15 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.h	2011-09-28 12:28:08 +0000
@@ -76,6 +76,8 @@
 
   const char* BamfName();
 
+  bool HandlesSpread () { return true; }
+
 private:
   BamfApplication* m_App;
   Launcher* _launcher;

=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2011-09-15 17:20:21 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2011-09-28 12:28:08 +0000
@@ -197,7 +197,9 @@
 void
 LauncherIcon::Activate(ActionArg arg)
 {
-  if (WindowManager::Default()->IsScaleActive())
+  /* Launcher Icons that handle spread will adjust the spread state
+   * accordingly, for all other icons we should terminate spread */
+  if (WindowManager::Default()->IsScaleActive() && !HandlesSpread ())
     WindowManager::Default()->TerminateScale();
 
   ActivateLauncherIcon(arg);

=== modified file 'plugins/unityshell/src/LauncherIcon.h'
--- plugins/unityshell/src/LauncherIcon.h	2011-09-27 03:41:15 +0000
+++ plugins/unityshell/src/LauncherIcon.h	2011-09-28 12:28:08 +0000
@@ -242,6 +242,8 @@
 
   virtual void OpenInstanceLauncherIcon(ActionArg arg) {}
 
+  virtual bool HandlesSpread () { return false; }
+
   nux::BaseTexture* TextureFromGtkTheme(const char* name, int size, bool update_glow_colors = true);
 
   nux::BaseTexture* TextureFromSpecificGtkTheme(GtkIconTheme* theme, const char* name, int size, bool update_glow_colors = true, bool is_default_theme = false);

=== modified file 'plugins/unityshell/src/compizminimizedwindowhandler.h'
--- plugins/unityshell/src/compizminimizedwindowhandler.h	2011-09-20 20:53:38 +0000
+++ plugins/unityshell/src/compizminimizedwindowhandler.h	2011-09-28 12:28:08 +0000
@@ -55,6 +55,8 @@
 
   void updateFrameRegion (CompRegion &r);
 
+  void windowNotify (CompWindowNotify n);
+
   static void setFunctions (bool keepMinimized);
   static void handleCompizEvent (const char *, const char *, CompOption::Vector &);
   static void handleEvent (XEvent *event);
@@ -62,6 +64,7 @@
 
   typedef CompizMinimizedWindowHandler<Screen, Window> CompizMinimizedWindowHandler_complete;
   typedef boost::shared_ptr<CompizMinimizedWindowHandler_complete> Ptr;
+  typedef std::list <Ptr> List;
 protected:
 
   virtual std::vector<unsigned int> getTransients ();
@@ -70,10 +73,14 @@
 
   PrivateCompizMinimizedWindowHandler *priv;
   static bool handleEvents;
+  static std::list<Ptr> minimizedWindows;
 };
 }
 
 template <typename Screen, typename Window>
+typename compiz::CompizMinimizedWindowHandler<Screen, Window>::List compiz::CompizMinimizedWindowHandler<Screen, Window>::minimizedWindows;
+
+template <typename Screen, typename Window>
 CompWindowList compiz::CompizMinimizedWindowHandler<Screen, Window>::minimizingWindows;
 
 template <typename Screen, typename Window>
@@ -126,12 +133,19 @@
   Atom          wmState = XInternAtom (screen->dpy (), "WM_STATE", 0);
   unsigned long data[2];
 
+  typedef compiz::CompizMinimizedWindowHandler<Screen, Window> minimized_window_handler_full;
+
   std::vector<unsigned int> transients = getTransients ();
 
   handleEvents = true;
   priv->mWindow->windowNotify (CompWindowNotifyMinimize);
   priv->mWindow->changeState (priv->mWindow->state () | CompWindowStateHiddenMask);
 
+  compiz::CompizMinimizedWindowHandler<Screen, Window>::Ptr compizMinimizeHandler =
+        boost::dynamic_pointer_cast <minimized_window_handler_full> (Window::get (priv->mWindow)->mMinimizeHandler);
+
+  minimizedWindows.push_back (compizMinimizeHandler);
+
   for (unsigned int &w : transients)
   {
     CompWindow *win = screen->findWindow (w);
@@ -150,7 +164,31 @@
                    32, PropModeReplace, (unsigned char *) data, 2);
 
   priv->mWindow->changeState (priv->mWindow->state () | CompWindowStateHiddenMask);
+
+  /* Don't allow other windows to be focused by moveInputFocusToOtherWindow */
+  for (auto mh : minimizedWindows)
+    mh->priv->mWindow->focusSetEnabled (Window::get (mh->priv->mWindow), false);
+
   priv->mWindow->moveInputFocusToOtherWindow ();
+
+  for (auto mh : minimizedWindows)
+    mh->priv->mWindow->focusSetEnabled (Window::get (mh->priv->mWindow), true);
+}
+
+template <typename Screen, typename Window>
+void
+compiz::CompizMinimizedWindowHandler<Screen, Window>::windowNotify (CompWindowNotify n)
+{
+  if (n == CompWindowNotifyFocusChange && priv->mWindow->minimized ())
+  {
+    for (auto mh : minimizedWindows)
+      mh->priv->mWindow->focusSetEnabled (Window::get (mh->priv->mWindow), false);
+
+    priv->mWindow->moveInputFocusToOtherWindow ();
+
+    for (auto mh : minimizedWindows)
+      mh->priv->mWindow->focusSetEnabled (Window::get (mh->priv->mWindow), true);
+  }
 }
 
 template <typename Screen, typename Window>
@@ -174,8 +212,17 @@
   Atom          wmState = XInternAtom (screen->dpy (), "WM_STATE", 0);
   unsigned long data[2];
 
+  typedef compiz::CompizMinimizedWindowHandler<Screen, Window> minimized_window_handler_full;
+
   std::vector<unsigned int> transients = getTransients ();
 
+  compiz::CompizMinimizedWindowHandler<Screen, Window>::Ptr compizMinimizeHandler =
+        boost::dynamic_pointer_cast <minimized_window_handler_full> (Window::get (priv->mWindow)->mMinimizeHandler);
+
+  minimizedWindows.remove (compizMinimizeHandler);
+
+  priv->mWindow->focusSetEnabled (Window::get (priv->mWindow), true);
+
   priv->mWindow->windowNotify (CompWindowNotifyUnminimize);
   priv->mWindow->changeState (priv->mWindow->state () & ~CompWindowStateHiddenMask);
   priv->mWindow->windowNotify (CompWindowNotifyShow);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-28 01:43:32 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-09-28 12:28:08 +0000
@@ -1680,7 +1680,19 @@
 
 
   window->windowNotify(n);
-  
+
+  if (mMinimizeHandler.get () != NULL)
+  {
+    /* The minimize handler will short circuit the frame
+     * region update func and ensure that the frame
+     * does not have a region */
+    typedef compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow> minimized_window_handler_unity;
+
+    compiz::CompizMinimizedWindowHandler<UnityScreen, UnityWindow>::Ptr compizMinimizeHandler =
+        boost::dynamic_pointer_cast <minimized_window_handler_unity> (mMinimizeHandler);
+    compizMinimizeHandler->windowNotify (n);
+  }
+
   // We do this after the notify to ensure input focus has actually been moved.
   if (n == CompWindowNotifyFocusChange)
   {
@@ -2295,10 +2307,25 @@
   WindowInterface::setHandler(window);
   GLWindowInterface::setHandler(gWindow);
 
-  window->focusSetEnabled (this, false);
-  window->minimizedSetEnabled (this, false);
-  window->minimizeSetEnabled (this, false);
-  window->unminimizeSetEnabled (this, false);
+  if (UnityScreen::get (screen)->optionGetShowMinimizedWindows () &&
+      window->mapNum ())
+  {
+    bool wasMinimized = window->minimized ();
+    if (wasMinimized)
+      window->unminimize ();
+    window->minimizeSetEnabled (this, true);
+    window->unminimizeSetEnabled (this, true);
+    window->minimizedSetEnabled (this, true);
+
+    if (wasMinimized)
+      window->minimize ();
+  }
+  else
+  {
+    window->minimizeSetEnabled (this, false);
+    window->unminimizeSetEnabled (this, false);
+    window->minimizedSetEnabled (this, false);
+  }
 
   if (window->state () & CompWindowStateFullscreenMask)
     UnityScreen::get (screen)->fullscreen_windows_.push_back(window);