Merge lp:~thumper/unity/move-application-manager into lp:unity

[Tim Penhey]

Unmerged revisions

2966. By Tim Penhey on 2012-12-11

Move the application manager into UnityCore.

2965. By Tim Penhey on 2012-12-11

Logging, and change the BamfApplicationManager so it doesn't filter out unmapped windows.

2964. By Tim Penhey on 2012-12-11

Merge prev pipe.

2963. By Tim Penhey on 2012-12-11

Moar logging.

=== renamed file 'unity-shared/ApplicationManager.cpp' => 'UnityCore/ApplicationManager.cpp'
--- unity-shared/ApplicationManager.cpp	2012-12-12 00:49:23 +0000
+++ UnityCore/ApplicationManager.cpp	2012-12-12 00:49:23 +0000
@@ -17,7 +17,7 @@
  * Authored by: Tim Penhey <[e-mail]>
  */
 
-#include "unity-shared/ApplicationManager.h"
+#include "ApplicationManager.h"
 
 
 namespace unity

=== renamed file 'unity-shared/ApplicationManager.h' => 'UnityCore/ApplicationManager.h'
--- unity-shared/ApplicationManager.h	2012-12-12 00:49:23 +0000
+++ UnityCore/ApplicationManager.h	2012-12-12 00:49:23 +0000
@@ -25,7 +25,8 @@
 
 #include <sigc++/signal.h>
 #include <NuxCore/Property.h>
-#include <UnityCore/WindowManager.h>
+
+#include "WindowManager.h"
 
 
 namespace unity

=== renamed file 'unity-shared/BamfApplicationManager.cpp' => 'UnityCore/BamfApplicationManager.cpp'
--- unity-shared/BamfApplicationManager.cpp	2012-12-12 00:49:23 +0000
+++ UnityCore/BamfApplicationManager.cpp	2012-12-12 00:49:23 +0000
@@ -17,7 +17,7 @@
  * Authored by: Tim Penhey <[e-mail]>
  */
 
-#include "unity-shared/BamfApplicationManager.h"
+#include "BamfApplicationManager.h"
 
 #include <NuxCore/Logger.h>
 
@@ -26,6 +26,13 @@
 
 namespace unity
 {
+// This function is used by the static Default method on the ApplicationManager
+// class, and uses link time to make sure there is a function available.
+std::shared_ptr<ApplicationManager> create_application_manager()
+{
+  return std::shared_ptr<ApplicationManager>(new bamf::Manager());
+}
+
 namespace bamf
 {
 namespace
@@ -346,7 +353,7 @@
   if (!bamf_app_)
     return result;
 
-  WindowManager& wm = WindowManager::Default();
+  //WindowManager& wm = WindowManager::Default();
   std::shared_ptr<GList> children(bamf_view_get_children(bamf_view_), g_list_free);
   for (GList* l = children.get(); l; l = l->next)
   {
@@ -355,12 +362,7 @@
     if (!window)
       continue;
 
-    Window window_id = window->window_id();
-
-    if (wm.IsWindowMapped(window_id))
-    {
-      result.push_back(window);
-    }
+    result.push_back(window);
   }
   return result;
 }
@@ -436,6 +438,8 @@
   for (auto& window : GetWindows())
   {
     Window window_id = window->window_id();
+    LOG_DEBUG(logger) << "Window: " << window_id << ", urgent: " << window->urgent()
+                      << ", visible: " << window->visible();
     if (window->urgent())
       urgent_windows.push_back(window_id);
     else if (window->visible())
@@ -461,6 +465,9 @@
   }
   if (!urgent_windows.empty())
   {
+    LOG_DEBUG(logger) << "Urgent windows, FocusWindowGroup, have "
+                      << urgent_windows.size()
+                      << " windows, for monitor " << monitor;
     // Last param is whether to show only the top most window.  In the situation
     // where we have urgent windows, we want to raise all the urgent windows on
     // the current workspace, or the workspace of the top most urgent window.
@@ -468,10 +475,16 @@
   }
   else if (!visible_windows.empty())
   {
+    LOG_DEBUG(logger) << "Visible windows, FocusWindowGroup, have "
+                      << visible_windows.size()
+                      << " windows, for monitor " << monitor;
     wm.FocusWindowGroup(visible_windows, visibility, monitor, true);
   }
   else
   {
+    LOG_DEBUG(logger) << "Non-visible windows, FocusWindowGroup, have "
+                      << non_visible_windows.size()
+                      << " windows, for monitor " << monitor;
     // Not sure what the use case is for this behaviour, but at this stage,
     // copying behaviour from ApplicationLauncherIcon.
     wm.FocusWindowGroup(non_visible_windows, visibility, monitor, true);

=== renamed file 'unity-shared/BamfApplicationManager.h' => 'UnityCore/BamfApplicationManager.h'
--- unity-shared/BamfApplicationManager.h	2012-11-28 08:47:23 +0000
+++ UnityCore/BamfApplicationManager.h	2012-12-12 00:49:23 +0000
@@ -21,10 +21,9 @@
 #define UNITYSHARED_BAMF_APPLICATION_MANAGER_H
 
 #include <libbamf/libbamf.h>
-#include <UnityCore/GLibWrapper.h>
-#include <UnityCore/GLibSignal.h>
-
-#include "unity-shared/ApplicationManager.h"
+#include "GLibWrapper.h"
+#include "GLibSignal.h"
+#include "ApplicationManager.h"
 
 
 namespace unity

=== modified file 'UnityCore/CMakeLists.txt'
--- UnityCore/CMakeLists.txt	2012-12-12 00:49:23 +0000
+++ UnityCore/CMakeLists.txt	2012-12-12 00:49:23 +0000
@@ -1,12 +1,13 @@
 find_package (PkgConfig)
 set(UNITY_CORE_DEPS
-    glib-2.0
-    gio-2.0
     dee-1.0
-    sigc++-2.0
-    nux-core-4.0
     gdk-pixbuf-2.0
+    gio-2.0
+    glib-2.0
     gtk+-3.0>=3.1
+    libbamf3
+    nux-core-4.0
+    sigc++-2.0
     unity-protocol-private
 )
 pkg_check_modules (CORE_DEPS REQUIRED ${UNITY_CORE_DEPS})
@@ -18,6 +19,7 @@
 # Headers & Sources
 #
 set (CORE_HEADERS
+     ApplicationManager.h
      ApplicationPreview.h
      AppmenuIndicator.h
      Categories.h
@@ -68,8 +70,10 @@
     )
 
 set (CORE_SOURCES
+     ApplicationManager.cpp
      ApplicationPreview.cpp
      AppmenuIndicator.cpp
+     BamfApplicationManager.cpp
      Categories.cpp
      Category.cpp
      CheckOptionFilter.cpp

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2012-12-12 00:49:23 +0000
+++ hud/HudController.cpp	2012-12-12 00:49:23 +0000
@@ -20,11 +20,11 @@
 
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
+#include <UnityCore/ApplicationManager.h>
 #include <UnityCore/Variant.h>
 #include <UnityCore/UScreen.h>
 #include <UnityCore/WindowManager.h>
 
-#include "unity-shared/ApplicationManager.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UBusMessages.h"
 

=== modified file 'launcher/AbstractLauncherIcon.h'
--- launcher/AbstractLauncherIcon.h	2012-12-12 00:49:23 +0000
+++ launcher/AbstractLauncherIcon.h	2012-12-12 00:49:23 +0000
@@ -29,9 +29,9 @@
 #include <libdbusmenu-glib/menuitem.h>
 
 #include "DndData.h"
+#include <UnityCore/ApplicationManager.h>
 #include <UnityCore/Introspectable.h>
 #include <UnityCore/WindowManager.h>
-#include <unity-shared/ApplicationManager.h>
 #include "unity-shared/IconTextureSource.h"
 
 #include "LauncherEntryRemote.h"

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2012-11-29 01:50:21 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2012-12-12 00:49:23 +0000
@@ -212,6 +212,11 @@
   SimpleLauncherIcon::ActivateLauncherIcon(arg);
   WindowManager& wm = WindowManager::Default();
 
+  LOG_DEBUG(logger) << "ActivateLauncherIcon: " << tooltip_text()
+                    << ", source: " << arg.source
+                    << ", button: " << arg.button
+                    << ", target: " << arg.target
+                    << ", monitor: " << arg.monitor;
   // This is a little awkward as the target is only set from the switcher.
   if (arg.target)
   {
@@ -251,22 +256,26 @@
         if (!any_visible && wm.IsWindowOnCurrentDesktop(xid))
         {
           any_visible = true;
+          LOG_DEBUG(logger) << "  any_visible is true.";
         }
 
         if (!any_mapped && wm.IsWindowMapped(xid))
         {
           any_mapped = true;
+          LOG_DEBUG(logger) << "  any_mapped is true.";
         }
 
         if (!any_on_top && wm.IsWindowOnTop(xid))
         {
           any_on_top = true;
+          LOG_DEBUG(logger) << "  any_on_top is true.";
         }
 
         if (!any_on_monitor && window->monitor() == arg.monitor &&
             wm.IsWindowMapped(xid) && wm.IsWindowVisible(xid))
         {
           any_on_monitor = true;
+          LOG_DEBUG(logger) << "  any_on_monitor is true.";
         }
 
         if (window->active())
@@ -293,6 +302,8 @@
 
   if (!IsRunning() || (IsRunning() && !user_visible)) // #1 above
   {
+    LOG_DEBUG(logger) << "  1) Nothing running, or nothing visible -> launch application";
+
     if (GetQuirk(Quirk::STARTING))
       return;
 
@@ -305,10 +316,12 @@
     {
       if (scaleWasActive) // #5 above
       {
+        LOG_DEBUG(logger) << "  5) Spread is active -> Spread de-activated, and fall through";
         Focus(arg);
       }
       else // #2 above
       {
+        LOG_DEBUG(logger) << "  2) Running and active -> spread application";
         if (arg.source != ActionArg::SWITCHER)
         {
           Spread(true, 0, false);
@@ -319,12 +332,14 @@
     {
       if (scaleWasActive) // #4 above
       {
+        LOG_DEBUG(logger) << "  4) Spread is active and different icon pressed -> change spread";
         Focus(arg);
         if (arg.source != ActionArg::SWITCHER)
           Spread(true, 0, false);
       }
       else // #3 above
       {
+        LOG_DEBUG(logger) << "  3) Running and not active -> focus application";
         Focus(arg);
       }
     }
@@ -536,18 +551,20 @@
   ApplicationWindowPtr window = app_->GetFocusableWindow();
   if (window)
   {
-    // If we have a window, try to focus it.
+    LOG_DEBUG(logger) << "We have a window, try to focus it.";
     if (window->Focus())
       return;
   }
   else if (app_->type() == "webapp")
   {
-    // Webapps are again special.
+    LOG_DEBUG(logger) << "Webapps are special.";
     OpenInstanceLauncherIcon();
     return;
   }
 
   bool show_only_visible = arg.source == ActionArg::SWITCHER;
+  LOG_DEBUG(logger) << "Focus the windows for the app, show_only_visible: "
+                    << show_only_visible << " for monitor: " << arg.monitor;
   app_->Focus(show_only_visible, arg.monitor);
 }
 

=== modified file 'launcher/CMakeLists.txt'
--- launcher/CMakeLists.txt	2012-12-12 00:49:23 +0000
+++ launcher/CMakeLists.txt	2012-12-12 00:49:23 +0000
@@ -100,7 +100,6 @@
 set (LAUNCHER_LIBS
     launcher-lib
     unity-shared
-    unity-shared-bamf
     )
 
 #

=== modified file 'launcher/MockLauncherIcon.h'
--- launcher/MockLauncherIcon.h	2012-11-28 22:00:12 +0000
+++ launcher/MockLauncherIcon.h	2012-12-12 00:49:23 +0000
@@ -32,7 +32,7 @@
 #include <sigc++/sigc++.h>
 
 #include <libdbusmenu-glib/menuitem.h>
-#include "unity-shared/ApplicationManager.h"
+#include <UnityCore/ApplicationManager.h>
 
 #include "AbstractLauncherIcon.h"
 

=== modified file 'plugins/unityshell/CMakeLists.txt'
--- plugins/unityshell/CMakeLists.txt	2012-12-12 00:49:23 +0000
+++ plugins/unityshell/CMakeLists.txt	2012-12-12 00:49:23 +0000
@@ -11,7 +11,7 @@
                LIBDIRS "${CMAKE_BINARY_DIR}/UnityCore"
                )
 add_dependencies(unityshell unity-core-${UNITY_API_VERSION} dash-lib launcher-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared)
-target_link_libraries(unityshell unity-core-${UNITY_API_VERSION} launcher-lib dash-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared unity-shared-bamf)
+target_link_libraries(unityshell unity-core-${UNITY_API_VERSION} launcher-lib dash-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared)
 set_target_properties(unityshell
                       PROPERTIES INSTALL_RPATH "${CACHED_UNITY_PRIVATE_DEPS_LIBRARY_DIRS}"
                       INSTALL_RPATH_USE_LINK_PATH TRUE)

=== modified file 'plugins/unityshell/src/PluginAdapter.cpp'
--- plugins/unityshell/src/PluginAdapter.cpp	2012-12-12 00:49:23 +0000
+++ plugins/unityshell/src/PluginAdapter.cpp	2012-12-12 00:49:23 +0000
@@ -35,6 +35,13 @@
 const char* _UNITY_FRAME_EXTENTS = "_UNITY_FRAME_EXTENTS";
 
 PluginAdapter* global_instance = nullptr;
+
+std::ostream& operator<<(std::ostream& o, CompPoint const& p)
+{
+  o << "(" << p.x() << ", " << p.y() << ")";
+  return o;
+}
+
 }
 
 #define MAXIMIZABLE (CompWindowActionMaximizeHorzMask & CompWindowActionMaximizeVertMask & CompWindowActionResizeMask)
@@ -735,6 +742,12 @@
   CompWindow* top_window = nullptr;
   CompWindow* top_monitor_win = nullptr;
 
+  LOG_DEBUG(logger) << "FocusWindowGroup, given " << window_ids.size()
+                    << " windows, focus_vis: " << static_cast<int>(focus_visibility)
+                    << ", monitor: " << monitor
+                    << ", only_top_win: " << only_top_win
+                    << ", target_vp: " << target_vp;
+
   // mapped windows are visible windows (non-minimised)
   bool any_on_current = false;
   bool any_mapped = false;
@@ -749,6 +762,7 @@
     if (std::find(window_ids.begin(), window_ids.end(), id) != window_ids.end())
       windows.push_back(win);
   }
+  LOG_DEBUG(logger) << "  " << windows.size() << " compiz windows found.";
 
   // Work out if there are any visible windows on the current view port.
   for (CompWindow* &win : windows)
@@ -772,7 +786,7 @@
   }
 
   // If we don't find any windows on the current view port, we need to look
-  // for the view port of the maooed window.  Or if there are not any mapped
+  // for the view port of the mapped window.  Or if there are not any mapped
   // windows, then just choosing any view port is fine.
   if (!any_on_current)
   {
@@ -787,10 +801,13 @@
         break;
       }
     }
+    LOG_DEBUG(logger) << "  No windows on current view port, target_vp now "
+                      << target_vp;
   }
 
   for (CompWindow* &win : windows)
   {
+    LOG_DEBUG(logger) << "  win->defaultViewport() == " << win->defaultViewport();
     if (win->defaultViewport() == target_vp)
     {
       int win_monitor = GetWindowMonitor(win->id());
@@ -804,6 +821,7 @@
           (focus_visibility == WindowManager::FocusVisibility::ForceUnminimizeInvisible &&
            win->mapNum() == 0))
       {
+        LOG_DEBUG(logger) << "  force visibility";
         top_window = win;
         forced_unminimize = true;
 
@@ -814,14 +832,19 @@
         {
           bool is_mapped = (win->mapNum() != 0);
           win->unminimize();
+          LOG_DEBUG(logger) << "  unminimizing window just to be sure";
 
            /* Initially minimized windows dont get raised */
           if (!is_mapped)
+          {
             win->raise();
+            LOG_DEBUG(logger) << "  win not mapped, raising";
+          }
         }
       }
       else if ((any_mapped_on_current && !win->minimized()) || !any_mapped_on_current)
       {
+        LOG_DEBUG(logger) << "  not even sure what to say here";
         if (!forced_unminimize || target_vp == m_Screen->vp())
         {
           top_window = win;
@@ -831,6 +854,7 @@
 
           if (!only_top_win)
             win->raise();
+          LOG_DEBUG(logger) << "  record top window";
         }
       }
     }
@@ -844,14 +868,17 @@
     if (only_top_win)
     {
       if (forced_unminimize)
-        {
-          top_window->unminimize();
-        }
+      {
+        top_window->unminimize();
+        LOG_DEBUG(logger) << "  unminimize the top window";
+      }
 
       top_window->raise();
+      LOG_DEBUG(logger) << "  raise the top window";
     }
 
     top_window->activate();
+    LOG_DEBUG(logger) << "  activate the top window";
   }
 }
 

=== modified file 'tests/mock-application.h'
--- tests/mock-application.h	2012-11-28 09:34:44 +0000
+++ tests/mock-application.h	2012-12-12 00:49:23 +0000
@@ -20,7 +20,7 @@
 #define TESTS_MOCK_APPLICATION_H
 
 #include <map>
-#include "unity-shared/ApplicationManager.h"
+#include <UnityCore/ApplicationManager.h>
 
 
 namespace testmocks

=== removed file 'unity-shared/BamfApplicationManagerFactory.cpp'
--- unity-shared/BamfApplicationManagerFactory.cpp	2012-11-28 03:44:41 +0000
+++ unity-shared/BamfApplicationManagerFactory.cpp	1970-01-01 00:00:00 +0000
@@ -1,31 +0,0 @@
-// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
-/*
- * Copyright (C) 2012 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: Tim Penhey <[e-mail]>
- */
-
-#include "unity-shared/BamfApplicationManager.h"
-
-namespace unity
-{
-// This function is used by the static Default method on the ApplicationManager
-// class, and uses link time to make sure there is a function available.
-std::shared_ptr<ApplicationManager> create_application_manager()
-{
-    return std::shared_ptr<ApplicationManager>(new bamf::Manager());
-}
-
-}

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2012-12-12 00:49:23 +0000
+++ unity-shared/CMakeLists.txt	2012-12-12 00:49:23 +0000
@@ -25,7 +25,6 @@
 #
 set (UNITY_SHARED_SOURCES
      AbstractSeparator.cpp
-     ApplicationManager.cpp
      Animator.cpp
      BGHash.cpp
      CoverArt.cpp
@@ -84,22 +83,8 @@
 target_link_libraries (unity-shared ${LIBS})
 add_dependencies (unity-shared unity-core-${UNITY_API_VERSION})
 
-#
-# We also need to build compiz specific parts and standalone variants of those parts
-#
-
-if (ENABLE_X_SUPPORT)
-  # bamf application manager
-  set (UNITY_SHARED_BAMF_SOURCES
-    BamfApplicationManager.cpp
-    BamfApplicationManagerFactory.cpp
-    )
-  add_library (unity-shared-bamf STATIC ${UNITY_SHARED_BAMF_SOURCES})
-  target_link_libraries (unity-shared-bamf ${LIBS})
-  add_dependencies (unity-shared-bamf unity-shared)
-endif()
 
 add_executable (app-manager StandaloneAppManager.cpp)
-add_dependencies (app-manager  unity-shared unity-shared-bamf)
-target_link_libraries (app-manager  unity-shared unity-shared-bamf)
+add_dependencies (app-manager unity-shared)
+target_link_libraries (app-manager unity-shared)
 

=== modified file 'unity-shared/StandaloneAppManager.cpp'
--- unity-shared/StandaloneAppManager.cpp	2012-12-12 00:49:23 +0000
+++ unity-shared/StandaloneAppManager.cpp	2012-12-12 00:49:23 +0000
@@ -25,9 +25,9 @@
 #include <gtk/gtk.h>
 #include <signal.h>
 
-#include "unity-shared/ApplicationManager.h"
-#include "UnityCore/GLibSource.h"
-#include "UnityCore/StandaloneWindowManager.h"
+#include <UnityCore/ApplicationManager.h>
+#include <UnityCore/GLibSource.h>
+#include <UnityCore/StandaloneWindowManager.h>
 
 using namespace std;
 using namespace unity;

=== modified file 'unity-standalone/CMakeLists.txt'
--- unity-standalone/CMakeLists.txt	2012-12-12 00:49:23 +0000
+++ unity-standalone/CMakeLists.txt	2012-12-12 00:49:23 +0000
@@ -35,5 +35,4 @@
                        launcher-lib
                        panel-lib
                        unity-shared
-                       unity-shared-bamf
                        )