Merge lp:~didrocks/unity/misc-launcher-fixes-070411 into lp:unity

[Didier Roche-Tolomelli]

Some additional fixes since yesterday:
- make shortcuts work with fn key and keynum pad (LP: #747153)
- unmimize all for selected apps window on scale. Don't minimize them if not selected after, see FIXME (LP: #750349)
- depends on largedestkop feature (LP: #711561)
- finish the "start drag but press 1s" animation.

[Neil J. Patel (njpatel)]

Looks good, approved!

review: Approve

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-04-06 17:53:41 +0000
+++ src/Launcher.cpp	2011-04-07 13:52:26 +0000
@@ -381,6 +381,9 @@
     _drag_out_id            = 0;
     _drag_out_delta_x       = 0.0f;
     
+    // FIXME: remove
+    _initial_drag_animation = false;
+    
     _check_window_over_launcher   = true;
     _postreveal_mousemove_delta_x = 0;
     _postreveal_mousemove_delta_y = 0;
@@ -1322,7 +1325,9 @@
     
     icon->SetCenter (nux::Point3 (roundf (center.x), roundf (center.y), roundf (center.z)));
     
-    if (icon == _drag_icon && _drag_window && _drag_window->Animating ())
+    // FIXME: this is a hack, we should have a look why SetAnimationTarget is necessary in SetAnimationTarget
+    // we should ideally just need it at start to set the target
+    if (!_initial_drag_animation && icon == _drag_icon && _drag_window && _drag_window->Animating ())
       _drag_window->SetAnimationTarget ((int) center.x, (int) center.y + _parent->GetGeometry ().y);
     
     center.y += (half_size * size_modifier) + spacing;   // move to end
@@ -2748,7 +2753,8 @@
       self->_icon_under_mouse->MouseLeave.emit ();
       self->_icon_under_mouse->_mouse_inside = false;
       self->_icon_under_mouse = 0;
-      } 
+      }
+      self->_initial_drag_animation = true;
       self->StartIconDragRequest (self->GetMouseX (), self->GetMouseY ());
     }
     self->_start_dragicon_handle = 0;
@@ -2765,7 +2771,11 @@
   {
     StartIconDrag (drag_icon);
     SetActionState (ACTION_DRAG_ICON);
-    UpdateDragWindowPosition (x, y);
+    UpdateDragWindowPosition (drag_icon->GetCenter ().x, drag_icon->GetCenter ().y);
+    if(_initial_drag_animation) {
+      _drag_window->SetAnimationTarget (x, y + _drag_window->GetGeometry ().height/2);
+      _drag_window->StartAnimation ();
+    }
     EnsureAnimation ();
   } 
 }
@@ -2882,6 +2892,9 @@
 void Launcher::RecvMouseDrag(int x, int y, int dx, int dy, unsigned long button_flags, unsigned long key_flags)
 {
   SetMousePosition (x, y);
+  
+  // FIXME: hack (see SetupRenderArg)
+  _initial_drag_animation = false;
 
   _dnd_delta_y += dy;
   _dnd_delta_x += dx;
@@ -3001,9 +3014,10 @@
 }
 
 gboolean
-Launcher::CheckSuperShortcutPressed (unsigned int key_sym,
+Launcher::CheckSuperShortcutPressed (unsigned int  key_sym,
                                      unsigned long key_code,
-                                     unsigned long key_state)
+                                     unsigned long key_state,
+                                     char*         key_string)
 {
   if (!_super_pressed)
     return false;
@@ -3013,8 +3027,9 @@
   // Shortcut to start launcher icons. Only relies on Keycode, ignore modifier
   for (it = _model->begin (); it != _model->end (); it++)
   {
-    if (XKeysymToKeycode (screen->dpy (), (*it)->GetShortcut ()) == key_code)
-    {
+    if ((XKeysymToKeycode (screen->dpy (), (*it)->GetShortcut ()) == key_code) ||
+        ((gchar)((*it)->GetShortcut ()) == key_string[0]))
+    {      
       /*
        * start a timeout while repressing the same shortcut will be ignored.
        * This is because the keypress repeat is handled by Xorg and we have no

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-04-05 15:43:59 +0000
+++ src/Launcher.h	2011-04-07 13:52:26 +0000
@@ -138,7 +138,7 @@
   void SetAutoHideAnimation (AutoHideAnimation animation);
   AutoHideAnimation GetAutoHideAnimation ();
   
-  gboolean CheckSuperShortcutPressed (unsigned int key_sym, unsigned long key_code, unsigned long key_state);
+  gboolean CheckSuperShortcutPressed (unsigned int key_sym, unsigned long key_code, unsigned long key_state, char* key_string);
   
   nux::BaseWindow* GetParent () { return _parent; };
 
@@ -519,6 +519,8 @@
                                        gpointer               user_data);
   
   struct timespec  _times[TIME_LAST];
+  
+  bool _initial_drag_animation;
 
   sigc::connection _set_hidden_connection;
   sigc::connection _set_hover_connection;

=== modified file 'src/PluginAdapter.cpp'
--- src/PluginAdapter.cpp	2011-04-05 09:28:19 +0000
+++ src/PluginAdapter.cpp	2011-04-07 13:52:26 +0000
@@ -284,6 +284,13 @@
     {
       if (std::find (m_SpreadedWindows.begin (), m_SpreadedWindows.end (), w->id ()) == m_SpreadedWindows.end ())
         m_SpreadedWindows.push_back (w->id ());
+      /* FIXME:
+         just unminimize minimized window for now, don't minimize them after the scale if not picked as TerminateScale is only 
+         called if you click on the launcher, not on any icon. More generally, we should hook up InitiateScale and TerminateScale
+         to a Scale plugin signal as the shortcut will have a different behaviour then.
+      */
+      if (w->minimized ())
+        w->unminimize ();
       xids.push_back (w->id ());
     }
   }

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-04-05 08:55:52 +0000
+++ src/unityshell.cpp	2011-04-07 13:52:26 +0000
@@ -256,8 +256,12 @@
       break;
     case KeyPress:
       KeySym key_sym;
-      if (XLookupString (&(event->xkey), NULL, 0, &key_sym, 0) > 0)
-        skip_other_plugins = launcher->CheckSuperShortcutPressed (key_sym, event->xkey.keycode, event->xkey.state);
+      char key_string[2];
+      int result;
+      if ((result = XLookupString (&(event->xkey), key_string, 2, &key_sym, 0)) > 0) {
+        key_string[result] = 0;
+        skip_other_plugins = launcher->CheckSuperShortcutPressed (key_sym, event->xkey.keycode, event->xkey.state, key_string);
+      }
       break;
   }
 

=== modified file 'unityshell.xml.in'
--- unityshell.xml.in	2011-03-30 14:04:40 +0000
+++ unityshell.xml.in	2011-04-07 13:52:26 +0000
@@ -33,7 +33,7 @@
             </relation>
             <requirement>
                 <plugin>opengl</plugin>
-                <plugin>wall</plugin>
+                <feature>largedesktop</feature>
             </requirement>
         </deps>
         <options>