Merge lp:~3v1n0/unity/switcher-activenumber-overflow-fix-7.0 into lp:unity

[Marco Trevisan (Treviño)]

SwitcherController: use proper long long types for WindowActiveNumber

Otherwise an overflow can cause bad window selection after long uptime.

Backporting lp:~3v1n0/unity/switcher-activenumber-overflow-fix/+merge/164549 to unity-7.0

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3321
http://jenkins.qa.ubuntu.com/job/unity-ci/77/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/81
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/77
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/77

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/77/rebuild

review: Approve (continuous-integration)

=== modified file 'dash/previews/MusicPreview.cpp'
=== modified file 'dash/previews/MusicPreview.h'
=== modified file 'debian/changelog'
--- debian/changelog	2013-05-09 16:26:04 +0000
+++ debian/changelog	2013-05-17 22:08:29 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 unity (7.0.0daily13.05.08ubuntu.unity.experimental.certified-0ubuntu1) raring; urgency=low
 
   [ Nick Dedekind ]
@@ -138,6 +139,54 @@
 
  -- Ubuntu daily release <[e-mail]>  Wed, 10 Apr 2013 07:16:02 +0000
 
+=======
+unity (7.0.0daily13.05.08~13.04-0ubuntu1) raring; urgency=low
+
+  [ Sebastien Bacher ]
+  * Some untranslatable and wrong strings in the previews (LP: #1074038)
+
+  [ Andrea Azzarone ]
+  * [alt-tab] Disable detail view for webapp icons. (LP: #1169340)
+
+  [ Marco Trevisan (Treviño) ]
+  * Launcher - count label pops out in auto-hide mode (LP: #1171476)
+  * Panel shadow is drawn above full-screen windows when notifications
+    are shown (LP: #1171934)
+  * [regression] Icon count is not shown if the icon is not transformed
+    (LP: #1171663)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3314
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 08 May 2013 04:37:10 +0000
+
+unity (7.0.0daily13.04.18~13.04-0ubuntu1) raring; urgency=low
+
+  [ Manuel de la Pena ]
+  * Purchased songs won't download when not logged to U1 (LP: #1168674)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3309
+
+ -- Ubuntu daily release <[e-mail]>  Thu, 18 Apr 2013 05:43:34 +0000
+
+unity (7.0.0daily13.04.17~13.04-0ubuntu1) raring; urgency=low
+
+  [ Marco Trevisan (Treviño) ]
+  * Top Bar, window managment - top bar shadow not falling on restored
+    windows that are partially off the top edge of the screen (LP:
+    #871758)
+
+  [ Matthieu James ]
+  * [UIFe] BFB icon swirl should run clockwise not anti-clockwise (LP:
+    #1169238)
+
+  [ Ubuntu daily release ]
+  * Automatic snapshot from revision 3305
+
+ -- Ubuntu daily release <[e-mail]>  Wed, 17 Apr 2013 04:07:04 +0000
+
+>>>>>>> MERGE-SOURCE
 unity (7.0.0daily13.04.15-0ubuntu1) raring; urgency=low
 
   [ Brandon Schaefer ]

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
=== modified file 'launcher/LauncherIcon.cpp'
=== modified file 'launcher/MockLauncherIcon.h'
=== modified file 'launcher/SwitcherController.cpp'
--- launcher/SwitcherController.cpp	2013-04-18 14:04:10 +0000
+++ launcher/SwitcherController.cpp	2013-05-17 22:08:29 +0000
@@ -649,15 +649,15 @@
     return;
   }
 
-  unsigned int first_highest = 0;
-  unsigned int first_second = 0; // first icons second highest active
-  unsigned int second_first = 0; // second icons first highest active
+  unsigned long long first_highest = 0;
+  unsigned long long first_second = 0; // first icons second highest active
+  unsigned long long second_first = 0; // second icons first highest active
 
   WindowManager& wm = WindowManager::Default();
   for (auto& window : first->Windows())
   {
-    guint32 xid = window->window_id();
-    unsigned int num = wm.GetWindowActiveNumber(xid);
+    Window xid = window->window_id();
+    unsigned long long num = wm.GetWindowActiveNumber(xid);
 
     if (num > first_highest)
     {
@@ -670,11 +670,7 @@
     }
   }
 
-  for (auto& window : second->Windows())
-  {
-    guint32 xid = window->window_id();
-    second_first = std::max<unsigned long long>(wm.GetWindowActiveNumber(xid), second_first);
-  }
+  second_first = second->SwitcherPriority();
 
   if (first_second > second_first)
     model_->Select(first);

=== modified file 'plugins/unityshell/src/unityshell.cpp'
=== modified file 'po/POTFILES.in'
=== modified file 'tests/autopilot/unity/tests/__init__.py'
=== modified file 'tests/autopilot/unity/tests/test_panel.py'
=== modified file 'tests/test_application_launcher_icon.cpp'
--- tests/test_application_launcher_icon.cpp	2013-04-17 19:16:54 +0000
+++ tests/test_application_launcher_icon.cpp	2013-05-17 22:08:29 +0000
@@ -29,7 +29,6 @@
 #include "FavoriteStore.h"
 #include "StandaloneWindowManager.h"
 #include "mock-application.h"
-#include "StandaloneWindowManager.h"
 #include "test_utils.h"
 
 using namespace testing;

=== modified file 'tests/test_switcher_controller.cpp'
--- tests/test_switcher_controller.cpp	2013-04-17 19:16:54 +0000
+++ tests/test_switcher_controller.cpp	2013-05-17 22:08:29 +0000
@@ -84,7 +84,7 @@
   EXPECT_CALL(*mock_window_, ShowWindow(true, _)).Times(AtLeast(1));
 
   controller_->Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, icons_);
-  Utils::WaitForTimeoutMSec(200);
+  Utils::WaitUntilMSec([this] { return controller_->Visible(); });
   EXPECT_TRUE(controller_->Visible());
   EXPECT_TRUE(controller_->StartIndex() == 1);
 }
@@ -97,7 +97,7 @@
   ASSERT_TRUE(controller_->IsShowDesktopDisabled());
 
   controller_->Show(ShowMode::ALL, SortMode::LAUNCHER_ORDER, icons_);
-  Utils::WaitForTimeoutMSec(200);
+  Utils::WaitUntilMSec([this] { return controller_->Visible(); });
   ASSERT_TRUE(controller_->StartIndex() == 0);
   Selection selection = controller_->GetCurrentSelection();
   EXPECT_NE(selection.application_->tooltip_text(), "Show Desktop");
@@ -120,6 +120,31 @@
   EXPECT_FALSE(selection.application_);
 }
 
+TEST_F(TestSwitcherController, ShowSwitcherSelectsWindowOfActiveApp)
+{
+  // Making the first application active
+  auto const& first_app = icons_[1];
+  first_app->SetQuirk(launcher::AbstractLauncherIcon::Quirk::ACTIVE, true);
+
+  // Raising the priority of the second window of the first app
+  auto first_app_windows = first_app->Windows();
+  auto first_app_last_window = first_app_windows.back();
+  auto standalone = WM->GetWindowByXid(first_app_last_window->window_id());
+  standalone->active_number = WM->GetWindowActiveNumber(first_app_windows.front()->window_id()) - 1;
+
+  // Setting the active number of the first window of the second app to max uint
+  auto second_app_first_window = icons_[2]->Windows().front();
+  standalone = WM->GetWindowByXid(second_app_first_window->window_id());
+  standalone->active_number = std::numeric_limits<unsigned>::max();
+
+  controller_->Show(ShowMode::CURRENT_VIEWPORT, SortMode::FOCUS_ORDER, icons_);
+  Utils::WaitUntilMSec([this] { return controller_->Visible(); });
+
+  Selection selection = controller_->GetCurrentSelection();
+  ASSERT_EQ(selection.application_, first_app);
+  EXPECT_EQ(selection.window_, first_app_last_window->window_id());
+}
+
 TEST_F(TestSwitcherController, Opacity)
 {
   EXPECT_EQ(controller_->Opacity(), 0.0f);

=== modified file 'tests/test_switcher_controller.h'
--- tests/test_switcher_controller.h	2013-04-17 19:16:54 +0000
+++ tests/test_switcher_controller.h	2013-05-17 22:08:29 +0000
@@ -28,6 +28,7 @@
 #include "test_utils.h"
 #include "DesktopLauncherIcon.h"
 #include "SimpleLauncherIcon.h"
+#include "StandaloneWindowManager.h"
 #include "SwitcherController.h"
 #include "SwitcherView.h"
 #include "TimeUtil.h"
@@ -51,7 +52,7 @@
 class FakeApplicationWindow : public unity::ApplicationWindow
 {
 public:
-  FakeApplicationWindow(Window xid);
+  FakeApplicationWindow(Window xid, unsigned long long active_number = 0);
 
   std::string title() const;
   virtual std::string icon() const;
@@ -62,6 +63,7 @@
   virtual unity::ApplicationPtr application() const;
   virtual bool Focus() const;
   virtual void Quit() const;
+
 private:
   Window xid_;
 };
@@ -69,8 +71,9 @@
 /**
  * A fake LauncherIcon for verifying selection operations of the switcher.
  */
-class FakeLauncherIcon : public unity::launcher::SimpleLauncherIcon
+struct FakeLauncherIcon : unity::launcher::SimpleLauncherIcon
 {
+<<<<<<< TREE
 public:
   FakeLauncherIcon(std::string const& app_name, bool allow_detail_view, unsigned priority);
 
@@ -81,6 +84,16 @@
 private:
   bool allow_detail_view_;
   unsigned   priority_;
+=======
+  FakeLauncherIcon(std::string const& app_name, bool allow_detail_view, unsigned long long priority);
+
+  unity::WindowList Windows() override;
+  bool AllowDetailViewInSwitcher() const override;
+  unsigned long long SwitcherPriority() override;
+
+  bool allow_detail_view_;
+  unsigned long long priority_;
+>>>>>>> MERGE-SOURCE
   unity::WindowList window_list;
 };
 
@@ -96,6 +109,7 @@
   // required to create hidden secret global variables before test objects
   unity::Settings unity_settings_;
 
+  unity::StandaloneWindowManager* WM;
   nux::animation::TickSource tick_source_;
   nux::animation::AnimationController animation_controller_;
   unity::testmocks::MockBaseWindow::Ptr mock_window_;

=== modified file 'tests/test_switcher_controller_class.cpp'
--- tests/test_switcher_controller_class.cpp	2013-04-17 19:16:54 +0000
+++ tests/test_switcher_controller_class.cpp	2013-05-17 22:08:29 +0000
@@ -25,7 +25,14 @@
 using namespace unity::switcher;
 using namespace std::chrono;
 
-FakeApplicationWindow::FakeApplicationWindow(Window xid) : xid_(xid) {}
+FakeApplicationWindow::FakeApplicationWindow(Window xid, unsigned long long active_number)
+  : xid_(xid)
+{
+  auto WM = dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default());
+  auto standalone_window = std::make_shared<StandaloneWindow>(xid_);
+  standalone_window->active_number = active_number;
+  WM->AddStandaloneWindow(standalone_window);
+}
 
 std::string FakeApplicationWindow::title() const { return "FakeApplicationWindow"; }
 std::string FakeApplicationWindow::icon() const { return ""; }
@@ -35,14 +42,18 @@
 int FakeApplicationWindow::monitor() const { return -1; }
 ApplicationPtr FakeApplicationWindow::application() const { return ApplicationPtr(); }
 bool FakeApplicationWindow::Focus() const { return false; }
-void FakeApplicationWindow::Quit() const {}
+void FakeApplicationWindow::Quit() const { WindowManager::Default().Close(xid_); }
 
+<<<<<<< TREE
 FakeLauncherIcon::FakeLauncherIcon(std::string const& app_name, bool allow_detail_view, unsigned priority)
+=======
+FakeLauncherIcon::FakeLauncherIcon(std::string const& app_name, bool allow_detail_view, unsigned long long priority)
+>>>>>>> MERGE-SOURCE
   : launcher::SimpleLauncherIcon(IconType::APPLICATION)
   , allow_detail_view_(allow_detail_view)
   , priority_(priority)
-  , window_list{ std::make_shared<FakeApplicationWindow>(priority_ | 0x0001),
-                 std::make_shared<FakeApplicationWindow>(priority_ | 0x0002) }
+  , window_list{ std::make_shared<FakeApplicationWindow>(priority_ | 0x0001, SwitcherPriority()),
+                 std::make_shared<FakeApplicationWindow>(priority_ | 0x0002, priority_) }
 {
   tooltip_text = app_name;
 }
@@ -59,7 +70,7 @@
 
 unsigned long long FakeLauncherIcon::SwitcherPriority()
 {
-  return 0xffffffff - priority_;
+  return std::numeric_limits<unsigned long long>::max() - priority_;
 }
 
 /**
@@ -67,7 +78,8 @@
  */
 //class TestSwitcherController : public testing::Test
 TestSwitcherController::TestSwitcherController()
-  : animation_controller_(tick_source_)
+  : WM(dynamic_cast<StandaloneWindowManager*>(&WindowManager::Default()))
+  , animation_controller_(tick_source_)
   , mock_window_(new NiceMock<testmocks::MockBaseWindow>())
 {
   ON_CALL(*mock_window_, SetOpacity(_))

=== modified file 'tests/test_switcher_controller_slow.cpp'
--- tests/test_switcher_controller_slow.cpp	2013-03-19 01:13:43 +0000
+++ tests/test_switcher_controller_slow.cpp	2013-05-17 22:08:29 +0000
@@ -69,17 +69,22 @@
 
   controller_->Next();
   selection = controller_->GetCurrentSelection();
-  EXPECT_EQ(selection.application_->tooltip_text(), "Show Desktop");
-  EXPECT_EQ(selection.window_, 0);
-
-  controller_->Next();
-  selection = controller_->GetCurrentSelection();
-  EXPECT_EQ(selection.application_->tooltip_text(), "First");
+  ASSERT_EQ(selection.application_->tooltip_text(), "Third");
+  EXPECT_EQ(selection.window_, 0);
+
+  controller_->Next();
+  selection = controller_->GetCurrentSelection();
+  ASSERT_EQ(selection.application_->tooltip_text(), "Show Desktop");
+  EXPECT_EQ(selection.window_, 0);
+
+  controller_->Next();
+  selection = controller_->GetCurrentSelection();
+  ASSERT_EQ(selection.application_->tooltip_text(), "First");
   EXPECT_EQ(selection.window_, 0);
 
   Utils::WaitForTimeoutMSec(details_timeout * 1.1);
   selection = controller_->GetCurrentSelection();
-  EXPECT_EQ(selection.application_->tooltip_text(), "First");
+  ASSERT_EQ(selection.application_->tooltip_text(), "First");
   EXPECT_EQ(selection.window_, 0x0101);
 
 

=== modified file 'unity-shared/PreviewStyle.cpp'
--- unity-shared/PreviewStyle.cpp	2013-05-09 16:26:04 +0000
+++ unity-shared/PreviewStyle.cpp	2013-05-17 22:08:29 +0000
@@ -294,6 +294,7 @@
   return 12;
 }
 
+<<<<<<< TREE
 std::string Style::payment_title_font() const
 {
   return "Ubuntu 22";
@@ -383,6 +384,13 @@
   return "Ubuntu Bold 11.5";
 }
 
+=======
+std::string Style::u1_warning_font() const
+{
+  return "Ubuntu Bold 11.5";
+}
+
+>>>>>>> MERGE-SOURCE
 float Style::GetVideoImageAspectRatio() const
 {
   return float(540)/380;
@@ -492,6 +500,7 @@
   return pimpl->preview_pause_texture_.texture();
 }
 
+<<<<<<< TREE
 nux::BaseTexture* Style::GetLockIcon()
 {
   return nux::CreateTexture2DFromFile(
@@ -503,6 +512,13 @@
   return pimpl->warning_icon_texture_.texture();
 }
 
+=======
+nux::BaseTexture* Style::GetWarningIcon()
+{
+  return pimpl->warning_icon_texture_.texture();
+}
+
+>>>>>>> MERGE-SOURCE
 nux::BaseTexture* Style::GetSearchSpinIcon(int size)
 {
   return pimpl->preview_spin_texture_.texture(size);

=== modified file 'unity-shared/PreviewStyle.h'
=== modified file 'unity-shared/StandaloneWindowManager.cpp'
--- unity-shared/StandaloneWindowManager.cpp	2013-02-21 13:43:48 +0000
+++ unity-shared/StandaloneWindowManager.cpp	2013-05-17 22:08:29 +0000
@@ -39,6 +39,7 @@
   , geo(nux::Geometry(0, 0, 10, 10))
   , current_desktop(0)
   , monitor(0)
+  , active_number(0)
   , active(false)
   , mapped(true)
   , visible(true)
@@ -480,6 +481,10 @@
 
 unsigned long long StandaloneWindowManager::GetWindowActiveNumber(Window window_id) const
 {
+  auto window = GetWindowByXid(window_id);
+  if (window)
+    return window->active_number;
+
   return 0;
 }
 

=== modified file 'unity-shared/StandaloneWindowManager.h'
--- unity-shared/StandaloneWindowManager.h	2013-02-09 16:06:56 +0000
+++ unity-shared/StandaloneWindowManager.h	2013-05-17 22:08:29 +0000
@@ -44,6 +44,7 @@
   nux::Size deco_sizes[4];
   unsigned current_desktop;
   unsigned monitor;
+  unsigned long long active_number;
   nux::Property<bool> active;
   nux::Property<bool> mapped;
   nux::Property<bool> visible;
@@ -146,6 +147,7 @@
   virtual std::string GetWindowName(Window window_id) const;
 
   // Mock functions
+  StandaloneWindow::Ptr GetWindowByXid(Window window_id) const;
   void AddStandaloneWindow(StandaloneWindow::Ptr const& window);
   std::list<StandaloneWindow::Ptr> GetStandaloneWindows() const;
 
@@ -160,8 +162,6 @@
   virtual void AddProperties(GVariantBuilder* builder);
 
 private:
-  StandaloneWindow::Ptr GetWindowByXid(Window window_id) const;
-
   bool expo_state_;
   bool in_show_desktop_;
   bool scale_active_;