Merge lp:~3v1n0/unity/fix-nvidia-glDrawArrays-crash-5.0 into lp:unity

[Marco Trevisan (Treviño)]

unityshell: fix the nvidia crash on glDrawArrays disabling/enabling the client state on nuxPrologue/Epilogue

Fix some crashes with the NVIDIA driver, happening on glDrawArray call.
Thanks to Sam for the hint.

[Łukasz Zemczak (sil2100)]

I see a LOT of conflicts - the diff generated by this branch is also terrible. Is it all just because the prerequisite branch is not yet merged?

review: Needs Information

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

sil, I forgot to make this request against the correct branch (lp:unity/5.0), this MR is already superseded, follow the top link to get the new request ;)

=== modified file 'launcher/EdgeBarrierController.cpp'
--- launcher/EdgeBarrierController.cpp	2012-08-01 00:58:23 +0000
+++ launcher/EdgeBarrierController.cpp	2012-08-01 00:58:26 +0000
@@ -65,7 +65,7 @@
 {
   UScreen *uscreen = UScreen::GetDefault();
 
-  auto monitors = uscreen->GetMonitors();
+  auto const& monitors = uscreen->GetMonitors();
   ResizeBarrierList(monitors);
 
   uscreen->changed.connect([&](int primary, std::vector<nux::Geometry>& layout) {
@@ -147,15 +147,24 @@
   }
 
   float decay_responsiveness_mult = ((parent_->options()->edge_responsiveness() - 1) * .3f) + 1;
+<<<<<<< TREE
   decaymulator_.rate_of_decay = parent_->options()->edge_decay_rate() * decay_responsiveness_mult;
 
+=======
+  decaymulator_->rate_of_decay = parent_->options()->edge_decay_rate() * decay_responsiveness_mult;
+
+>>>>>>> MERGE-SOURCE
   float overcome_responsiveness_mult = ((parent_->options()->edge_responsiveness() - 1) * 1.0f) + 1;
   edge_overcome_pressure_ = parent_->options()->edge_overcome_pressure() * overcome_responsiveness_mult;
 }
 
 void EdgeBarrierController::Impl::OnPointerBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr event)
 {
+<<<<<<< TREE
   unsigned int monitor = owner->index;
+=======
+  unsigned monitor = owner->index;
+>>>>>>> MERGE-SOURCE
   bool process = true;
 
   if (monitor < subscribers_.size())
@@ -206,8 +215,14 @@
 }
 
 EdgeBarrierController::EdgeBarrierController()
+<<<<<<< TREE
   : pimpl(new Impl(this))
 {}
+=======
+  : sticky_edges(false)
+  , pimpl(new Impl(this))
+{}
+>>>>>>> MERGE-SOURCE
 
 EdgeBarrierController::~EdgeBarrierController()
 {}
@@ -230,6 +245,7 @@
 
   auto const& monitors = UScreen::GetDefault()->GetMonitors();
   pimpl->subscribers_[monitor] = nullptr;
+<<<<<<< TREE
   pimpl->ResizeBarrierList(monitors);
   pimpl->SetupBarriers(monitors);
 }
@@ -246,6 +262,20 @@
 {
   pimpl->OnPointerBarrierEvent(owner, event);
 }
+=======
+  pimpl->ResizeBarrierList(monitors);
+  pimpl->SetupBarriers(monitors);
+}
+
+EdgeBarrierSubscriber* EdgeBarrierController::GetSubscriber(unsigned int monitor)
+{
+  if (monitor >= pimpl->subscribers_.size())
+    return nullptr;
+
+  return pimpl->subscribers_[monitor];
+}
+
+>>>>>>> MERGE-SOURCE
 
 }
 }

=== modified file 'launcher/EdgeBarrierController.h'
--- launcher/EdgeBarrierController.h	2012-07-25 23:18:17 +0000
+++ launcher/EdgeBarrierController.h	2012-08-01 00:58:26 +0000
@@ -41,12 +41,18 @@
   nux::RWProperty<bool> sticky_edges;
   nux::Property<launcher::Options::Ptr> options;
 
+<<<<<<< TREE
   void Subscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
   void Unsubscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
   EdgeBarrierSubscriber* GetSubscriber(unsigned int monitor);
 
 protected:
   void ProcessBarrierEvent(PointerBarrierWrapper* owner, BarrierEvent::Ptr event);
+=======
+  void Subscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
+  void Unsubscribe(EdgeBarrierSubscriber* subscriber, unsigned int monitor);
+  EdgeBarrierSubscriber* GetSubscriber(unsigned int monitor);
+>>>>>>> MERGE-SOURCE
 
 private:
   struct Impl;

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-08-01 00:58:23 +0000
+++ launcher/LauncherController.cpp	2012-08-01 00:58:26 +0000
@@ -26,21 +26,36 @@
 #include <Nux/BaseWindow.h>
 #include <NuxCore/Logger.h>
 
-#include "LauncherOptions.h"
 #include "BamfLauncherIcon.h"
+#include "BFBLauncherIcon.h"
 #include "DesktopLauncherIcon.h"
 #include "DeviceLauncherIcon.h"
 #include "FavoriteStore.h"
 #include "HudLauncherIcon.h"
 #include "LauncherController.h"
-#include "LauncherControllerPrivate.h"
+<<<<<<< TREE
+#include "LauncherControllerPrivate.h"
+=======
+#include "LauncherControllerPrivate.h"
+#include "LauncherOptions.h"
+>>>>>>> MERGE-SOURCE
 #include "SoftwareCenterLauncherIcon.h"
+<<<<<<< TREE
 #include "unity-shared/WindowManager.h"
+=======
+#include "TimeUtil.h"
+>>>>>>> MERGE-SOURCE
 #include "TrashLauncherIcon.h"
+<<<<<<< TREE
 #include "BFBLauncherIcon.h"
 #include "unity-shared/UScreen.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/TimeUtil.h"
+=======
+#include "UBusMessages.h"
+#include "UScreen.h"
+#include "WindowManager.h"
+>>>>>>> MERGE-SOURCE
 
 namespace unity
 {
@@ -90,122 +105,12 @@
 
 GDBusInterfaceVTable Controller::Impl::interface_vtable =
   { Controller::Impl::OnDBusMethodCall, NULL, NULL};
+
 =======
 }
 }
 
-class Controller::Impl
-{
-public:
-  Impl(Display* display, Controller* parent);
-  ~Impl();
-
-  void UpdateNumWorkspaces(int workspaces);
-
-  Launcher* CreateLauncher(int monitor);
-
-  void Save();
-  void SortAndUpdate();
-
-  nux::ObjectPtr<Launcher> CurrentLauncher();
-
-  void OnIconAdded(AbstractLauncherIcon::Ptr icon);
-  void OnIconRemoved(AbstractLauncherIcon::Ptr icon);
-
-  void OnLauncherAddRequest(char* path, AbstractLauncherIcon::Ptr before);
-  void OnLauncherAddRequestSpecial(std::string const& path, AbstractLauncherIcon::Ptr before, std::string const& aptdaemon_trans_id, std::string const& icon_path,
-                                   int icon_x, int icon_y, int icon_size);
-  void OnLauncherRemoveRequest(AbstractLauncherIcon::Ptr icon);
-  void OnSCIconAnimationComplete(AbstractLauncherIcon::Ptr icon);
-
-  void OnLauncherEntryRemoteAdded(LauncherEntryRemote::Ptr const& entry);
-  void OnLauncherEntryRemoteRemoved(LauncherEntryRemote::Ptr const& entry);
-
-  void OnFavoriteStoreFavoriteAdded(std::string const& entry, std::string const& pos, bool before);
-  void OnFavoriteStoreFavoriteRemoved(std::string const& entry);
-  void OnFavoriteStoreReordered();
-
-
-  void InsertExpoAction();
-  void RemoveExpoAction();
-
-  void InsertDesktopIcon();
-  void RemoveDesktopIcon();
-
-  void SendHomeActivationRequest();
-
-  int MonitorWithMouse();
-
-  void InsertTrash();
-
-  void RegisterIcon(AbstractLauncherIcon::Ptr icon);
-
-  AbstractLauncherIcon::Ptr CreateFavorite(const char* file_path);
-
-  SoftwareCenterLauncherIcon::Ptr CreateSCLauncherIcon(std::string const& file_path, std::string const& aptdaemon_trans_id, std::string const& icon_path);
-
-  void SetupBamf();
-
-  void EnsureLaunchers(int primary, std::vector<nux::Geometry> const& monitors);
-
-  void OnExpoActivated();
-
-  void OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors);
-
-  void OnWindowFocusChanged (guint32 xid);
-
-  void OnViewOpened(BamfMatcher* matcher, BamfView* view);
-
-  void ReceiveMouseDownOutsideArea(int x, int y, unsigned long button_flags, unsigned long key_flags);
-
-  void ReceiveLauncherKeyPress(unsigned long eventType,
-                               unsigned long keysym,
-                               unsigned long state,
-                               const char* character,
-                               unsigned short keyCount);
-
-  Controller* parent_;
-  glib::Object<BamfMatcher> matcher_;
-  glib::Signal<void, BamfMatcher*, BamfView*> view_opened_signal_;
-  LauncherModel::Ptr     model_;
-  nux::ObjectPtr<Launcher> launcher_;
-  nux::ObjectPtr<Launcher> keyboard_launcher_;
-  int                    sort_priority_;
-  DeviceLauncherSection  device_section_;
-  LauncherEntryRemoteModel remote_model_;
-  AbstractLauncherIcon::Ptr expo_icon_;
-  AbstractLauncherIcon::Ptr desktop_icon_;
-  int                    num_workspaces_;
-  bool                   show_desktop_icon_;
-  Display*               display_;
-
-  guint                  bamf_timer_handler_id_;
-  guint                  launcher_key_press_handler_id_;
-  guint                  launcher_label_show_handler_id_;
-  guint                  launcher_hide_handler_id_;
-
-  bool                   launcher_open;
-  bool                   launcher_keynav;
-  bool                   launcher_grabbed;
-  bool                   reactivate_keynav;
-  int                    reactivate_index;
-  bool                   keynav_restore_window_;
-
-  UBusManager            ubus;
-
-  int                    launcher_key_press_time_;
-
-  ui::EdgeBarrierController::Ptr edge_barriers_;
-
-  LauncherList launchers;
-
-  sigc::connection on_expoicon_activate_connection_;
-  sigc::connection launcher_key_press_connection_;
-  sigc::connection launcher_event_outside_connection_;
-};
-
 >>>>>>> MERGE-SOURCE
-
 Controller::Impl::Impl(Display* display, Controller* parent)
   : parent_(parent)
   , model_(new LauncherModel())
@@ -214,7 +119,13 @@
   , device_section_(volume_monitor_)
   , show_desktop_icon_(false)
   , display_(display)
+<<<<<<< TREE
   , matcher_(bamf_matcher_get_default())
+=======
+  , launcher_key_press_handler_id_(0)
+  , launcher_label_show_handler_id_(0)
+  , launcher_hide_handler_id_(0)
+>>>>>>> MERGE-SOURCE
 {
   edge_barriers_.options = parent_->options();
 

=== modified file 'launcher/LauncherIcon.cpp'
--- launcher/LauncherIcon.cpp	2012-08-01 00:58:23 +0000
+++ launcher/LauncherIcon.cpp	2012-08-01 00:58:26 +0000
@@ -623,19 +623,12 @@
 
 <<<<<<< TREE
 void LauncherIcon::RecvMouseDown(int button, int monitor, unsigned long key_flags)
-=======
-void LauncherIcon::RecvMouseDown(int button, unsigned long key_flags, int monitor)
->>>>>>> MERGE-SOURCE
 {
   if (button == 3)
     OpenQuicklist();
 }
 
-<<<<<<< TREE
 void LauncherIcon::RecvMouseUp(int button, int monitor, unsigned long key_flags)
-=======
-void LauncherIcon::RecvMouseUp(int button, unsigned long key_flags, int monitor)
->>>>>>> MERGE-SOURCE
 {
   if (button == 3)
   {
@@ -644,9 +637,18 @@
   }
 }
 
-<<<<<<< TREE
 void LauncherIcon::RecvMouseClick(int button, int monitor, unsigned long key_flags)
 =======
+void LauncherIcon::RecvMouseDown(int button, unsigned long key_flags, int monitor)
+{
+}
+
+void LauncherIcon::RecvMouseUp(int button, unsigned long key_flags, int monitor)
+{
+  if (button == 3)
+    OpenQuicklist(false, monitor);
+}
+
 void LauncherIcon::RecvMouseClick(int button, unsigned long key_flags, int monitor)
 >>>>>>> MERGE-SOURCE
 {

=== renamed file 'launcher/LauncherControllerPrivate.h' => 'plugins/unityshell/src/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	2012-07-25 13:42:41 +0000
+++ plugins/unityshell/src/LauncherControllerPrivate.h	2012-08-01 00:58:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /*
  * Copyright 2012 Canonical Ltd.
  *
@@ -161,3 +162,162 @@
 } // unity namespace
 
 #endif
+=======
+/*
+ * Copyright 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY 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
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Jason Smith <[e-mail]>
+ *              Tim Penhey <[e-mail]>
+ *              Marco Trevisan (Treviño) <[e-mail]>
+ *
+ */
+
+#ifndef LAUNCHER_CONTROLLER_PRIVATE_H
+#define LAUNCHER_CONTROLLER_PRIVATE_H
+
+#include <Nux/Nux.h>
+
+#include "AbstractLauncherIcon.h"
+#include "DeviceLauncherSection.h"
+#include "EdgeBarrierController.h"
+#include "LauncherController.h"
+#include "Launcher.h"
+#include "LauncherEntryRemote.h"
+#include "LauncherEntryRemoteModel.h"
+#include "LauncherModel.h"
+#include "SoftwareCenterLauncherIcon.h"
+#include "UBusWrapper.h"
+
+namespace unity
+{
+namespace launcher
+{
+
+class Controller::Impl
+{
+public:
+  Impl(Display* display, Controller* parent);
+  ~Impl();
+
+  void UpdateNumWorkspaces(int workspaces);
+
+  Launcher* CreateLauncher(int monitor);
+
+  void Save();
+  void SortAndUpdate();
+
+  nux::ObjectPtr<Launcher> CurrentLauncher();
+
+  void OnIconAdded(AbstractLauncherIcon::Ptr icon);
+  void OnIconRemoved(AbstractLauncherIcon::Ptr icon);
+
+  void OnLauncherAddRequest(char* path, AbstractLauncherIcon::Ptr before);
+  void OnLauncherAddRequestSpecial(std::string const& path, AbstractLauncherIcon::Ptr before, std::string const& aptdaemon_trans_id, std::string const& icon_path,
+                                   int icon_x, int icon_y, int icon_size);
+  void OnLauncherRemoveRequest(AbstractLauncherIcon::Ptr icon);
+  void OnSCIconAnimationComplete(AbstractLauncherIcon::Ptr icon);
+
+  void OnLauncherEntryRemoteAdded(LauncherEntryRemote::Ptr const& entry);
+  void OnLauncherEntryRemoteRemoved(LauncherEntryRemote::Ptr const& entry);
+
+  void OnFavoriteStoreFavoriteAdded(std::string const& entry, std::string const& pos, bool before);
+  void OnFavoriteStoreFavoriteRemoved(std::string const& entry);
+  void OnFavoriteStoreReordered();
+
+
+  void InsertExpoAction();
+  void RemoveExpoAction();
+
+  void InsertDesktopIcon();
+  void RemoveDesktopIcon();
+
+  void SendHomeActivationRequest();
+
+  int MonitorWithMouse();
+
+  void InsertTrash();
+
+  void RegisterIcon(AbstractLauncherIcon::Ptr icon);
+
+  AbstractLauncherIcon::Ptr CreateFavorite(const char* file_path);
+
+  SoftwareCenterLauncherIcon::Ptr CreateSCLauncherIcon(std::string const& file_path, std::string const& aptdaemon_trans_id, std::string const& icon_path);
+
+  void SetupBamf();
+
+  void EnsureLaunchers(int primary, std::vector<nux::Geometry> const& monitors);
+
+  void OnExpoActivated();
+
+  void OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors);
+
+  void OnWindowFocusChanged (guint32 xid);
+
+  void OnViewOpened(BamfMatcher* matcher, BamfView* view);
+
+  void ReceiveMouseDownOutsideArea(int x, int y, unsigned long button_flags, unsigned long key_flags);
+
+  void ReceiveLauncherKeyPress(unsigned long eventType,
+                               unsigned long keysym,
+                               unsigned long state,
+                               const char* character,
+                               unsigned short keyCount);
+
+  Controller* parent_;
+  glib::Object<BamfMatcher> matcher_;
+  glib::Signal<void, BamfMatcher*, BamfView*> view_opened_signal_;
+  LauncherModel::Ptr     model_;
+  nux::ObjectPtr<Launcher> launcher_;
+  nux::ObjectPtr<Launcher> keyboard_launcher_;
+  int                    sort_priority_;
+  DeviceLauncherSection  device_section_;
+  LauncherEntryRemoteModel remote_model_;
+  AbstractLauncherIcon::Ptr expo_icon_;
+  AbstractLauncherIcon::Ptr desktop_icon_;
+  int                    num_workspaces_;
+  bool                   show_desktop_icon_;
+  Display*               display_;
+
+  guint                  bamf_timer_handler_id_;
+  guint                  launcher_key_press_handler_id_;
+  guint                  launcher_label_show_handler_id_;
+  guint                  launcher_hide_handler_id_;
+
+  bool                   launcher_open;
+  bool                   launcher_keynav;
+  bool                   launcher_grabbed;
+  bool                   reactivate_keynav;
+  int                    reactivate_index;
+  bool                   keynav_restore_window_;
+
+  UBusManager            ubus;
+
+  int                    launcher_key_press_time_;
+
+  ui::EdgeBarrierController edge_barriers_;
+
+  LauncherList launchers;
+
+  sigc::connection on_expoicon_activate_connection_;
+  sigc::connection launcher_key_press_connection_;
+  sigc::connection launcher_event_outside_connection_;
+};
+
+} // launcher namespace
+} // unity namespace
+
+#endif
+>>>>>>> MERGE-SOURCE

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-08-01 00:58:23 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-08-01 00:58:26 +0000
@@ -515,6 +515,15 @@
 
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
+
+  /* This is needed to Fix a crash in glDrawArrays with the NVIDIA driver
+   * see bugs #1031554 and #982626.
+   * The NVIDIA driver looks to see if the legacy GL_VERTEX_ARRAY,
+   * GL_TEXTURE_COORDINATES_ARRAY and other such client states are enabled
+   * first before checking if a vertex buffer is bound and will prefer the
+   * client buffers over the the vertex buffer object. */
+  glDisableClientState(GL_VERTEX_ARRAY);
+  glDisableClientState(GL_TEXTURE_COORD_ARRAY);
 #endif
 
   glGetError();
@@ -544,6 +553,11 @@
   glReadBuffer(GL_BACK);
 
   glPopAttrib();
+
+  /* Re-enable the client states that have been disabled in nuxPrologue , for
+   * NVIDIA compatibility reasons */
+  glEnableClientState(GL_VERTEX_ARRAY);
+  glEnableClientState(GL_TEXTURE_COORD_ARRAY);
 #else
 #ifdef USE_GLES
   glDepthRangef(0, 1);

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-08-01 00:58:23 +0000
+++ tests/CMakeLists.txt	2012-08-01 00:58:26 +0000
@@ -254,6 +254,7 @@
 =======
                  test_im_text_entry.cpp
                  test_hud_view.cpp
+                 test_launcher_controller.cpp
                  test_keyboard_util.cpp
                  test_resultviewgrid.cpp
 >>>>>>> MERGE-SOURCE
@@ -355,13 +356,21 @@
                  ${UNITY_SRC}/AbstractPlacesGroup.cpp
                  ${UNITY_SRC}/Animator.cpp
                  ${UNITY_SRC}/BackgroundEffectHelper.cpp
+                 ${UNITY_SRC}/BamfLauncherIcon.cpp
+                 ${UNITY_SRC}/BFBLauncherIcon.cpp
                  ${UNITY_SRC}/CairoBaseWindow.cpp
                  ${UNITY_SRC}/DashSettings.cpp
                  ${UNITY_SRC}/DashStyle.cpp
                  ${UNITY_SRC}/DashViewPrivate.cpp
                  ${UNITY_SRC}/Decaymulator.cpp
+                 ${UNITY_SRC}/DesktopLauncherIcon.cpp
+                 ${UNITY_SRC}/DeviceLauncherIcon.cpp
+                 ${UNITY_SRC}/DeviceLauncherSection.cpp
+                 ${UNITY_SRC}/DevicesSettings.cpp
                  ${UNITY_SRC}/DNDCollectionWindow.cpp
                  ${UNITY_SRC}/DndData.cpp
+                 ${UNITY_SRC}/EdgeBarrierController.cpp
+                 ${UNITY_SRC}/FavoriteStore.cpp
                  ${UNITY_SRC}/GeisAdapter.cpp
                  ${UNITY_SRC}/IconLoader.cpp
                  ${UNITY_SRC}/IconRenderer.cpp
@@ -374,16 +383,21 @@
                  ${UNITY_SRC}/HudController.cpp
                  ${UNITY_SRC}/HudIcon.cpp
                  ${UNITY_SRC}/HudIconTextureSource.cpp
+                 ${UNITY_SRC}/HudLauncherIcon.cpp
                  ${UNITY_SRC}/HudPrivate.cpp
                  ${UNITY_SRC}/HudView.cpp
+                 ${UNITY_SRC}/IntrospectableWrappers.cpp
                  ${UNITY_SRC}/LayoutSystem.cpp
                  ${UNITY_SRC}/Launcher.cpp
                  ${UNITY_SRC}/LauncherDragWindow.cpp
+                 ${UNITY_SRC}/LauncherController.cpp
                  ${UNITY_SRC}/LauncherEntryRemote.cpp
+                 ${UNITY_SRC}/LauncherEntryRemoteModel.cpp
                  ${UNITY_SRC}/LauncherHideMachine.cpp
                  ${UNITY_SRC}/LauncherHoverMachine.cpp
                  ${UNITY_SRC}/LauncherIcon.cpp
                  ${UNITY_SRC}/LauncherModel.cpp
+                 ${UNITY_SRC}/LauncherOptions.cpp
                  ${UNITY_SRC}/KeyboardUtil.cpp
                  ${UNITY_SRC}/OverlayRenderer.cpp
                  ${UNITY_SRC}/JSONParser.cpp
@@ -407,6 +421,7 @@
                  ${UNITY_SRC}/QuicklistMenuItemLabel.cpp
                  ${UNITY_SRC}/QuicklistMenuItemRadio.cpp
                  ${UNITY_SRC}/QuicklistMenuItemSeparator.cpp
+                 ${UNITY_SRC}/SoftwareCenterLauncherIcon.cpp
                  ${UNITY_SRC}/SpacerLauncherIcon.cpp
                  ${UNITY_SRC}/TextureCache.cpp
                  ${UNITY_SRC}/UBusWrapper.cpp
@@ -418,7 +433,7 @@
                  ${UNITY_SRC}/ResultView.cpp
                  ${UNITY_SRC}/ResultViewGrid.cpp
                  ${UNITY_SRC}/ResultRenderer.cpp
-                 ${UNITY_SRC}/IntrospectableWrappers.cpp
+                 ${UNITY_SRC}/TrashLauncherIcon.cpp
 >>>>>>> MERGE-SOURCE
                 )
   target_link_libraries(test-gtest gtest gmock ${LIBS})

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2012-07-26 13:09:16 +0000
+++ tests/test_launcher_controller.cpp	2012-08-01 00:58:26 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 /*
  * Copyright 2012 Canonical Ltd.
  *
@@ -200,3 +201,207 @@
 }
 
 }
+=======
+/*
+ * Copyright 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY 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
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Marco Trevisan (Treviño) <[e-mail]>
+ */
+
+#include <gmock/gmock.h>
+#include "test_uscreen_mock.h"
+
+#include "FavoriteStore.h"
+#include "LauncherController.h"
+#include "LauncherControllerPrivate.h"
+#include "PanelStyle.h"
+#include "DashSettings.h"
+
+using namespace unity::launcher;
+using namespace testing;
+
+namespace unity
+{
+
+class MockFavoriteStore : public FavoriteStore
+{
+public:
+  FavoriteList const& GetFavorites()
+  {
+    return fav_list_;
+  };
+
+  void AddFavorite(std::string const& desktop_path, int position) {};
+  void RemoveFavorite(std::string const& desktop_path) {};
+  void MoveFavorite(std::string const& desktop_path, int position) {};
+  void SetFavorites(FavoriteList const& desktop_paths) {};
+
+private:
+  FavoriteList fav_list_;
+};
+
+namespace launcher
+{
+class TestLauncherController : public testing::Test
+{
+public:
+  TestLauncherController()
+    : lc(nux::GetGraphicsDisplay()->GetX11Display())
+  {}
+
+  virtual void SetUp()
+  {
+    lc.options = std::make_shared<Options>();
+    lc.multiple_launchers = true;
+  }
+
+protected:
+  ui::EdgeBarrierController &GetBarrierController()
+  {
+    return lc.pimpl->edge_barriers_;
+  }
+
+  MockUScreen uscreen;
+  dash::Settings settings;
+  panel::Style panel_style;
+  GeisAdapter geis_adapter;
+  MockFavoriteStore favorite_store;
+  Controller lc;
+};
+}
+
+TEST_F(TestLauncherController, Construction)
+{
+  EXPECT_NE(lc.options(), nullptr);
+  EXPECT_TRUE(lc.multiple_launchers());
+}
+
+TEST_F(TestLauncherController, MultimonitorMultipleLaunchers)
+{
+  lc.multiple_launchers = true;
+  uscreen.SetupFakeMultiMonitor();
+
+  ASSERT_EQ(lc.launchers().size(), max_num_monitors);
+
+  for (int i = 0; i < max_num_monitors; ++i)
+  {
+    EXPECT_EQ(lc.launchers()[i]->monitor(), i);
+  }
+}
+
+TEST_F(TestLauncherController, MultimonitorSingleLauncher)
+{
+  lc.multiple_launchers = false;
+  uscreen.SetupFakeMultiMonitor(0, false);
+
+  for (int i = 0; i < max_num_monitors; ++i)
+  {
+    uscreen.SetPrimary(i);
+    ASSERT_EQ(lc.launchers().size(), 1);
+    EXPECT_EQ(lc.launcher().monitor(), i);
+  }
+}
+
+TEST_F(TestLauncherController, MultimonitorSwitchToMultipleLaunchers)
+{
+  lc.multiple_launchers = false;
+  uscreen.SetupFakeMultiMonitor();
+
+  ASSERT_EQ(lc.launchers().size(), 1);
+
+  lc.multiple_launchers = true;
+  EXPECT_EQ(lc.launchers().size(), max_num_monitors);
+}
+
+TEST_F(TestLauncherController, MultimonitorSwitchToSingleLauncher)
+{
+  lc.multiple_launchers = true;
+  int primary = 3;
+  uscreen.SetupFakeMultiMonitor(primary);
+
+  ASSERT_EQ(lc.launchers().size(), max_num_monitors);
+
+  lc.multiple_launchers = false;
+  EXPECT_EQ(lc.launchers().size(), 1);
+  EXPECT_EQ(lc.launcher().monitor(), primary);
+}
+
+TEST_F(TestLauncherController, MultimonitorSwitchToSingleMonitor)
+{
+  uscreen.SetupFakeMultiMonitor();
+  ASSERT_EQ(lc.launchers().size(), max_num_monitors);
+
+  uscreen.Reset();
+  EXPECT_EQ(lc.launchers().size(), 1);
+  EXPECT_EQ(lc.launcher().monitor(), 0);
+}
+
+TEST_F(TestLauncherController, MultimonitorRemoveMiddleMonitor)
+{
+  uscreen.SetupFakeMultiMonitor();
+  ASSERT_EQ(lc.launchers().size(), max_num_monitors);
+
+  std::vector<nux::Geometry> &monitors = uscreen.GetMonitors();
+  monitors.erase(monitors.begin() + monitors.size()/2);
+  uscreen.changed.emit(uscreen.GetPrimaryMonitor(), uscreen.GetMonitors());
+  ASSERT_EQ(lc.launchers().size(), max_num_monitors - 1);
+
+  for (int i = 0; i < max_num_monitors - 1; ++i)
+    EXPECT_EQ(lc.launchers()[i]->monitor(), i);
+}
+
+TEST_F(TestLauncherController, SingleMonitorSwitchToMultimonitor)
+{
+  ASSERT_EQ(lc.launchers().size(), 1);
+
+  uscreen.SetupFakeMultiMonitor();
+
+  EXPECT_EQ(lc.launchers().size(), max_num_monitors);
+}
+
+TEST_F(TestLauncherController, MultiMonitorEdgeBarrierSubscriptions)
+{
+  uscreen.SetupFakeMultiMonitor();
+
+  for (int i = 0; i < max_num_monitors; ++i)
+    ASSERT_EQ(GetBarrierController().GetSubscriber(i), lc.launchers()[i].GetPointer());
+}
+
+TEST_F(TestLauncherController, SingleMonitorEdgeBarrierSubscriptionsUpdates)
+{
+  lc.multiple_launchers = false;
+  uscreen.SetupFakeMultiMonitor(0, false);
+
+  for (int i = 0; i < max_num_monitors; ++i)
+  {
+    uscreen.SetPrimary(i);
+
+    for (int j = 0; j < max_num_monitors; ++j)
+    {
+      if (j == i)
+      {
+        ASSERT_EQ(GetBarrierController().GetSubscriber(j), &lc.launcher());
+      }
+      else
+      {
+        ASSERT_EQ(GetBarrierController().GetSubscriber(j), nullptr);
+      }
+    }
+  }
+}
+
+}
+>>>>>>> MERGE-SOURCE

=== modified file 'unity-shared/UScreen.cpp'
--- unity-shared/UScreen.cpp	2012-08-01 00:58:23 +0000
+++ unity-shared/UScreen.cpp	2012-08-01 00:58:26 +0000
@@ -37,9 +37,10 @@
 
 namespace
 {
-static UScreen* default_screen_ = nullptr;
 nux::logging::Logger logger("unity.screen");
 } 
+
+UScreen* UScreen::default_screen_ = nullptr;
 >>>>>>> MERGE-SOURCE
 
 UScreen::UScreen()
@@ -51,13 +52,13 @@
            "org.freedesktop.UPower",
            G_BUS_TYPE_SYSTEM)
 =======
-  : screen_(gdk_screen_get_default(), glib::AddRef())
+  : primary_(0)
+  , screen_(gdk_screen_get_default(), glib::AddRef())
   , proxy_("org.freedesktop.UPower",
            "/org/freedesktop/UPower",
            "org.freedesktop.UPower",
            G_BUS_TYPE_SYSTEM)
   , refresh_id_(0)
-  , primary_(0)
 >>>>>>> MERGE-SOURCE
 {
   size_changed_signal_.Connect(screen_, "size-changed", sigc::mem_fun(this, &UScreen::Changed));

=== modified file 'unity-shared/UScreen.h'
--- unity-shared/UScreen.h	2012-08-01 00:58:23 +0000
+++ unity-shared/UScreen.h	2012-08-01 00:58:26 +0000
@@ -64,19 +64,9 @@
   void Changed(GdkScreen* screen);
   void Refresh();
 
-<<<<<<< TREE
 protected:
   static UScreen* default_screen_;
   std::vector<nux::Geometry> monitors_;
-=======
-private:
-  std::vector<nux::Geometry> monitors_;
-  glib::Object<GdkScreen> screen_;
-  glib::DBusProxy proxy_;
-  glib::Signal<void, GdkScreen*> size_changed_signal_;
-  glib::Signal<void, GdkScreen*> monitors_changed_signal_;
-  guint refresh_id_;
->>>>>>> MERGE-SOURCE
   int primary_;
 <<<<<<< TREE
 
@@ -87,6 +77,13 @@
   glib::Signal<void, GdkScreen*> monitors_changed_signal_;
   glib::Source::UniquePtr refresh_idle_;
 =======
+
+private:
+  glib::Object<GdkScreen> screen_;
+  glib::DBusProxy proxy_;
+  glib::Signal<void, GdkScreen*> size_changed_signal_;
+  glib::Signal<void, GdkScreen*> monitors_changed_signal_;
+  guint refresh_id_;
 >>>>>>> MERGE-SOURCE
 };