Merge lp:~azzar1/unity/fix-754565-5.0 into lp:unity/5.0

[Andrea Azzarone]

Backport lp:~thomir/unity/fix-for-754565

== Problem ==
Shift+Click on a launcher icon should open a new instance of the application.

== Fix ==
Backport fix

== Test ==
Backported test too. Please test it, ap doesn't work on my system.

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

Good for me.

review: Approve

=== modified file 'plugins/unityshell/src/AbstractLauncherIcon.h'
--- plugins/unityshell/src/AbstractLauncherIcon.h	2012-04-26 23:27:17 +0000
+++ plugins/unityshell/src/AbstractLauncherIcon.h	2012-07-16 14:01:42 +0000
@@ -210,9 +210,9 @@
   
   virtual void UnStick() = 0;
 
-  sigc::signal<void, int, int> mouse_down;
-  sigc::signal<void, int, int> mouse_up;
-  sigc::signal<void, int, int> mouse_click;
+  sigc::signal<void, int, unsigned long, int> mouse_down;
+  sigc::signal<void, int, unsigned long, int> mouse_up;
+  sigc::signal<void, int, unsigned long, int> mouse_click;
   sigc::signal<void, int>      mouse_enter;
   sigc::signal<void, int>      mouse_leave;
 
 
=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-07-13 15:19:42 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-07-16 14:01:42 +0000
@@ -2590,7 +2590,7 @@
       g_source_remove(_start_dragicon_handle);
     _start_dragicon_handle = g_timeout_add(START_DRAGICON_DURATION, &Launcher::StartIconDragTimeout, this);
 
-    launcher_icon->mouse_down.emit(nux::GetEventButton(button_flags), monitor);
+    launcher_icon->mouse_down.emit(nux::GetEventButton(button_flags), key_flags, monitor);
   }
 }
 
@@ -2606,19 +2606,20 @@
 
   if (_icon_mouse_down && (_icon_mouse_down == launcher_icon))
   {
-    _icon_mouse_down->mouse_up.emit(nux::GetEventButton(button_flags), monitor);
+    _icon_mouse_down->mouse_up.emit(nux::GetEventButton(button_flags), key_flags, monitor);
 
     if (GetActionState() == ACTION_NONE)
     {
+
       /* This will inform the icon if the action is valid for all the monitors */
       int action_monitor = options()->show_for_all ? -1 : monitor;
-      _icon_mouse_down->mouse_click.emit(nux::GetEventButton(button_flags), action_monitor);
+      _icon_mouse_down->mouse_click.emit(nux::GetEventButton(button_flags), key_flags, action_monitor);
     }
   }
 
   if (launcher_icon && (_icon_mouse_down != launcher_icon))
   {
-    launcher_icon->mouse_up.emit(nux::GetEventButton(button_flags), monitor);
+    launcher_icon->mouse_up.emit(nux::GetEventButton(button_flags), key_flags, monitor);
   }
 
   if (GetActionState() == ACTION_DRAG_LAUNCHER)
 
=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2012-04-26 23:27:17 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2012-07-16 14:01:42 +0000
@@ -630,13 +630,13 @@
   return true;
 }
 
-void LauncherIcon::RecvMouseDown(int button, int monitor)
+void LauncherIcon::RecvMouseDown(int button, unsigned long key_flags, int monitor)
 {
   if (button == 3)
     OpenQuicklist();
 }
 
-void LauncherIcon::RecvMouseUp(int button, int monitor)
+void LauncherIcon::RecvMouseUp(int button, unsigned long key_flags, int monitor)
 {
   if (button == 3)
   {
@@ -645,14 +645,17 @@
   }
 }
 
-void LauncherIcon::RecvMouseClick(int button, int monitor)
+void LauncherIcon::RecvMouseClick(int button, unsigned long key_flags, int monitor)
 {
   ActionArg arg(ActionArg::LAUNCHER, button);
   arg.monitor = monitor;
+  bool shift_pressed = nux::GetKeyModifierState(key_flags, nux::NUX_STATE_SHIFT);
 
-  if (button == 1)
+  // Click without shift
+  if (button == 1 && !shift_pressed)
     Activate(arg);
-  else if (button == 2)
+  // Middle click or click with shift
+  else if ((button == 2) || (button == 1 && shift_pressed))
     OpenInstance(arg);
 }
 
 
=== modified file 'plugins/unityshell/src/LauncherIcon.h'
--- plugins/unityshell/src/LauncherIcon.h	2012-04-26 23:27:17 +0000
+++ plugins/unityshell/src/LauncherIcon.h	2012-07-16 14:01:42 +0000
@@ -76,11 +76,11 @@
 
   void RecvMouseLeave(int monitor);
 
-  void RecvMouseDown(int button, int monitor);
-
-  void RecvMouseUp(int button, int monitor);
-
-  void RecvMouseClick(int button, int monitor);
+  void RecvMouseDown(int button, unsigned long key_flags, int monitor);
+
+  void RecvMouseUp(int button, unsigned long key_flags, int monitor);
+
+  void RecvMouseClick(int button, unsigned long key_flags, int monitor);
 
   void HideTooltip();
 
 
=== modified file 'plugins/unityshell/src/SimpleLauncherIcon.cpp'
--- plugins/unityshell/src/SimpleLauncherIcon.cpp	2012-03-25 22:52:20 +0000
+++ plugins/unityshell/src/SimpleLauncherIcon.cpp	2012-07-16 14:01:42 +0000
@@ -69,15 +69,15 @@
     g_signal_handler_disconnect(gtk_icon_theme_get_default(), theme_changed_id_);
 }
 
-void SimpleLauncherIcon::OnMouseDown(int button, int monitor)
-{
-}
-
-void SimpleLauncherIcon::OnMouseUp(int button, int monitor)
-{
-}
-
-void SimpleLauncherIcon::OnMouseClick(int button, int monitor)
+void SimpleLauncherIcon::OnMouseDown(int button, unsigned long key_flags, int monitor)
+{
+}
+
+void SimpleLauncherIcon::OnMouseUp(int button, unsigned long key_flags, int monitor)
+{
+}
+
+void SimpleLauncherIcon::OnMouseClick(int button, unsigned long key_flags, int monitor)
 {
 }
 
 
=== modified file 'plugins/unityshell/src/SimpleLauncherIcon.h'
--- plugins/unityshell/src/SimpleLauncherIcon.h	2012-03-25 22:52:20 +0000
+++ plugins/unityshell/src/SimpleLauncherIcon.h	2012-07-16 14:01:42 +0000
@@ -49,11 +49,12 @@
   std::string GetName() const;
   void AddProperties(GVariantBuilder* builder);
 
-  virtual void OnMouseDown(int button, int monitor);
-  virtual void OnMouseUp(int button, int monitor);
-  virtual void OnMouseClick(int button, int monitor);
+  virtual void OnMouseDown(int button, unsigned long key_flags, int monitor);
+  virtual void OnMouseUp(int button, unsigned long key_flags, int monitor);
+  virtual void OnMouseClick(int button, unsigned long key_flags, int monitor);
   virtual void OnMouseEnter(int monitor);
   virtual void OnMouseLeave(int monitor);
+
   virtual void ActivateLauncherIcon(ActionArg arg);
 
 private:
 
=== modified file 'tests/autopilot/autopilot/tests/test_launcher.py'
--- tests/autopilot/autopilot/tests/test_launcher.py	2012-06-29 23:36:10 +0000
+++ tests/autopilot/autopilot/tests/test_launcher.py	2012-07-16 14:01:42 +0000
@@ -900,3 +900,29 @@
          self.mouse.move(bfb.center_x, bfb.center_y)
 
          self.assertThat(bfb.get_tooltip().active, Eventually(Equals(False)))
+
+class LauncherIconTests(UnityTestCase):
+    """Tests for the launcher icons."""
+
+    def assertNumberWinsIsEventually(self, app, num):
+       """Asserts that 'app' eventually has 'num' wins. Waits up to 10 seconds."""
+        for i in range(10):
+            wins = app.get_windows()
+            if len(wins) == num:
+                return
+            sleep(1)
+
+        self.assertThat(len(app.get_windows()), Equals(num))
+
+    def test_shift_click_opens_new_application_instance(self):
+        """Shift+Clicking MUST open a new instance of an already-running application."""
+        app = self.start_app("Calculator")
+        desktop_id = app.desktop_file
+        icon = self.launcher.model.get_icon_by_desktop_id(desktop_id)
+        launcher_instance = self.launcher.get_launcher_for_monitor(0)
+
+        self.keyboard.press("Shift")
+        self.addCleanup(self.keyboard.release, "Shift")
+        launcher_instance.click_launcher_icon(icon)
+
+        self.assertNumberWinsIsEventually(app, 2)