Merge lp:~mjuhasz/unity/fix-for-754565 into lp:unity

[Miklos Juhasz]

Fix for bug #754565 - Shift+Click on a launcher icon should open a new instance of the application.

Also see: https://code.launchpad.net/~yeganeh/unity/fix-for-754565/+merge/77739

[Alex Launi (alexlauni)]

Please add an autopilot test to ensure that this feature does not regress, and is working properly. A new test should go into tests/autopilot/autopilot/tests/test_launcher.py

review: Needs Fixing (quality)

[Miklos Juhasz (mjuhasz)]

@thomir: Is your offer to write the test still valid?

=== modified file 'plugins/unityshell/src/AbstractLauncherIcon.h'
--- plugins/unityshell/src/AbstractLauncherIcon.h	2012-03-30 15:24:34 +0000
+++ plugins/unityshell/src/AbstractLauncherIcon.h	2012-04-11 19:21:24 +0000
@@ -207,9 +207,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, int, unsigned long> mouse_down;
+  sigc::signal<void, int, int, unsigned long> mouse_up;
+  sigc::signal<void, int, int, unsigned long> 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-04-10 01:41:16 +0000
+++ plugins/unityshell/src/Launcher.cpp	2012-04-11 19:21:24 +0000
@@ -2533,7 +2533,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), monitor, key_flags);
   }
 }
 
@@ -2549,17 +2549,17 @@
 
   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), monitor, key_flags);
 
     if (GetActionState() == ACTION_NONE)
     {
-      _icon_mouse_down->mouse_click.emit(nux::GetEventButton(button_flags), monitor);
+      _icon_mouse_down->mouse_click.emit(nux::GetEventButton(button_flags), monitor, key_flags);
     }
   }
 
   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), monitor, key_flags);
   }
 
   if (GetActionState() == ACTION_DRAG_LAUNCHER)
 
=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2012-04-10 00:39:14 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2012-04-11 19:21:24 +0000
@@ -620,13 +620,13 @@
   return true;
 }
 
-void LauncherIcon::RecvMouseDown(int button, int monitor)
+void LauncherIcon::RecvMouseDown(int button, int monitor, unsigned long key_flags)
 {
   if (button == 3)
     OpenQuicklist();
 }
 
-void LauncherIcon::RecvMouseUp(int button, int monitor)
+void LauncherIcon::RecvMouseUp(int button, int monitor, unsigned long key_flags)
 {
   if (button == 3)
   {
@@ -635,14 +635,18 @@
   }
 }
 
-void LauncherIcon::RecvMouseClick(int button, int monitor)
+void LauncherIcon::RecvMouseClick(int button, int monitor, unsigned long key_flags)
 {
   ActionArg arg(ActionArg::LAUNCHER, button);
   arg.monitor = monitor;
 
-  if (button == 1)
+  bool shift_pressed = nux::GetKeyModifierState(key_flags, nux::NUX_STATE_SHIFT);
+
+  // 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-03 22:18:36 +0000
+++ plugins/unityshell/src/LauncherIcon.h	2012-04-11 19:21:24 +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, int monitor, unsigned long key_flags = 0);
+
+  void RecvMouseUp(int button, int monitor, unsigned long key_flags = 0);
+
+  void RecvMouseClick(int button, int monitor, unsigned long key_flags = 0);
 
   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-04-11 19:21:24 +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, int monitor, unsigned long key_flags)
+{
+}
+
+void SimpleLauncherIcon::OnMouseUp(int button, int monitor, unsigned long key_flags)
+{
+}
+
+void SimpleLauncherIcon::OnMouseClick(int button, int monitor, unsigned long key_flags)
 {
 }
 
 
=== 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-04-11 19:21:24 +0000
@@ -49,9 +49,9 @@
   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, int monitor, unsigned long key_flags = 0);
+  virtual void OnMouseUp(int button, int monitor, unsigned long key_flags = 0);
+  virtual void OnMouseClick(int button, int monitor, unsigned long key_flags = 0);
   virtual void OnMouseEnter(int monitor);
   virtual void OnMouseLeave(int monitor);
   virtual void ActivateLauncherIcon(ActionArg arg);