Merge lp:~canonical-dx-team/unity/unity.fix-646712 into lp:unity

[Mirco Müller]

This branch makes the superkey-overlays show up on the launcher, if the Super-key is held down. The first 10 icons get labels and trash-can and workspace-switcher get special labels.

[Didier Roche-Tolomelli (didrocks)]

160 + if (_super_show_launcher)
(and following)… Can you please avoid by any mean to hardcode the keys?
The places can set dynamic values in their .place file for that for instance, so it won't scale. We will probably change the "t" and "w" shortcut as well. So having them in one place is better.

if you go over the model, I think you can get both the index and the shortcut.

review: Needs Fixing

[Mirco Müller (macslow)]

I didn't know about the dynamic-mapping for trashcan, workspaces-switcher and places.

[Mirco Müller (macslow)]

Fixed

[Didier Roche-Tolomelli (didrocks)]

Approved!

review: Approve

=== modified file 'src/Launcher.cpp'
--- src/Launcher.cpp	2011-02-23 12:20:41 +0000
+++ src/Launcher.cpp	2011-02-24 09:32:15 +0000
@@ -292,6 +292,10 @@
     _arrow_rtl              = nux::CreateTexture2DFromFile (PKGDATADIR"/launcher_arrow_rtl.png", -1, true);
     _arrow_empty_rtl        = nux::CreateTexture2DFromFile (PKGDATADIR"/launcher_arrow_outline_rtl.png", -1, true);
 
+    for (int i = 0; i < MAX_SUPERKEY_LABELS - 1; i++)
+      _superkey_labels[i] = cairoToTexture2D ((char) ('1' + i), LAUNCHER_ICON_SIZE, LAUNCHER_ICON_SIZE);
+    _superkey_labels[9] = cairoToTexture2D ((char) ('0'), LAUNCHER_ICON_SIZE, LAUNCHER_ICON_SIZE);
+
     _enter_y                = 0;
     _dnd_security           = 15;
     _launcher_drag_delta    = 0;
@@ -351,7 +355,11 @@
 
 Launcher::~Launcher()
 {
-
+  for (int i = 0; i < MAX_SUPERKEY_LABELS; i++)
+  {
+    if (_superkey_labels[i])
+      _superkey_labels[i]->UnReference ();
+  }
 }
 
 /* Introspection */
@@ -362,6 +370,120 @@
 }
 
 void
+Launcher::DrawRoundedRectangle (cairo_t* cr,
+                                double   aspect,
+                                double   x,
+                                double   y,
+                                double   cornerRadius,
+                                double   width,
+                                double   height)
+{
+  double radius = cornerRadius / aspect;
+  
+  // top-left, right of the corner
+  cairo_move_to (cr, x + radius, y);
+  
+  // top-right, left of the corner
+  cairo_line_to (cr, x + width - radius, y);
+  
+  // top-right, below the corner
+  cairo_arc (cr,
+             x + width - radius,
+             y + radius,
+             radius,
+             -90.0f * G_PI / 180.0f,
+             0.0f * G_PI / 180.0f);
+  
+  // bottom-right, above the corner
+  cairo_line_to (cr, x + width, y + height - radius);
+
+  // bottom-right, left of the corner
+  cairo_arc (cr,
+             x + width - radius,
+             y + height - radius,
+             radius,
+             0.0f * G_PI / 180.0f,
+             90.0f * G_PI / 180.0f);
+  
+  // bottom-left, right of the corner
+  cairo_line_to (cr, x + radius, y + height);
+  
+  // bottom-left, above the corner
+  cairo_arc (cr,
+             x + radius,
+             y + height - radius,
+             radius,
+             90.0f * G_PI / 180.0f,
+             180.0f * G_PI / 180.0f);
+  
+  // top-left, right of the corner
+  cairo_arc (cr,
+             x + radius,
+             y + radius,
+             radius,
+             180.0f * G_PI / 180.0f,
+             270.0f * G_PI / 180.0f);
+}
+
+nux::BaseTexture*
+Launcher::cairoToTexture2D (const char label, int width, int height)
+{
+  nux::BaseTexture*     texture  = NULL;
+  nux::CairoGraphics*   cg       = new nux::CairoGraphics (CAIRO_FORMAT_ARGB32,
+                                                           width,
+                                                           height);
+  cairo_t*              cr       = cg->GetContext ();
+  PangoLayout*          layout   = NULL;
+  PangoContext*         pangoCtx = NULL;
+  PangoFontDescription* desc     = NULL;
+  GtkSettings*          settings = gtk_settings_get_default (); // not ref'ed
+  gchar*                fontName = NULL;
+  double                label_x  = 18.0f;
+  double                label_y  = 18.0f;
+  double                label_w  = 18.0f;
+  double                label_h  = 18.0f;
+  double                label_r  = 3.0f;
+
+  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+  cairo_paint (cr);
+  cairo_scale (cr, 1.0f, 1.0f);
+  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+  DrawRoundedRectangle (cr, 1.0f, label_x, label_y, label_r, label_w, label_h);
+  cairo_set_source_rgba (cr, 0.0f, 0.0f, 0.0f, 0.65f);
+  cairo_fill (cr);
+
+  layout = pango_cairo_create_layout (cr);
+  g_object_get (settings, "gtk-font-name", &fontName, NULL);
+  desc = pango_font_description_from_string (fontName);
+  pango_font_description_set_size (desc, 11 * PANGO_SCALE);
+  pango_layout_set_font_description (layout, desc);
+  pango_layout_set_text (layout, &label, 1);
+  pangoCtx = pango_layout_get_context (layout); // is not ref'ed
+
+  PangoRectangle logRect;
+  PangoRectangle inkRect;
+  pango_layout_get_extents (layout, &inkRect, &logRect);
+
+  /* position and paint text */
+  cairo_set_source_rgba (cr, 1.0f, 1.0f, 1.0f, 1.0f);
+  double x = label_x - ((logRect.width / PANGO_SCALE) - label_w) / 2.0f;
+  double y = label_y - ((logRect.height / PANGO_SCALE) - label_h) / 2.0f - 1;
+  cairo_move_to (cr, x, y);
+  pango_cairo_show_layout (cr, layout);
+
+  nux::NBitmapData* bitmap = cg->GetBitmap ();
+  texture = nux::GetThreadGLDeviceFactory()->CreateSystemCapableTexture ();
+  texture->Update (bitmap);
+  delete bitmap;
+  delete cg;
+  g_object_unref (layout);
+  pango_font_description_free (desc);
+  g_free (fontName);
+
+  return texture;
+}
+
+void
 Launcher::startKeyNavMode ()
 {
   _navmod_show_launcher = true;
@@ -1184,6 +1306,7 @@
 void Launcher::StartKeyShowLauncher ()
 {
     _super_show_launcher = true;
+    QueueDraw ();
     SetTimeStruct (&_times[TIME_TAP_SUPER], NULL, ANIM_DURATION_SHORT);
     EnsureHiddenState ();
 }
@@ -1194,6 +1317,7 @@
     clock_gettime (CLOCK_MONOTONIC, &current);  
 
     _super_show_launcher = false;
+    QueueDraw ();
 
     // it's a tap on super
     if (TimeDelta (&current, &_times[TIME_TAP_SUPER]) < ANIM_DURATION_SHORT)
@@ -1682,6 +1806,10 @@
     // needs to be disconnected
     icon->needs_redraw.connect (sigc::mem_fun(this, &Launcher::OnIconNeedsRedraw));
 
+   guint64 shortcut = icon->GetShortcut ();
+    if (shortcut != 0 && !g_ascii_isdigit ((gchar) shortcut))
+      icon->SetSuperkeyLabel (cairoToTexture2D ((gchar) shortcut, LAUNCHER_ICON_SIZE, LAUNCHER_ICON_SIZE));
+
     AddChild (icon);
 }
 
@@ -2090,6 +2218,51 @@
                 nux::Color (0xFFFFFFFF),
                 arg.alpha,
                 arg.icon->_xform_coords["Glow"]);
+
+  /* draw superkey-shortcut label */ 
+  if (_super_show_launcher)
+  {
+    guint64 shortcut = arg.icon->GetShortcut ();
+
+    /* deal with dynamic labels for places, which can be set via the locale */
+    if (shortcut != 0 && !g_ascii_isdigit ((gchar) shortcut))
+    {
+      RenderIcon (GfxContext,
+                  arg,
+                  arg.icon->GetSuperkeyLabel ()->GetDeviceTexture (),
+                  nux::Color (0xFFFFFFFF),
+                  arg.alpha,
+                  arg.icon->_xform_coords["Tile"]);
+    }
+    else
+    {
+      /* deal with the hardcoded labels used for the first 10 icons on the launcher */
+      gchar key   = (gchar) shortcut;
+      int   index = -1;
+
+      switch (key)
+      {
+        case '1': index = 0; break;
+        case '2': index = 1; break;
+        case '3': index = 2; break;
+        case '4': index = 3; break;
+        case '5': index = 4; break;
+        case '6': index = 5; break;
+        case '7': index = 6; break;
+        case '8': index = 7; break;
+        case '9': index = 8; break;
+        case '0': index = 9; break;
+      }
+
+      if (index != -1)
+        RenderIcon (GfxContext,
+                    arg,
+                    _superkey_labels[index]->GetDeviceTexture (),
+                    nux::Color (0xFFFFFFFF),
+                    arg.alpha,
+                    arg.icon->_xform_coords["Tile"]);
+    }
+  }
 }
 
 void Launcher::DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw)
@@ -2426,7 +2599,10 @@
                                      unsigned long key_state)
 {
   if (_super_show_launcher)
+  {
     RecvKeyPressed (key_sym, key_code, key_state);
+    QueueDraw ();
+  }
 }
 
 void

=== modified file 'src/Launcher.h'
--- src/Launcher.h	2011-02-23 11:18:17 +0000
+++ src/Launcher.h	2011-02-24 09:32:15 +0000
@@ -38,6 +38,9 @@
 #define ANIM_DURATION       200
 #define ANIM_DURATION_LONG  350
 
+#define MAX_SUPERKEY_LABELS 10
+#define LAUNCHER_ICON_SIZE  54
+
 class LauncherModel;
 class QuicklistView;
 class LauncherIcon;
@@ -341,7 +344,21 @@
 
   void SetOffscreenRenderTarget (nux::IntrusiveSP<nux::IOpenGLBaseTexture> texture);
   void RestoreSystemRenderTarget ();
-  
+
+  void
+  DrawRoundedRectangle (cairo_t* cr,
+                        double   aspect,
+                        double   x,
+                        double   y,
+                        double   cornerRadius,
+                        double   width,
+                        double   height);
+
+  nux::BaseTexture*
+  cairoToTexture2D (const char label,
+                    int        width,
+                    int        height);
+
   std::list<char *> StringToUriList (char * input);
 
   nux::HLayout* m_Layout;
@@ -421,6 +438,8 @@
   nux::BaseTexture* _arrow_empty_ltr;
   nux::BaseTexture* _arrow_empty_rtl;
 
+  nux::BaseTexture* _superkey_labels[MAX_SUPERKEY_LABELS];
+
   nux::IntrusiveSP<nux::IOpenGLBaseTexture> _offscreen_drag_texture;
   nux::IntrusiveSP<nux::IOpenGLBaseTexture> _offscreen_progress_texture;
 

=== modified file 'src/LauncherIcon.cpp'
--- src/LauncherIcon.cpp	2011-02-23 10:21:23 +0000
+++ src/LauncherIcon.cpp	2011-02-24 09:32:15 +0000
@@ -73,6 +73,7 @@
   _shortcut = 0;
   
   _emblem = 0;
+  _superkey_label = 0;
 
   _quicklist = new QuicklistView ();
   _quicklist_is_initialized = false;
@@ -106,6 +107,9 @@
   if (_center_stabilize_handle)
     g_source_remove (_center_stabilize_handle);
   _center_stabilize_handle = 0;
+
+  if (_superkey_label)
+    _superkey_label->UnReference ();
 }
 
 bool
@@ -688,6 +692,24 @@
   needs_redraw.emit (this);
 }
 
+void
+LauncherIcon::SetSuperkeyLabel (nux::BaseTexture* label)
+{
+  if (_superkey_label == label)
+    return;
+  
+  if (_superkey_label)
+    _superkey_label->UnReference ();
+  
+  _superkey_label = label;  
+}
+
+nux::BaseTexture*
+LauncherIcon::GetSuperkeyLabel ()
+{
+  return _superkey_label;
+}
+
 void 
 LauncherIcon::SetEmblemIconName (const char *name)
 {

=== modified file 'src/LauncherIcon.h'
--- src/LauncherIcon.h	2011-02-22 17:05:31 +0000
+++ src/LauncherIcon.h	2011-02-24 09:32:15 +0000
@@ -176,6 +176,8 @@
     void SetSortPriority (int priority);
 
     void SetEmblem (nux::BaseTexture *emblem);
+    void SetSuperkeyLabel (nux::BaseTexture* label);
+    nux::BaseTexture* GetSuperkeyLabel ();
 
     virtual std::list<DbusmenuMenuitem *> GetMenus ();
     virtual nux::BaseTexture * GetTextureForSize (int size) = 0;
@@ -258,6 +260,7 @@
     IconType         _icon_type;
     
     nux::BaseTexture* _emblem;
+    nux::BaseTexture* _superkey_label;
     
     bool             _quirks[QUIRK_LAST];
     struct timespec  _quirk_times[QUIRK_LAST];