Merge lp:~unity-team/unity/more-multi-monitor into lp:unity

[Neil J. Patel]

Okay, this is a biggy in the can-break-the-world sense of things :)

It adds a panel per monitor, which exhibits the follow behaviour:

- Home button is only on primary monitor (this is because I don't have the time to make laucnehr and dash work correctly with >1 home button

- Menubar/title/window buttons only draw on the monitor where the active window is.

- If you move a window to another monitor, the menubar/title/window-buttons will follow

- F10, Alt+$foo therefore effect the monitor where the active window is

- All monitors get the app/system indicators

- Tray is a bit weird (can be on any monitor), will fix that separately.

Please make sure:

1. Normal case of one monitor still works
2. Two monitors work as described
3. Monitors of different size etc work

I'll ask apinheiro to make sure I didn't break a11y.

[Gord Allott (gordallott)]

Works well on my un-even monitors (1920x1600 - 1440x900) with two comments

Fullscreen doesn't work if you don't have the fullscreen application focused anymore, i loaded up a video to test on my second monitor, set it in to fullscreen mode and clicked on a window on my first monitor, panel is now drawn over the video on the second monitor. tested with VLC

Windows should only be considered on a monitor if the window has a significant portion on that monitor (> 50%? probably needs some testing to find the "right" amount - especially for applications that you might actually want spanning > 1 monitor

review: Approve

[Alejandro Piñeiro (apinheiro)]

I have tested it and the launcher part and other things (like the key event reemission) are working.

Anyway, it also modifies a lot the panel, so I added rodrigo to the review list, in order to check it.

As I said, it is ok for me.

review: Approve

[Rodrigo Moya (rodrigo-moya)]

Seems the panel service keeps working as expected, approving

review: Approve

=== added file 'src/PanelController.cpp'
--- src/PanelController.cpp	1970-01-01 00:00:00 +0000
+++ src/PanelController.cpp	2011-03-23 17:01:13 +0000
@@ -0,0 +1,212 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Neil Jagdish Patel <[e-mail]>
+ */
+
+#include "PanelController.h"
+
+#include "UScreen.h"
+
+#include "unitya11y.h"
+#include "unity-util-accessible.h"
+
+PanelController::PanelController ()
+: _bfb_size (66),
+  _opacity (1.0f)
+{
+  UScreen *screen = UScreen::GetDefault ();
+
+  screen->changed.connect (sigc::mem_fun (this, &PanelController::OnScreenChanged));
+
+  OnScreenChanged (screen->GetPrimaryMonitor (), screen->GetMonitors ());
+}
+
+PanelController::~PanelController ()
+{
+
+}
+
+void
+PanelController::SetBFBSize (int size)
+{
+  std::vector<nux::BaseWindow *>::iterator it, eit = _windows.end ();
+
+  _bfb_size = size;
+
+  for (it = _windows.begin (); it != eit; ++it)
+  {
+    ViewForWindow (*it)->GetHomeButton ()->SetButtonWidth (_bfb_size);
+  }
+}
+
+void
+PanelController::StartFirstMenuShow ()
+{
+  std::vector<nux::BaseWindow *>::iterator it, eit = _windows.end ();
+
+  for (it = _windows.begin (); it != eit; ++it)
+  {
+    PanelView *view = ViewForWindow (*it);
+
+    view->StartFirstMenuShow ();
+  }
+}
+
+void
+PanelController::EndFirstMenuShow ()
+{
+  std::vector<nux::BaseWindow *>::iterator it, eit = _windows.end ();
+
+  for (it = _windows.begin (); it != eit; ++it)
+  {
+    PanelView *view = ViewForWindow (*it);
+    view->EndFirstMenuShow ();
+  }
+}
+
+void
+PanelController::SetOpacity (float opacity)
+{
+  std::vector<nux::BaseWindow *>::iterator it, eit = _windows.end ();
+
+  _opacity = opacity;
+
+  for (it = _windows.begin (); it != eit; ++it)
+  {
+    ViewForWindow (*it)->SetOpacity (_opacity);
+  }
+}
+
+PanelView *
+PanelController::ViewForWindow (nux::BaseWindow *window)
+{
+  nux::Layout *layout = window->GetLayout ();
+  std::list<nux::Area *>::iterator it = layout->GetChildren ().begin ();
+
+  return static_cast<PanelView *> (*it);
+}
+
+// We need to put a panel on every monitor, and try and re-use the panels we already have
+void
+PanelController::OnScreenChanged (int primary_monitor, std::vector<nux::Geometry>& monitors)
+{
+  std::vector<nux::BaseWindow *>::iterator it, eit = _windows.end ();
+  int n_monitors = monitors.size ();
+  int i = 0;
+
+  for (it = _windows.begin (); it != eit; ++it)
+  {
+    if (i < n_monitors)
+    {
+      PanelView *view;
+
+      (*it)->EnableInputWindow (false);
+      (*it)->InputWindowEnableStruts (false);
+
+      nux::Geometry geo = monitors[i];
+      geo.height = 24;
+      (*it)->SetGeometry (geo);
+
+      view = ViewForWindow (*it);
+      view->SetPrimary (i == primary_monitor);
+      view->SetMonitor (i);
+
+      (*it)->EnableInputWindow (true);
+      (*it)->InputWindowEnableStruts (true);
+
+      i++;
+    }
+  }
+
+  // Add new ones if needed
+  if (i < n_monitors)
+  {
+    for (i = i; i < n_monitors; i++)
+    {
+      nux::BaseWindow *window;
+      PanelView       *view;
+      nux::HLayout    *layout;
+
+      layout = new nux::HLayout();
+      
+      view = new PanelView ();    
+      view->SetMaximumHeight (24);
+      view->GetHomeButton ()->SetButtonWidth (_bfb_size);
+      view->SetOpacity (_opacity);
+      view->SetPrimary (i == primary_monitor);
+      view->SetMonitor (i);
+      AddChild (view);
+
+      layout->AddView (view, 1);
+      layout->SetContentDistribution (nux::eStackLeft);
+      layout->SetVerticalExternalMargin (0);
+      layout->SetHorizontalExternalMargin (0);
+
+      window = new nux::BaseWindow("");
+      window->SinkReference ();
+      window->SetConfigureNotifyCallback(&PanelController::WindowConfigureCallback, window);
+      window->SetLayout(layout);
+      window->SetBackgroundColor(nux::Color(0x00000000));
+      window->ShowWindow(true);
+      window->EnableInputWindow(true, "panel", false, false);
+      window->InputWindowEnableStruts(true);
+
+      nux::Geometry geo = monitors[i];
+      geo.height = 24;
+      window->SetGeometry (geo);
+
+      /* FIXME: this should not be manual, should be managed with a
+         show/hide callback like in GAIL*/
+      if (unity_a11y_initialized () == TRUE)
+        unity_util_accessible_add_window (window);
+
+      _windows.push_back (window);
+    }
+  }
+
+  if ((int)_windows.size () > n_monitors)
+  {
+    std::vector<nux::BaseWindow*>::iterator sit;
+    for (sit = it; sit != eit; ++sit)
+    {
+      (*sit)->UnReference ();
+    }
+
+    _windows.erase (it, _windows.end ());
+  }
+}
+
+void
+PanelController::WindowConfigureCallback (int            window_width,
+                                          int            window_height,
+                                          nux::Geometry& geo,
+                                          void          *user_data)
+{
+  nux::BaseWindow *window = static_cast<nux::BaseWindow *> (user_data);
+  geo = window->GetGeometry ();
+}
+
+const gchar *
+PanelController::GetName ()
+{
+  return "PanelController";
+}
+
+void
+PanelController::AddProperties (GVariantBuilder *builder)
+{
+
+}

=== added file 'src/PanelController.h'
--- src/PanelController.h	1970-01-01 00:00:00 +0000
+++ src/PanelController.h	2011-03-23 17:01:13 +0000
@@ -0,0 +1,58 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Neil Jagdish Patel <[e-mail]>
+ */
+
+#ifndef _PANEL_CONTROLLER_H_
+#define _PANEL_CONTROLLER_H_
+
+#include <Nux/Nux.h>
+#include <Nux/BaseWindow.h>
+#include <vector>
+
+#include "Introspectable.h"
+#include "PanelView.h"
+
+class PanelController : public nux::Object, public Introspectable
+{
+public:
+  PanelController  ();
+  ~PanelController ();
+
+  void SetBFBSize (int size);
+  void StartFirstMenuShow ();
+  void EndFirstMenuShow ();
+  void SetOpacity (float opacity);
+
+protected:
+  const gchar * GetName       ();
+  void          AddProperties (GVariantBuilder *builder);
+
+private:
+  PanelView * ViewForWindow (nux::BaseWindow *window);
+  void OnScreenChanged (int primary_monitor, std::vector<nux::Geometry>& monitors);
+  
+  static void WindowConfigureCallback (int            window_width,
+                                       int            window_height,
+                                       nux::Geometry& geo,
+                                       void          *user_data);
+private:
+  std::vector<nux::BaseWindow *> _windows;
+  int _bfb_size;
+  float _opacity;
+};
+
+#endif // _PANEL_CONTROLLER_H_

=== modified file 'src/PanelIndicatorObjectEntryView.cpp'
--- src/PanelIndicatorObjectEntryView.cpp	2011-03-17 09:41:28 +0000
+++ src/PanelIndicatorObjectEntryView.cpp	2011-03-23 17:01:13 +0000
@@ -73,7 +73,7 @@
       || (_proxy->icon_visible && _proxy->icon_sensitive))
   {
     _proxy->ShowMenu (GetAbsoluteGeometry ().x + 1, //cairo translation
-                      PANEL_HEIGHT,
+                      GetAbsoluteGeometry ().y + PANEL_HEIGHT,
                       time (NULL),
                       nux::GetEventButton (button_flags));
   }
@@ -89,7 +89,7 @@
 PanelIndicatorObjectEntryView::Activate ()
 {
   _proxy->ShowMenu (GetAbsoluteGeometry().x + 1, //cairo translation FIXME: Make this into one function
-                    PANEL_HEIGHT,
+                    GetAbsoluteGeometry ().y + PANEL_HEIGHT,
                     time (NULL),
                     1);
 }

=== modified file 'src/PanelMenuView.cpp'
--- src/PanelMenuView.cpp	2011-03-22 13:32:19 +0000
+++ src/PanelMenuView.cpp	2011-03-23 17:01:13 +0000
@@ -41,6 +41,8 @@
 #include "ubus-server.h"
 #include "UBusMessages.h"
 
+#include "UScreen.h"
+
 #define BUTTONS_WIDTH 72
 
 static void on_active_window_changed (BamfMatcher   *matcher,
@@ -66,7 +68,11 @@
   _last_width (0),
   _last_height (0),
   _places_showing (false),
-  _show_now_activated (false)
+  _show_now_activated (false),
+  _we_control_active (false),
+  _monitor (0),
+  _active_xid (0),
+  _active_moved_id (0)
 {
   WindowManager *win_manager;
 
@@ -108,6 +114,7 @@
   win_manager->window_maximized.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowMaximized));
   win_manager->window_restored.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowRestored));
   win_manager->window_unmapped.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowUnmapped));
+  win_manager->window_moved.connect (sigc::mem_fun (this, &PanelMenuView::OnWindowMoved));
 
   PanelStyle::GetDefault ()->changed.connect (sigc::mem_fun (this, &PanelMenuView::Refresh));
 
@@ -133,6 +140,9 @@
   _menu_layout->UnReference ();
   _window_buttons->UnReference ();
   _panel_titlebar_grab_area->UnReference ();
+
+  if (_active_moved_id)
+    g_source_remove (_active_moved_id);
 }
 
 void
@@ -159,6 +169,9 @@
   long ret = TraverseInfo;
   nux::Geometry geo = GetAbsoluteGeometry ();
 
+  if (!_we_control_active)
+    return _panel_titlebar_grab_area->OnEvent (ievent, ret, ProcessEventInfo);
+
   if (geo.IsPointInside (ievent.e_x, ievent.e_y))
   {
     if (_is_inside != true)
@@ -253,7 +266,7 @@
   nux::ColorLayer layer (nux::Color (0x00000000), true, rop);
   gPainter.PushDrawLayer (GfxContext, GetGeometry (), &layer);
 
-  if (_is_own_window || _places_showing)
+  if (_is_own_window || _places_showing || !_we_control_active)
   {
 
   }
@@ -351,7 +364,7 @@
 
   GfxContext.PushClippingRectangle (geo);
 
-  if (!_is_own_window && !_places_showing)
+  if (!_is_own_window && !_places_showing && _we_control_active)
   {
     if (_is_inside || _last_active_view || _show_now_activated)
     {
@@ -668,13 +681,19 @@
                                       BamfView *new_view)
 {
   _is_maximized = false;
-
+  _active_xid = 0;
+  if (_active_moved_id)
+    g_source_remove (_active_moved_id);
+  _active_moved_id = 0;
 
   if (BAMF_IS_WINDOW (new_view))
   {
     BamfWindow *window = BAMF_WINDOW (new_view);
-    guint32 xid = bamf_window_get_xid (window);
+    guint32 xid = _active_xid = bamf_window_get_xid (window);
     _is_maximized = WindowManager::Default ()->IsWindowMaximized (xid);
+    nux::Geometry geo = WindowManager::Default ()->GetWindowGeometry (xid);
+
+    _we_control_active = UScreen::GetDefault ()->GetMonitorGeometry (_monitor).IsPointInside (geo.x + (geo.width/2), geo.y);
 
     if (_decor_map.find (xid) == _decor_map.end ())
     {
@@ -803,6 +822,32 @@
   FullRedraw ();
 }
 
+gboolean
+PanelMenuView::UpdateActiveWindowPosition (PanelMenuView *self)
+{
+  nux::Geometry geo = WindowManager::Default ()->GetWindowGeometry (self->_active_xid);
+
+  self->_we_control_active = UScreen::GetDefault ()->GetMonitorGeometry (self->_monitor).IsPointInside (geo.x + (geo.width/2), geo.y);
+
+  self->_active_moved_id = 0;
+
+  self->QueueDraw ();
+
+  return FALSE;
+}
+
+void
+PanelMenuView::OnWindowMoved (guint xid)
+{
+  if (_active_xid == xid)
+  {
+    if (_active_moved_id)
+      g_source_remove (_active_moved_id);
+    
+    _active_moved_id = g_timeout_add (250, (GSourceFunc)PanelMenuView::UpdateActiveWindowPosition, this);
+  }
+}
+
 void
 PanelMenuView::OnCloseClicked ()
 {
@@ -843,6 +888,8 @@
 PanelMenuView::GetMaximizedWindow ()
 {
   guint32 window_xid = 0;
+  nux::Geometry monitor =  UScreen::GetDefault ()->GetMonitorGeometry (_monitor);
+  
   // Find the front-most of the maximized windows we are controlling
   foreach (guint32 xid, _maximized_set)
   {
@@ -850,8 +897,12 @@
     if (WindowManager::Default ()->IsWindowOnCurrentDesktop (xid)
         && !WindowManager::Default ()->IsWindowObscured (xid))
     {
-      window_xid = xid;
-      break;
+      nux::Geometry geo = WindowManager::Default ()->GetWindowGeometry (xid);
+      if (monitor.IsPointInside (geo.x + (geo.width/2), geo.y))
+      {
+        window_xid = xid;
+        break;
+      }
     }
   }
   return window_xid;
@@ -971,3 +1022,14 @@
   QueueDraw ();
 }
 
+void
+PanelMenuView::SetMonitor (int monitor)
+{
+  _monitor = monitor;
+}
+
+bool
+PanelMenuView::GetControlsActive ()
+{
+  return _we_control_active;
+}

=== modified file 'src/PanelMenuView.h'
--- src/PanelMenuView.h	2011-03-22 13:32:19 +0000
+++ src/PanelMenuView.h	2011-03-23 17:01:13 +0000
@@ -75,6 +75,7 @@
   void OnWindowUnmapped (guint32 xid);
   void OnWindowMaximized (guint32 xid);
   void OnWindowRestored  (guint32 xid);
+  void OnWindowMoved (guint32 xid);
   
   guint32 GetMaximizedWindow ();
 
@@ -89,6 +90,8 @@
   void OnMinimizeClicked ();
   void OnRestoreClicked ();
   void OnWindowButtonsRedraw ();
+  void SetMonitor (int monitor);
+  bool GetControlsActive ();
 
 protected:
   const gchar * GetName ();
@@ -100,6 +103,7 @@
   static void OnPlaceViewShown (GVariant *data, PanelMenuView *self);
   static void OnPlaceViewHidden (GVariant *data, PanelMenuView *self);
   void UpdateShowNow (bool ignore);
+  static gboolean UpdateActiveWindowPosition (PanelMenuView *self);
   
 private:
   BamfMatcher* _matcher;
@@ -130,5 +134,10 @@
 
   bool _places_showing;
   bool _show_now_activated;
+
+  bool _we_control_active;
+  int  _monitor;
+  guint32 _active_xid;
+  guint32 _active_moved_id;
 };
 #endif

=== modified file 'src/PanelView.cpp'
--- src/PanelView.cpp	2011-03-17 09:30:07 +0000
+++ src/PanelView.cpp	2011-03-23 17:01:13 +0000
@@ -46,7 +46,9 @@
 PanelView::PanelView (NUX_FILE_LINE_DECL)
 :   View (NUX_FILE_LINE_PARAM),
   _is_dirty (true),
-  _opacity (1.0f)
+  _opacity (1.0f),
+  _is_primary (false),
+  _monitor (0)
 {
   _needs_geo_sync = false;
   _style = new PanelStyle ();
@@ -129,7 +131,7 @@
 
   GfxContext.PopClippingRectangle ();
 
-  if (_needs_geo_sync)
+  if (_needs_geo_sync && _menu_view->GetControlsActive ())
   {
     SyncGeometries ();
     _needs_geo_sync = false;
@@ -313,6 +315,9 @@
 {
   std::list<Area *>::iterator it;
 
+  if (!_menu_view->GetControlsActive ())
+    return;
+
   std::list<Area *> my_children = _layout->GetChildren ();
   for (it = my_children.begin(); it != my_children.end(); it++)
   {
@@ -355,7 +360,7 @@
 // Useful Public Methods
 //
 PanelHomeButton * 
-PanelView::HomeButton ()
+PanelView::GetHomeButton ()
 {
   return _home_button;
 }
@@ -371,6 +376,9 @@
 {
   std::list<Area *>::iterator it;
 
+  if (!_menu_view->GetControlsActive ())
+    return;
+
   std::list<Area *> my_children = _layout->GetChildren ();
   for (it = my_children.begin(); it != my_children.end(); it++)
   {
@@ -409,6 +417,12 @@
   ForceUpdateBackground ();
 }
 
+bool
+PanelView::GetPrimary ()
+{
+  return _is_primary;
+}
+
 static void
 on_sync_geometries_done_cb (GObject      *source,
                             GAsyncResult *res,
@@ -426,6 +440,14 @@
 }
 
 void
+PanelView::SetPrimary (bool primary)
+{
+  _is_primary = primary;
+
+  _home_button->SetVisible (primary);
+}
+
+void
 PanelView::SyncGeometries ()
 {
   GVariantBuilder b;
@@ -491,3 +513,11 @@
 
   g_variant_unref (method_args);
 }
+
+void
+PanelView::SetMonitor (int monitor)
+{
+  _monitor = monitor;
+  _menu_view->SetMonitor (monitor);
+}
+

=== modified file 'src/PanelView.h'
--- src/PanelView.h	2011-03-17 09:30:07 +0000
+++ src/PanelView.h	2011-03-23 17:01:13 +0000
@@ -52,8 +52,12 @@
   void OnEntryActivateRequest (const char *entry_id);
   void OnEntryActivated (const char *entry_id);
   void OnSynced ();
+
+  void SetPrimary (bool primary);
+  bool GetPrimary ();
+  void SetMonitor (int monitor);
   
-  PanelHomeButton * HomeButton ();
+  PanelHomeButton * GetHomeButton ();
 
   void StartFirstMenuShow ();
   void EndFirstMenuShow ();
@@ -89,6 +93,8 @@
   bool        _is_dirty;
   float       _opacity;
   bool        _needs_geo_sync;
+  bool        _is_primary;
+  int         _monitor;
 };
 
 #endif // PANEL_VIEW_H

=== modified file 'src/PlacesController.h'
--- src/PlacesController.h	2011-03-10 13:15:55 +0000
+++ src/PlacesController.h	2011-03-23 17:01:13 +0000
@@ -14,6 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  * Authored by: Gordon Allott <[e-mail]>
+ *              Neil Jagdish Patel <[e-mail]>
  */
 
 #ifndef PLACES_CONTROLLER_H

=== modified file 'src/PluginAdapter.cpp'
--- src/PluginAdapter.cpp	2011-03-22 13:32:19 +0000
+++ src/PluginAdapter.cpp	2011-03-23 17:01:13 +0000
@@ -448,6 +448,24 @@
     window->lower ();
 }
 
+nux::Geometry
+PluginAdapter::GetWindowGeometry (guint32 xid)
+{
+  Window win = (Window)xid;
+  CompWindow *window;
+  nux::Geometry geo (0, 0, 1, 1);
+
+  window = m_Screen->findWindow (win);
+  if (window)
+  {
+    geo.x = window->x ();
+    geo.y = window->y ();
+    geo.width = window->width ();
+    geo.height = window->height ();
+  }
+  return geo;
+}
+
 void PluginAdapter::MaximizeIfBigEnough (CompWindow *window)
 {
   XClassHint   classHint;

=== modified file 'src/PluginAdapter.h'
--- src/PluginAdapter.h	2011-03-22 13:32:19 +0000
+++ src/PluginAdapter.h	2011-03-23 17:01:13 +0000
@@ -89,6 +89,8 @@
     void Lower (guint32 xid);
 
     void MaximizeIfBigEnough (CompWindow *window);
+
+    nux::Geometry GetWindowGeometry (guint32 xid);
     
 protected:
     PluginAdapter(CompScreen *screen);

=== added file 'src/UScreen.cpp'
--- src/UScreen.cpp	1970-01-01 00:00:00 +0000
+++ src/UScreen.cpp	2011-03-23 17:01:13 +0000
@@ -0,0 +1,121 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Neil Jagdish Patel <[e-mail]>
+ */
+
+#include "UScreen.h"
+
+static UScreen *_default_screen = NULL;
+
+UScreen::UScreen ()
+: _refresh_id (0)
+{
+  GdkScreen *screen;
+
+  screen = gdk_screen_get_default ();
+  g_signal_connect (screen, "size-changed",
+                    (GCallback)UScreen::Changed, this);
+  g_signal_connect (screen, "monitors-changed",
+                    (GCallback)UScreen::Changed, this);
+
+  Refresh ();
+}
+
+UScreen::~UScreen ()
+{
+  if (_default_screen == this)
+    _default_screen = NULL;
+
+  g_signal_handlers_disconnect_by_func ((gpointer)gdk_screen_get_default (),
+                                        (gpointer)UScreen::Changed,
+                                        (gpointer)this);
+}
+
+UScreen *
+UScreen::GetDefault ()
+{
+  if (G_UNLIKELY (!_default_screen))
+    _default_screen = new UScreen ();
+
+  return _default_screen;
+}
+
+int
+UScreen::GetPrimaryMonitor ()
+{
+  return gdk_screen_get_primary_monitor (gdk_screen_get_default ());
+}
+
+nux::Geometry&
+UScreen::GetMonitorGeometry (int monitor)
+{
+  return _monitors[monitor];
+}
+
+std::vector<nux::Geometry>&
+UScreen::GetMonitors ()
+{
+  return _monitors;
+}
+
+void
+UScreen::Changed (GdkScreen *screen, UScreen *self)
+{
+  if (self->_refresh_id)
+    return;
+
+  self->_refresh_id = g_idle_add ((GSourceFunc)UScreen::OnIdleChanged, self);
+}
+
+gboolean
+UScreen::OnIdleChanged (UScreen *self)
+{
+  self->_refresh_id = 0;
+  self->Refresh ();
+
+  return FALSE;
+}
+
+void
+UScreen::Refresh ()
+{
+  GdkScreen    *screen;
+  int           primary;
+  
+  screen = gdk_screen_get_default ();
+  primary = GetPrimaryMonitor ();
+
+  _monitors.erase (_monitors.begin (), _monitors.end ());
+
+  g_print ("\nScreen geometry changed:\n");
+
+  for (int i = 0; i < gdk_screen_get_n_monitors (screen); i++)
+  {
+    GdkRectangle rect = { 0 };
+    
+    gdk_screen_get_monitor_geometry (screen, i, &rect);
+
+    nux::Geometry geo (rect.x, rect.y, rect.width, rect.height);
+    _monitors.push_back (geo);
+
+    g_print ("  Monitor %d%s\n", i, i == primary ? "(primary)" : "");
+    g_print ("   %dx%dx%dx%d\n", geo.x, geo.y, geo.width, geo.height);
+  }
+  
+  g_print ("\n");
+
+  changed.emit (primary, _monitors);
+}

=== added file 'src/UScreen.h'
--- src/UScreen.h	1970-01-01 00:00:00 +0000
+++ src/UScreen.h	2011-03-23 17:01:13 +0000
@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Neil Jagdish Patel <[e-mail]>
+ */
+
+#ifndef _UNITY_SCREEN_H_
+#define _UNITY_SCREEN_H_
+
+#include <gdk/gdk.h>
+#include <Nux/Nux.h>
+#include <sigc++/sigc++.h>
+#include <vector>
+
+class UScreen : public sigc::trackable
+{
+public:
+  UScreen ();
+  ~UScreen ();
+
+  static UScreen * GetDefault ();
+
+  int             GetPrimaryMonitor ();
+  nux::Geometry&  GetMonitorGeometry (int monitor);
+
+  std::vector<nux::Geometry>& GetMonitors ();
+
+  // <void, primary_monitor, monitors>
+  sigc::signal<void, int, std::vector<nux::Geometry>&> changed;
+
+private:
+  static void     Changed (GdkScreen *screen, UScreen *self);
+  static gboolean OnIdleChanged (UScreen *self);
+  void            Refresh ();
+
+private:
+  std::vector<nux::Geometry> _monitors;
+  guint32 _refresh_id;
+};
+
+#endif // _UNITY_SCREEN_H_

=== modified file 'src/WindowManager.cpp'
--- src/WindowManager.cpp	2011-03-15 23:36:05 +0000
+++ src/WindowManager.cpp	2011-03-23 17:01:13 +0000
@@ -68,11 +68,11 @@
     g_debug ("%s", G_STRFUNC);
   }
 
- void Close (guint32 xid)
+  void Close (guint32 xid)
   {
     g_debug ("%s", G_STRFUNC);
   }
-
+  
  void Activate (guint32 xid)
   {
     g_debug ("%s", G_STRFUNC);
@@ -87,6 +87,11 @@
   {
     g_debug ("%s", G_STRFUNC);
   }
+
+  nux::Geometry GetWindowGeometry (guint xid)
+  {
+    return nux::Geometry (0, 0, 1, 1);
+  }
 };
 
 WindowManager *

=== modified file 'src/WindowManager.h'
--- src/WindowManager.h	2011-03-22 13:32:19 +0000
+++ src/WindowManager.h	2011-03-23 17:01:13 +0000
@@ -65,6 +65,8 @@
 
   void StartMove (guint32 id, int, int);
 
+  virtual nux::Geometry GetWindowGeometry (guint32 xid) = 0;
+
   // Signals
   sigc::signal<void, guint32> window_mapped;
   sigc::signal<void, guint32> window_unmapped;

=== modified file 'src/unity-panel-view-accessible.cpp'
--- src/unity-panel-view-accessible.cpp	2011-02-17 12:57:17 +0000
+++ src/unity-panel-view-accessible.cpp	2011-03-23 17:01:13 +0000
@@ -99,7 +99,7 @@
     return 0;
 
   panel = dynamic_cast<PanelView *>(nux_object);
-  if ((home_button = panel->HomeButton ()) != NULL)
+  if ((home_button = panel->GetHomeButton ()) != NULL)
     rc = 1;
 
   return rc;
@@ -120,7 +120,7 @@
     return NULL;
 
   panel = dynamic_cast<PanelView *>(nux_object);
-  if ((home_button = panel->HomeButton ()) != NULL)
+  if ((home_button = panel->GetHomeButton ()) != NULL)
     {
       nux::Object *child = NULL;
 

=== modified file 'src/unityshell.cpp'
--- src/unityshell.cpp	2011-03-23 10:59:57 +0000
+++ src/unityshell.cpp	2011-03-23 17:01:13 +0000
@@ -277,7 +277,7 @@
   if (state & CompAction::StateInitKey)
     action->setState (action->state () | CompAction::StateTermKey);
   
-  panelView->StartFirstMenuShow ();
+  panelController->StartFirstMenuShow ();
   return false;
 }
 
@@ -286,7 +286,7 @@
                                              CompAction::State   state,
                                              CompOption::Vector &options)
 {
-  panelView->EndFirstMenuShow ();
+  panelController->EndFirstMenuShow ();
   return false;
 }
 
@@ -568,15 +568,6 @@
                       geo.width, self->_primary_monitor.height - 24);
 }
 
-/* Configure callback for the panel window */
-void
-UnityScreen::panelWindowConfigureCallback(int WindowWidth, int WindowHeight, nux::Geometry& geo, void *user_data)
-{
-  UnityScreen *self = static_cast<UnityScreen *> (user_data);
-  geo = nux::Geometry(self->_primary_monitor.x, self->_primary_monitor.y,
-                      self->_primary_monitor.width, 24);
-}
-
 /* Start up nux after OpenGL is initialized */
 void
 UnityScreen::initUnity(nux::NThread* thread, void* InitData)
@@ -615,10 +606,10 @@
       launcher->SetUrgentAnimation ((Launcher::UrgentAnimation) optionGetUrgentAnimation ());
       break;
     case UnityshellOptions::PanelOpacity:
-      panelView->SetOpacity (optionGetPanelOpacity ());
+      panelController->SetOpacity (optionGetPanelOpacity ());
       break;
     case UnityshellOptions::IconSize:
-      panelHomeButton->SetButtonWidth (optionGetIconSize()+18);
+      panelController->SetBFBSize (optionGetIconSize()+18);
       launcher->SetIconSize (optionGetIconSize()+6, optionGetIconSize());
       PlacesController::SetLauncherSize (optionGetIconSize()+18);
       
@@ -652,8 +643,9 @@
 {
   GdkScreen *scr;
   GdkRectangle rect;
-  nux::Geometry lCurGeom, pCurGeom;
+  nux::Geometry lCurGeom;
   gint primary_monitor;
+  int panel_height = 24;
 
   if (!needsRelayout)
     return;
@@ -665,42 +657,23 @@
 
   wt->SetWindowSize (rect.width, rect.height);
 
-  pCurGeom = panelWindow->GetGeometry(); 
   lCurGeom = launcherWindow->GetGeometry(); 
-
-  panelWindow->EnableInputWindow(false);
-  panelWindow->InputWindowEnableStruts(false);
-
-  panelView->SetMaximumWidth(rect.width);
-  launcher->SetMaximumHeight(rect.height - pCurGeom.height);
-
-  g_debug ("setting to primary screen rect: x=%d y=%d w=%d h=%d",
+  launcher->SetMaximumHeight(rect.height - panel_height);
+
+  g_debug ("Setting to primary screen rect: x=%d y=%d w=%d h=%d",
            rect.x,
            rect.y,
            rect.width,
            rect.height);
 
-  panelWindow->SetGeometry(nux::Geometry(rect.x,
-					rect.y,
-					rect.width,
-					pCurGeom.height));
-  panelView->SetGeometry(nux::Geometry(rect.x,
-					rect.y,
-					rect.width,
-					pCurGeom.height));
-
   launcherWindow->SetGeometry(nux::Geometry(rect.x,
-					rect.y + pCurGeom.height,
+					rect.y + panel_height,
 					lCurGeom.width,
-					rect.height - pCurGeom.height));
+					rect.height - panel_height));
   launcher->SetGeometry(nux::Geometry(rect.x,
-					rect.y + pCurGeom.height,
+					rect.y + panel_height,
 					lCurGeom.width,
-					rect.height - pCurGeom.height));
-
-  panelWindow->EnableInputWindow(true);
-  panelWindow->InputWindowEnableStruts(true);
-
+					rect.height - panel_height));
   needsRelayout = false;
 }
 
@@ -863,21 +836,10 @@
 UnityScreen::~UnityScreen ()
 {
   launcherWindow->UnReference ();
-  panelWindow->UnReference ();
+  panelController->UnReference ();
   unity_a11y_finalize ();
 }
 
-/* Can't create windows until after we have initialized everything */
-gboolean UnityScreen::strutHackTimeout (gpointer data)
-{
-  UnityScreen *self = (UnityScreen*) data;
-
-  self->panelWindow->InputWindowEnableStruts(false);
-  self->panelWindow->InputWindowEnableStruts(true);
-
-  return FALSE;
-}
-
 /* Start up the launcher */
 void UnityScreen::initLauncher (nux::NThread* thread, void* InitData)
 {
@@ -919,34 +881,8 @@
 
   /* Setup panel */
   LOGGER_START_PROCESS ("initLauncher-Panel");
-  self->panelView = new PanelView ();
-  self->AddChild (self->panelView);
-
-  self->panelHomeButton = self->panelView->HomeButton ();
-
-  layout = new nux::HLayout();
-
-  self->panelView->SetMaximumHeight(24);
-  layout->AddView(self->panelView, 1);
-  layout->SetContentDistribution(nux::eStackLeft);
-  layout->SetVerticalExternalMargin(0);
-  layout->SetHorizontalExternalMargin(0);
-
-  self->panelWindow = new nux::BaseWindow("");
-  self->panelWindow->SinkReference ();
-
-  self->panelWindow->SetConfigureNotifyCallback(&UnityScreen::panelWindowConfigureCallback, self);
-  self->panelWindow->SetLayout(layout);
-  self->panelWindow->SetBackgroundColor(nux::Color(0x00000000));
-  self->panelWindow->ShowWindow(true);
-  self->panelWindow->EnableInputWindow(true, "panel", false, false);
-  self->panelWindow->InputWindowEnableStruts(true);
-
-  /* FIXME: this should not be manual, should be managed with a
-     show/hide callback like in GAIL*/
-  if (unity_a11y_initialized () == TRUE)
-    unity_util_accessible_add_window (self->panelWindow);
-
+  self->panelController = new PanelController ();
+  self->AddChild (self->panelController);
   LOGGER_END_PROCESS ("initLauncher-Panel");
 
   /* Setup Places */
@@ -961,7 +897,6 @@
   self->launcher->SetLaunchAnimation (Launcher::LAUNCH_ANIMATION_PULSE);
   self->launcher->SetUrgentAnimation (Launcher::URGENT_ANIMATION_WIGGLE);
   self->ScheduleRelayout (2000);
-  g_timeout_add (2000, &UnityScreen::strutHackTimeout, self);
 
   END_FUNCTION ();
 }

=== modified file 'src/unityshell.h'
--- src/unityshell.h	2011-03-21 08:57:21 +0000
+++ src/unityshell.h	2011-03-23 17:01:13 +0000
@@ -33,8 +33,8 @@
 #include "Introspectable.h"
 #include "Launcher.h"
 #include "LauncherController.h"
-#include "PanelView.h"
-#include "PanelHomeButton.h"
+#include "PanelController.h"
+#include "UScreen.h"
 #include "PlacesController.h"
 #include "GestureEngine.h"
 #include "DebugDBusInterface.h"
@@ -173,14 +173,8 @@
 	launcherWindowConfigureCallback(int WindowWidth, int WindowHeight, nux::Geometry& geo, void* user_data);
 
 	static void
-	panelWindowConfigureCallback(int WindowWidth, int WindowHeight, nux::Geometry& geo, void* user_data);
-
-	static void
 	initUnity(nux::NThread* thread, void* InitData);
 
-	static gboolean
-	strutHackTimeout (gpointer data);
-
   static void
   OnStartKeyNav (GVariant* data, void* value);
 
@@ -204,8 +198,7 @@
 
 	Launcher               *launcher;
 	LauncherController     *controller;
-	PanelView              *panelView;
-  PanelHomeButton        *panelHomeButton;
+  PanelController        *panelController;
 	PlacesController 			 *placesController;
 	GestureEngine          *gestureEngine;
 	nux::WindowThread      *wt;

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-03-22 16:04:22 +0000
+++ tests/CMakeLists.txt	2011-03-23 17:01:13 +0000
@@ -120,6 +120,8 @@
                 ../src/WindowButtons.h
                 ../src/WindowManager.cpp
                 ../src/WindowManager.h
+                ../src/UScreen.cpp
+                ../src/UScreen.h
                 ../src/ubus-server.cpp
                 ../src/ubus-server.h
                 )