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

[Manuel Nicetto]

[Tim Penhey (thumper)]

On Sat, 25 Jun 2011 08:44:55 you wrote:
> +void
> +Launcher::RecvKeyReleased (unsigned int key_sym,
> + unsigned long key_code,
> + unsigned long key_state)
> +{
> + _shift_pressed=false;
> +}
> +

This looks wrong. What if the user held shift, then alt, then released alt,
but shift still down. This would incorrectly clear the shift pressed. We
should check the key code.

Tim

[Marco Biscaro (marcobiscaro2112)]

+ bool _shift_pressed;

You are using tab here. Please, use spaces instead.

+ _shift_pressed=false;
+ _icon_mouse_down->_shift_pressed=_shift_pressed;

Use spaces before and after the assignment operator. Something like:
_shift_pressed = false;
_icon_mouse_down->_shift_pressed = _shift_pressed;

[Jason Smith (jassmith)]

please dont use public variables to signify information to a method on LauncherIcon, pass shift_pressed as an argument to the click behavior.

review: Needs Fixing

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-30 15:21:07 +0000
+++ plugins/unityshell/src/Launcher.cpp	2011-06-30 22:35:53 +0000
@@ -261,7 +261,12 @@
     _parent = parent;
     _screen = screen;
     _active_quicklist = 0;
+<<<<<<< TREE
 
+=======
+    _shift_pressed = false;
+    
+>>>>>>> MERGE-SOURCE
     _hide_machine = new LauncherHideMachine ();
     _set_hidden_connection = (sigc::connection) _hide_machine->should_hide_changed.connect (sigc::mem_fun (this, &Launcher::SetHidden));
     _hover_machine = new LauncherHoverMachine ();
@@ -279,6 +284,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));
 
@@ -3039,6 +3045,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);
 
@@ -3131,7 +3138,12 @@
 {
   SetMousePosition (x, y);
   SetStateMouseOverLauncher (true);
+<<<<<<< TREE
 
+=======
+  GrabKeyboard ();
+  
+>>>>>>> MERGE-SOURCE
   // make sure we actually get a chance to get events before turning this off
   if (x > 0)
     _hide_machine->SetQuirk (LauncherHideMachine::MOUSE_OVER_ACTIVE_EDGE, false);
@@ -3145,6 +3157,7 @@
   SetMousePosition (x, y);
   SetStateMouseOverLauncher (false);
   LauncherIcon::SetSkipTooltipDelay (false);
+  UnGrabKeyboard ();
 
   EventLogic ();
   EnsureAnimation ();
@@ -3266,6 +3279,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
@@ -3372,6 +3391,16 @@
   }
 }
 
+void
+Launcher::RecvKeyReleased (unsigned int  key_sym,
+                          unsigned long key_code,
+                          unsigned long key_state)
+{
+  if(key_sym == NUX_VK_SHIFT){
+    _shift_pressed = false;
+  }
+}
+
 void Launcher::RecvQuicklistOpened (QuicklistView *quicklist)
 {
   _hide_machine->SetQuirk (LauncherHideMachine::QUICKLIST_OPEN, true);
@@ -3454,7 +3483,8 @@
     _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->MouseClick.emit (nux::GetEventButton (button_flags), _shift_pressed);
+      _shift_pressed = false;
     }
   }
 

=== modified file 'plugins/unityshell/src/Launcher.h'
--- plugins/unityshell/src/Launcher.h	2011-06-28 11:49:06 +0000
+++ plugins/unityshell/src/Launcher.h	2011-06-30 22:35:53 +0000
@@ -152,6 +152,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);
@@ -418,6 +419,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-30 22:35:53 +0000
@@ -606,12 +606,17 @@
   }
 }
 
-void LauncherIcon::RecvMouseClick (int button)
+void LauncherIcon::RecvMouseClick (int button, bool shift_pressed)
 {
-  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 ();
+  }
 }
 
 void LauncherIcon::HideTooltip ()

=== modified file 'plugins/unityshell/src/LauncherIcon.h'
--- plugins/unityshell/src/LauncherIcon.h	2011-06-04 15:15:56 +0000
+++ plugins/unityshell/src/LauncherIcon.h	2011-06-30 22:35:53 +0000
@@ -95,7 +95,7 @@
     void RecvMouseLeave ();
     void RecvMouseDown (int button);
     void RecvMouseUp (int button);
-    void RecvMouseClick (int button);
+    void RecvMouseClick (int button, bool shift_pressed = false);
     
     void HideTooltip ();
     gboolean OpenQuicklist (bool default_to_first_item = false);
@@ -155,7 +155,7 @@
     sigc::signal<void, int> MouseUp;
     sigc::signal<void>      MouseEnter;
     sigc::signal<void>      MouseLeave;
-    sigc::signal<void, int> MouseClick;
+    sigc::signal<void, int, bool> MouseClick;
     
     sigc::signal<void, LauncherIcon *> show;
     sigc::signal<void, LauncherIcon *> hide;

=== modified file 'plugins/unityshell/src/SimpleLauncherIcon.cpp'
--- plugins/unityshell/src/SimpleLauncherIcon.cpp	2011-04-20 09:40:45 +0000
+++ plugins/unityshell/src/SimpleLauncherIcon.cpp	2011-06-30 22:35:53 +0000
@@ -67,7 +67,7 @@
 }
 
 void
-SimpleLauncherIcon::OnMouseClick (int button)
+SimpleLauncherIcon::OnMouseClick (int button, bool shift_pressed)
 {
 }
 

=== modified file 'plugins/unityshell/src/SimpleLauncherIcon.h'
--- plugins/unityshell/src/SimpleLauncherIcon.h	2011-03-29 17:32:19 +0000
+++ plugins/unityshell/src/SimpleLauncherIcon.h	2011-06-30 22:35:53 +0000
@@ -40,7 +40,7 @@
 protected:
     virtual void OnMouseDown (int button);
     virtual void OnMouseUp (int button);
-    virtual void OnMouseClick (int button);
+    virtual void OnMouseClick (int button, bool shift_pressed = false);
     virtual void OnMouseEnter ();
     virtual void OnMouseLeave ();