Merge lp:~didrocks/unity/desktop_label_fixes into lp:unity

[Didier Roche-Tolomelli]

Fixes:
- Focus the desktop when the desktop is mapped and that there is no other window around (focus on startup in particular) (LP: #863037)

- Show the 'Desktop' label when desktop has been focused (LP: #863129)

[Jason Smith (jassmith)]

we dont do m prefixing anymore please_use_this_style_ :) (note the trailing backslash)

review: Approve

=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2011-09-29 00:14:59 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2011-09-30 10:42:24 +0000
@@ -660,8 +660,7 @@
       // Make the special 
       label = g_strdup(g_dgettext("nautilus", "Desktop"));
     }
-
-    if (!WindowManager::Default()->IsWindowOnCurrentDesktop(window_xid) ||
+    else if (!WindowManager::Default()->IsWindowOnCurrentDesktop(window_xid) ||
         WindowManager::Default()->IsWindowObscured(window_xid))
     {
        return g_strdup("");

=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2011-09-30 04:18:01 +0000
+++ plugins/unityshell/src/unityshell.cpp	2011-09-30 10:42:24 +0000
@@ -1640,6 +1640,23 @@
   return mMinimizeHandler.get () != NULL;
 }
 
+gboolean
+UnityWindow::FocusDesktopTimeout(gpointer data)
+{
+  UnityWindow *self = reinterpret_cast<UnityWindow*>(data);
+
+  self->mFocusdesktophandle = 0;
+
+  for (CompWindow *w : screen->clientList ())
+  {
+    if (!(w->type() & NO_FOCUS_MASK) && w->focus ())
+      return FALSE;
+  }
+  self->window->moveInputFocusTo();
+
+  return FALSE;
+}
+
 /* Called whenever a window is mapped, unmapped, minimized etc */
 void UnityWindow::windowNotify(CompWindowNotify n)
 {
@@ -1648,6 +1665,11 @@
   switch (n)
   {
     case CompWindowNotifyMap:
+      if (window->type() == CompWindowTypeDesktopMask) {
+        if (!mFocusdesktophandle)
+           mFocusdesktophandle = g_timeout_add (1000, &UnityWindow::FocusDesktopTimeout, this);
+      }
+      break;
     case CompWindowNotifyUnmap:
       if (UnityScreen::get (screen)->optionGetShowMinimizedWindows () &&
           window->mapNum ())
@@ -2358,6 +2380,7 @@
   , window(window)
   , gWindow(GLWindow::get(window))
   , mShowdesktopHandler(nullptr)
+  , mFocusdesktophandle(0)
 {
   WindowInterface::setHandler(window);
   GLWindowInterface::setHandler(gWindow);
@@ -2413,6 +2436,9 @@
   }
   if (mShowdesktopHandler)
     delete mShowdesktopHandler;
+    
+  if (mFocusdesktophandle)
+    g_source_remove(mFocusdesktophandle);
 
   if (window->state () & CompWindowStateFullscreenMask)
     UnityScreen::get (screen)->fullscreen_windows_.remove(window);

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2011-09-28 20:22:43 +0000
+++ plugins/unityshell/src/unityshell.h	2011-09-30 10:42:24 +0000
@@ -392,6 +392,11 @@
 
   compiz::MinimizedWindowHandler::Ptr mMinimizeHandler;
   UnityShowdesktopHandler             *mShowdesktopHandler;
+  
+private:
+
+  guint  mFocusdesktophandle;
+  static gboolean FocusDesktopTimeout(gpointer data);
 };