Merge lp:~didrocks/unity/misc-launcher-fix into lp:unity

[Didier Roche-Tolomelli]

* don't lock the launcher on launcher reveal if the mouse didn't move (LP:
#727746)

 * enable using shortcut even if keybinding isn't shown. Disable tap on super in
this case (LP: #727580). Also, if a unity shortcut is triggered, don't let other
plugins using it (LP: #729166)

 * Get the lastest X server status, not the cached one which can be racy (LP:
#718054)

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-03-01 11:25:44 +0000
+++ src/Launcher.cpp	2011-03-07 14:23:15 +0000
@@ -1348,6 +1348,8 @@
 
 void Launcher::StartKeyShowLauncher ()
 {
+    bool was_hidden = _hidden;
+    
     _super_show_launcher = true;
     QueueDraw ();
     SetTimeStruct (&_times[TIME_TAP_SUPER], NULL, SUPER_TAP_DURATION);
@@ -1355,6 +1357,10 @@
       g_source_remove (_redraw_handle);
     _redraw_handle = g_timeout_add (SUPER_TAP_DURATION, &Launcher::DrawLauncherTimeout, this);
     EnsureHiddenState ();
+    
+    // don't lock on mouseover state to avoid locking it the pointer was already there but not moved
+    if (was_hidden)
+      _mouseover_launcher_locked = false;
 }
 
 void Launcher::EndKeyShowLauncher ()
@@ -1434,7 +1440,7 @@
 {
     if (hidden == _hidden)
         return;
-
+    
     // auto lock/unlock the launcher depending on the state switch
     if (hidden)
     {
@@ -1507,7 +1513,7 @@
   if (!window || !(window->type () & intersect_types) || !window->isMapped () || !window->isViewable ())
     return false;
 
-  if (CompRegion (window->inputRect ()).intersects (CompRect (geo.x, geo.y, geo.width, geo.height)))
+  if (CompRegion (window->serverInputRect ()).intersects (CompRect (geo.x, geo.y, geo.width, geo.height)))
     return true;
 
   return false;
@@ -2651,16 +2657,34 @@
   EnsureAnimation ();
 }
 
-void
+gboolean
 Launcher::CheckSuperShortcutPressed (unsigned int key_sym,
                                      unsigned long key_code,
                                      unsigned long key_state)
 {
-  if (_super_show_launcher)
+  if (!_super_show_launcher)
+    return false;
+
+  LauncherModel::iterator it;
+  int i;
+  
+  // Shortcut to start launcher icons. Only relies on Keycode, ignore modifier
+  for (it = _model->begin (), i = 0; it != _model->end (); it++, i++)
   {
-    RecvKeyPressed (key_sym, key_code, key_state);
-    QueueDraw ();
+    if (XKeysymToKeycode (screen->dpy (), (*it)->GetShortcut ()) == key_code)
+    {
+      if (g_ascii_isdigit ((gchar) (*it)->GetShortcut ()) && (key_state & ShiftMask))
+        (*it)->OpenInstance ();
+      else
+        (*it)->Activate ();
+      // disable the "tap on super" check
+      _times[TIME_TAP_SUPER].tv_sec = 0;
+      _times[TIME_TAP_SUPER].tv_nsec = 0;
+      return true;
+    }
   }
+  
+  return false;
 }
 
 void
@@ -2749,26 +2773,7 @@
       leaveKeyNavMode (false);
     break;
       
-    // Shortcut to start launcher icons. Only relies on Keycode, ignore modifier
     default:
-    {
-        if (_super_show_launcher && !TapOnSuper ())
-        {
-            int i;
-            for (it = _model->begin (), i = 0; it != _model->end (); it++, i++)
-            {
-              if (XKeysymToKeycode (screen->dpy (), (*it)->GetShortcut ()) == key_code)
-              {
-                if (g_ascii_isdigit ((gchar) (*it)->GetShortcut ()) && (key_state & ShiftMask))
-                  (*it)->OpenInstance ();
-                else
-                  (*it)->Activate ();
-              }
-            }
-        }
-      
-      
-    }
     break;
   }
 }
@@ -2796,9 +2801,16 @@
     return;
 
   LauncherIcon* launcher_icon = 0;
+  bool should_lock_launcher = false;
 
-  if (_mouse_inside_launcher)
+  if (_mouse_inside_launcher) {
     launcher_icon = MouseIconIntersection (_mouse_position.x, _mouse_position.y);
+    // indicate if the mouse should relock the launcher or not (it doesn't explicitely lock the launcher
+    // when it's entering the launcher. This is for the case: Super reveals the launcher, mouse doesn't move)
+    if (_icon_under_mouse && !_hidden)
+      should_lock_launcher = true;
+  }  
+  
 
   if (_icon_under_mouse && (_icon_under_mouse != launcher_icon))
   {
@@ -2812,8 +2824,8 @@
     launcher_icon->MouseEnter.emit ();
     launcher_icon->_mouse_inside = true;
     _icon_under_mouse = launcher_icon;
-    // reset trigger has the mouse moved to another item (only if the launcher is supposed to be seen)
-    if (!_hidden)
+    // reset trigger only when in right context
+    if (should_lock_launcher)
       _mouseover_launcher_locked = true;
   }
 }

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-03-01 11:25:44 +0000
+++ src/Launcher.h	2011-03-07 14:23:15 +0000
@@ -127,7 +127,7 @@
   void SetAutoHideAnimation (AutoHideAnimation animation);
   AutoHideAnimation GetAutoHideAnimation ();
   
-  void 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);
   
   nux::BaseWindow* GetParent () { return _parent; };
 

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-03-01 09:41:36 +0000
+++ src/unityshell.cpp	2011-03-07 14:23:15 +0000
@@ -181,6 +181,8 @@
 void
 UnityScreen::handleEvent (XEvent *event)
 {
+  bool skip_other_plugins = false;
+  
   switch (event->type)
   {
     case FocusIn:
@@ -193,13 +195,15 @@
     case KeyPress:
       KeySym key_sym;
       if (XLookupString (&(event->xkey), NULL, 0, &key_sym, 0) > 0)
-          launcher->CheckSuperShortcutPressed (key_sym, event->xkey.keycode, event->xkey.state);
+        skip_other_plugins = launcher->CheckSuperShortcutPressed (key_sym, event->xkey.keycode, event->xkey.state);
       break;
   }
 
-  screen->handleEvent (event);
+  // avoid further propagation (key conflict for instance)
+  if (!skip_other_plugins)
+    screen->handleEvent (event);
 
-  if (screen->otherGrabExist ("deco", "move", "wall", "switcher", NULL))
+  if (!skip_other_plugins && screen->otherGrabExist ("deco", "move", "wall", "switcher", NULL))
   {
     wt->ProcessForeignEvent (event, NULL);
   }