Merge lp:~manuel-nicetto/unity/bug-754565 into lp:unity

[Manuel Nicetto]

[lp:~manuel-nicetto/unity/bug-754565]

1242. By Manuel Nicetto on 2011-06-24

fixed _shift_pressed assigned twice in LauncherIcon.cpp

1243. By Manuel Nicetto on 2011-06-27

-- Fixed key release checking the correct shift pressed event reported by Tim Penhey
-- Fixed identation errors reported from Marco Biscaro

1244. By Manuel Nicetto on 2011-06-27

-- fixed another identation error

1245. By Manuel Nicetto on 2011-06-30

Pass shift_pressed on click behavior as suggested by Jason

Unmerged revisions

1245. By Manuel Nicetto on 2011-06-30

Pass shift_pressed on click behavior as suggested by Jason

1244. By Manuel Nicetto on 2011-06-27

-- fixed another identation error

1243. By Manuel Nicetto on 2011-06-27

-- Fixed key release checking the correct shift pressed event reported by Tim Penhey
-- Fixed identation errors reported from Marco Biscaro

1242. By Manuel Nicetto on 2011-06-24

fixed _shift_pressed assigned twice in LauncherIcon.cpp

1241. By Manuel Nicetto on 2011-06-16

* Regression: shift+click on a launcher icon to open a new application instance gone

-- Manuel Nicetto <email address hidden> Thu 16 Jun 2011 23:31

=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2011-06-22 19:18:47 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-06-24 20:43:44 +0000
@@ -258,6 +258,7 @@
     _parent = parent;
     _screen = screen;
     _active_quicklist = 0;
+    _shift_pressed=false;
     
     _hide_machine = new LauncherHideMachine ();
     _set_hidden_connection = (sigc::connection) _hide_machine->should_hide_changed.connect (sigc::mem_fun (this, &Launcher::SetHidden));    
@@ -276,6 +277,7 @@
     OnMouseMove.connect (sigc::mem_fun (this, &Launcher::RecvMouseMove));
     OnMouseWheel.connect (sigc::mem_fun (this, &Launcher::RecvMouseWheel));
     OnKeyPressed.connect (sigc::mem_fun (this, &Launcher::RecvKeyPressed));
+    OnKeyReleased.connect (sigc::mem_fun (this, &Launcher::RecvKeyReleased));
     OnMouseDownOutsideArea.connect (sigc::mem_fun (this, &Launcher::RecvMouseDownOutsideArea));
     //OnEndFocus.connect   (sigc::mem_fun (this, &Launcher::exitKeyNavMode));
     
@@ -3050,6 +3052,7 @@
 
 void Launcher::RecvMouseDown(int x, int y, unsigned long button_flags, unsigned long key_flags)
 {
+  UnGrabKeyboard ();
   _last_button_press = nux::GetEventButton (button_flags);
   SetMousePosition (x, y);
 
@@ -3142,6 +3145,7 @@
 {
   SetMousePosition (x, y);
   SetStateMouseOverLauncher (true);
+  GrabKeyboard ();
   
   // make sure we actually get a chance to get events before turning this off
   if (x > 0)
@@ -3156,6 +3160,7 @@
   SetMousePosition (x, y);
   SetStateMouseOverLauncher (false);
   LauncherIcon::SetSkipTooltipDelay (false);
+  UnGrabKeyboard ();
 
   EventLogic ();
   EnsureAnimation ();
@@ -3277,6 +3282,12 @@
 {
 
   LauncherModel::iterator it;
+  
+  if(key_sym==NUX_VK_SHIFT){
+    _shift_pressed=true;
+  } else {
+    _shift_pressed=false;
+  }
 
   /*
    * all key events below are related to keynavigation. Make an additional
@@ -3383,6 +3394,14 @@
   }
 }
 
+void
+Launcher::RecvKeyReleased (unsigned int  key_sym,
+                          unsigned long key_code,
+                          unsigned long key_state)
+{
+  _shift_pressed=false;
+}
+
 void Launcher::RecvQuicklistOpened (QuicklistView *quicklist)
 {
   _hide_machine->SetQuirk (LauncherHideMachine::QUICKLIST_OPEN, true);
@@ -3465,7 +3484,9 @@
     _icon_mouse_down->MouseUp.emit (nux::GetEventButton (button_flags));
 
     if (GetActionState () == ACTION_NONE) {
-      _icon_mouse_down->MouseClick.emit (nux::GetEventButton (button_flags));
+      _icon_mouse_down->_shift_pressed=_shift_pressed;
+	  _icon_mouse_down->MouseClick.emit (nux::GetEventButton (button_flags));
+      _shift_pressed=false;
     }
   }
 
 
=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2011-06-09 07:23:27 +0000
+++ plugins/unityshell/src/Launcher.h	2011-06-24 20:43:44 +0000
@@ -156,6 +156,7 @@
   virtual void RecvMouseDownOutsideArea (int x, int y, unsigned long button_flags, unsigned long key_flags);
 
   virtual void RecvKeyPressed (unsigned int key_sym, unsigned long key_code, unsigned long key_state);
+  virtual void RecvKeyReleased (unsigned int key_sym, unsigned long key_code, unsigned long key_state);
 
   virtual void RecvQuicklistOpened (QuicklistView *quicklist);
   virtual void RecvQuicklistClosed (QuicklistView *quicklist);
@@ -424,6 +425,7 @@
   bool          _shortcuts_shown;  
   bool          _super_pressed;
   bool          _keynav_activated;
+  bool			_shift_pressed;
   guint64       _latest_shortcut;
     
   BacklightMode _backlight_mode;
 
=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2011-06-21 12:10:09 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2011-06-24 20:43:44 +0000
@@ -60,6 +60,7 @@
 LauncherIcon::LauncherIcon(Launcher* launcher)
 {
   _folding_angle = 0;
+  _shift_pressed=false;
   _launcher = launcher;
   m_TooltipText = "blank";
 
@@ -608,10 +609,17 @@
 
 void LauncherIcon::RecvMouseClick (int button)
 {
-  if (button == 1)
+  if (button == 1 && !_shift_pressed){
     Activate ();
-  else if (button == 2)
-    OpenInstance ();
+  }
+  else if (button == 1 && _shift_pressed){
+    OpenInstance ();
+  }
+  else if (button == 2){
+    OpenInstance ();
+  }
+  
+  _shift_pressed=false;
 }
 
 void LauncherIcon::HideTooltip ()
 
=== modified file 'plugins/unityshell/src/LauncherIcon.h'
--- plugins/unityshell/src/LauncherIcon.h	2011-05-27 18:57:49 +0000
+++ plugins/unityshell/src/LauncherIcon.h	2011-06-24 20:43:44 +0000
@@ -234,6 +234,8 @@
     bool          _mouse_inside;
     float         _folding_angle;
 
+    bool          _shift_pressed;
+
     nux::Tooltip *_tooltip;
     QuicklistView *_quicklist;