Merge lp:~jassmith/unity/unity.mm-options into lp:unity

[Jason Smith]

== The Problem ==
Design requested changes to multi-monitor to provide support for toggling barriers and multiple-launchers

== The Solution ==
Implement the options

== Testing ==
Interactions should be covered under existing tests

[Tim Penhey (thumper)]

You hit my rule of three, same code in three places should be a simple method:

int get_monitor(bool use_primary)
{
  UScreen *uscreen = UScreen::GetDefault();
  if (use_primary)
    return uscreen->GetPrimaryMonitor();
  else
    return uscreen->GetMonitorWithMouse();
}

  // ... then
  auto monitor_geo = uscreen->GetMonitorGeometry(get_monitor(use_primary));

review: Needs Fixing

[Tim Penhey (thumper)]

Thanks for the updates.

review: Approve

[Didier Roche-Tolomelli (didrocks)]

Can you please open a bug (or ask design to do so for a FFe?)

[Omer Akram (om26er)]

bugs are 950136 and 946104

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

387 +nux::ObjectPtr<Launcher> Controller::Impl::CurrentLauncher()
388 +{
389 + nux::ObjectPtr<Launcher> result;
390 + int best = std::max<int> (launchers.size() - 1, MonitorWithMouse());
391 + if (best >= 0)
392 + result = launchers[best];
393 + return result;
394 +}

This is causing that the right-most monitor is always used for keyboard navigation, while the MonitorWithMouse is actually ignored.

Using std::min of course fixes the issue.

Also, there are some autopilot tests failing when using this in multimonitor (some of them should be related to the problem above).

=== added file 'manual-tests/MMOptions.txt'
--- manual-tests/MMOptions.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/MMOptions.txt	2012-03-13 03:12:20 +0000
@@ -0,0 +1,22 @@
+Test Barrier Toggle
+-----------
+This test is to ensure the barrier toggle works on multiple-monitor systems
+
+#. Get a system with 2 monitors, ensure the left most monitor is set as primary
+#. Disable the "Capture Mouse" setting in CCSM
+#. Move your mouse between the left and right monitor
+
+Outcome
+  The mouse should move freely between monitors, without a launcher blocking its movement.
+
+
+Test Number of Launchers
+-----------
+This test is to ensure that the number of launchers created and positioned can be properly configured
+
+#. Get a system with 2 monitors, ensure the left most monitor is set as primary
+#. Open CCSM and changed the Number of Launchers option to "Primary Only"
+#. Check for the existence of a launcher on your non-primary monitor
+
+Outcome
+  There should only be a launcher on the primary monitor.
\ No newline at end of file

=== modified file 'plugins/unityshell/src/AbstractLauncherIcon.h'
--- plugins/unityshell/src/AbstractLauncherIcon.h	2012-02-12 10:43:11 +0000
+++ plugins/unityshell/src/AbstractLauncherIcon.h	2012-03-13 03:12:20 +0000
@@ -151,6 +151,8 @@
 
   virtual const bool WindowVisibleOnMonitor(int monitor) = 0;
 
+  virtual const bool WindowVisibleOnViewport() = 0;
+
   virtual bool IsSpacer() = 0;
 
   virtual float PresentUrgency() = 0;

=== modified file 'plugins/unityshell/src/DashController.cpp'
--- plugins/unityshell/src/DashController.cpp	2012-03-11 23:00:59 +0000
+++ plugins/unityshell/src/DashController.cpp	2012-03-13 03:12:20 +0000
@@ -39,6 +39,7 @@
 
 Controller::Controller()
   : launcher_width(64)
+  , use_primary(false)
   , window_(0)
   , visible_(false)
   , need_show_(false)
@@ -160,11 +161,22 @@
   geo = self->GetIdealWindowGeometry();
 }
 
+int Controller::GetIdealMonitor()
+{
+  UScreen *uscreen = UScreen::GetDefault();
+  int primary_monitor;
+  if (use_primary)
+    primary_monitor = uscreen->GetPrimaryMonitor();
+  else
+    primary_monitor = uscreen->GetMonitorWithMouse();
+
+  return primary_monitor;
+}
+
 nux::Geometry Controller::GetIdealWindowGeometry()
 {
   UScreen *uscreen = UScreen::GetDefault();
-  int primary_monitor = uscreen->GetMonitorWithMouse();
-  auto monitor_geo = uscreen->GetMonitorGeometry(primary_monitor);
+  auto monitor_geo = uscreen->GetMonitorGeometry(GetIdealMonitor());
 
   // We want to cover as much of the screen as possible to grab any mouse events outside
   // of our window
@@ -260,7 +272,7 @@
 
   StartShowHideTimeline();
 
-  GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, UScreen::GetDefault()->GetMonitorWithMouse());
+  GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, GetIdealMonitor());
   ubus_manager_.SendMessage(UBUS_OVERLAY_SHOWN, info);
 }
 
@@ -286,7 +298,7 @@
 
   StartShowHideTimeline();
 
-  GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, g_variant_new_int32(UScreen::GetDefault()->GetMonitorWithMouse()));
+  GVariant* info = g_variant_new(UBUS_OVERLAY_FORMAT_STRING, "dash", TRUE, GetIdealMonitor());
   ubus_manager_.SendMessage(UBUS_OVERLAY_HIDDEN, info);
 }
 

=== modified file 'plugins/unityshell/src/DashController.h'
--- plugins/unityshell/src/DashController.h	2012-02-15 10:54:48 +0000
+++ plugins/unityshell/src/DashController.h	2012-03-13 03:12:20 +0000
@@ -52,6 +52,7 @@
   std::vector<char> GetAllShortcuts();
 
   nux::Property<int> launcher_width;
+  nux::Property<bool> use_primary;
 
   sigc::signal<void> on_realize;
 
@@ -67,6 +68,7 @@
   void RegisterUBusInterests();
 
   nux::Geometry GetIdealWindowGeometry();
+  int GetIdealMonitor();
   void Relayout(GdkScreen*screen=NULL);
 
   void OnMouseDownOutsideWindow(int x, int y, unsigned long bflags, unsigned long kflags);

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-02-29 16:09:07 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-03-13 03:12:20 +0000
@@ -221,6 +221,7 @@
   _autoscroll_handle      = 0;
   _start_dragicon_handle  = 0;
   _dnd_check_handle       = 0;
+  _strut_hack_handle      = 0;
   _last_reveal_progress   = 0;
 
   _shortcuts_shown        = false;
@@ -313,6 +314,8 @@
     g_source_remove(_start_dragicon_handle);
   if (_launcher_animation_timeout > 0)
     g_source_remove(_launcher_animation_timeout);
+  if (_strut_hack_handle)
+    g_source_remove(_strut_hack_handle);
 
   if (_on_data_collected_connection.connected())
       _on_data_collected_connection.disconnect();
@@ -881,7 +884,6 @@
   arg.colorify            = nux::color::White;
   arg.running_arrow       = icon->GetQuirk(AbstractLauncherIcon::QUIRK_RUNNING);
   arg.running_colored     = icon->GetQuirk(AbstractLauncherIcon::QUIRK_URGENT);
-  arg.running_on_viewport = icon->WindowVisibleOnMonitor(monitor);
   arg.draw_edge_only      = IconDrawEdgeOnly(icon);
   arg.active_colored      = false;
   arg.x_rotation          = 0.0f;
@@ -905,6 +907,11 @@
   else
     arg.active_arrow = icon->GetQuirk(AbstractLauncherIcon::QUIRK_ACTIVE);
 
+  if (options()->show_for_all)
+    arg.running_on_viewport = icon->WindowVisibleOnViewport();
+  else
+    arg.running_on_viewport = icon->WindowVisibleOnMonitor(monitor);
+
   guint64 shortcut = icon->GetShortcut();
   if (shortcut > 32)
     arg.shortcut_label = (char) shortcut;
@@ -924,7 +931,10 @@
   }
   else
   {
-    arg.window_indicators = std::max<int> (icon->WindowsForMonitor(monitor).size(), 1);
+    if (options()->show_for_all)
+      arg.window_indicators = std::max<int> (icon->Windows().size(), 1);
+    else
+      arg.window_indicators = std::max<int> (icon->WindowsForMonitor(monitor).size(), 1);
   }
 
   arg.backlight_intensity = IconBackgroundIntensity(icon, current);
@@ -1483,6 +1493,7 @@
   if (self->options()->hide_mode == LAUNCHER_HIDE_NEVER)
     self->_parent->InputWindowEnableStruts(true);
 
+  self->_strut_hack_handle = 0;
   return false;
 }
 
@@ -1506,24 +1517,37 @@
   SetHideMode(options->hide_mode);
   SetIconSize(options->tile_size, options->icon_size);
 
-  // make the effect half as strong as specified as other values shouldn't scale
-  // as quickly as the max velocity multiplier
-  float decay_responsiveness_mult = ((options->edge_responsiveness() - 1) * .3f) + 1;
-  float reveal_responsiveness_mult = ((options->edge_responsiveness() - 1) * .025f) + 1;
-  float overcome_responsiveness_mult = ((options->edge_responsiveness() - 1) * 1.0f) + 1;
-
-  decaymulator_->rate_of_decay = options->edge_decay_rate() * decay_responsiveness_mult;
-  _edge_overcome_pressure = options->edge_overcome_pressure() * overcome_responsiveness_mult;
-
-  _pointer_barrier->threshold = options->edge_stop_velocity();
-  _pointer_barrier->max_velocity_multiplier = options->edge_responsiveness();
+  ConfigureBarrier();
+  EnsureAnimation();
+}
+
+void Launcher::ConfigureBarrier()
+{
+  nux::Geometry geo = GetAbsoluteGeometry();
   _pointer_barrier->DestroyBarrier();
-  _pointer_barrier->ConstructBarrier();
-
-  _hide_machine->reveal_pressure = options->edge_reveal_pressure() * reveal_responsiveness_mult;
-  _hide_machine->edge_decay_rate = options->edge_decay_rate() * decay_responsiveness_mult;
-
-  EnsureAnimation();
+
+  if (options()->edge_resist || geo.x == 0)
+  {
+    unity::panel::Style &panel_style = panel::Style::Instance();
+
+    _pointer_barrier->x1 = geo.x;
+    _pointer_barrier->x2 = geo.x;
+    _pointer_barrier->y1 = geo.y - panel_style.panel_height;
+    _pointer_barrier->y2 = geo.y + geo.height;
+
+    float decay_responsiveness_mult = ((options()->edge_responsiveness() - 1) * .3f) + 1;
+    float reveal_responsiveness_mult = ((options()->edge_responsiveness() - 1) * .025f) + 1;
+    float overcome_responsiveness_mult = ((options()->edge_responsiveness() - 1) * 1.0f) + 1;
+    decaymulator_->rate_of_decay = options()->edge_decay_rate() * decay_responsiveness_mult;
+    _edge_overcome_pressure = options()->edge_overcome_pressure() * overcome_responsiveness_mult;
+    
+    _pointer_barrier->threshold = options()->edge_stop_velocity();
+    _pointer_barrier->max_velocity_multiplier = options()->edge_responsiveness();
+    _pointer_barrier->ConstructBarrier();
+    
+    _hide_machine->reveal_pressure = options()->edge_reveal_pressure() * reveal_responsiveness_mult;
+    _hide_machine->edge_decay_rate = options()->edge_decay_rate() * decay_responsiveness_mult;
+  }
 }
 
 void Launcher::SetHideMode(LauncherHideMode hidemode)
@@ -1535,7 +1559,8 @@
   else
   {
     _parent->EnableInputWindow(true, "launcher", false, false);
-    g_timeout_add(1000, &Launcher::StrutHack, this);
+    if (!_strut_hack_handle)
+      _strut_hack_handle = g_timeout_add(1000, &Launcher::StrutHack, this);
     _parent->InputWindowEnableStruts(true);
   }
 
@@ -1690,18 +1715,9 @@
   nux::Geometry new_geometry(geo.x, geo.y + panel_style.panel_height, width, geo.height - panel_style.panel_height);
   SetMaximumHeight(new_geometry.height);
   _parent->SetGeometry(new_geometry);
-  SetGeometry(new_geometry);
-
-  _pointer_barrier->DestroyBarrier();
-
-  _pointer_barrier->x1 = new_geometry.x;
-  _pointer_barrier->x2 = new_geometry.x;
-  _pointer_barrier->y1 = new_geometry.y - panel_style.panel_height;
-  _pointer_barrier->y2 = new_geometry.y + new_geometry.height;
-  _pointer_barrier->threshold = options()->edge_stop_velocity();
-
-  _pointer_barrier->ConstructBarrier();
-
+  SetGeometry(nux::Geometry(0, 0, new_geometry.width, new_geometry.height));
+
+  ConfigureBarrier();
 }
 
 void Launcher::OnIconAdded(AbstractLauncherIcon::Ptr icon)

=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2012-02-12 10:43:11 +0000
+++ plugins/unityshell/src/Launcher.h	2012-03-13 03:12:20 +0000
@@ -166,6 +166,8 @@
     TIME_LAST
   } LauncherActionTimes;
 
+  void ConfigureBarrier();
+
   void OnOptionsChanged(Options::Ptr options);
   void OnOptionChanged();
   void UpdateOptions(Options::Ptr options);
@@ -355,6 +357,7 @@
   guint _autoscroll_handle;
   guint _start_dragicon_handle;
   guint _dnd_check_handle;
+  guint _strut_hack_handle;
 
   nux::Point2   _mouse_position;
   nux::BaseWindow* _parent;

=== modified file 'plugins/unityshell/src/LauncherController.cpp'
--- plugins/unityshell/src/LauncherController.cpp	2012-02-29 17:05:43 +0000
+++ plugins/unityshell/src/LauncherController.cpp	2012-03-13 03:12:20 +0000
@@ -80,6 +80,8 @@
   void Save();
   void SortAndUpdate();
 
+  nux::ObjectPtr<Launcher> CurrentLauncher();
+
   void OnIconAdded(AbstractLauncherIcon::Ptr icon);
   void OnIconRemoved(AbstractLauncherIcon::Ptr icon);
 
@@ -119,6 +121,8 @@
 
   void SetupBamf();
 
+  void EnsureLaunchers(std::vector<nux::Geometry> const& monitors);
+
   void OnExpoActivated();
 
   void OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors);
@@ -194,13 +198,7 @@
   reactivate_keynav = false;
   keynav_restore_window_ = true;
 
-  int i = 0;
-  for (auto monitor : monitors)
-  {
-    Launcher* launcher = CreateLauncher(i);
-    launchers.push_back(nux::ObjectPtr<Launcher> (launcher));
-    i++;
-  }
+  EnsureLaunchers(monitors);
 
   launcher_ = launchers[0];
 
@@ -264,9 +262,17 @@
   delete device_section_;
 }
 
-void Controller::Impl::OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors)
+void Controller::Impl::EnsureLaunchers(std::vector<nux::Geometry> const& monitors)
 {
-  unsigned int num_monitors = monitors.size();
+  unsigned int num_monitors;
+  if (parent_->multiple_launchers)
+  {
+    num_monitors = monitors.size();
+  }
+  else
+  {
+    num_monitors = 1;
+  }
 
   unsigned int i;
   for (i = 0; i < num_monitors; i++)
@@ -286,6 +292,11 @@
   launchers.resize(num_monitors);
 }
 
+void Controller::Impl::OnScreenChanged(int primary_monitor, std::vector<nux::Geometry>& monitors)
+{
+  EnsureLaunchers(monitors);
+}
+
 void Controller::Impl::OnWindowFocusChanged (guint32 xid)
 {
   static bool keynav_first_focus = false;
@@ -780,10 +791,16 @@
 }
 
 Controller::Controller(Display* display)
+ : options(Options::Ptr(new Options()))
+ , multiple_launchers(true)
+ , pimpl(new Impl(display, this))
 {
-  options = Options::Ptr(new Options());
-  // options must be set before creating pimpl which loads launchers
-  pimpl = new Impl(display, this);
+  multiple_launchers.changed.connect([&](bool value) -> void {
+    UScreen* uscreen = UScreen::GetDefault();
+    auto monitors = uscreen->GetMonitors();
+    pimpl->EnsureLaunchers(monitors);
+    options()->show_for_all = !value;
+  });
 }
 
 Controller::~Controller()
@@ -834,6 +851,8 @@
 
 Window Controller::LauncherWindowId(int launcher) const
 {
+  if (launcher >= (int)pimpl->launchers.size())
+    return 0;
   return pimpl->launchers[launcher]->GetParent()->GetInputWindowId();
 }
 
@@ -868,6 +887,15 @@
   return uscreen->GetMonitorWithMouse();
 }
 
+nux::ObjectPtr<Launcher> Controller::Impl::CurrentLauncher()
+{
+  nux::ObjectPtr<Launcher> result;
+  int best = std::max<int> (launchers.size() - 1, MonitorWithMouse());
+  if (best >= 0)
+    result = launchers[best];
+  return result;
+}
+
 void Controller::HandleLauncherKeyPress()
 {
   unity::TimeUtil::SetTimeStruct(&pimpl->launcher_key_press_time_);
@@ -876,7 +904,7 @@
   {
     Impl* self = static_cast<Impl*>(user_data);
     if (self->keyboard_launcher_.IsNull())
-      self->keyboard_launcher_ = self->launchers[self->MonitorWithMouse()];
+      self->keyboard_launcher_ = self->CurrentLauncher();
 
     if (self->launcher_hide_handler_id_ > 0)
     {
@@ -897,7 +925,7 @@
     if (!self->launcher_keynav)
     {
       if (self->keyboard_launcher_.IsNull())
-        self->keyboard_launcher_ = self->launchers[self->MonitorWithMouse()];
+        self->keyboard_launcher_ = self->CurrentLauncher();
 
       self->keyboard_launcher_->ShowShortcuts(true);
       self->launcher_open = true;
@@ -1021,7 +1049,7 @@
   pimpl->reactivate_keynav = false;
   pimpl->launcher_keynav = true;
   pimpl->keynav_restore_window_ = true;
-  pimpl->keyboard_launcher_ = pimpl->launchers[pimpl->MonitorWithMouse()];
+  pimpl->keyboard_launcher_ = pimpl->CurrentLauncher();
 
   pimpl->keyboard_launcher_->EnterKeyNavMode();
   pimpl->model_->SetSelection(0);
@@ -1087,7 +1115,7 @@
   .add("key_nav_launcher_monitor", pimpl->keyboard_launcher_.IsValid() ?  pimpl->keyboard_launcher_->monitor : -1)
   .add("key_nav_selection", pimpl->model_->SelectionIndex())
   .add("key_nav_is_grabbed", pimpl->launcher_grabbed)
-  .add("keyboard_launcher", pimpl->launchers[pimpl->MonitorWithMouse()]->monitor);
+  .add("keyboard_launcher", pimpl->CurrentLauncher()->monitor);
 }
 
 void Controller::Impl::ReceiveLauncherKeyPress(unsigned long eventType,

=== modified file 'plugins/unityshell/src/LauncherController.h'
--- plugins/unityshell/src/LauncherController.h	2012-02-29 01:56:47 +0000
+++ plugins/unityshell/src/LauncherController.h	2012-03-13 03:12:20 +0000
@@ -42,6 +42,7 @@
   typedef std::vector<nux::ObjectPtr<Launcher> > LauncherList;
 
   nux::Property<Options::Ptr> options;
+  nux::Property<bool> multiple_launchers;
 
   Controller(Display* display);
   ~Controller();

=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2012-02-21 02:03:40 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2012-03-13 03:12:20 +0000
@@ -166,6 +166,15 @@
   return _has_visible_window[monitor];
 }
 
+const bool LauncherIcon::WindowVisibleOnViewport()
+{
+  for (int i = 0; i < max_num_monitors; ++i)
+    if (_has_visible_window[i])
+      return true;
+
+  return false;
+}
+
 std::string
 LauncherIcon::GetName() const
 {

=== modified file 'plugins/unityshell/src/LauncherIcon.h'
--- plugins/unityshell/src/LauncherIcon.h	2012-02-14 23:52:22 +0000
+++ plugins/unityshell/src/LauncherIcon.h	2012-03-13 03:12:20 +0000
@@ -110,6 +110,8 @@
 
   const bool WindowVisibleOnMonitor(int monitor);
 
+  const bool WindowVisibleOnViewport();
+
   virtual bool IsSpacer()
   {
     return false;

=== modified file 'plugins/unityshell/src/LauncherOptions.cpp'
--- plugins/unityshell/src/LauncherOptions.cpp	2012-02-08 18:34:43 +0000
+++ plugins/unityshell/src/LauncherOptions.cpp	2012-03-13 03:12:20 +0000
@@ -42,6 +42,8 @@
   reveal_trigger = RevealTrigger::EDGE;
   tile_size = 54;
   urgent_animation = URGENT_ANIMATION_WIGGLE;
+  edge_resist = true;
+  show_for_all = false;
 
   auto_hide_animation.changed.connect   ([&] (AutoHideAnimation value)-> void { option_changed.emit(); });
   background_alpha.changed.connect      ([&] (float value)            -> void { option_changed.emit(); });
@@ -57,6 +59,7 @@
   reveal_trigger.changed.connect        ([&] (RevealTrigger vallue)   -> void { option_changed.emit(); });
   tile_size.changed.connect             ([&] (int value)              -> void { option_changed.emit(); });
   urgent_animation.changed.connect      ([&] (UrgentAnimation value)  -> void { option_changed.emit(); });
+  edge_resist.changed.connect           ([&] (bool value)             -> void { option_changed.emit(); });
 }
 
 

=== modified file 'plugins/unityshell/src/LauncherOptions.h'
--- plugins/unityshell/src/LauncherOptions.h	2012-02-08 17:22:28 +0000
+++ plugins/unityshell/src/LauncherOptions.h	2012-03-13 03:12:20 +0000
@@ -97,6 +97,8 @@
   nux::Property<int> edge_stop_velocity;
   nux::Property<int> edge_reveal_pressure;
   nux::Property<float> edge_responsiveness;
+  nux::Property<bool> edge_resist;
+  nux::Property<bool> show_for_all;
 
   sigc::signal<void> option_changed;
 };

=== modified file 'plugins/unityshell/src/MockLauncherIcon.h'
--- plugins/unityshell/src/MockLauncherIcon.h	2012-02-12 10:43:11 +0000
+++ plugins/unityshell/src/MockLauncherIcon.h	2012-03-13 03:12:20 +0000
@@ -137,6 +137,11 @@
     return 7;
   }
 
+  const bool WindowVisibleOnViewport()
+  {
+    return false;
+  }
+
   const bool WindowVisibleOnMonitor(int monitor)
   {
     return false;

=== modified file 'plugins/unityshell/src/UScreen.cpp'
--- plugins/unityshell/src/UScreen.cpp	2012-02-04 05:28:23 +0000
+++ plugins/unityshell/src/UScreen.cpp	2012-03-13 03:12:20 +0000
@@ -119,8 +119,7 @@
 
   g_print("\nScreen geometry changed:\n");
 
-  int lowest_x = std::numeric_limits<int>::max();
-  int highest_y = std::numeric_limits<int>::min();
+  primary_ = gdk_screen_get_primary_monitor(screen);
   for (int i = 0; i < gdk_screen_get_n_monitors(screen); i++)
   {
     GdkRectangle rect = { 0 };
@@ -136,13 +135,6 @@
 
     _monitors.push_back(geo);
 
-    if (geo.x < lowest_x || (geo.x == lowest_x && geo.y > highest_y))
-    {
-      lowest_x = geo.x;
-      highest_y = geo.y;
-      primary_ = i;
-    }
-
     g_print("   %dx%dx%dx%d\n", geo.x, geo.y, geo.width, geo.height);
   }
 

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-03-13 00:35:02 +0000
+++ plugins/unityshell/src/unityshell.cpp	2012-03-13 03:12:20 +0000
@@ -337,6 +337,9 @@
      optionSetDecayRateNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
      optionSetShowMinimizedWindowsNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
 
+     optionSetNumLaunchersNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
+     optionSetLauncherCaptureMouseNotify(boost::bind(&UnityScreen::optionChanged, this, _1, _2));
+
      ubus_manager_.RegisterInterest(UBUS_LAUNCHER_START_KEY_NAV,
                    sigc::mem_fun(this, &UnityScreen::OnLauncherStartKeyNav));
 
@@ -2452,6 +2455,13 @@
   unity::launcher::Options::Ptr launcher_options = launcher_controller_->options();
   switch (num)
   {
+    case UnityshellOptions::NumLaunchers:
+      launcher_controller_->multiple_launchers = optionGetNumLaunchers() == 0;
+      dash_controller_->use_primary = !launcher_controller_->multiple_launchers();
+      break;
+    case UnityshellOptions::LauncherCaptureMouse:
+      launcher_options->edge_resist = optionGetLauncherCaptureMouse();
+      break;
     case UnityshellOptions::BackgroundColor:
     {
       nux::Color override_color (optionGetBackgroundColorRed() / 65535.0f,

=== modified file 'plugins/unityshell/unityshell.xml.in'
--- plugins/unityshell/unityshell.xml.in	2012-03-12 18:26:30 +0000
+++ plugins/unityshell/unityshell.xml.in	2012-03-13 03:12:20 +0000
@@ -453,6 +453,27 @@
                     <default>300</default>
                 </option>
 
+                <option name="num_launchers" type="int">
+                    <_short>Launcher Monitors</_short>
+                    <_long>Monitors on which launchers will be displayed</_long>
+                    <min>0</min>
+                    <max>1</max>
+                    <default>0</default>
+                    <desc>
+                        <value>0</value>
+                        <_name>All Desktops</_name>
+                    </desc>
+                    <desc>
+                        <value>1</value>
+                        <_name>Primary Desktop</_name>
+                    </desc>
+                </option>
+
+                <option name="launcher_capture_mouse" type="bool">
+                  <_short>Launcher Capture Mouse</_short>
+                  <_long>Determines if the launcher edges should capture the mouse</_long>
+                  <default>true</default>
+                </option>
             </group>
         </options>
     </plugin>