Merge lp:~azzar1/unity/fix-991637-6.0 into lp:unity

[Andrea Azzarone]

== Problem ==
unity launcher vanishes when switching to mirrored displays

== Test ==
Unit test added.

=== modified file 'dash/previews/PreviewContainer.cpp'
--- dash/previews/PreviewContainer.cpp	2013-01-16 15:43:38 +0000
+++ dash/previews/PreviewContainer.cpp	2013-02-14 20:05:37 +0000
@@ -586,8 +586,13 @@
 
 float PreviewContainer::GetSwipeAnimationProgress(struct timespec const& current) const
 {
+<<<<<<< TREE
   DeltaTime time_delta = TimeUtil::TimeDelta(&current, &last_progress_time_);
   float progress = preview_layout_->GetAnimationProgress() + (navigation_progress_speed_ * time_delta);
+=======
+  DeltaTime time_delta = TimeUtil::TimeDelta(&current, &last_progress_time_);
+  float progress = content_layout_->GetAnimationProgress() + (navigation_progress_speed_ * time_delta);
+>>>>>>> MERGE-SOURCE
 
   return progress;
 }

=== modified file 'hud/HudController.cpp'
--- hud/HudController.cpp	2013-01-17 21:39:37 +0000
+++ hud/HudController.cpp	2013-02-14 20:05:37 +0000
@@ -357,6 +357,8 @@
     focused_app_icon_ = PKGDATADIR "/launcher_bfb.png";
   }
 
+  WindowManager::Default()->saveInputFocus();
+
   LOG_DEBUG(logger) << "Taking application icon: " << focused_app_icon_;
   SetIcon(focused_app_icon_);
 

=== modified file 'launcher/Launcher.cpp'
=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2013-02-09 15:16:41 +0000
+++ launcher/LauncherController.cpp	2013-02-14 20:05:37 +0000
@@ -216,7 +216,7 @@
       launchers[i] = nux::ObjectPtr<Launcher>(CreateLauncher());
     }
 
-    int monitor = (num_launchers == 1) ? primary : i;
+    int monitor = (num_launchers == 1 && num_monitors > 1) ? primary : i;
 
     if (launchers[i]->monitor() != monitor)
     {

=== modified file 'launcher/SwitcherView.cpp'
--- launcher/SwitcherView.cpp	2013-02-07 17:06:56 +0000
+++ launcher/SwitcherView.cpp	2013-02-14 20:05:37 +0000
@@ -253,8 +253,15 @@
 
 nux::Geometry SwitcherView::UpdateRenderTargets(float progress)
 {
+<<<<<<< TREE
   std::vector<Window> const& xids = model_->DetailXids();
   render_targets_.clear();
+=======
+  std::vector<Window> xids = model_->DetailXids ();
+
+  DeltaTime ms_since_change = TimeUtil::TimeDelta(&current, &save_time_);
+  float progress = MIN (1.0f, (float) ms_since_change / (float) animation_length());
+>>>>>>> MERGE-SOURCE
 
   for (Window window : xids)
   {
@@ -517,7 +524,12 @@
       ++i;
     }
 
+<<<<<<< TREE
     if (saved_args_.size () == results.size () && progress < 1.0f)
+=======
+    DeltaTime ms_since_change = TimeUtil::TimeDelta(&current, &save_time_);
+    if (saved_args_.size () == results.size () && ms_since_change < animation_length)
+>>>>>>> MERGE-SOURCE
     {
       std::list<RenderArg> end = results;
       results.clear();
@@ -623,7 +635,14 @@
     nux::GetPainter().PopPaintLayerStack();
   }
 
-  DeltaTime ms_since_change = TimeUtil::TimeDelta(&current_, &save_time_);
+<<<<<<< TREE
+  DeltaTime ms_since_change = TimeUtil::TimeDelta(&current_, &save_time_);
+=======
+  text_view_->SetBaseY(last_background_.y + last_background_.height - 45);
+  text_view_->Draw(GfxContext, force_draw);
+
+  DeltaTime ms_since_change = TimeUtil::TimeDelta(&current_, &save_time_);
+>>>>>>> MERGE-SOURCE
 
   if (ms_since_change < animation_length && !redraw_idle_)
   {

=== modified file 'panel/PanelMenuView.cpp'
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2013-02-08 18:31:30 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-02-14 20:05:37 +0000
@@ -1436,6 +1436,7 @@
         view->QueueDraw();
     }
   }
+<<<<<<< TREE
 
   if (switcher_controller_ && switcher_controller_->Visible())
   {
@@ -1450,6 +1451,22 @@
         view->QueueDraw();
     }
   }
+=======
+
+  if (switcher_controller_ && switcher_controller_->Visible())
+  {
+    unity::switcher::SwitcherView* view = switcher_controller_->GetView();
+
+    if (G_LIKELY(view))
+    {
+      nux::Geometry const& geo = view->GetAbsoluteGeometry();
+      CompRegion switcher_region(geo.x, geo.y, geo.width, geo.height);
+
+      if (damage.intersects(switcher_region))
+        view->QueueDraw();
+    }
+  }
+>>>>>>> MERGE-SOURCE
 }
 
 /* Grab changed nux regions and add damage rects for them */
@@ -3671,7 +3688,11 @@
         int text_x = win::decoration::ITEMS_PADDING * 2 + win::decoration::CLOSE_SIZE;
         RenderText(context, text_x, 0.0, width - win::decoration::ITEMS_PADDING, height);
         decoration_selected_tex_ = context.pixmap_texture_;
+<<<<<<< TREE
         uScreen->damageRegion(CompRegion(geo.x, geo.y, width, height));
+=======
+        uScreen->damageRegion(CompRegion(scaled_geo.x, scaled_geo.y, width, height));
+>>>>>>> MERGE-SOURCE
       }
       else
       {

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-02-07 21:31:13 +0000
+++ tests/CMakeLists.txt	2013-02-14 20:05:37 +0000
@@ -94,6 +94,7 @@
 
 
 # The actual test executable (xless) - do not put anything that requires X in here
+<<<<<<< TREE
   set (GTEST_XLESS_SOURCES
        test_main_xless.cpp
        test_abstract_interface_generator.cpp
@@ -163,6 +164,70 @@
 
   target_link_libraries(test-gtest-xless ${GTEST_XLESS_LIBS})
 
+=======
+  add_executable(test-gtest-xless
+                 test_main_xless.cpp
+                 test_animator.cpp
+                 test_launcher_model.cpp
+                 test_glib_object.cpp
+                 test_glib_object_utils.cpp
+                 test_glib_object_utils.h
+                 test_glib_signals.cpp
+                 test_glib_signals_utils.cpp
+                 test_glib_signals_utils.h
+                 test_glib_source.cpp
+                 test_glib_variant.cpp
+                 test_grabhandle.cpp
+                 test_desktop_utilities.cpp
+                 test_hud_private.cpp
+                 test_indicator.cpp
+                 test_indicator_appmenu.cpp
+                 test_indicator_entry.cpp
+                 test_indicators.cpp
+                 test_introspection.cpp
+                 test_favorite_store.cpp
+                 test_favorite_store_gsettings.cpp
+                 test_favorite_store_private.cpp
+                 test_home_lens.cpp
+                 test_launcher_entry_remote.cpp
+                 test_model_iterator.cpp
+                 test_pointer_barrier.cpp
+                 test_previews.cpp
+                 test_shortcut_model.cpp
+                 test_shortcut_private.cpp
+                 test_showdesktop_handler.cpp
+                 test_time_util.cpp
+                 test_unityshell_private.cpp
+                 ${CMAKE_CURRENT_BINARY_DIR}/test_glib_signals_utils_marshal.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/AbstractLauncherIcon.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/Animator.cpp
+                 ${UNITY_SRC}/DebugDBusInterface.cpp
+                 ${UNITY_SRC}/XPathQueryPart.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/FavoriteStore.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/FavoriteStoreGSettings.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/IconTextureSource.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/LauncherModel.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/LauncherEntryRemote.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/MockLauncherIcon.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/FavoriteStorePrivate.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/PointerBarrier.cpp
+                 ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutModel.cpp
+                 ${CMAKE_SOURCE_DIR}/shortcuts/ShortcutHintPrivate.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/TextureCache.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/Timer.cpp
+                 ${UNITY_SRC}/UnityshellPrivate.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/WindowManager.cpp
+                 ${UNITY_SRC}/UnityShowdesktopHandler.cpp
+                 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle.cpp
+                 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-group.cpp
+                 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.cpp
+                 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-layout.cpp
+                 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-texture.cpp
+                 ${CMAKE_SOURCE_DIR}/hud/HudPrivate.cpp
+                 )
+  target_link_libraries(test-gtest-xless gtest unity-shared ${GMOCK_LIB} ${GMOCK_MAIN_LIB} ${LIBS})
+>>>>>>> MERGE-SOURCE
   add_test(UnityGTestXless test-gtest-xless)
 
 # tests that require dbus, must not require X

=== modified file 'tests/autopilot/unity/tests/launcher/test_keynav.py'
--- tests/autopilot/unity/tests/launcher/test_keynav.py	2013-02-04 22:31:47 +0000
+++ tests/autopilot/unity/tests/launcher/test_keynav.py	2013-02-14 20:05:37 +0000
@@ -234,6 +234,7 @@
         bfb_ql = bfb_icon.get_quicklist()
 
         bfb_ql.click_item(bfb_ql.selected_item)
+<<<<<<< TREE
         self.addCleanup(self.unity.dash.ensure_hidden)
 
         self.assertThat(self.unity.dash.visible, Eventually(Equals(True)))
@@ -244,3 +245,15 @@
 
       self.start_keynav_with_cleanup_cancel()
       self.assertThat(self.unity.panels.get_active_panel().title, Eventually(Equals("Search your computer and online sources")))
+=======
+        self.addCleanup(self.dash.ensure_hidden)
+
+        self.assertThat(self.dash.visible, Eventually(Equals(True)))
+        self.assertThat(self.launcher.key_nav_is_active, Eventually(Equals(False)))
+
+    def test_launcher_keynav_changes_panel(self):
+        """The panel title must change when in key nav mode."""
+
+        self.start_keynav_with_cleanup_cancel()
+        self.assertThat(self.panels.get_active_panel().title, Eventually(Equals("Dash Home")))
+>>>>>>> MERGE-SOURCE

=== modified file 'tests/autopilot/unity/tests/test_hud.py'
--- tests/autopilot/unity/tests/test_hud.py	2013-02-04 19:54:47 +0000
+++ tests/autopilot/unity/tests/test_hud.py	2013-02-14 20:05:37 +0000
@@ -422,8 +422,13 @@
 
         self.mouse.move(x + w + (screen_w-((screen_x-x)+w))/2, y + h + (screen_h-((screen_y-y)+h))/2)
         self.mouse.click()
+<<<<<<< TREE
 
         self.assertThat(self.unity.hud.visible, Eventually(Equals(False)))
+=======
+
+        self.assertThat(self.hud.visible, Eventually(Equals(False)))
+>>>>>>> MERGE-SOURCE
 
     def test_closes_then_focuses_window_on_mouse_down(self):
         """If 2 windows are open with 1 maximized and the non-maxmized
@@ -445,6 +450,7 @@
 
         self.assertProperty(char_win, is_active=True)
 
+<<<<<<< TREE
     def test_hud_does_not_focus_wrong_window_after_alt_tab(self):
         """Test the Hud focuses the correct window after an Alt+Tab."""
 
@@ -460,6 +466,22 @@
         self.assertProperty(char_win, is_active=True)
 
 
+=======
+    def test_hud_does_not_focus_wrong_window_after_alt_tab(self):
+        """Test the Hud focuses the correct window after an Alt+Tab."""
+
+        char_win = self.start_app('Character Map')
+        self.start_app('Calculator')
+
+        self.keybinding("switcher/reveal_normal")
+
+        self.hud.ensure_visible()
+        self.hud.ensure_hidden()
+
+        self.assertProperty(char_win, is_active=True)
+
+
+>>>>>>> MERGE-SOURCE
 class HudLauncherInteractionsTests(HudTestsBase):
 
     launcher_modes = [('Launcher autohide', {'launcher_autohide': False}),

=== modified file 'tests/test_glib_source.cpp'
--- tests/test_glib_source.cpp	2013-01-24 14:46:08 +0000
+++ tests/test_glib_source.cpp	2013-02-14 20:05:37 +0000
@@ -139,7 +139,13 @@
   Utils::WaitUntilMSec([&timeout] {return timeout.IsRunning();}, false, 500);
   EXPECT_TRUE(callback_called);
   EXPECT_EQ(callback_call_count, 1);
+<<<<<<< TREE
   EXPECT_TRUE(removed_called);
+=======
+  DeltaTime time_delta = unity::TimeUtil::TimeDelta(&post, &pre);
+  EXPECT_GE(time_delta, 100);
+  EXPECT_LT(time_delta, 110);
+>>>>>>> MERGE-SOURCE
 }
 
 TEST(TestGLibTimeout, MultipleShotsRun)
@@ -157,8 +163,15 @@
   }
 
   EXPECT_TRUE(callback_called);
+<<<<<<< TREE
   EXPECT_GT(callback_call_count, 1);
   EXPECT_TRUE(removed_called);
+=======
+  EXPECT_EQ(callback_call_count, 6);
+  DeltaTime time_delta = unity::TimeUtil::TimeDelta(&post, &pre);
+  EXPECT_GE(time_delta, 600);
+  EXPECT_LT(time_delta, 700);
+>>>>>>> MERGE-SOURCE
 }
 
 TEST(TestGLibTimeout, OneShotRunWithEmptyCallback)
@@ -167,8 +180,16 @@
   Timeout timeout(100, Source::Callback());
   timeout.removed.connect([&] (unsigned int id) { removed_called = true; });
 
+<<<<<<< TREE
   Utils::WaitUntilMSec([&timeout] {return timeout.IsRunning();}, false, 500);
   EXPECT_TRUE(removed_called);
+=======
+  Utils::WaitForTimeoutMSec(500);
+  EXPECT_FALSE(timeout.IsRunning());
+  DeltaTime time_delta = unity::TimeUtil::TimeDelta(&post, &pre);
+  EXPECT_GE(time_delta, 100);
+  EXPECT_LT(time_delta, 110);
+>>>>>>> MERGE-SOURCE
 }
 
 TEST(TestGLibTimeout, Removal)
@@ -322,7 +343,13 @@
   Utils::WaitUntil([&timeout] {return timeout.IsRunning();}, false, 2);
   EXPECT_TRUE(callback_called);
   EXPECT_EQ(callback_call_count, 1);
+<<<<<<< TREE
   EXPECT_TRUE(removed_called);
+=======
+  DeltaTime time_delta = unity::TimeUtil::TimeDelta(&post, &pre);
+  EXPECT_GE(time_delta, 500);
+  EXPECT_LT(time_delta, 2000);
+>>>>>>> MERGE-SOURCE
 }
 
 TEST(TestGLibTimeoutSeconds, MultipleShotsRun)
@@ -340,8 +367,16 @@
   }
 
   EXPECT_TRUE(callback_called);
+<<<<<<< TREE
   EXPECT_GT(callback_call_count, 1);
   EXPECT_TRUE(removed_called);
+=======
+  EXPECT_GE(callback_call_count, 3);
+  EXPECT_LE(callback_call_count, 4);
+  DeltaTime time_delta = unity::TimeUtil::TimeDelta(&post, &pre);
+  EXPECT_GE(time_delta, 3500);
+  EXPECT_LT(time_delta, 5000);
+>>>>>>> MERGE-SOURCE
 }
 
 // GLib Idle tests

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2013-02-09 15:16:41 +0000
+++ tests/test_launcher_controller.cpp	2013-02-14 20:05:37 +0000
@@ -346,6 +346,16 @@
   }
 }
 
+TEST_F(TestLauncherController, MirroredMultimonitorSingleLauncherOnExternalMonitor)
+{
+  // See lp bug 991637
+  lc.multiple_launchers = false;
+  uscreen.SetPrimary(1);
+
+  ASSERT_EQ(lc.launchers().size(), 1);
+  ASSERT_EQ(lc.launcher().monitor(), 0);
+}
+
 TEST_F(TestLauncherController, MultimonitorSwitchToMultipleLaunchers)
 {
   lc.multiple_launchers = false;

=== added file 'tests/test_time_util.cpp'
--- tests/test_time_util.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_time_util.cpp	2013-02-14 20:05:37 +0000
@@ -0,0 +1,38 @@
+// -*- 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: Brandon Schaefer <[e-mail]>
+*
+*/
+
+
+#include <cinttypes>
+#include <gtest/gtest.h>
+#include <unity-shared/TimeUtil.h>
+
+using namespace testing;
+
+TEST(TestTimeUtil, Testin32BufferOverflow)
+{
+  struct timespec start, end;
+  unity::TimeUtil::SetTimeStruct(&start);
+  unity::TimeUtil::SetTimeStruct(&end);
+
+  end.tv_sec = start.tv_sec + INT32_MAX;
+
+  EXPECT_GT(unity::TimeUtil::TimeDelta(&end, &start), 0);
+}
+

=== renamed file 'tests/test_time_util.cpp' => 'tests/test_time_util.cpp.moved'
=== modified file 'unity-shared/TimeUtil.h'
--- unity-shared/TimeUtil.h	2012-11-30 20:22:13 +0000
+++ unity-shared/TimeUtil.h	2013-02-14 20:05:37 +0000
@@ -30,9 +30,15 @@
 public:
   static DeltaTime TimeDelta (struct timespec const* x, struct timespec const* y)
   {
+<<<<<<< TREE
     DeltaTime d_sec = ((x->tv_sec - y->tv_sec));
     DeltaTime d_nsec = ((x->tv_nsec - y->tv_nsec));
     return (d_sec * 1000) + (d_nsec / 1000000);
+=======
+    DeltaTime d_sec = (x->tv_sec - y->tv_sec);
+    DeltaTime d_nsec = (x->tv_nsec - y->tv_nsec);
+    return (d_sec * 1000) + (d_nsec / 1000000);
+>>>>>>> MERGE-SOURCE
   }
 
   static void SetTimeStruct(struct timespec* timer, struct timespec* sister = 0, DeltaTime sister_relation = 0)