Merge lp:~thumper/unity/adjust-cmake-setup into lp:unity

[Tim Penhey]

[lp:~thumper/unity/adjust-cmake-setup]

2687. By Tim Penhey on 2012-09-18

Merge trunk.

2688. By Tim Penhey on 2012-09-19

Neither of these X11 includes are needed.

2689. By Tim Penhey on 2012-09-19

Merge in the nux api fixes.

2690. By Tim Penhey on 2012-09-20

Abstract out the keyboard methods.

2691. By Tim Penhey on 2012-09-20

Merge trunk.

2692. By Tim Penhey on 2012-09-20

Fix typos, variable name, and old using stamement.

2693. By Tim Penhey on 2012-09-20

More include tweaks, and confirm that the tests pass.

2694. By Tim Penhey on 2012-09-20

Type updates.

2695. By Tim Penhey on 2012-09-20

Refactoring the window manager code.

2696. By Tim Penhey on 2012-09-20

Finish implementing the standalone window manager, and hook up tests and standalone versions.

2697. By Tim Penhey on 2012-09-20

More includes, and make vector params const&

2698. By Tim Penhey on 2012-09-20

Finish off the member rename.

2699. By Tim Penhey on 2012-09-20

missing includes.

2700. By Tim Penhey on 2012-09-20

Parameter name changed.

2701. By Tim Penhey on 2012-09-20

Try the gesture tests with the standalone window manager.

2702. By Tim Penhey on 2012-09-20

Migrate the script to use window manager instead of plugin adapter.

2703. By Tim Penhey on 2012-09-20

Have the xless tests use the standalone window manager.

2704. By Tim Penhey on 2012-09-20

Be explicit in the type.

2705. By Tim Penhey on 2012-09-20

Attempt to get the gesture compiling.

2706. By Tim Penhey on 2012-09-20

More parameter renames and missing consts.

2707. By Tim Penhey on 2012-09-20

Be explicit in the type.

2708. By Tim Penhey on 2012-09-20

Missing header.

2709. By Tim Penhey on 2012-09-20

Missing include.

2710. By Tim Penhey on 2012-09-20

Fix up the expo test to use the more generic window manager.

2711. By Tim Penhey on 2012-09-21

Another attempt to get gesture tests working.

2712. By Tim Penhey on 2012-09-21

More changed params missed.

2713. By Tim Penhey on 2012-09-21

Use explicit types for std::max. I still think this whole idea of using long long is a bad one, but perhaps we'll get to it later.

2714. By Tim Penhey on 2012-09-21

Revert failed attempts at changing the test-gestures.

2715. By Tim Penhey on 2012-09-21

Handle the horrible const case.

2716. By Tim Penhey on 2012-09-21

Reference not pointer.

2717. By Tim Penhey on 2012-09-21

Reference not pointer again.

2718. By Tim Penhey on 2012-09-21

Standalone function instead of private static.

2719. By Tim Penhey on 2012-09-21

Remove the path from the include.

2720. By Tim Penhey on 2012-09-21

Missing include.

2721. By Tim Penhey on 2012-09-21

Make the standalone use the standalone unity-shared variant.

2722. By Tim Penhey on 2012-09-21

Oops, need both.

2723. By Tim Penhey on 2012-09-21

More missed bits.

2724. By Tim Penhey on 2012-09-21

Merge trunk and resolve conflicts.

2725. By Tim Penhey on 2012-09-28

Attempt to split it out.

2726. By Tim Penhey on 2012-10-04

Merge trunk and resolve conflicts.

2727. By Tim Penhey on 2012-10-04

Edited wrong file.

2728. By Tim Penhey on 2012-10-04

More uses of the window manager.

2729. By Tim Penhey on 2012-10-04

Also fix typo that I reintroduced.

2730. By Tim Penhey on 2012-10-04

Merge prev pipe.

2731. By Tim Penhey on 2012-10-04

Merged window-manager-refactor into adjust-cmake-setup.

2732. By Tim Penhey on 2012-10-04

Merge prev.

2733. By Tim Penhey on 2012-10-04

Merged no-barriers-with-no-x into adjust-cmake-setup.

2734. By Tim Penhey on 2012-10-05

Merged no-barriers-with-no-x into adjust-cmake-setup.

2735. By Tim Penhey on 2012-10-15

Merged no-barriers-with-no-x into adjust-cmake-setup.

2736. By Tim Penhey on 2012-10-16

No ASM shaders in ARM

2737. By Tim Penhey on 2012-10-16

Missing define.

2738. By Tim Penhey on 2012-10-16

Don't build docs or i18n for arm right now.

2739. By Tim Penhey on 2012-10-16

Conditionally compile the X stuff.

2740. By Tim Penhey on 2012-10-17

No input window without X

2741. By Tim Penhey on 2012-10-17

Don't try to compile the compiz plugin if no X.

2742. By Tim Penhey on 2012-10-17

No ASM shaders in gles.

2743. By Tim Penhey on 2012-10-17

Don't compile the panel or hud if no X.

2744. By Tim Penhey on 2012-10-17

Don't make the standalone unity for arm.

2745. By Tim Penhey on 2012-10-17

Comment out the DND support for arm.

2746. By Tim Penhey on 2012-10-17

Comment out the DND support for arm.

2747. By Tim Penhey on 2012-10-17

Don't compile the standalone switcher for arm.

2748. By Tim Penhey on 2012-10-17

Comment out the DND support for arm.

2749. By Tim Penhey on 2012-10-17

Remove unneeded headers.

2750. By Tim Penhey on 2012-10-17

Comment out the DND support for arm.

2751. By Tim Penhey on 2012-10-17

Fake keyboard util for arm.

2752. By Tim Penhey on 2012-10-17

Merge prev pipe.

2753. By Tim Penhey on 2012-10-17

Merged no-barriers-with-no-x into adjust-cmake-setup.

2754. By Tim Penhey on 2012-10-17

Merged no-barriers-with-no-x into adjust-cmake-setup.

2755. By Tim Penhey on 2012-10-17

Merged no-barriers-with-no-x into adjust-cmake-setup.

2756. By Tim Penhey on 2012-10-17

Merged application-manager into adjust-cmake-setup.

2757. By Tim Penhey on 2012-10-17

Revert unneeded makefile changes.

2758. By Tim Penhey on 2012-10-24

Merge prev and resolve conflicts.

2759. By Tim Penhey on 2012-10-24

Merged application-manager into adjust-cmake-setup.

Unmerged revisions

2759. By Tim Penhey on 2012-10-24

Merged application-manager into adjust-cmake-setup.

2758. By Tim Penhey on 2012-10-24

Merge prev and resolve conflicts.

2757. By Tim Penhey on 2012-10-17

Revert unneeded makefile changes.

2756. By Tim Penhey on 2012-10-17

Merged application-manager into adjust-cmake-setup.

2755. By Tim Penhey on 2012-10-17

Merged no-barriers-with-no-x into adjust-cmake-setup.

2754. By Tim Penhey on 2012-10-17

Merged no-barriers-with-no-x into adjust-cmake-setup.

2753. By Tim Penhey on 2012-10-17

Merged no-barriers-with-no-x into adjust-cmake-setup.

2752. By Tim Penhey on 2012-10-17

Merge prev pipe.

2751. By Tim Penhey on 2012-10-17

Fake keyboard util for arm.

2750. By Tim Penhey on 2012-10-17

Comment out the DND support for arm.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-10-18 15:29:34 +0000
+++ CMakeLists.txt	2012-10-24 08:23:34 +0000
@@ -18,23 +18,32 @@
 set (CMAKE_CXX_FLAGS_RELEASE "")
 
 option(
-  UNITY_ENABLE_X_ORG_SUPPORT
+  ENABLE_X_SUPPORT
   "Enable X.org support in unity"
   ON
 )
 
-if(UNITY_ENABLE_X_ORG_SUPPORT)
-  add_definitions(-DUNITY_HAS_X_ORG_SUPPORT)
+# This is due to bug lp:668799 - qemu-arm segfaults executing msgmerge
+option(
+  I18N_SUPPORT
+  "Enable I18N, do the .po file thing."
+  ON
+)
+
+if (ENABLE_X_SUPPORT)
+  add_definitions(-DUSE_X11)
   message("Unity is configured with support for X.org")
 else ()
   message("Unity is configured with without X.org")
-endif()
+  add_definitions(-DNO_X11)
+endif ()
 
 if (BUILD_GLES)
-    set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNUX_OPENGLES_20 -DUSE_GLES")
-    set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl")
+  add_definitions(-DNUX_OPENGLES_20)
+  add_definitions(-DUSE_GLES)
+  set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl")
 else ()
-    set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl -lGL -lGLU")
+  set (UNITY_STANDALONE_LADD "-lunity-core-${UNITY_API_VERSION} -lm -lpthread -ldl -lGL -lGLU")
 endif ()
 
 #
@@ -107,7 +116,6 @@
 #
 # i18n
 #
-
 find_package (Gettext REQUIRED)
 
 set (COMPIZ_I18N_DIR ${CMAKE_SOURCE_DIR}/po)
@@ -117,16 +125,19 @@
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 		)
 
+if (I18N_SUPPORT)
 if (${GETTEXT_FOUND} STREQUAL "TRUE")
         set (HAVE_GETTEXT true)
         file (GLOB _translations ${CMAKE_SOURCE_DIR}/po/*.po)
         GETTEXT_CREATE_TRANSLATIONS (${CMAKE_SOURCE_DIR}/po/${PROJECT_NAME}.pot
                 ALL ${_translations})
 endif (${GETTEXT_FOUND} STREQUAL "TRUE")
+endif()
+
 
 #
 # Enable or disable boot logging
-# 
+#
 option (BOOT_LOGGER "Enable startup performance logging" OFF)
 if (BOOT_LOGGER)
     SET (BOOT_LOGGER_FLAG "-DENABLE_LOGGER")
@@ -144,10 +155,10 @@
 #
 # Compiz Plugins
 #
-if(UNITY_ENABLE_X_ORG_SUPPORT)
+if (ENABLE_X_SUPPORT)
   set (UNITY_PLUGIN_DEPS "compiz>=0.9.8.0;nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;gmodule-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;atk-bridge-2.0;unity-misc>=0.4.0;dbus-glib-1;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.95.1;libgeis;xrender>=0.9;zeitgeist-1.0>=0.3.18")
 else ()
-  set (UNITY_PLUGIN_DEPS "nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;gmodule-2.0;dbusmenu-glib-0.4;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;atk-bridge-2.0;unity-misc>=0.4.0;dbus-glib-1;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;xfixes;unity-protocol-private>=5.95.1;libgeis;xrender>=0.9;zeitgeist-1.0>=0.3.18")
+  set (UNITY_PLUGIN_DEPS "nux-3.0>=3.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;gmodule-2.0;dbusmenu-glib-0.4;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;atk-bridge-2.0;unity-misc>=0.4.0;dbus-glib-1;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;unity-protocol-private>=5.95.1;zeitgeist-1.0>=0.3.18")
 endif ()
 
 set (UNITY_PROTOCOL_PRIVATE_DEPS "unity-protocol-private>=5.95.1")
@@ -159,16 +170,16 @@
 add_subdirectory(unity-shared)
 add_subdirectory(dash)
 add_subdirectory(launcher)
-add_subdirectory(shortcuts)
-if(UNITY_ENABLE_X_ORG_SUPPORT)
+if (ENABLE_X_SUPPORT)
   add_subdirectory(hud)
   add_subdirectory(panel)
   add_subdirectory(plugins/unityshell)
   add_subdirectory(plugins/networkarearegion)
   add_subdirectory(plugins/unitydialog)
   add_subdirectory(plugins/unity-mt-grab-handles)
+  add_subdirectory(shortcuts)
   add_subdirectory(unity-standalone)
-endif()
+endif ()
 
 # subdirs
 add_subdirectory(doc)

=== added file 'Notes.txt'
--- Notes.txt	1970-01-01 00:00:00 +0000
+++ Notes.txt	2012-10-24 08:23:34 +0000
@@ -0,0 +1,80 @@
+For no X, don't compile:
+ * PointerBarrier.h
+ * EdgeBarrierController
+ * XKeyboardUtil.cpp
+
+ * test_pointer_barrier
+ * test_edge_barrier_controller
+ * test_keyboard_util
+
+Need a WindowManager implementation...
+ * How to handle the lack of options...
+ * LauncherOptions has its own class
+
+
+X11 include locations:
+
+launcher/AbstractLauncherIcon.h:30:#include <X11/Xlib.h>
+ * Window used for member in ActionArg
+ * Window used in vector return types
+ * Should check to see if we can have a simple typedef
+
+launcher/LayoutSystem.h:26:#include <X11/Xlib.h>
+ * We won't need this for phone or tablet initially
+ * Conditionally compile it, and #ifdef out the usage
+   where it is used at the moment.
+ * Used in SwitcherView
+ * We are unlikely to use the same switcher for tablet/phone
+
+
+launcher/PointerBarrier.cpp:21:#include <X11/extensions/Xfixes.h>
+launcher/PointerBarrier.h:24:#include <X11/Xlib.h>
+launcher/PointerBarrier.h:25:#include <X11/extensions/Xfixes.h>
+
+ * None of the pointer barrier work is needed on the phone/tablet
+
+panel/PanelTitlebarGrabAreaView.cpp:28:#include <X11/cursorfont.h>
+ * Changes the cursor over the grab area
+ * Don't have these in the phone, tablet, so should be able to
+   #ifdef these out
+
+plugins/networkarearegion/src/networkarearegion.h:23:#include <X11/Xatom.h>
+plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h:75:    typedef boost::shared_ptr <X11Texture> Ptr;
+plugins/unitydialog/src/unitydialog.h:24:#include <X11/Xatom.h>
+plugins/unitydialog/src/unitydialog.h:25:#include <X11/Xproto.h>
+plugins/unityshell/src/UnityGestureBroker.cpp:27:#include <X11/cursorfont.h>
+plugins/unityshell/src/comptransientfor.h:25:#include <X11/Xlib.h>
+plugins/unityshell/src/comptransientfor.h:26:#include <X11/Xatom.h>
+plugins/unityshell/src/inputremover.cpp:23:#include <X11/Xregion.h>
+plugins/unityshell/src/inputremover.h:26:#include <X11/Xlib.h>
+plugins/unityshell/src/inputremover.h:27:#include <X11/Xatom.h>
+plugins/unityshell/src/inputremover.h:28:#include <X11/extensions/shape.h>
+plugins/unityshell/src/minimizedwindowhandler.h:25:#include <X11/Xlib.h>
+plugins/unityshell/src/minimizedwindowhandler.h:26:#include <X11/Xatom.h>
+plugins/unityshell/src/transientfor.h:25:#include <X11/Xlib.h>
+plugins/unityshell/src/transientfor.h:26:#include <X11/Xatom.h>
+
+We shouldn't care about any of the plugins as this is all compiz related, and
+we aren't dealing with compiz on the phone/tablet.
+
+services/panel-service.c:34:#include <X11/extensions/XInput2.h>
+services/panel-service.c:35:#include <X11/XKBlib.h>
+
+Panel service needed?  Must check
+
+tests/test-gestures/X11_mock.cpp:21:#include <X11/Xlib.h>
+tests/test-gestures/X11_mock.h:24:#include <X11/Xlib.h>
+tests/test-gestures/compiz_mock/core/core.h:24:#include <X11_mock.h>
+tests/test-gestures/compiz_mock/core/screen.h:24:#include <X11/Xlib.h>
+tests/x11-window-read-transients.h:23:#include <X11/Xlib.h>
+tests/x11-window-read-transients.h:24:#include <X11/Xatom.h>
+tests/x11-window.h:22:#include <X11/Xlib.h>
+tests/x11-window.h:23:#include <X11/Xatom.h>
+
+We probably don't care about the tests
+
+unity-shared/KeyboardUtil.h:25:#include <X11/keysym.h>
+unity-shared/KeyboardUtil.h:26:#include <X11/XKBlib.h>
+unity-shared/KeyboardUtil.h:27:#include <X11/extensions/XKBgeom.h>
+
+Grep finished (matches found) at Fri Sep 14 14:37:53

=== modified file 'dash/ResultViewGrid.cpp'
--- dash/ResultViewGrid.cpp	2012-10-17 22:26:46 +0000
+++ dash/ResultViewGrid.cpp	2012-10-24 08:23:34 +0000
@@ -780,7 +780,7 @@
 */
 bool ResultViewGrid::DndSourceDragBegin()
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   unsigned num_results = GetNumResults();
   unsigned drag_index = GetIndexAtPosition(last_mouse_down_x_, last_mouse_down_y_);
 
@@ -932,7 +932,7 @@
 
 void ResultViewGrid::DndSourceDragFinished(nux::DndAction result)
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   UnReference();
   last_mouse_down_x_ = -1;
   last_mouse_down_y_ = -1;

=== modified file 'launcher/ApplicationLauncherIcon.cpp'
--- launcher/ApplicationLauncherIcon.cpp	2012-10-17 22:26:46 +0000
+++ launcher/ApplicationLauncherIcon.cpp	2012-10-24 08:23:34 +0000
@@ -1301,7 +1301,7 @@
 
 nux::DndAction ApplicationLauncherIcon::OnQueryAcceptDrop(DndData const& dnd_data)
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   return ValidateUrisForLaunch(dnd_data).empty() ? nux::DNDACTION_NONE : nux::DNDACTION_COPY;
 #else
   return nux::DNDACTION_NONE;

=== modified file 'launcher/CMakeLists.txt'
--- launcher/CMakeLists.txt	2012-10-18 10:44:07 +0000
+++ launcher/CMakeLists.txt	2012-10-24 08:23:34 +0000
@@ -75,13 +75,13 @@
      VolumeMonitorWrapper.cpp
      )
 
-if(UNITY_ENABLE_X_ORG_SUPPORT)
+if (ENABLE_X_SUPPORT)
   set (LAUNCHER_SOURCES
     EdgeBarrierController.cpp
     PointerBarrier.cpp
     ${LAUNCHER_SOURCES}
     )
-endif()
+endif ()
 
 add_library (launcher-lib STATIC ${LAUNCHER_SOURCES})
 add_dependencies (launcher-lib unity-core-${UNITY_API_VERSION} unity-shared)
@@ -104,8 +104,8 @@
 add_dependencies (launcher launcher-lib)
 target_link_libraries (launcher launcher-lib unity-shared unity-shared-standalone)
 
-if(UNITY_ENABLE_X_ORG_SUPPORT)
+if (ENABLE_X_SUPPORT)
   add_executable (switcher StandaloneSwitcher.cpp)
   add_dependencies (switcher switcher-lib launcher-lib)
   target_link_libraries (switcher switcher-lib launcher-lib unity-shared unity-shared-standalone)
-endif()
+endif ()

=== modified file 'launcher/Launcher.cpp'
--- launcher/Launcher.cpp	2012-10-18 00:27:52 +0000
+++ launcher/Launcher.cpp	2012-10-24 08:23:34 +0000
@@ -106,7 +106,7 @@
                    nux::ObjectPtr<DNDCollectionWindow> const& collection_window,
                    NUX_FILE_LINE_DECL)
   : View(NUX_FILE_LINE_PARAM)
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   , display(nux::GetGraphicsDisplay()->GetX11Display())
 #else
   , display(0)
@@ -191,7 +191,7 @@
   wm.terminate_expo.connect(sigc::mem_fun(this, &Launcher::OnPluginStateChanged));
   wm.screen_viewport_switch_ended.connect(sigc::mem_fun(this, &Launcher::EnsureAnimation));
 
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   display.changed.connect(sigc::mem_fun(this, &Launcher::OnDisplayChanged));
 #endif
 
@@ -235,8 +235,8 @@
   _collection_window->display = display;
 }
 
-void
-Launcher::OnDragStart(const nux::GestureEvent &event)
+#ifdef NUX_GESTURES_SUPPORT
+void Launcher::OnDragStart(const nux::GestureEvent &event)
 {
   _drag_gesture_ongoing = true;
   if (_hidden)
@@ -250,16 +250,14 @@
   }
 }
 
-void
-Launcher::OnDragUpdate(const nux::GestureEvent &event)
+void Launcher::OnDragUpdate(const nux::GestureEvent &event)
 {
   _drag_out_delta_x =
     CLAMP(_drag_out_delta_x + event.GetDelta().x, 0.0f, DRAG_OUT_PIXELS);
   EnsureAnimation();
 }
 
-void
-Launcher::OnDragFinish(const nux::GestureEvent &event)
+void Launcher::OnDragFinish(const nux::GestureEvent &event)
 {
   if (_drag_out_delta_x >= DRAG_OUT_PIXELS - 90.0f)
     _hide_machine.SetQuirk(LauncherHideMachine::MT_DRAG_OUT, true);
@@ -269,6 +267,7 @@
   EnsureAnimation();
   _drag_gesture_ongoing = false;
 }
+#endif
 
 void Launcher::AddProperties(GVariantBuilder* builder)
 {
@@ -1357,7 +1356,7 @@
 
 bool Launcher::OnUpdateDragManagerTimeout()
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   if (display() == 0)
     return false;
 
@@ -1399,7 +1398,7 @@
 
 void Launcher::DndTimeoutSetup()
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   if (sources_.GetSource(DND_CHECK_TIMEOUT))
     return;
 
@@ -2231,7 +2230,7 @@
 
   if (GetActionState() == ACTION_NONE)
   {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
     if (nux::Abs(_dnd_delta_y) >= nux::Abs(_dnd_delta_x))
     {
       _launcher_drag_delta += _dnd_delta_y;
@@ -2306,7 +2305,7 @@
   EnsureAnimation();
 }
 
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
 
 bool Launcher::HandleBarrierEvent(ui::PointerBarrierWrapper* owner, ui::BarrierEvent::Ptr event)
 {
@@ -2523,6 +2522,7 @@
   RestoreSystemRenderTarget();
 }
 
+#ifdef NUX_GESTURES_SUPPORT
 nux::GestureDeliveryRequest Launcher::GestureEvent(const nux::GestureEvent &event)
 {
   switch(event.type)
@@ -2540,6 +2540,7 @@
 
   return nux::GestureDeliveryRequest::NONE;
 }
+#endif
 
 void
 Launcher::SetOffscreenRenderTarget(nux::ObjectPtr<nux::IOpenGLBaseTexture> texture)
@@ -2572,7 +2573,7 @@
 
 void Launcher::OnDNDDataCollected(const std::list<char*>& mimes)
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   _dnd_data.Reset();
 
   const std::string uri_list = "text/uri-list";
@@ -2619,7 +2620,7 @@
 
 void Launcher::ProcessDndEnter()
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   SetStateMouseOverLauncher(true);
 
   _dnd_data.Reset();
@@ -2633,7 +2634,7 @@
 
 void Launcher::DndReset()
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   _dnd_data.Reset();
 
   bool is_overlay_open = IsOverlayOpen();
@@ -2661,7 +2662,7 @@
 
 void Launcher::DndHoveredIconReset()
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   _drag_edge_touching = false;
   SetActionState(ACTION_NONE);
 
@@ -2681,7 +2682,7 @@
 
 void Launcher::ProcessDndLeave()
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   SetStateMouseOverLauncher(false);
 
   DndHoveredIconReset();
@@ -2690,7 +2691,7 @@
 
 void Launcher::ProcessDndMove(int x, int y, std::list<char*> mimes)
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   if (!_data_checked)
   {
     const std::string uri_list = "text/uri-list";
@@ -2822,7 +2823,7 @@
 
 void Launcher::ProcessDndDrop(int x, int y)
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   if (_steal_drag)
   {
     for (auto const& uri : _dnd_data.Uris())

=== modified file 'launcher/Launcher.h'
--- launcher/Launcher.h	2012-10-17 22:21:51 +0000
+++ launcher/Launcher.h	2012-10-24 08:23:34 +0000
@@ -43,7 +43,7 @@
 #include "unity-shared/UBusWrapper.h"
 #include "SoftwareCenterLauncherIcon.h"
 
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
 # include "PointerBarrier.h"
 # include "EdgeBarrierController.h"
 #endif
@@ -57,7 +57,7 @@
 class AbstractLauncherIcon;
 
 class Launcher : public unity::debug::Introspectable,
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
                  // TODO: abstract this into a more generic class.
                  public ui::EdgeBarrierSubscriber,
 #endif
@@ -148,7 +148,10 @@
 
   void RenderIconToTexture(nux::GraphicsEngine& GfxContext, AbstractLauncherIcon::Ptr const& icon, nux::ObjectPtr<nux::IOpenGLBaseTexture> texture);
 
+#ifdef NUX_GESTURES_SUPPORT
   virtual nux::GestureDeliveryRequest GestureEvent(const nux::GestureEvent &event);
+#endif
+
 protected:
   // Introspectable methods
   std::string GetName() const;
@@ -193,11 +196,13 @@
   void OnOptionChanged();
   void UpdateOptions(Options::Ptr options);
 
+#ifdef NUX_GESTURES_SUPPORT
   void OnDragStart(const nux::GestureEvent &event);
   void OnDragUpdate(const nux::GestureEvent &event);
   void OnDragFinish(const nux::GestureEvent &event);
+#endif
 
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   bool HandleBarrierEvent(ui::PointerBarrierWrapper* owner, ui::BarrierEvent::Ptr event);
 #endif
 

=== modified file 'launcher/LauncherController.cpp'
--- launcher/LauncherController.cpp	2012-10-17 22:21:51 +0000
+++ launcher/LauncherController.cpp	2012-10-24 08:23:34 +0000
@@ -115,7 +115,7 @@
   , gdbus_connection_(nullptr)
   , reg_id_(0)
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   edge_barriers_.options = parent_->options();
 #endif
 
@@ -201,7 +201,7 @@
 
     int monitor = (num_launchers == 1) ? primary : i;
 
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
     if (launchers[i]->monitor() != monitor)
     {
       edge_barriers_.Unsubscribe(launchers[i].GetPointer(), launchers[i]->monitor);
@@ -210,7 +210,7 @@
 
     launchers[i]->monitor(monitor);
     launchers[i]->Resize();
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
     edge_barriers_.Subscribe(launchers[i].GetPointer(), launchers[i]->monitor);
 #endif
   }
@@ -222,7 +222,7 @@
     {
       parent_->RemoveChild(launcher.GetPointer());
       launcher->GetParent()->UnReference();
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
       edge_barriers_.Unsubscribe(launcher.GetPointer(), launcher->monitor);
 #endif
     }

=== modified file 'launcher/LauncherControllerPrivate.h'
--- launcher/LauncherControllerPrivate.h	2012-10-17 22:21:51 +0000
+++ launcher/LauncherControllerPrivate.h	2012-10-24 08:23:34 +0000
@@ -28,7 +28,7 @@
 #include "AbstractLauncherIcon.h"
 #include "DeviceLauncherSection.h"
 #include "DevicesSettingsImp.h"
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
 #include "EdgeBarrierController.h"
 #endif
 #include "LauncherController.h"
@@ -129,7 +129,7 @@
   AbstractLauncherIcon::Ptr expo_icon_;
   AbstractLauncherIcon::Ptr desktop_icon_;
 
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   ui::EdgeBarrierController edge_barriers_;
 #endif
 

=== modified file 'launcher/LauncherOptions.h'
--- launcher/LauncherOptions.h	2012-08-07 10:53:16 +0000
+++ launcher/LauncherOptions.h	2012-10-24 08:23:34 +0000
@@ -24,7 +24,6 @@
 #include <memory>
 #include <vector>
 #include <sigc++/sigc++.h>
-#include <core/core.h>
 
 #include <Nux/Nux.h>
 

=== modified file 'launcher/TrashLauncherIcon.cpp'
--- launcher/TrashLauncherIcon.cpp	2012-10-17 22:26:46 +0000
+++ launcher/TrashLauncherIcon.cpp	2012-10-24 08:23:34 +0000
@@ -139,7 +139,7 @@
 
 nux::DndAction TrashLauncherIcon::OnQueryAcceptDrop(DndData const& dnd_data)
 {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
   return nux::DNDACTION_MOVE;
 #else
   return nux::DNDACTION_NONE;

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-10-22 09:31:20 +0000
+++ tests/CMakeLists.txt	2012-10-24 08:23:34 +0000
@@ -112,51 +112,57 @@
 
 
 # The actual test executable (xless) - do not put anything that requires X in here
-  add_executable(test-gtest-xless
-                 test_main_xless.cpp
-                 test_animator.cpp
-                 test_launcher_model.cpp
-                 test_glib_object.cpp
-                 test_glib_object_utils.cpp
-                 test_glib_object_utils.h
-                 test_glib_signals.cpp
-                 test_glib_signals_utils.cpp
-                 test_glib_signals_utils.h
-                 test_glib_source.cpp
-                 test_glib_variant.cpp
-                 test_grabhandle.cpp
-                 test_desktop_utilities.cpp
-                 test_hud_private.cpp
-                 test_indicator.cpp
-                 test_indicator_appmenu.cpp
-                 test_indicator_entry.cpp
-                 test_indicators.cpp
-                 test_introspection.cpp
-                 test_favorite_store.cpp
-                 test_favorite_store_gsettings.cpp
-                 test_favorite_store_private.cpp
-                 test_home_lens.cpp
-                 test_launcher_entry_remote.cpp
-                 test_model_iterator.cpp
-                 test_pointer_barrier.cpp
-                 test_previews.cpp
-                 test_shortcut_model.cpp
-                 test_shortcut_private.cpp
-                 test_showdesktop_handler.cpp
-                 test_ubus.cpp
-                 test_unityshell_private.cpp
-                 ${CMAKE_CURRENT_BINARY_DIR}/test_glib_signals_utils_marshal.cpp
-                 ${UNITY_SRC}/DebugDBusInterface.cpp
-                 ${UNITY_SRC}/XPathQueryPart.cpp
-                 ${UNITY_SRC}/UnityshellPrivate.cpp
-                 ${UNITY_SRC}/UnityShowdesktopHandler.cpp
-                 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle.cpp
-                 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-group.cpp
-                 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.cpp
-                 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-layout.cpp
-                 ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-texture.cpp
-                 )
-  target_link_libraries(test-gtest-xless gtest unity-shared ${GMOCK_LIB} ${GMOCK_MAIN_LIB} ${LIBS} launcher-lib shortcuts-lib hud-lib)
+  set (GTEST_XLESS_SOURCES
+       test_main_xless.cpp
+       test_animator.cpp
+       test_launcher_model.cpp
+       test_glib_object.cpp
+       test_glib_object_utils.cpp
+       test_glib_object_utils.h
+       test_glib_signals.cpp
+       test_glib_signals_utils.cpp
+       test_glib_signals_utils.h
+       test_glib_source.cpp
+       test_glib_variant.cpp
+       test_grabhandle.cpp
+       test_desktop_utilities.cpp
+       test_indicator.cpp
+       test_indicator_appmenu.cpp
+       test_indicator_entry.cpp
+       test_indicators.cpp
+       test_introspection.cpp
+       test_favorite_store.cpp
+       test_favorite_store_gsettings.cpp
+       test_favorite_store_private.cpp
+       test_home_lens.cpp
+       test_launcher_entry_remote.cpp
+       test_model_iterator.cpp
+       test_previews.cpp
+       test_ubus.cpp
+       test_unityshell_private.cpp
+       ${CMAKE_CURRENT_BINARY_DIR}/test_glib_signals_utils_marshal.cpp
+       ${UNITY_SRC}/UnityshellPrivate.cpp
+       ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle.cpp
+       ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-group.cpp
+       ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-impl-factory.cpp
+       ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-grab-handle-layout.cpp
+       ${CMAKE_SOURCE_DIR}/plugins/unity-mt-grab-handles/src/unity-mt-texture.cpp
+)
+
+if (ENABLE_X_SUPPORT)
+  set (GTEST_XLESS_SOURCES
+    test_hud_private.cpp
+    test_pointer_barrier.cpp
+    test_shortcut_model.cpp
+    test_shortcut_private.cpp
+    ${LAUNCHER_SOURCES}
+    )
+endif ()
+
+  add_executable(test-gtest-xless ${GTEST_XLESS_SOURCES})
+
+
+  target_link_libraries(test-gtest-xless gtest unity-shared ${GMOCK_LIB} ${GMOCK_MAIN_LIB} ${LIBS} launcher-lib)
   add_test(UnityGTestXless test-gtest-xless)
   add_dependencies(test-gtest-xless unity-core-${UNITY_API_VERSION} gtest)
 
@@ -179,6 +185,7 @@
   add_test(UnityGTestDBus test-gtest-dbus)
   add_dependencies(test-gtest-dbus unity-core-${UNITY_API_VERSION} test-gtest-service gtest)
 
+if (ENABLE_X_SUPPORT)
 # Tests that require X
   add_executable(test-gtest
                  test_main.cpp
@@ -213,6 +220,7 @@
                  test_shortcut_controller.cpp
                  test_single_monitor_launcher_icon.cpp
                  test_expo_launcher_icon.cpp
+                 test_showdesktop_handler.cpp
                  test_switcher_controller.cpp
                  test_switcher_model.cpp
                  test_texture_cache.cpp
@@ -225,17 +233,20 @@
                  bamf-mock-application.c
                  gmockmount.c
                  gmockvolume.c
+                 ${UNITY_SRC}/UnityShowdesktopHandler.cpp
                  ${CMAKE_SOURCE_DIR}/plugins/unityshell/src/WindowMinimizeSpeedController.cpp
                 )
   target_link_libraries(test-gtest gtest gmock unity-shared ${LIBS} launcher-lib unity-shared-standalone shortcuts-lib previews-lib hud-lib switcher-lib dash-lib panel-lib)
   add_test(UnityGTest test-gtest)
   add_dependencies(test-gtest unity-core-${UNITY_API_VERSION} gtest gmock)
-
+endif (ENABLE_X_SUPPORT)
 endif (GTEST_SRC_DIR AND
        GMOCK_LIB AND
        GMOCK_MAIN_LIB)
 
-add_subdirectory (test-gestures)
+if(ENABLE_X_SUPPORT)
+  add_subdirectory (test-gestures)
+endif()
 
 #
 # check target
@@ -243,10 +254,12 @@
 set (TEST_RESULT_DIR ${CMAKE_BINARY_DIR}/tests)
 set (TEST_RESULT_XML ${TEST_RESULT_DIR}/test-results.xml)
 set (TEST_RESULT_HTML ${TEST_RESULT_DIR}/test-results.html)
-set (GTEST_TEST_COMMAND ./test-gtest)
+if (ENABLE_X_SUPPORT)
+  set (GTEST_TEST_COMMAND ./test-gtest)
+  set (GTEST_TEST_COMMAND_GESTURES ./test-gestures/test-gestures)
+endif (ENABLE_X_SUPPORT)
 set (GTEST_TEST_COMMAND_XLESS ./test-gtest-xless)
 set (GTEST_TEST_COMMAND_DBUS dbus-test-runner --task ./test-gtest-service --task ./test-gtest-dbus)
-set (GTEST_TEST_COMMAND_GESTURES ./test-gestures/test-gestures)
 
 set (TEST_COMMAND
      gtester --verbose -k --g-fatal-warnings -o=${TEST_RESULT_XML} ./test-unit
@@ -263,10 +276,16 @@
   && echo "Warning, DBus test cases are disabled!!")
 
 if (GTEST_SRC_DIR)
-  add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-unit test-gtest test-gtest-xless test-gtest-dbus test-gestures)
-  add_custom_target (check-headless COMMAND ${TEST_COMMAND_HEADLESS} DEPENDS test-gtest-xless test-gtest-dbus test-gestures)
+  if (ENABLE_X_SUPPORT)
+    add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-unit test-gtest test-gtest-xless test-gtest-dbus test-gestures)
+    add_custom_target (check-headless COMMAND ${TEST_COMMAND_HEADLESS} DEPENDS test-gtest-xless test-gtest-dbus test-gestures)
+    add_custom_target (gcheck COMMAND  ${DBUS_TEST_COMMAND} DEPENDS test-gtest test-gtest-xless)
+  else ()
+    add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-unit test-gtest-xless test-gtest-dbus)
+    add_custom_target (check-headless COMMAND ${TEST_COMMAND_HEADLESS} DEPENDS test-gtest-xless test-gtest-dbus)
+    add_custom_target (gcheck COMMAND  ${DBUS_TEST_COMMAND} DEPENDS test-gtest-xless)
+  endif ()
   add_custom_target (check-report COMMAND ${TEST_UNIT_COMMAND} && gtester-report ${TEST_RESULT_XML} > ${TEST_RESULT_HTML})
-  add_custom_target (gcheck COMMAND  ${DBUS_TEST_COMMAND} DEPENDS test-gtest test-gtest-xless)
 else (GTEST_SRC_DIR)
   add_custom_target (check COMMAND  ${TEST_COMMAND} DEPENDS test-unit)
 endif (GTEST_SRC_DIR)

=== modified file 'tests/test_launcher_controller.cpp'
--- tests/test_launcher_controller.cpp	2012-10-17 22:21:51 +0000
+++ tests/test_launcher_controller.cpp	2012-10-24 08:23:34 +0000
@@ -380,7 +380,7 @@
   EXPECT_EQ(lc.launchers().size(), max_num_monitors);
 }
 
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
 
 TEST_F(TestLauncherController, MultiMonitorEdgeBarrierSubscriptions)
 {

=== added file 'unity-shared/ApplicationManager.cpp'
--- unity-shared/ApplicationManager.cpp	1970-01-01 00:00:00 +0000
+++ unity-shared/ApplicationManager.cpp	2012-10-24 08:23:34 +0000
@@ -0,0 +1,34 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2012 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: Tim Penhey <[e-mail]>
+ */
+
+#include "unity-shared/ApplicationManager.h"
+
+namespace unity
+{
+// This function is used by the static Default method on the ApplicationManager
+// class, and uses link time to make sure there is a function available.
+ApplicationManagerPtr create_application_manager();
+
+ApplicationManager& ApplicationManager::Default()
+{
+  static ApplicationManagerPtr instance(create_application_manager());
+  return *instance;
+}
+
+} // namespace unity

=== added file 'unity-shared/ApplicationManager.h'
--- unity-shared/ApplicationManager.h	1970-01-01 00:00:00 +0000
+++ unity-shared/ApplicationManager.h	2012-10-24 08:23:34 +0000
@@ -0,0 +1,55 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/*
+ * Copyright (C) 2012 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: Tim Penhey <[e-mail]>
+ */
+
+#ifndef UNITYSHARED_APPLICATION_MANAGER_H
+#define UNITYSHARED_APPLICATION_MANAGER_H
+
+#include <memory>
+
+namespace unity
+{
+
+class Application;
+class ApplicationManager;
+typedef std::shared_ptr<Application> ApplicationPtr;
+typedef std::shared_ptr<ApplicationManager> ApplicationManagerPtr;
+
+class Application
+{
+public:
+  virtual ~Application() {}
+
+  virtual std::string icon() const = 0;
+  virtual std::string title() const = 0;
+
+};
+
+class ApplicationManager
+{
+public:
+  virtual ~ApplicationManager() {}
+
+  static ApplicationManager& Default();
+
+  virtual ApplicationPtr active_application() const = 0;
+};
+
+}
+
+#endif // UNITYSHARED_APPLICATION_MANAGER_H

=== modified file 'unity-shared/CMakeLists.txt'
--- unity-shared/CMakeLists.txt	2012-10-18 10:44:07 +0000
+++ unity-shared/CMakeLists.txt	2012-10-24 08:23:34 +0000
@@ -32,6 +32,7 @@
      CoverArt.cpp
      BackgroundEffectHelper.cpp
      DashStyle.cpp
+     DebugDBusInterface.cpp
      DefaultThumbnailProvider.cpp
      FontSettings.cpp
      IMTextEntry.cpp
@@ -64,9 +65,10 @@
      UnityWindowView.cpp
      UserThumbnailProvider.cpp
      WindowManager.cpp
+     XPathQueryPart.cpp
 )
 
-if(UNITY_ENABLE_X_ORG_SUPPORT)
+if(ENABLE_X_SUPPORT)
   set (UNITY_SHARED_SOURCES
     XKeyboardUtil.cpp
     XWindowManager.cpp
@@ -87,7 +89,7 @@
 # We also need to build compiz specific parts and standalone variants of those parts
 #
 
-if(UNITY_ENABLE_X_ORG_SUPPORT)
+if (ENABLE_X_SUPPORT)
   # compiz
   set (UNITY_SHARED_COMPIZ_SOURCES
     PluginAdapter.cpp

=== renamed file 'plugins/unityshell/src/DebugDBusInterface.cpp' => 'unity-shared/DebugDBusInterface.cpp'
--- plugins/unityshell/src/DebugDBusInterface.cpp	2012-06-29 04:17:55 +0000
+++ unity-shared/DebugDBusInterface.cpp	2012-10-24 08:23:34 +0000
@@ -24,7 +24,6 @@
 #include <boost/algorithm/string/split.hpp>
 #include <boost/algorithm/string/classification.hpp>
 #include <boost/bind.hpp>
-#include <core/core.h>
 #include <NuxCore/Logger.h>
 #include <NuxCore/LoggingWriter.h>
 
@@ -303,7 +302,7 @@
                                         query_strings.end(),
                                         boost::bind( &std::string::empty, _1 ) ),
                       query_strings.end());
-    foreach(std::string part, query_strings)
+    for (auto part : query_strings)
     {
       query_parts.push_back(XPathQueryPart(part));
     }
@@ -343,7 +342,7 @@
         start_points.push_back(node);
       }
       // Add all children of current node to queue.
-      foreach(Introspectable* child, node->GetIntrospectableChildren())
+      for (Introspectable* child : node->GetIntrospectableChildren())
       {
         queue.push(child);
       }
@@ -355,7 +354,7 @@
   typedef std::pair<Introspectable*, std::list<XPathQueryPart>::iterator> node_match_pair;
 
   std::queue<node_match_pair> traverse_queue;
-  foreach(Introspectable *node, start_points)
+  for (Introspectable *node : start_points)
   {
     traverse_queue.push(node_match_pair(node, query_parts.begin()));
   }
@@ -377,7 +376,7 @@
     else
     {
       // push all children of current node to start of queue, advance search iterator, and loop again.
-      foreach (Introspectable *child, node->GetIntrospectableChildren())
+      for (Introspectable* child : node->GetIntrospectableChildren())
       {
         if (query_it->Matches(child))
         {

=== renamed file 'plugins/unityshell/src/DebugDBusInterface.h' => 'unity-shared/DebugDBusInterface.h'
=== modified file 'unity-shared/KeyboardUtil.h'
--- unity-shared/KeyboardUtil.h	2012-10-04 07:42:43 +0000
+++ unity-shared/KeyboardUtil.h	2012-10-24 08:23:34 +0000
@@ -32,4 +32,3 @@
 }
 
 #endif // UNITYSHARED_KEYBOARDUTIL_H
-

=== modified file 'unity-shared/ResizingBaseWindow.h'
--- unity-shared/ResizingBaseWindow.h	2012-10-18 00:27:52 +0000
+++ unity-shared/ResizingBaseWindow.h	2012-10-24 08:23:34 +0000
@@ -35,7 +35,7 @@
 
   void UpdateInputWindowGeometry()
   {
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
     if (m_input_window && m_input_window_enabled)
       m_input_window->SetGeometry(geo_func_(GetGeometry()));
 #endif

=== modified file 'unity-shared/UnityWindowView.cpp'
--- unity-shared/UnityWindowView.cpp	2012-10-11 01:44:15 +0000
+++ unity-shared/UnityWindowView.cpp	2012-10-24 08:23:34 +0000
@@ -136,7 +136,7 @@
   gPainter.PaintShapeCornerROP(GfxContext,
                                internal_clip,
                                nux::color::White,
-                               nux::eSHAPE_CORNER_ROUND5,
+                               nux::eSHAPE_CORNER_ROUND4,
                                nux::eCornerTopLeft | nux::eCornerTopRight |
                                nux::eCornerBottomLeft | nux::eCornerBottomRight,
                                true,

=== modified file 'unity-shared/WindowManager.h'
--- unity-shared/WindowManager.h	2012-10-04 23:10:23 +0000
+++ unity-shared/WindowManager.h	2012-10-24 08:23:34 +0000
@@ -28,7 +28,7 @@
 #include <NuxCore/Rect.h>
 #include <Nux/Utils.h>
 
-#ifdef UNITY_HAS_X_ORG_SUPPORT
+#ifdef USE_X11
 #include <X11/Xlib.h>
 #else
 typedef unsigned long Window;

=== renamed file 'plugins/unityshell/src/XPathQueryPart.cpp' => 'unity-shared/XPathQueryPart.cpp'
=== renamed file 'plugins/unityshell/src/XPathQueryPart.h' => 'unity-shared/XPathQueryPart.h'