Merge lp:~robertcarr/unity/webapps into lp:unity

[Robert Carr]

Webapps support for unity

>>158 + if (WindowManager::Default()->IsWindowOnCurrentDesktop(xid) == false)
>> 159 + continue;

>> dNo way to fix this in bamf more than here? However the IsWindowOnCurrentDesktop would only check for the >> viewport..

We would need to add the bamf_window_get_monitor style interface to bamf tab. the way I would really like to solve this is to make BamfWindow and BamfTab both inherit from a BamfViewContainer type class but its a bit difficult to work out exactly how it should work, and certainly at this point.

[Sam Spilsbury (smspillaz)]

30 +
31

Whitespace brigade.

Otherwise looks okay.

Tests?

[Łukasz Zemczak (sil2100)]

Yes, we would probably need it tested. Robert?

[Robert Carr (robertcarr)]

We have a pretty fair amount of autopilot coverage. But it is currently in the middle of being ported to Q. Is this enough? Do we need to get the autopilot tests in the branch or can we agree to land them asap and go ahead and land the functionality?

Pretty worried about feature freeze :)

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

This looks good to me.

review: Approve

[Łukasz Zemczak (sil2100)]

Ok, I approve it as well then - just as I already mentioned on IRC, would be great if you could post here the link to a branch with the AP-tests migration work-in-progress, so that we remember about it and can see how the progress goes. Those autopilot tests are _VERY_ important. Could you post those ASAP?

[Unity Merger (unity-merger)]

No commit message specified.

[Sam Spilsbury (smspillaz)]

(Approved as tests have been assured to come soon)

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1107/console reported an error when processing this lp:~robertcarr/unity/webapps branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1111/console reported an error when processing this lp:~robertcarr/unity/webapps branch.
Not merging it.

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1113/console reported an error when processing this lp:~robertcarr/unity/webapps branch.
Not merging it.

[Timo Jyrinki (timo-jyrinki)]

Should now go through with rev 2609 in.

review: Approve

[Sebastien Bacher (seb128)]

don't approve it, that will need to come in a separate transition, see https://bugs.launchpad.net/ubuntu/+source/bamf/+bug/1040268

basically bamf abi,api changes and the soname needs to be changed and a transition needs to happen in a planned way, that's going to be after ff with a ffe though

[Łukasz Zemczak (sil2100)]

Ok, we're after FF - so we can approve it.

The lp:bamf trunk already has webapps support, so accepting this merge proposal will only help us find possible problems earlier when using unity-team/staging. We'll try releasing everything next week.

=== modified file 'launcher/BamfLauncherIcon.cpp'
--- launcher/BamfLauncherIcon.cpp	2012-08-17 00:27:16 +0000
+++ launcher/BamfLauncherIcon.cpp	2012-08-21 21:50:36 +0000
@@ -39,6 +39,8 @@
 #include <glib/gi18n-lib.h>
 #include <gio/gdesktopappinfo.h>
 
+#include <libbamf/bamf-tab.h>
+
 namespace unity
 {
 namespace launcher
@@ -93,6 +95,12 @@
   sig = new glib::Signal<void, BamfView*, BamfView*>(bamf_view, "child-removed",
                           [&] (BamfView*, BamfView*) { EnsureWindowState(); });
   _gsignals.Add(sig);
+  
+  sig = new glib::Signal<void, BamfView*, BamfView*>(bamf_view, "child-moved",
+                                                     [&] (BamfView *, BamfView *) {
+                                                       EnsureWindowState();
+                                                     });
+  _gsignals.Add(sig);
 
   sig = new glib::Signal<void, BamfView*, gboolean>(bamf_view, "urgent-changed",
                           [&] (BamfView*, gboolean urgent) {
@@ -227,6 +235,7 @@
     wm->Activate(arg.target);
     return;
   }
+  
 
   /* We should check each child to see if there is
    * an unmapped (!= minimized) window around and
@@ -248,12 +257,17 @@
 
       for (GList* l = children; l; l = l->next)
       {
-        if (!BAMF_IS_WINDOW(l->data))
-          continue;
-
         auto view = static_cast<BamfView*>(l->data);
         auto win = static_cast<BamfWindow*>(l->data);
-        Window xid = bamf_window_get_xid(win);
+        Window xid;
+
+        if (BAMF_IS_WINDOW(l->data))
+          xid = bamf_window_get_xid(static_cast<BamfWindow*>(l->data));
+        else if (BAMF_IS_TAB(l->data))
+          xid = bamf_tab_get_xid(static_cast<BamfTab*>(l->data));
+        else
+          continue;
+
 
         if (!any_visible && wm->IsWindowOnCurrentDesktop(xid))
         {
@@ -615,15 +629,45 @@
   OpenInstanceWithUris(empty);
 }
 
-void BamfLauncherIcon::Focus(ActionArg arg)
+std::vector<Window> BamfLauncherIcon::GetFocusableWindows(ActionArg arg, bool &any_visible, bool &any_urgent)
 {
-  bool any_urgent = false;
-  bool any_visible = false;
   bool any_user_visible = false;
   WindowManager* wm = WindowManager::Default();
 
   std::vector<Window> windows;
-  GList* children = bamf_view_get_children(BAMF_VIEW(_bamf_app.RawPtr()));
+  GList* children;
+
+  BamfView *focusable_child = BAMF_VIEW (bamf_application_get_focusable_child (_bamf_app.RawPtr()));
+  
+  if (focusable_child != NULL)
+    {
+      Window xid;
+      
+      if (BAMF_IS_WINDOW (focusable_child))
+        xid = bamf_window_get_xid (BAMF_WINDOW(focusable_child));
+      else if (BAMF_IS_TAB (focusable_child))
+        {
+          BamfTab *focusable_tab = BAMF_TAB (focusable_child);
+          
+          xid = bamf_tab_get_xid (focusable_tab);
+          
+          bamf_tab_raise (focusable_tab);
+        }
+      
+      windows.push_back(xid);
+      return windows;
+    }
+  else
+    {
+      if (g_strcmp0 (bamf_application_get_application_type (_bamf_app.RawPtr()), "webapp") == 0)
+        {
+          OpenInstanceLauncherIcon(arg);
+          
+          return windows;
+        }
+    }
+
+  children = bamf_view_get_children(BAMF_VIEW(_bamf_app.RawPtr()));
 
   /* get the list of windows */
   for (GList* l = children; l; l = l->next)
@@ -667,6 +711,16 @@
   }
 
   g_list_free(children);
+  
+  return windows;
+
+}
+
+void BamfLauncherIcon::Focus(ActionArg arg)
+{
+  bool any_visible = false, any_urgent = false;
+  WindowManager* wm = WindowManager::Default();
+  std::vector<Window> windows = GetFocusableWindows(arg, any_visible, any_urgent);
 
   auto visibility = WindowManager::FocusVisibility::OnlyVisible;
 
@@ -702,11 +756,27 @@
     GList* children = bamf_view_get_children(BAMF_VIEW(_bamf_app.RawPtr()));
     for (GList* l = children; l; l = l->next)
     {
+      Window xid;
+
+      if (BAMF_IS_TAB(l->data))
+      {
+        /* BamfTab does not support the monitor interface...so a bit of a nasty hack here. */
+        xid = bamf_tab_get_xid (static_cast<BamfTab*>(l->data));
+        
+        if (WindowManager::Default()->IsWindowOnCurrentDesktop(xid) == false)
+          continue;
+        
+        for (int j = 0; j < max_num_monitors; j++)
+          monitors[j] = true;
+        
+        continue;
+      }
+
       if (!BAMF_IS_WINDOW(l->data))
         continue;
 
       auto window = static_cast<BamfWindow*>(l->data);
-      Window xid = bamf_window_get_xid(window);
+      xid = bamf_window_get_xid(window);
       int monitor = bamf_window_get_monitor(window);
 
       if (monitor >= 0 && WindowManager::Default()->IsWindowOnCurrentDesktop(xid))
@@ -851,6 +921,12 @@
 
   for (l = children; l; l = l->next)
   {
+    if (BAMF_IS_TAB (l->data))
+    {
+      // As Unity can not close a tab inside the provider application, we have to ask Bamf to delegate for us.
+      bamf_tab_close (BAMF_TAB (l->data));
+      continue;
+    }
     if (!BAMF_IS_WINDOW(l->data))
       continue;
 

=== modified file 'launcher/BamfLauncherIcon.h'
--- launcher/BamfLauncherIcon.h	2012-08-15 02:51:33 +0000
+++ launcher/BamfLauncherIcon.h	2012-08-21 21:50:36 +0000
@@ -111,6 +111,7 @@
 
   void OpenInstanceWithUris(std::set<std::string> uris);
   void Focus(ActionArg arg);
+  std::vector<Window> GetFocusableWindows(ActionArg arg, bool &any_visible, bool &any_urgent);
   bool Spread(bool current_desktop, int state, bool force);
 
   void OnWindowMinimized(guint32 xid);