Merge lp:~3v1n0/unity/ups-special-keys into lp:unity

[Marco Trevisan (Treviño)]

PanelService: inject special key events back to the root window when a menu is opened

This will make the multimedia keys to work also if an indicator menu is opened.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3889
http://jenkins.qa.ubuntu.com/job/unity-ci/1113/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-amd64-ci/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-armhf-ci/200
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-utopic-i386-ci/200

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-ci/1113/rebuild

review: Approve (continuous-integration)

[Andrea Azzarone (azzar1)]

LGTM.

review: Approve

=== modified file 'services/panel-main.c'
--- services/panel-main.c	2014-09-19 18:38:21 +0000
+++ services/panel-main.c	2014-11-04 19:05:13 +0000
@@ -19,6 +19,7 @@
  */
 
 #include <glib.h>
+#include <glib-unix.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
 #include <libido/libido.h>
@@ -422,19 +423,14 @@
   gtk_main_quit ();
 }
 
-static void
-on_indicators_cleared (PanelService *service)
-{
-  gtk_main_quit ();
-}
-
-static void
-on_signal (int sig)
-{
-  PanelService *service = panel_service_get_default ();
+static gboolean
+on_unix_signal (gpointer data)
+{
+  PanelService *service = PANEL_SERVICE (data);
+  g_signal_connect (service, "indicators-cleared",
+                    G_CALLBACK (gtk_main_quit), NULL);
   panel_service_clear_indicators (service);
-  g_signal_connect (service, "indicators-cleared",
-                    G_CALLBACK (on_indicators_cleared), NULL);
+  return FALSE;
 }
 
 static void
@@ -497,8 +493,8 @@
                              service,
                              NULL);
 
-  signal (SIGINT, on_signal);
-  signal (SIGTERM, on_signal);
+  g_unix_signal_add (SIGINT, on_unix_signal, service);
+  g_unix_signal_add (SIGTERM, on_unix_signal, service);
 
   gtk_main ();
 

=== modified file 'services/panel-service.c'
--- services/panel-service.c	2014-09-19 19:17:00 +0000
+++ services/panel-service.c	2014-11-04 19:05:13 +0000
@@ -31,6 +31,7 @@
 #include <libindicator/indicator-ng.h>
 
 #include <X11/XKBlib.h>
+#include <X11/XF86keysym.h>
 #include <X11/extensions/XInput2.h>
 
 #include <upstart.h>
@@ -474,6 +475,64 @@
   return FALSE;
 }
 
+static gboolean
+is_special_keysym (KeySym keysym)
+{
+  /* Multimedia keys, see X11/XF86keysym.h */
+  if (keysym >= 0x1008FF00 && keysym <= 0x1008FFFF)
+    return TRUE;
+
+  return FALSE;
+}
+
+static gboolean
+is_control_keysym (KeySym keysym)
+{
+  if (!is_special_keysym (keysym))
+    return FALSE;
+
+  /* Display backlight controls */
+  if (keysym >= 0x1008FF01 && keysym <= 0x1008FF0F)
+    return TRUE;
+
+  switch (keysym)
+    {
+      case XF86XK_Battery:
+      case XF86XK_Bluetooth:
+      case XF86XK_WLAN:
+      case XF86XK_UWB:
+        return !lockscreen_mode;
+      case XF86XK_Suspend:
+      case XF86XK_Hibernate:
+      case XF86XK_Sleep:
+      case XF86XK_PowerOff:
+      case XF86XK_ScreenSaver:
+        return lockscreen_mode;
+    }
+
+  const gchar *keystr = XKeysymToString (keysym);
+
+  if (g_str_has_prefix (keystr, "XF86Audio") ||
+      g_str_has_prefix (keystr, "XF86Touchpad"))
+    {
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+static gboolean
+is_allowed_keysym (KeySym keysym)
+{
+  if (keysym == XK_Print)
+    return TRUE;
+
+  if (is_special_keysym (keysym))
+    return TRUE;
+
+  return FALSE;
+}
+
 static GdkFilterReturn
 event_filter (GdkXEvent *ev, GdkEvent *gev, PanelService *self)
 {
@@ -503,10 +562,18 @@
     {
       case XI_KeyPress:
         {
+          KeySym keysym = XkbKeycodeToKeysym (event->display, event->detail, 0, 0);
+
           if (lockscreen_mode)
-            break;
+            {
+              if (is_control_keysym (keysym))
+                {
+                  reinject_key_event_to_root_window (event);
+                  ret = GDK_FILTER_REMOVE;
+                }
 
-          KeySym keysym = XkbKeycodeToKeysym (event->display, event->detail, 0, 0);
+              break;
+            }
 
           if (event_matches_keybinding (event->mods.base, keysym, &priv->menu_toggle) ||
               event_matches_keybinding (event->mods.base, keysym, &priv->show_dash) ||
@@ -519,9 +586,9 @@
             }
           else if (event->mods.base != GDK_CONTROL_MASK)
             {
-              if (!IsModifierKey (keysym) && (event->mods.base != 0 || keysym == XK_Print))
+              if (!IsModifierKey (keysym) && (event->mods.base != 0 || is_allowed_keysym (keysym)))
                 {
-                  if (GTK_IS_MENU (priv->last_menu))
+                  if (GTK_IS_MENU (priv->last_menu) && !is_control_keysym (keysym))
                     gtk_menu_popdown (GTK_MENU (priv->last_menu));
 
                   reinject_key_event_to_root_window (event);
@@ -593,19 +660,20 @@
                     }
                 }
             }
-          else if (entry && (event->detail == 2 || event->detail == 4 || event->detail == 5))
+          else if (entry && (event->detail == 2 || event->detail >= 4 || event->detail <= 7))
             {
               /* If we're scrolling or middle-clicking over an indicator
                * (which is not an appmenu entry) then we need to send the
                * event to the indicator itself, and avoid it to close */
               gchar *entry_id = get_indicator_entry_id_by_entry (entry);
 
-              if (event->detail == 4 || event->detail == 5)
+              if (event->detail >= 4 || event->detail <= 7)
                 {
-                  gint32 delta = (event->detail == 4) ? 120 : -120;
+                  gint32 delta = (event->detail >= 6) ? NUX_HORIZONTAL_SCROLL_DELTA : NUX_VERTICAL_SCROLL_DELTA;
+                  delta = (event->detail % 2 == 0) ? delta : delta * -1;
                   panel_service_scroll_entry (self, entry_id, delta);
                 }
-              else if (entry == priv->pressed_entry)
+              else if (event->detail == 2 && entry == priv->pressed_entry)
                 {
                   panel_service_secondary_activate_entry (self, entry_id);
                 }

=== modified file 'unity-shared/GnomeKeyGrabber.cpp'
--- unity-shared/GnomeKeyGrabber.cpp	2014-10-03 16:53:29 +0000
+++ unity-shared/GnomeKeyGrabber.cpp	2014-11-04 19:05:13 +0000
@@ -202,12 +202,14 @@
 
   if (action.key().toString().empty())
   {
-      CompString prefixed = "XF86" + CompString(accelerator);
-      LOG_DEBUG(logger) << "Can't grab \"" << accelerator << "\", trying \"" << prefixed << "\"";
-      action.keyFromString(prefixed);
+    CompString prefixed = "XF86" + CompString(accelerator);
+    LOG_DEBUG(logger) << "Can't grab \"" << accelerator << "\", trying \"" << prefixed << "\"";
+    action.keyFromString(prefixed);
   }
   else
-      LOG_DEBUG(logger) << "grabAccelerator \"" << accelerator << "\"";
+  {
+    LOG_DEBUG(logger) << "grabAccelerator \"" << accelerator << "\"";
+  }
 
   if (!isActionPostponed(action))
   {