Merge lp:~3v1n0/unity/fix-688117 into lp:unity

[Marco Trevisan (Treviño)]

Fixing bug #688117

To get this, when all the application windows are in the selected workspace, we had to revert the order we activate the windows, and finally to move the focus to the top one.
Otherwise in the case that all the windows are in a different workspace we need a workaround, and basically before we have to activate the background windows, then wait for the workspace switch to be completed and finally to activate the top window.

/* OLD:
Unfortunately when we do a workspace switch there's no way to do this, and neither re-stacking the top window seems to help. */

Branch updated to give better support to the urgent windows.

[Jason Smith (jassmith)]

Thank you for this branch. It was amazingly helpful in finally fixing the raise bug (though I did not use your code, you made me realize how to fix it). If there is anything I missed please let me know, and if not, please know your code was not a waste but a huge inspiration for the fix (which works cross workspace too).

review: Needs Resubmitting

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

I've made a test with your code, it seems to work in some cases but it's buggy in some others.

For example: focus a window on a viewport, move to another viewport then click over its launcher icon: no viewport switch happens...

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.cpp'
--- plugins/unityshell/src/BamfLauncherIcon.cpp	2011-08-02 19:50:45 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.cpp	2011-08-02 19:50:46 +0000
@@ -137,6 +137,7 @@
   _dnd_hovered = false;
   _launcher = IconManager;
   _menu_desktop_shortcuts = NULL;
+  _delayed_window = NULL;
   char* icon_name = bamf_view_get_icon(BAMF_VIEW(m_App));
 
   tooltip_text = BamfName();
@@ -418,9 +419,11 @@
 {
   GList* children, *l;
   BamfView* view;
+  CompWindow* top_win = NULL;
   bool any_urgent = false;
   bool any_on_current = false;
   bool any_mapped = false;
+  bool any_focused = false;
 
   children = bamf_view_get_children(BAMF_VIEW(m_App));
 
@@ -434,13 +437,22 @@
     if (BAMF_IS_WINDOW(view))
     {
       guint32 xid = bamf_window_get_xid(BAMF_WINDOW(view));
-
       CompWindow* window = m_Screen->findWindow((Window) xid);
 
       if (window)
       {
         if (bamf_view_is_urgent(view))
           any_urgent = true;
+
+        if (m_Screen->activeWindow() == xid)
+          any_focused = true;
+
+        if (window->defaultViewport() == m_Screen->vp())
+          any_on_current = true;
+
+        if (!window->minimized())
+          any_mapped = true;
+
         windows.push_back(window);
       }
     }
@@ -458,75 +470,135 @@
   for (CompWindow* &win : m_Screen->windows())
   {
     if (std::find(windows.begin(), windows.end(), win) != windows.end())
-      tmp.push_back(win);
+      tmp.insert(tmp.begin(), win);
   }
   windows = tmp;
 
-  /* filter based on workspace */
-  for (CompWindow* &win : windows)
-  {
-    if (win->defaultViewport() == m_Screen->vp())
-    {
-      any_on_current = true;
-    }
-
-    if (!win->minimized())
-    {
-      any_mapped = true;
-    }
-
-    if (any_on_current && any_mapped)
-      break;
-  }
+  /*
+     If no window is available in the current viewport we need to activate the
+     other windows placed in the viewport which contains top window.
+     However with the current compiz implementation if there are more of one
+     window in the same viewport we have to activate the background windows
+     before to switch viewport, and finally the top window.
+     This is done using the event that compiz emits on viewport switch.
+  */
+  CompWindowList top_vp_windows;
+  bool use_delayed_activate = false;
 
   if (any_urgent)
   {
     // FIXME we cant use the compiz tracking since it is currently broken
-    /*for (it = windows.begin (); it != windows.end (); it++)
-    {
-      if ((*it)->state () & CompWindowStateDemandsAttentionMask)
-      {
-        (*it)->activate ();
-        break;
-      }
-    }*/
-    for (l = children; l; l = l->next)
-    {
-      view = (BamfView*) l->data;
-
-      if (BAMF_IS_WINDOW(view))
-      {
-        guint32 xid = bamf_window_get_xid(BAMF_WINDOW(view));
-
-        CompWindow* window = m_Screen->findWindow((Window) xid);
-
-        if (window && bamf_view_is_urgent(view))
+    // i.e. checking (win->state () & CompWindowStateDemandsAttentionMask)
+
+    for (CompWindow* &win : windows)
+    {
+      bool is_urgent = false;
+
+      for (l = children; l; l = l->next)
+      {
+        view = (BamfView*) l->data;
+
+        if (BAMF_IS_WINDOW(view) && bamf_view_is_urgent(view) &&
+            win->id() == bamf_window_get_xid(BAMF_WINDOW(view)))
         {
-          window->activate();
+          is_urgent = true;
           break;
         }
       }
+
+      if (is_urgent)
+      {
+        if (!top_win)
+        {
+          top_win = win;
+        }
+        else if (win->defaultViewport() == top_win->defaultViewport())
+        {
+          top_vp_windows.push_back(win);
+        }
+      }
+    }
+
+    if (top_win)
+    {
+      if (top_vp_windows.size() > 0 && top_win->defaultViewport() != m_Screen->vp())
+      {
+        use_delayed_activate = true;
+      }
+      else
+      {
+        top_win->activate();
+      }
     }
   }
-  else if (any_on_current)
+  else if (!any_focused && any_on_current)
   {
     for (CompWindow* &win : windows)
     {
       if (win->defaultViewport() == m_Screen->vp() &&
-          ((any_mapped && !win->minimized()) || !any_mapped))
+          (!any_mapped || (any_mapped && !win->minimized())))
       {
+        if (!top_win)
+          top_win = win;
+
         win->activate();
       }
     }
-  }
-  else
-  {
-    (*(windows.rbegin()))->activate();
+
+    if (top_win)
+      top_win->moveInputFocusTo();
+  }
+  else if (!any_focused)
+  {
+    for (CompWindow* &win : windows)
+    {
+      if (!any_mapped || (any_mapped && !win->minimized()))
+      {
+        if (!top_win)
+        {
+          top_win = win;
+        }
+        else if (win->defaultViewport() == top_win->defaultViewport())
+        {
+          top_vp_windows.push_back(win);
+        }
+      }
+    }
+
+    if (top_vp_windows.size() > 0)
+    {
+      use_delayed_activate = true;
+    }
+    else if (top_win)
+    {
+      top_win->activate();
+    }
+  }
+
+  if (use_delayed_activate && top_vp_windows.size() > 0 && top_win)
+  {
+    _delayed_window = top_win;
+    _delayed_connection = PluginAdapter::Default()->
+                          compiz_screen_viewport_switch_ended.connect(
+                                   sigc::mem_fun(this,
+                                   &BamfLauncherIcon::DelayedActivateWindow));
+
+    for (CompWindow* &win : top_vp_windows)
+      win->activate();
   }
 
   g_list_free(children);
 }
 
+void BamfLauncherIcon::DelayedActivateWindow()
+{
+  if (_delayed_window)
+    _delayed_window->activate();
+
+  _delayed_window = NULL;
+  _delayed_connection.disconnect();
+}
+
 bool BamfLauncherIcon::Spread(int state, bool force)
 {
   BamfView* view;

=== modified file 'plugins/unityshell/src/BamfLauncherIcon.h'
--- plugins/unityshell/src/BamfLauncherIcon.h	2011-08-02 19:50:45 +0000
+++ plugins/unityshell/src/BamfLauncherIcon.h	2011-08-02 19:50:46 +0000
@@ -80,6 +80,8 @@
   std::map<std::string, DbusmenuMenuitem*> _menu_items;
   std::map<std::string, gulong> _menu_callbacks;
   DbusmenuMenuitem* _menu_desktop_shortcuts;
+  sigc::connection _delayed_connection;
+  CompWindow* _delayed_window;
   gchar* _remote_uri;
   bool _dnd_hovered;
   guint _dnd_hover_timer;
@@ -103,6 +105,7 @@
 
   void OnWindowMinimized(guint32 xid);
   void OnViewPortSwitchEnded();
+  void DelayedActivateWindow();
   bool OwnsWindow(Window w);
 
   static void OnClosed(BamfView* view, gpointer data);