Merge lp:~gordallott/unity/standalone-unity into lp:unity

[Gord Allott]

Adds a standalone mode to unity

Adds a standalone mode to unity, basically just pulls in select components in a single window.

Required a few changes, mostly insignificant but pads out the diff. DashSettings got renamed to UnitySettings in the chaos, no need for it to be DashSpecific. Added a new FormFactor

build with make unity-standalone

its worth noting that its not perfect right now, but this diff is large enough

No tests, covered by existing tests, mostly just organisational renaming, no new logic.

[Jason Smith (jassmith)]

Looks good to me, seems to work too.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-05-07 22:28:17 +0000
+++ CMakeLists.txt	2012-05-22 15:59:33 +0000
@@ -131,6 +131,7 @@
 add_subdirectory(hud)
 add_subdirectory(launcher)
 add_subdirectory(shortcuts)
+add_subdirectory(unity-standalone)
 add_subdirectory(plugins/unityshell)
 add_subdirectory(plugins/gtkloader)
 add_subdirectory(plugins/networkarearegion)

=== modified file 'com.canonical.Unity.gschema.xml'
--- com.canonical.Unity.gschema.xml	2012-03-21 12:31:11 +0000
+++ com.canonical.Unity.gschema.xml	2012-05-22 15:59:33 +0000
@@ -3,6 +3,7 @@
     <value nick="Automatic" value="0" />
     <value nick="Desktop" value="1" />
     <value nick="Netbook" value="2" />
+    <value nick="TV" value="3" />
   </enum>
   <enum id="home-expanded-enum">
     <value nick="Not Expanded" value="0" />

=== modified file 'dash/CMakeLists.txt'
--- dash/CMakeLists.txt	2012-05-18 23:34:15 +0000
+++ dash/CMakeLists.txt	2012-05-22 15:59:33 +0000
@@ -61,7 +61,6 @@
 
 add_library (dash-lib STATIC ${DASH_SOURCES})
 add_dependencies (dash-lib unity-core-${UNITY_API_VERSION} unity-shared)
-
 # 
 # Standalone variant
 #

=== modified file 'dash/DashController.cpp'
--- dash/DashController.cpp	2012-05-07 22:28:17 +0000
+++ dash/DashController.cpp	2012-05-22 15:59:33 +0000
@@ -21,7 +21,7 @@
 #include <NuxCore/Logger.h>
 #include <Nux/HLayout.h>
 
-#include "unity-shared/DashSettings.h"
+#include "unity-shared/UnitySettings.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/PluginAdapter.h"
 #include "unity-shared/UBusMessages.h"
@@ -251,7 +251,6 @@
 void Controller::ShowDash()
 {
   EnsureDash();
-
   PluginAdapter* adaptor = PluginAdapter::Default();
   // Don't want to show at the wrong time
   if (visible_ || adaptor->IsExpoActive() || adaptor->IsScaleActive())
@@ -267,12 +266,12 @@
     need_show_ = true;
     return;
   }
-
   view_->AboutToShow();
 
   window_->ShowWindow(true);
   window_->PushToFront();
-  window_->EnableInputWindow(true, "Dash", true, false);
+  if (!Settings::Instance().is_standalone) // in standalone mode, we do not need an input window. we are one.
+    window_->EnableInputWindow(true, "Dash", true, false);
   window_->SetInputFocus();
   window_->CaptureMouseDownAnyWhereElse(true);
   window_->QueueDraw();

=== modified file 'dash/DashView.cpp'
--- dash/DashView.cpp	2012-05-06 23:48:38 +0000
+++ dash/DashView.cpp	2012-05-22 15:59:33 +0000
@@ -30,7 +30,7 @@
 #include <UnityCore/RadioOptionFilter.h>
 
 #include "unity-shared/DashStyle.h"
-#include "unity-shared/DashSettings.h"
+#include "unity-shared/UnitySettings.h"
 #include "unity-shared/UBusMessages.h"
 
 namespace unity
@@ -232,14 +232,14 @@
 {
   nux::Geometry const& geo = GetGeometry();
   content_geo_ = GetBestFitGeometry(geo);
-
-  if (Settings::Instance().GetFormFactor() == FormFactor::NETBOOK)
+  dash::Style& style = dash::Style::Instance();
+  
+  if (style.always_maximised)
   {
     if (geo.width >= content_geo_.width && geo.height > content_geo_.height)
       content_geo_ = geo;
   }
 
-  dash::Style& style = dash::Style::Instance();
 
   // kinda hacky, but it makes sure the content isn't so big that it throws
   // the bottom of the dash off the screen
@@ -771,6 +771,8 @@
     form_factor = "netbook";
   else if (Settings::Instance().GetFormFactor() == FormFactor::DESKTOP)
     form_factor = "desktop";
+  else if (Settings::Instance().GetFormFactor() == FormFactor::TV)
+    form_factor = "tv";
 
   unity::variant::BuilderWrapper wrapper(builder);
   wrapper.add(nux::Geometry(GetAbsoluteX(), GetAbsoluteY(), content_geo_.width, content_geo_.height));

=== modified file 'dash/StandaloneDash.cpp'
--- dash/StandaloneDash.cpp	2012-05-06 23:48:38 +0000
+++ dash/StandaloneDash.cpp	2012-05-22 15:59:33 +0000
@@ -29,7 +29,7 @@
 #include "unity-shared/BGHash.h"
 #include "unity-shared/FontSettings.h"
 #include "DashView.h"
-#include "unity-shared/DashSettings.h"
+#include "unity-shared/UnitySettings.h"
 #include "unity-shared/DashStyle.h"
 
 #define WIDTH 1024
@@ -90,7 +90,7 @@
   nux::logging::configure_logging(::getenv("UNITY_LOG_SEVERITY"));
   // The instances for the pseudo-singletons.
   unity::dash::Style dash_style;
-  unity::dash::Settings dash_settings;
+  unity::Settings settings;
 
   TestRunner *test_runner = new TestRunner ();
   wt = nux::CreateGUIThread(TEXT("Unity Dash"),

=== modified file 'hud/StandaloneHud.cpp'
--- hud/StandaloneHud.cpp	2012-05-07 00:49:31 +0000
+++ hud/StandaloneHud.cpp	2012-05-22 15:59:33 +0000
@@ -29,7 +29,7 @@
 
 #include "HudView.h"
 #include "unity-shared/DashStyle.h"
-#include "unity-shared/DashSettings.h"
+#include "unity-shared/UnitySettings.h"
 #include <NuxCore/Logger.h>
 
 namespace
@@ -47,7 +47,7 @@
   void Init ();
   nux::Layout *layout;
   unity::hud::View* hud_view_;
-  unity::dash::Settings dash_settings_;
+  unity::Settings dash_settings_;
 
 private:
   unity::hud::Hud hud_service_;

=== modified file 'panel/PanelMenuView.cpp'
--- panel/PanelMenuView.cpp	2012-05-07 22:28:17 +0000
+++ panel/PanelMenuView.cpp	2012-05-22 15:59:33 +0000
@@ -24,7 +24,7 @@
 #include "unity-shared/CairoTexture.h"
 #include "PanelMenuView.h"
 #include "unity-shared/PanelStyle.h"
-#include "unity-shared/DashSettings.h"
+#include "unity-shared/UnitySettings.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UScreen.h"
 

=== modified file 'panel/StandalonePanel.cpp'
--- panel/StandalonePanel.cpp	2012-05-07 00:49:31 +0000
+++ panel/StandalonePanel.cpp	2012-05-22 15:59:33 +0000
@@ -25,7 +25,7 @@
 #include "NuxGraphics/GraphicsEngine.h"
 #include <gtk/gtk.h>
 
-#include "unity-shared/DashSettings.h"
+#include "unity-shared/UnitySettings.h"
 #include "unity-shared/PanelStyle.h"
 #include "PanelView.h"
 #include <dbus/dbus-glib.h>
@@ -55,7 +55,7 @@
 
   // The instances for the pseudo-singletons.
   unity::panel::Style panel_style;
-  unity::dash::Settings dash_settings;
+  unity::Settings dash_settings;
 
   nux::WindowThread* wt = nux::CreateGUIThread(TEXT("Unity Panel"), 1024, 24, 0, &ThreadWidgetInit, 0);
 

=== modified file 'panel/WindowButtons.cpp'
--- panel/WindowButtons.cpp	2012-05-07 00:49:31 +0000
+++ panel/WindowButtons.cpp	2012-05-22 15:59:33 +0000
@@ -27,7 +27,7 @@
 
 #include "WindowButtons.h"
 
-#include "unity-shared/DashSettings.h"
+#include "unity-shared/UnitySettings.h"
 #include "unity-shared/PanelStyle.h"
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/WindowManager.h"
@@ -394,7 +394,7 @@
 
   ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, sigc::mem_fun(this, &WindowButtons::OnOverlayShown));
   ubus_manager_.RegisterInterest(UBUS_OVERLAY_HIDDEN, sigc::mem_fun(this, &WindowButtons::OnOverlayHidden));
-  dash::Settings::Instance().changed.connect(sigc::mem_fun(this, &WindowButtons::OnDashSettingsUpdated));
+  Settings::Instance().changed.connect(sigc::mem_fun(this, &WindowButtons::OnDashSettingsUpdated));
 }
 
 nux::Area* WindowButtons::FindAreaUnderMouse(const nux::Point& mouse, nux::NuxEventType event_type)
@@ -469,7 +469,7 @@
 
   if (win_button->IsOverlayOpen())
   {
-    dash::Settings::Instance().SetFormFactor(dash::FormFactor::DESKTOP);
+    Settings::Instance().SetFormFactor(FormFactor::DESKTOP);
   }
   else
   {
@@ -493,7 +493,7 @@
 
   if (win_button->IsOverlayOpen())
   {
-    dash::Settings::Instance().SetFormFactor(dash::FormFactor::NETBOOK);
+    Settings::Instance().SetFormFactor(FormFactor::NETBOOK);
   }
 
   maximize_clicked.emit();
@@ -545,8 +545,8 @@
 
   if (restore_button && maximize_button)
   {
-    dash::Settings &dash_settings = dash::Settings::Instance();
-    bool maximizable = (dash_settings.GetFormFactor() == dash::FormFactor::DESKTOP);
+    Settings &dash_settings = Settings::Instance();
+    bool maximizable = (dash_settings.GetFormFactor() == FormFactor::DESKTOP);
 
     restore_button->SetEnabled(can_maximise);
     maximize_button->SetEnabled(can_maximise);
@@ -668,8 +668,8 @@
 
   if (restore_button && restore_button->IsOverlayOpen() && maximize_button)
   {
-    dash::Settings &dash_settings = dash::Settings::Instance();
-    bool maximizable = (dash_settings.GetFormFactor() == dash::FormFactor::DESKTOP);
+    Settings &dash_settings = Settings::Instance();
+    bool maximizable = (dash_settings.GetFormFactor() == FormFactor::DESKTOP);
 
     if (maximizable != maximize_button->IsVisible())
     {

=== modified file 'plugins/unityshell/CMakeLists.txt'
--- plugins/unityshell/CMakeLists.txt	2012-05-07 22:28:17 +0000
+++ plugins/unityshell/CMakeLists.txt	2012-05-22 15:59:33 +0000
@@ -8,8 +8,8 @@
                CFLAGSADD "-DINSTALLPREFIX='\"${CMAKE_INSTALL_PREFIX}\"' -DPKGDATADIR='\"${PKGDATADIR}\"' -I${CMAKE_BINARY_DIR} -I${CMAKE_SOURCE_DIR} ${BOOT_LOGGER_FLAG} -DGETTEXT_PACKAGE='\"unity\"' ${MAINTAINER_CFLAGS} -I${CMAKE_SOURCE_DIR}/dash/ -I${CMAKE_SOURCE_DIR}/launcher/ -I${CMAKE_SOURCE_DIR}/hud/ -I${CMAKE_SOURCE_DIR}/panel/ -I${CMAKE_SOURCE_DIR}/shortcuts/ -I${CMAKE_SOURCE_DIR}/unity-shared/"
                LIBDIRS "${CMAKE_BINARY_DIR}/UnityCore"
                )
-add_dependencies(unityshell unity-core-${UNITY_API_VERSION} dash-lib launcher-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared)
-target_link_libraries(unityshell unity-core-${UNITY_API_VERSION} launcher-lib dash-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared)
+add_dependencies(unityshell unity-core-${UNITY_API_VERSION} dash-lib launcher-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared unity-shared-compiz)
+target_link_libraries(unityshell unity-core-${UNITY_API_VERSION} launcher-lib dash-lib switcher-lib hud-lib panel-lib shortcuts-lib unity-shared unity-shared-compiz)
 
 #
 # Data

=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-04-24 21:26:55 +0000
+++ plugins/unityshell/src/unityshell.h	2012-05-22 15:59:33 +0000
@@ -36,7 +36,7 @@
 
 #include "Introspectable.h"
 #include "DashController.h"
-#include "DashSettings.h"
+#include "UnitySettings.h"
 #include "DashStyle.h"
 #include "FavoriteStoreGSettings.h"
 #include "FontSettings.h"
@@ -233,7 +233,7 @@
 
   void OnPanelStyleChanged();
 
-  dash::Settings dash_settings_;
+  Settings dash_settings_;
   dash::Style    dash_style_;
   panel::Style   panel_style_;
   FontSettings   font_settings_;

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-05-15 18:54:33 +0000
+++ tests/CMakeLists.txt	2012-05-22 15:59:33 +0000
@@ -205,20 +205,18 @@
                  test_single_monitor_launcher_icon.cpp
                  test_switcher_controller.cpp
                  test_switcher_model.cpp
-                 ${CMAKE_SOURCE_DIR}/launcher/AbstractLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/dash/AbstractPlacesGroup.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/BackgroundEffectHelper.cpp
+                 ${CMAKE_SOURCE_DIR}/dash/DashViewPrivate.cpp
+                 ${CMAKE_SOURCE_DIR}/dash/LensViewPrivate.cpp
+                 ${CMAKE_SOURCE_DIR}/dash/ResultRenderer.cpp
+                 ${CMAKE_SOURCE_DIR}/dash/ResultView.cpp
+                 ${CMAKE_SOURCE_DIR}/dash/ResultViewGrid.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/AbstractLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/CairoBaseWindow.cpp
-                 ${CMAKE_SOURCE_DIR}/dash/DashViewPrivate.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/DNDCollectionWindow.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/Decaymulator.cpp
-                 ${CMAKE_SOURCE_DIR}/launcher/DNDCollectionWindow.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/DndData.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/GeisAdapter.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/IconLoader.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/IconRenderer.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/IconTextureSource.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
-                 ${CMAKE_SOURCE_DIR}/launcher/LayoutSystem.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/Launcher.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherDragWindow.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherEntryRemote.cpp
@@ -226,36 +224,39 @@
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherHoverMachine.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/LauncherModel.cpp
-                 ${CMAKE_SOURCE_DIR}/launcher/SimpleLauncherIcon.cpp
-                 ${CMAKE_SOURCE_DIR}/launcher/SingleMonitorLauncherIcon.cpp
-                 ${CMAKE_SOURCE_DIR}/dash/LensViewPrivate.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/StaticCairoText.cpp
-                 ${CMAKE_SOURCE_DIR}/launcher/SwitcherController.cpp
-                 ${CMAKE_SOURCE_DIR}/launcher/SwitcherModel.cpp
-                 ${CMAKE_SOURCE_DIR}/launcher/SwitcherView.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/Timer.cpp
-                 ${CMAKE_SOURCE_DIR}/launcher/Tooltip.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/PanelStyle.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/LayoutSystem.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/PointerBarrier.cpp
-                 ${CMAKE_SOURCE_DIR}/launcher/QuicklistView.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/QuicklistManager.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItem.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemCheckmark.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemLabel.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemRadio.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/QuicklistMenuItemSeparator.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/QuicklistView.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/SimpleLauncherIcon.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/SingleMonitorLauncherIcon.cpp
                  ${CMAKE_SOURCE_DIR}/launcher/SpacerLauncherIcon.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/SwitcherController.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/SwitcherModel.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/SwitcherView.cpp
+                 ${CMAKE_SOURCE_DIR}/launcher/Tooltip.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/BackgroundEffectHelper.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/IconLoader.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/IconRenderer.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/IconTextureSource.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/Introspectable.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/IntrospectableWrappers.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/PanelStyle.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/StaticCairoText.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/TextureCache.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/Timer.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/UBusWrapper.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/UScreen.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/UnitySettings.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/UnityWindowStyle.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/UnityWindowView.cpp
+                 ${CMAKE_SOURCE_DIR}/unity-shared/WindowManager.cpp
                  ${CMAKE_SOURCE_DIR}/unity-shared/ubus-server.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/UScreen.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/WindowManager.cpp
-                 ${CMAKE_SOURCE_DIR}/dash/ResultView.cpp
-                 ${CMAKE_SOURCE_DIR}/dash/ResultViewGrid.cpp
-                 ${CMAKE_SOURCE_DIR}/dash/ResultRenderer.cpp
-                 ${CMAKE_SOURCE_DIR}/unity-shared/IntrospectableWrappers.cpp
                 )
   target_link_libraries(test-gtest gtest gmock ${LIBS})
   add_test(UnityGTest test-gtest)

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2012-05-07 22:28:17 +0000
+++ unity-shared/CMakeLists.txt	2012-05-22 15:59:33 +0000
@@ -32,7 +32,6 @@
      Animator.cpp
      BGHash.cpp
      BackgroundEffectHelper.cpp
-     DashSettings.cpp
      DashStyle.cpp
      FontSettings.cpp
      IMTextEntry.cpp
@@ -46,7 +45,6 @@
      LineSeparator.cpp
      OverlayRenderer.cpp
      PanelStyle.cpp
-     PluginAdapter.cpp
      SearchBar.cpp
      SearchBarSpinner.cpp
      StaticCairoText.cpp
@@ -54,6 +52,7 @@
      Timer.cpp
      UBusWrapper.cpp
      UScreen.cpp
+     UnitySettings.cpp
      UnityWindowStyle.cpp
      UnityWindowView.cpp
      WindowManager.cpp
@@ -63,3 +62,22 @@
 add_library (unity-shared STATIC ${UNITY_SHARED_SOURCES})
 add_dependencies (unity-shared unity-core-${UNITY_API_VERSION})
 
+#
+# We also need to build compiz specific parts and standalone variants of those parts
+#
+
+# compiz
+set (UNITY_SHARED_COMPIZ_SOURCES
+     PluginAdapterCompiz.cpp
+     )
+add_library (unity-shared-compiz STATIC ${UNITY_SHARED_COMPIZ_SOURCES})
+add_dependencies (unity-shared-compiz unity-shared)
+
+# standalone
+set (UNITY_SHARED_STANDALONE_SOURCES
+     PluginAdapterStandalone.cpp
+     )
+add_library (unity-shared-standalone STATIC ${UNITY_SHARED_STANDALONE_SOURCES})
+add_dependencies (unity-shared-standalone unity-shared)
+
+

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2012-05-06 23:48:38 +0000
+++ unity-shared/DashStyle.cpp	2012-05-22 15:59:33 +0000
@@ -40,6 +40,7 @@
 
 #include "CairoTexture.h"
 #include "JSONParser.h"
+#include "UnitySettings.h"
 #include "config.h"
 
 #define DASH_WIDGETS_FILE DATADIR"/unity/themes/dash-widgets.json"
@@ -399,7 +400,8 @@
 
 
 Style::Style()
-  : pimpl(new Impl(this))
+  : always_maximised(false)
+  , pimpl(new Impl(this))
 {
   if (style_instance)
   {
@@ -409,6 +411,15 @@
   {
     style_instance = this;
   }
+
+  auto formfactor_lambda = [this] () 
+  {
+    FormFactor formfactor = Settings::Instance().GetFormFactor();
+    always_maximised = (formfactor == FormFactor::NETBOOK || formfactor == FormFactor::TV); 
+  };
+
+  Settings::Instance().changed.connect(formfactor_lambda);
+  formfactor_lambda();
 }
 
 Style::~Style ()

=== modified file 'unity-shared/DashStyle.h'
--- unity-shared/DashStyle.h	2012-05-06 23:48:38 +0000
+++ unity-shared/DashStyle.h	2012-05-22 15:59:33 +0000
@@ -238,6 +238,8 @@
 
   sigc::signal<void> changed;
 
+  nux::Property<bool> always_maximised;
+
 private:
   class Impl;
   Impl* pimpl;

=== modified file 'unity-shared/OverlayRenderer.cpp'
--- unity-shared/OverlayRenderer.cpp	2012-05-06 23:48:38 +0000
+++ unity-shared/OverlayRenderer.cpp	2012-05-22 15:59:33 +0000
@@ -26,7 +26,7 @@
 
 #include "unity-shared/BackgroundEffectHelper.h"
 #include "DashStyle.h"
-#include "unity-shared/DashSettings.h"
+#include "unity-shared/UnitySettings.h"
 
 #include "unity-shared/UBusMessages.h"
 #include "unity-shared/UBusWrapper.h"
@@ -378,7 +378,7 @@
   bool paint_blur = BackgroundEffectHelper::blur_type != BLUR_NONE;
   nux::Geometry geo(content_geo);
 
-  int excess_border = (dash::Settings::Instance().GetFormFactor() != dash::FormFactor::NETBOOK || force_edges) ? EXCESS_BORDER : 0;
+  int excess_border = (Settings::Instance().GetFormFactor() != FormFactor::NETBOOK || force_edges) ? EXCESS_BORDER : 0;
 
   nux::Geometry larger_content_geo = content_geo;
   larger_content_geo.OffsetSize(excess_border, excess_border);
@@ -510,7 +510,7 @@
                         larger_content_geo.width, larger_content_geo.height,
                         bg_shine_texture_, texxform_absolute_bg, nux::color::White);
 
-  if (dash::Settings::Instance().GetFormFactor() != dash::FormFactor::NETBOOK || force_edges)
+  if (Settings::Instance().GetFormFactor() != FormFactor::NETBOOK || force_edges)
   {
     // Paint the edges
     {
@@ -767,7 +767,7 @@
   nux::Geometry geo = geometry;
   bgs = 0;
 
-  int excess_border = (dash::Settings::Instance().GetFormFactor() != dash::FormFactor::NETBOOK) ? EXCESS_BORDER : 0;
+  int excess_border = (Settings::Instance().GetFormFactor() != FormFactor::NETBOOK) ? EXCESS_BORDER : 0;
 
   nux::Geometry larger_content_geo = content_geo;
   larger_content_geo.OffsetSize(excess_border, excess_border);

=== modified file 'unity-shared/PanelStyle.cpp'
--- unity-shared/PanelStyle.cpp	2012-05-07 00:49:31 +0000
+++ unity-shared/PanelStyle.cpp	2012-05-22 15:59:33 +0000
@@ -34,6 +34,7 @@
 #include "PanelStyle.h"
 
 #include <UnityCore/GLibWrapper.h>
+#include "unity-shared/UnitySettings.h"
 
 namespace unity
 {
@@ -72,6 +73,15 @@
     style_instance = this;
   }
 
+  if (Settings::Instance().GetFormFactor() == FormFactor::TV)
+    panel_height = 0;
+  
+  Settings::Instance().changed.connect([this]() 
+  {
+    if (Settings::Instance().GetFormFactor() == FormFactor::TV)
+      panel_height = 0;
+  });
+
   GtkWidgetPath* widget_path = gtk_widget_path_new();
   gint pos = gtk_widget_path_append_type(widget_path, GTK_TYPE_WINDOW);
   gtk_widget_path_iter_set_name(widget_path, pos, "UnityPanelWidget");

=== renamed file 'unity-shared/PluginAdapter.cpp' => 'unity-shared/PluginAdapterCompiz.cpp'
=== added file 'unity-shared/PluginAdapterStandalone.cpp'
--- unity-shared/PluginAdapterStandalone.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/PluginAdapterStandalone.cpp	2012-05-22 15:59:33 +0000
@@ -0,0 +1,453 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2010 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: Jason Smith <[e-mail]>
+ */
+
+#include <glib.h>
+#include <sstream>
+#include "PluginAdapter.h"
+#include "UScreen.h"
+
+#include <NuxCore/Logger.h>
+#include <UnityCore/Variant.h>
+
+//FIXME!! Entirely stubs for now, unless we need this functionality at some point
+
+namespace
+{
+nux::logging::Logger logger("unity.plugin");
+}
+
+PluginAdapter* PluginAdapter::_default = 0;
+
+/* static */
+PluginAdapter*
+PluginAdapter::Default()
+{
+  if (!_default)
+    return 0;
+  return _default;
+}
+
+/* static */
+void
+PluginAdapter::Initialize(CompScreen* screen)
+{
+  _default = new PluginAdapter(screen);
+}
+
+PluginAdapter::PluginAdapter(CompScreen* screen) :
+  m_Screen(screen),
+  m_ExpoActionList(0),
+  m_ScaleActionList(0),
+  _in_show_desktop (false),
+  _last_focused_window(nullptr)
+{
+}
+
+PluginAdapter::~PluginAdapter()
+{
+}
+
+/* A No-op for now, but could be useful later */
+void
+PluginAdapter::OnScreenGrabbed()
+{
+}
+
+void
+PluginAdapter::OnScreenUngrabbed()
+{
+}
+
+void
+PluginAdapter::NotifyResized(CompWindow* window, int x, int y, int w, int h)
+{
+}
+
+void
+PluginAdapter::NotifyMoved(CompWindow* window, int x, int y)
+{
+}
+
+void
+PluginAdapter::NotifyStateChange(CompWindow* window, unsigned int state, unsigned int last_state)
+{
+}
+
+void
+PluginAdapter::NotifyNewDecorationState(guint32 xid)
+{
+}
+
+void
+PluginAdapter::Notify(CompWindow* window, CompWindowNotify notify)
+{
+}
+
+void
+PluginAdapter::NotifyCompizEvent(const char* plugin, const char* event, CompOption::Vector& option)
+{
+}
+
+void
+MultiActionList::AddNewAction(CompAction* a, bool primary)
+{
+}
+
+void
+MultiActionList::RemoveAction(CompAction* a)
+{
+}
+
+void
+MultiActionList::InitiateAll(CompOption::Vector& extraArgs, int state)
+{
+}
+
+void
+MultiActionList::TerminateAll(CompOption::Vector& extraArgs)
+{
+}
+
+unsigned long long 
+PluginAdapter::GetWindowActiveNumber (guint32 xid)
+{
+  return 0;
+}
+
+void
+PluginAdapter::SetExpoAction(MultiActionList& expo)
+{
+}
+
+void
+PluginAdapter::SetScaleAction(MultiActionList& scale)
+{
+}
+
+std::string
+PluginAdapter::MatchStringForXids(std::vector<Window> *windows)
+{
+  return "";
+}
+
+void
+PluginAdapter::InitiateScale(std::string const& match, int state)
+{
+}
+
+void
+PluginAdapter::TerminateScale()
+{
+}
+
+bool
+PluginAdapter::IsScaleActive()
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsScaleActiveForGroup()
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsExpoActive()
+{
+  return false;
+}
+
+void
+PluginAdapter::InitiateExpo()
+{
+}
+
+// WindowManager implementation
+guint32
+PluginAdapter::GetActiveWindow()
+{
+  return 0;
+}
+
+bool
+PluginAdapter::IsWindowMaximized(guint xid)
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowDecorated(guint32 xid)
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowOnCurrentDesktop(guint32 xid)
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowObscured(guint32 xid)
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowMapped(guint32 xid)
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowVisible(guint32 xid)
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowOnTop(guint32 xid)
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowClosable(guint32 xid)
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowMinimizable(guint32 xid)
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsWindowMaximizable(guint32 xid)
+{
+  return false;
+}
+
+void
+PluginAdapter::Restore(guint32 xid)
+{
+}
+
+void
+PluginAdapter::RestoreAt(guint32 xid, int x, int y)
+{
+}
+
+void
+PluginAdapter::Minimize(guint32 xid)
+{
+}
+
+void
+PluginAdapter::Close(guint32 xid)
+{
+}
+
+void
+PluginAdapter::Activate(guint32 xid)
+{
+}
+
+void
+PluginAdapter::Raise(guint32 xid)
+{
+}
+
+void
+PluginAdapter::Lower(guint32 xid)
+{
+}
+
+void 
+PluginAdapter::FocusWindowGroup(std::vector<Window> window_ids, FocusVisibility focus_visibility, int monitor, bool only_top_win)
+{
+}
+
+bool 
+PluginAdapter::ScaleWindowGroup(std::vector<Window> windows, int state, bool force)
+{
+  return false;
+}
+
+void 
+PluginAdapter::SetWindowIconGeometry(Window window, nux::Geometry const& geo)
+{
+}
+
+void
+PluginAdapter::ShowDesktop()
+{
+}
+
+void
+PluginAdapter::OnShowDesktop()
+{
+}
+
+void
+PluginAdapter::OnLeaveDesktop()
+{
+}
+
+int
+PluginAdapter::GetWindowMonitor(guint32 xid) const
+{
+  return -1;
+}
+
+nux::Geometry
+PluginAdapter::GetWindowGeometry(guint32 xid) const
+{
+  nux::Geometry geo(0, 0, 1, 1);
+  return geo;
+}
+
+nux::Geometry
+PluginAdapter::GetWindowSavedGeometry(guint32 xid) const
+{
+  nux::Geometry geo(0, 0, 1, 1);
+  return geo;
+}
+
+nux::Geometry 
+PluginAdapter::GetScreenGeometry() const
+{
+  nux::Geometry geo(0, 0, 1, 1);
+  return geo;  
+}
+
+nux::Geometry 
+PluginAdapter::GetWorkAreaGeometry(guint32 xid) const
+{
+  nux::Geometry geo(0, 0, 1, 1);
+  return geo;
+}
+
+bool
+PluginAdapter::CheckWindowIntersection(nux::Geometry const& region, CompWindow* window)
+{
+  return false;
+}
+
+void 
+PluginAdapter::CheckWindowIntersections (nux::Geometry const& region, bool &active, bool &any)
+{
+}
+
+int
+PluginAdapter::WorkspaceCount()
+{
+  return 4;
+}
+
+void
+PluginAdapter::SetMwmWindowHints(Window xid, MotifWmHints* new_hints)
+{
+}
+
+void
+PluginAdapter::Decorate(guint32 xid)
+{
+}
+
+void
+PluginAdapter::Undecorate(guint32 xid)
+{
+}
+
+bool
+PluginAdapter::IsScreenGrabbed()
+{
+  return false;
+}
+
+bool
+PluginAdapter::IsViewPortSwitchStarted()
+{
+  return false;
+}
+
+/* Returns true if the window was maximized */
+bool PluginAdapter::MaximizeIfBigEnough(CompWindow* window)
+{
+  return true;
+}
+
+void
+PluginAdapter::ShowGrabHandles(CompWindow* window, bool use_timer)
+{
+}
+
+void
+PluginAdapter::HideGrabHandles(CompWindow* window)
+{
+}
+
+void
+PluginAdapter::ToggleGrabHandles(CompWindow* window)
+{
+}
+
+void
+PluginAdapter::SetCoverageAreaBeforeAutomaximize(float area)
+{
+}
+
+bool
+PluginAdapter::saveInputFocus()
+{
+  return false;
+}
+
+bool
+PluginAdapter::restoreInputFocus()
+{
+  return false;
+}
+
+void
+PluginAdapter::MoveResizeWindow(guint32 xid, nux::Geometry geometry)
+{
+}
+
+void
+PluginAdapter::OnWindowClosed(CompWindow *w)
+{
+}
+
+void
+PluginAdapter::AddProperties(GVariantBuilder* builder)
+{
+  unity::variant::BuilderWrapper wrapper(builder);
+  wrapper.add(GetScreenGeometry())
+         .add("workspace_count", WorkspaceCount())
+         .add("active_window", GetActiveWindow())
+         .add("screen_grabbed", IsScreenGrabbed())
+         .add("scale_active", IsScaleActive())
+         .add("scale_active_for_group", IsScaleActiveForGroup())
+         .add("expo_active", IsExpoActive())
+         .add("viewport_switch_running", IsViewPortSwitchStarted());
+}

=== renamed file 'unity-shared/DashSettings.cpp' => 'unity-shared/UnitySettings.cpp'
--- unity-shared/DashSettings.cpp	2012-05-06 23:48:38 +0000
+++ unity-shared/UnitySettings.cpp	2012-05-22 15:59:33 +0000
@@ -22,16 +22,14 @@
 
 #include <NuxCore/Logger.h>
 
-#include "DashSettings.h"
+#include "UnitySettings.h"
 #include "UScreen.h"
 
 namespace unity
 {
-namespace dash
-{
 namespace
 {
-nux::logging::Logger logger("unity.dash");
+nux::logging::Logger logger("unity");
 
 Settings* settings_instance = nullptr;
 const char* const FORM_FACTOR = "form-factor";
@@ -107,14 +105,16 @@
 {
   form_factor_ = factor;
   g_settings_set_enum(settings_, FORM_FACTOR, static_cast<int>(factor));
+  owner_->changed.emit();
 }
 
 Settings::Settings()
-  : pimpl(new Impl(this))
+  : is_standalone(false)
+  , pimpl(new Impl(this))
 {
   if (settings_instance)
   {
-    LOG_ERROR(logger) << "More than one dash::Settings created.";
+    LOG_ERROR(logger) << "More than one unity::Settings created.";
   }
   else
   {
@@ -133,7 +133,7 @@
 {
   if (!settings_instance)
   {
-    LOG_ERROR(logger) << "No dash::Settings created yet.";
+    LOG_ERROR(logger) << "No unity::Settings created yet.";
   }
 
   return *settings_instance;
@@ -150,5 +150,4 @@
 }
 
 
-} // namespace dash
 } // namespace unity

=== renamed file 'unity-shared/DashSettings.h' => 'unity-shared/UnitySettings.h'
--- unity-shared/DashSettings.h	2012-05-06 23:48:38 +0000
+++ unity-shared/UnitySettings.h	2012-05-22 15:59:33 +0000
@@ -17,20 +17,20 @@
 * Authored by: Neil Jagdish Patel <[e-mail]>
 */
 
-#ifndef DASH_SETTINGS_H
-#define DASH_SETTINGS_H
+#ifndef UNITY_SETTINGS_H
+#define UNITY_SETTINGS_H
 
 #include <sigc++/signal.h>
+#include <Nux/Nux.h>
 
 namespace unity
 {
-namespace dash
-{
 
 enum class FormFactor
 {
   DESKTOP = 1,
-  NETBOOK
+  NETBOOK = 2,
+  TV
 };
 
 class Settings
@@ -45,6 +45,7 @@
   FormFactor GetFormFactor() const;
   void SetFormFactor(FormFactor factor);
 
+  nux::Property<bool> is_standalone;
   sigc::signal<void> changed;
 
 private:
@@ -53,6 +54,5 @@
 };
 
 }
-}
 
-#endif // DASH_SETTINGS_H
+#endif // UNITY_SETTINGS_H

=== added directory 'unity-standalone'
=== added file 'unity-standalone/CMakeLists.txt'
--- unity-standalone/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ unity-standalone/CMakeLists.txt	2012-05-22 15:59:33 +0000
@@ -0,0 +1,46 @@
+set(UNITY_SRC ../plugins/unityshell/src)
+
+find_package (PkgConfig)
+
+set (CFLAGS
+     ${CACHED_UNITY_DEPS_CFLAGS}
+     ${CACHED_UNITY_DEPS_CFLAGS_OTHER}
+     ${MAINTAINER_CFLAGS}
+     "-DGETTEXT_PACKAGE=\"unity\""
+     "-I${CMAKE_CURRENT_BINARY_DIR}"
+     )
+
+if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+  set (CFLAGS ${CFLAGS} "-fPIC")
+endif (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64")
+
+add_definitions (${CFLAGS})
+
+set (LIBS ${CACHED_UNITY_DEPS_LIBRARIES} "-lunity-core-${UNITY_API_VERSION} -lm -lGL -lGLU")
+link_libraries (${LIBS})
+
+set (LIB_PATHS ${CACHED_UNITY_DEPS_LIBRARY_DIRS})
+link_directories (${CMAKE_BINARY_DIR}/UnityCore ${LIB_PATHS})
+
+include_directories (. .. ../services ../UnityCore ${UNITY_SRC} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})
+
+#
+# Headers & Sources
+#
+set (STANDALONE_SOURCES
+     StandaloneUnity.cpp
+     )
+
+add_executable (unity-standalone StandaloneUnity.cpp)
+add_dependencies (unity-standalone 
+                  dash-lib
+                  launcher-lib
+                  panel-lib
+                  unity-shared
+                  unity-shared-standalone)
+target_link_libraries (unity-standalone 
+                       dash-lib
+                       launcher-lib
+                       panel-lib
+                       unity-shared
+                       unity-shared-standalone)

=== added file 'unity-standalone/StandaloneUnity.cpp'
--- unity-standalone/StandaloneUnity.cpp	1970-01-01 00:00:00 +0000
+++ unity-standalone/StandaloneUnity.cpp	2012-05-22 15:59:33 +0000
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2010 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 warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY 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
+ * version 3 along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>
+ *
+ * Authored by: Gordon Allott <[e-mail]>
+ *              Neil Jagdish Patel <[e-mail]>
+ *
+ */
+#include <gtk/gtk.h>
+
+#include "Nux/Nux.h"
+#include "Nux/VLayout.h"
+#include "Nux/WindowThread.h"
+#include "NuxGraphics/GraphicsEngine.h"
+#include <NuxCore/Logger.h>
+
+#include "dash/DashController.h"
+#include "dash/DashView.h"
+#include "launcher/FavoriteStoreGSettings.h"
+#include "launcher/Launcher.h"
+#include "launcher/LauncherController.h"
+#include "panel/PanelController.h"
+#include "panel/PanelView.h"
+#include "unity-shared/BGHash.h"
+#include "unity-shared/BackgroundEffectHelper.h"
+#include "unity-shared/DashStyle.h"
+#include "unity-shared/FontSettings.h"
+#include "unity-shared/PanelStyle.h"
+#include "unity-shared/PluginAdapter.h"
+#include "unity-shared/UBusMessages.h"
+#include "unity-shared/UBusWrapper.h"
+#include "unity-shared/UnitySettings.h"
+
+namespace
+{
+  static int display_width = 1280;
+  static int display_height = 720;
+  static gboolean no_window_decorations = FALSE;
+  static gboolean force_tv = FALSE;
+
+  static GOptionEntry entries[] =
+  {
+    {"width", 'w', 0, G_OPTION_ARG_INT, &display_width, "Display width", NULL},
+    {"height", 'h', 0, G_OPTION_ARG_INT, &display_height, "Display height", NULL},
+    {"no-window-decorations", 'd', 0, G_OPTION_ARG_NONE, &no_window_decorations, "Disables the window decorations", NULL},
+    {"force-tv", 't', 0, G_OPTION_ARG_NONE, &force_tv, "Forces the TV interface", NULL},
+    {NULL}
+  };
+}
+
+using namespace unity;
+
+class UnityStandalone
+{
+public:
+  UnityStandalone ();
+  ~UnityStandalone ();
+
+  static void InitWindowThread (nux::NThread* thread, void* InitData);
+  void Init ();
+
+  launcher::Controller::Ptr launcher_controller;
+  dash::Controller::Ptr dash_controller;
+  panel::Controller::Ptr panel_controller;
+};
+
+UnityStandalone::UnityStandalone ()
+{
+}
+
+UnityStandalone::~UnityStandalone ()
+{
+}
+
+void UnityStandalone::Init ()
+{
+  launcher_controller.reset(new launcher::Controller(0));
+  panel_controller.reset(new panel::Controller());
+  dash_controller.reset(new dash::Controller());
+  dash_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1;
+}
+
+void UnityStandalone::InitWindowThread(nux::NThread* thread, void* InitData)
+{
+  UnityStandalone *self = static_cast<UnityStandalone*>(InitData);
+  self->Init();
+}
+
+
+class UnityStandaloneTV
+{
+public:
+  UnityStandaloneTV();
+  ~UnityStandaloneTV();
+
+  static void InitWindowThread (nux::NThread* thread, void* InitData);
+  void Init();
+
+  launcher::Controller::Ptr launcher_controller;
+  dash::Controller::Ptr dash_controller;
+};
+
+UnityStandaloneTV::UnityStandaloneTV() {};
+UnityStandaloneTV::~UnityStandaloneTV() {};
+
+void UnityStandaloneTV::Init()
+{
+  launcher_controller.reset(new launcher::Controller(0));
+  dash_controller.reset(new dash::Controller());
+  dash_controller->launcher_width = launcher_controller->launcher().GetAbsoluteWidth() - 1;
+
+  UBusManager().SendMessage(UBUS_DASH_EXTERNAL_ACTIVATION, nullptr);
+}
+
+void UnityStandaloneTV::InitWindowThread(nux::NThread* thread, void* InitData)
+{
+  UnityStandaloneTV *self = static_cast<UnityStandaloneTV*>(InitData);
+  self->Init();
+}
+
+int main(int argc, char **argv)
+{
+  nux::WindowThread* wt = NULL;
+  GError *error = NULL;
+  GOptionContext *context;
+
+  nux::NuxInitialize(0);
+  nux::logging::configure_logging(::getenv("UNITY_LOG_SEVERITY"));
+  
+  context = g_option_context_new("- Unity standalone");
+  g_option_context_add_main_entries(context, entries, GETTEXT_PACKAGE);
+  g_option_context_add_group(context, gtk_get_option_group(TRUE));
+  g_option_context_parse(context, &argc, &argv, &error);
+  if (error != NULL)
+  {
+    g_print("Option parsiong failed: %s\n", error->message);
+    g_error_free(error);
+    exit(1);
+  }
+
+  gtk_init(&argc, &argv);
+
+  BGHash bghash;
+  FontSettings font_settings;
+
+  // The instances for the pseudo-singletons.
+  Settings settings;
+  settings.is_standalone = true;
+  if (force_tv) Settings::Instance().SetFormFactor(FormFactor::TV);
+  
+  PluginAdapter::Initialize(NULL);
+  dash::Style dash_style;
+  panel::Style panel_style;
+
+  GeisAdapter geis_adapter;
+  internal::FavoriteStoreGSettings favorite_store;
+  BackgroundEffectHelper::blur_type = BLUR_NONE;
+
+  if (!force_tv)
+  {
+    UnityStandalone *standalone_runner = new UnityStandalone();
+    wt = nux::CreateNuxWindow("standalone-unity",
+                              display_width, display_height,
+                              (no_window_decorations) ? nux::WINDOWSTYLE_NOBORDER : nux::WINDOWSTYLE_NORMAL,
+                              0, /* no parent */
+                              false,
+                              &UnityStandalone::InitWindowThread,
+                              standalone_runner);
+  }
+  else
+  {
+    //TODO - we should be able to pass in a monitor so that we can make the window
+    //the size of the monitor and position the window on the monitor correctly.
+    UnityStandaloneTV *standalone_runner = new UnityStandaloneTV();
+    wt = nux::CreateNuxWindow("standalone-unity-tv",
+                              display_width, display_height,
+                              (no_window_decorations) ? nux::WINDOWSTYLE_NOBORDER : nux::WINDOWSTYLE_NORMAL,
+                              0, /* no parent */
+                              false,
+                              &UnityStandaloneTV::InitWindowThread,
+                              standalone_runner);
+  }
+  wt->Run(NULL);
+  delete wt;
+  return 0;
+}