Merge lp:~brandontschaefer/unity/lp806248-fix-int32-buffer-overflow-4.0 into lp:~ubuntu-desktop/unity/precise

[Chris J Arges]

[Stephen M. Webb (bregma)]

I see an awful lot of merge conflicts.

I think it would be better to get https://code.launchpad.net/~brandontschaefer/unity/lp806248-fix-int32-buffer-overflow-4.0/+merge/137684 merged upstream and then do an upstream release into Ubuntu through the regular SRU process.

[Stephen M. Webb (bregma)]

Patch has already been merged into lp:unity/5.0 which will be SRUd to lp:ubuntu-desktop/unity/precise... merging a unity 4.0 into lp:ubuntu-desktop/unity/precise makes no sense.

review: Disapprove

[Sebastien Bacher (seb128)]

setting as rejected, it got uploaded/merged through another merge request: http://bazaar.launchpad.net/~ubuntu-desktop/unity/precise/revision/712

Unmerged revisions

1740. By Brandon Schaefer on 2012-12-05

* Fix header

1739. By Brandon Schaefer on 2012-12-03

* Fix int32 buffer overflow in TimeUtil, now uses int64

1738. By Łukasz Zemczak on 2012-09-12

Release\ 4.30.0

1737. By Francis Ginther on 2012-09-07

Updated dependency to the renamed libgeis

1736. By Sam Spilsbury on 2012-01-19

Merge lp:unity/4.0

1735. By Sam Spilsbury on 2012-01-19

Unrevert 1721 , as it did not cause any regressions (yet)

1734. By Sam Spilsbury on 2012-01-19

Revert 1721 for now

It enters some strange codepaths and caused regressions better handled by
https://code.launchpad.net/~smspillaz/unity/unity.fix_881190_918360/+merge/89181

1733. By Sam Spilsbury on 2012-01-19

Merge lp:~smspillaz/unity/4.0_fix_912682

1732. By David Barth on 2012-01-05

Bumping revision to 4.2.28 to prepare a new SRU

1731. By David Barth on 2012-01-05

Fix for "right-clicking launcher when choosing a workspace causes quicklists to freeze" (#791810)

=== modified file 'AUTHORS'
--- AUTHORS	2012-11-12 12:20:38 +0000
+++ AUTHORS	2013-01-18 15:43:30 +0000
@@ -31,10 +31,14 @@
  David Gomes <[e-mail]>
  David Planella <[e-mail]>
  Didier Roche <[e-mail]>
+<<<<<<< TREE
  foxoman <[e-mail]>
  Francis Ginther <[e-mail]>
  Gabor Kelemen <[e-mail]>
  Gary Lasker <[e-mail]>
+=======
+ Francis Ginther <[e-mail]>
+>>>>>>> MERGE-SOURCE
  Gordon Allott <[e-mail]>
  Henri De Veene <[e-mail]>
  Jani Monoses <[e-mail]>
@@ -96,11 +100,15 @@
  Sam Spilsbury <[e-mail]>
  Sam Spilsbury <[e-mail]>, Daniel van Vugt <[e-mail]>
  Sebastien Bacher <[e-mail]>
+<<<<<<< TREE
  smspillaz <[e-mail]>
  smspillaz <[e-mail]>, Daniel van Vugt <[e-mail]>
  smspillaz <[e-mail]>, Sam Spilsbury <[e-mail]>
  Sven Baars <[e-mail]>
  Tarmac
+=======
+ smspillaz <[e-mail]>
+>>>>>>> MERGE-SOURCE
  Ted Gould <[e-mail]>
  Thomas Voß <[e-mail]>
  Thomi Richards <[e-mail]>
 
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-11-12 12:20:38 +0000
+++ CMakeLists.txt	2013-01-18 15:43:30 +0000
@@ -7,8 +7,13 @@
 # Base bits
 #
 set (PROJECT_NAME "unity")
+<<<<<<< TREE
 set (UNITY_MAJOR 5)
 set (UNITY_MINOR 18)
+=======
+set (UNITY_MAJOR 4)
+set (UNITY_MINOR 30)
+>>>>>>> MERGE-SOURCE
 set (UNITY_MICRO 0)
 set (UNITY_VERSION "${UNITY_MAJOR}.${UNITY_MINOR}.${UNITY_MICRO}")
 set (UNITY_API_VERSION "5.0")
@@ -122,6 +127,7 @@
 #
 # Compiz Plugins
 #
+<<<<<<< TREE
 set (UNITY_PLUGIN_DEPS "compiz;nux-2.0>=2.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gconf-2.0;libgeis;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;gnome-desktop-3.0;gdu;xfixes")
 
 add_subdirectory(plugins/unityshell)
@@ -158,6 +164,15 @@
 add_subdirectory(guides)
 add_subdirectory(standalone-clients EXCLUDE_FROM_ALL)
 
+=======
+set (UNITY_PLUGIN_DEPS "compiz;nux-1.0 >= 1.2.2;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4;atk;unity-misc >= 0.4.0;gconf-2.0;libgeis;gtk+-3.0 >= 3.1;sigc++-2.0;json-glib-1.0;libnotify;gnome-desktop-3.0")
+
+
+find_package (Compiz REQUIRED)
+include (CompizPlugin)
+
+compiz_add_plugins_in_folder ("${CMAKE_SOURCE_DIR}/plugins/")
+>>>>>>> MERGE-SOURCE
 
 #
 # GSettings Schema
 
=== modified file 'ChangeLog'
--- ChangeLog	2012-11-12 12:20:38 +0000
+++ ChangeLog	2013-01-18 15:43:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2012-10-18  Andrea Azzarone  <[e-mail]>
 
 	Use linear filtering to draw icons (when needed).. Fixes: https://bugs.launchpad.net/bugs/1036231. Approved by Marco Trevisan (Treviño).
@@ -18898,6 +18899,285 @@
 
 	fixes an issue with the panel service segfaulting on window change
 
+=======
[phone]  Francis Ginther  <[e-mail]>
+
+	Updated dependency to the renamed libgeis
+
[phone]  smspillaz  <[e-mail]>
+
+	Merge lp:unity/4.0
+
[phone]  David Barth  <[e-mail]>
+
+	revert custom dash patch
+
[phone]  David Barth  <[e-mail]>
+
+	Fixed bug #914251, local variables should be passed by value.
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: pass quicklist positions by value on expo-terminated lambda.
+	
+	This fixes bug #914251
+
[phone]  Didier Roche  <[e-mail]>
+
+	merge sam's fix for building standalone application on clean environment
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Also add a dependency on libunity-core for the window handling tests and
+	the glfuncloader dlopen loader since link_libraries forces those to be linked
+	against libunity-core and since link_libraries doesn't care about target
+	dependencies, there is a build race where libunity-core isn't built in time
+	for those targets to be (erroneously) linked to.
+	
+	The real solution is to kill the call to link_libraries.
+
[phone]  smspillaz  <[e-mail]>
+
+	Unrevert 1721 , as it did not cause any regressions (yet)
+
[phone]  smspillaz  <[e-mail]>
+
+	Revert 1721 for now
+	
+	It enters some strange codepaths and caused regressions better handled by
+	https://code.launchpad.net/~smspillaz/unity/unity.fix_881190_918360/+merge/89181
+
[phone]  smspillaz  <[e-mail]>
+
+	Merge lp:~smspillaz/unity/4.0_fix_912682
+
[phone]  smspillaz  <[e-mail]>
+
+	Fixes bug 912682
+
[phone]  David Barth  <[e-mail]>
+
+	Bumping revision to 4.2.28 to prepare a new SRU
+
[phone]  David Barth  <[e-mail]>
+
+	Fix for "right-clicking launcher when choosing a workspace causes quicklists to freeze" (#791810)
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: don't use auto operator when the content is not explicit
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	LauncherIcon: If expo is active, wait it to be terminated before showing a quicklist
+	
+	Opening a quicklist when the expo is active, cause the quicklist to freeze,
+	so if we're opening one when expo is runing, we need to wait it to be
+	terminated before showing up the quicklist.
+	
+	Including a manual-test.
+	
+	This fixes bug #791810
+
[phone]  Marco Trevisan (Treviño)  <[e-mail]>
+
+	Added Manual Tests ReadMe
+	
+	Backported patch by Tim to Unity/4.0.
+
[phone]  David Barth  <[e-mail]>
+
+	Fix SIGSEGV after SwitcherController desctruction (LP: #887465)
+
[phone]  Daniel van Vugt  <[e-mail]>
+
+	Safer destruction order.
+
[phone]  Daniel van Vugt  <[e-mail]>
+
+	Fix SIGSEGV after SwitcherController desctruction (LP: #887465)
+
[phone]  David Barth  <[e-mail]>
+
+	reapplies 1713
+
[phone]  David Barth  <[e-mail]>
+
+	revert rev. 1721 which was causing a regression (#905417)
+
[phone]  David Barth  <[e-mail]>
+
+	Merge custom dash patch (#785840)
+
[phone]  Olivier Tilloy  <[e-mail]>
+
+	Add some manual tests for the dash custom home screen functionality.
+
[phone]  Olivier Tilloy  <[e-mail]>
+
+	Allow customizing the dash’s home screen.
+	
+	The contents of the custom home screen are described in a JSON file called HomeShortcutsCustomized.json.
+	
+	The file is looked for in the following locations in decreasing order of priority:
+	- $XDG_CONFIG_HOME/unity/ (defaults to $HOME/.config/unity/)
+	- $DIR/unity/ for $DIR in $XDG_CONFIG_DIRS
+	
+	The syntax of the file is as follows:
+	==========================================================================
+	{
+	"shortcut1": {
+	"source": $source,
+	"name": $name,
+	"name[fr]": $name_in_french,
+	[…]
+	"icon": $icon
+	},
+	"shortcut2": {
+	[…]
+	},
+	[…]
+	}
+	==========================================================================
+	
+	The source attribute may either be a desktop file (full path or just its basename if it is located in a standard directory), or a lens file (basename only). This attribute is mandatory.
+	The 'name' attribute is optional. If present, it will override the default display name as advertised by the desktop file or by the lens. The name can be localized in several languages using the square brackets suffix notation, in which case the locale matching the system’s will be used, defaulting to the untranslated 'name' attribute if necessary.
+	The 'icon' attribute is optional. If present, it will override the default icon as advertised by the desktop file or by the lens. It should be a full path name.
+	If the source is a lens, the optional 'filter' attribute allows specifying a filter in the form "$name:$value", e.g. "type:videos" for the files lens.
+	If the source is a lens, the optional 'section' attribute allows specifying a section number (an integer starting at index 0).
+
[phone]  David Barth  <[e-mail]>
+
+	Merging in Sam's fix for a multi-monitor crasher (#838128)
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Check glGetError ()
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Minor style fix - use for loop
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Don't disable the scissor test explicitly
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Added missing file
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Added framebuffer object fixes
+
[phone]  David Barth  <[e-mail]>
+
+	changelog update, a patch was reverted earlier by gord, see rev. 1723
+
[phone]  David Barth  <[e-mail]>
+
+	merge lp:~macslow/unity/unity-sru1-4.26.0 in preparation of the 4.26 release candidate
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Release 4.26.0 (SRU1)
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Fixes #850623: don't segfault in geis_configuration_get_value() (backported from unity trunk r1728)
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Fixes #860805: get focus on dash by pressing the super key first time after login (backported from unity trunk r1759)
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Fixes #873100: clicking on panel when dash is open no longer causes maximized window to raise (backported from unity trunk r1751)
+
[phone]  Gord Allott  <[e-mail]>
+
+	Reverted out r1713
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Merged lp:~smspillaz/unity/unity4.0_fix_881190
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Don't read transients on windows which are not valid since all not valid
+	transient windows will match with that window.
+	
+	Also don't bother to re-fake-unminimize windows that have been fake minimized
+	if they were destroyed since the window isn't valid anyways and the operation
+	will be a no-op (note that we should do it on ~UnityWindow in the case where
+	the window has not been destroyed yet, as it probably means that the plugin
+	is being unloaded)
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Inhibit other windows from leaving show desktop mode in the case that
+	core tries to leave show desktop mode after a window was activated - in this
+	case we should only allow the window that was activated to leave show desktop
+	mode and keep the "show desktop" mode state on until the user explicitly leave
+	s
+	show desktop mode.
+	
+	Fixes LP #871801 and LP #899932
+
[phone]  Michal Hruby  <[e-mail]>
+
+	Backport fix for bug #856205 from trunk
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Fixes LP: #834630
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Add an out-of-bounds check to the DetailXids vector. Fixes LP: #834630
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Fixes LP: #832151
+
[phone]  Mirco Müller  <[e-mail]>
+
+	Be properly unref'ing _tray the FilterTrayCallback should be correctly unregistered and not called again. Fixes LP: 832151
+
[phone]  Jason Smith  <[e-mail]>
+
+	merge automatic raising of input winodws
+
[phone]  Jason Smith  <[e-mail]>
+
+	Raise input windows from nux unconditionally on alt-tab and showing of the dash using compiz
+
[phone]  Robert Carr  <[e-mail]>
+
+	Back out a horizontal margin that breaks sizing in some cases
+
[phone]  Sam Spilsbury  <[e-mail]>
+
+	Bug #863114: Cannot raise window from panel after minimize
+	Bug #865890: compiz crashed with SIGSEGV in nux::BaseWindow::GetInputWindowId() (when onboard is used)
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Revert out maximised window dash change
+
[phone]  Gord Allott  <[e-mail]>
+
+	fixes an issue with the panel segfaulting on window change
+
[phone]  Gord Allott  <[e-mail]>
+
+	fixes the panel service segfaulting in certain conditions
+
[phone]  Neil Jagdish Patel  <[e-mail]>
+
+	Release\ 4.24.0
+
+>>>>>>> MERGE-SOURCE
 2011-10-12  Neil Jagdish Patel  <[e-mail]>
 
 	Fix tests for FilerMultirangeWidget
 
=== modified file 'HACKING'
=== added file 'manual-tests/QuicklistOnExpo.txt'
--- manual-tests/QuicklistOnExpo.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/QuicklistOnExpo.txt	2013-01-18 15:43:30 +0000
@@ -0,0 +1,14 @@
+Test Quicklist while on Expo
+============================
+
+This test shows how the launcher quicklists work when the expo plugin is activated.
+
+#. Start with a clear screen
+#. Press Super+S or select the workspace switcher on the launcher
+#. When the workspace switcher is running, right-click over a launcher icon
+
+Outcome
+  The expo should terminate, and the quicklist should be shown once the
+  workspace switcher has been closed.
+  Clicking over a quicklist item should work as expected and clicking outside
+  that quicklist, should close it.
 
=== added file 'manual-tests/ReadMe.txt'
--- manual-tests/ReadMe.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/ReadMe.txt	2013-01-18 15:43:30 +0000
@@ -0,0 +1,47 @@
+==============
+Manual Testing
+==============
+
+Outline
+-------
+Sometimes it is not possible to easily make an automated test for some
+use-cases.  However just because something isn't easily tested automatically
+doesn't mean that there isn't value in creating a test for it, just that the
+test needs to be executed by a person until it is converted into an automated
+test.
+
+
+Format
+------
+Manual tests take the format of text files in this directory (the manual-test
+one).  These files are formatted using `reStructured Text`_.  A very
+comprehensive `quick reference`_ is available.
+
+.. _reStructured Text: http://en.wikipedia.org/wiki/ReStructuredText
+.. _quick reference: http://docutils.sourceforge.net/docs/user/rst/quickref.html
+
+Tests have a header, steps to follow, and an expected outcome, as demonstrated
+by the following example:
+
+There can be multiple tests in a single file, but they should all be related,
+and the filename should indicate the tests it contains.
+
+
+Test Dash
+---------
+This test shows that the dash appears when the super key is pushed.
+
+#. Start with a clear screen
+#. Press the <super> key
+
+Outcome
+  The dash appears, and focus is in the search box.  The icons on the laucher
+  are desaturated except for the ubuntu button at the top.  The icons in the
+  panel go white.
+
+
+Directory Structure
+-------------------
+It is expected that as we grow a number of manual tests, we will use
+directories to organise them.
+
 
=== added directory 'manual-tests/custom-dash-home'
=== added file 'manual-tests/custom-dash-home/HomeShortcutsCustomized-4-entries.json'
--- manual-tests/custom-dash-home/HomeShortcutsCustomized-4-entries.json	1970-01-01 00:00:00 +0000
+++ manual-tests/custom-dash-home/HomeShortcutsCustomized-4-entries.json	2013-01-18 15:43:30 +0000
@@ -0,0 +1,22 @@
+{
+	"shortcut1": {
+		"source": "/usr/share/applications/ubuntu-software-center.desktop",
+		"name": "Software Center",
+		"name[fr]": "Logithèque",
+		"icon": "/usr/share/icons/Humanity/places/64/start-here.svg"
+	},
+	"shortcut2": {
+		"source": "music.lens",
+		"filter": "genre:rock",
+		"name": "Rock Music"
+	},
+	"shortcut3": {
+		"source": "files.lens",
+		"filter": "type:videos",
+		"name": "Vidéos",
+		"icon": "/usr/share/icons/Humanity/actions/64/help-about.svg"
+	},
+	"shortcut4": {
+		"source": "transmission-gtk.desktop"
+	}
+}
 
=== added file 'manual-tests/custom-dash-home/HomeShortcutsCustomized-8-entries.json'
--- manual-tests/custom-dash-home/HomeShortcutsCustomized-8-entries.json	1970-01-01 00:00:00 +0000
+++ manual-tests/custom-dash-home/HomeShortcutsCustomized-8-entries.json	2013-01-18 15:43:30 +0000
@@ -0,0 +1,44 @@
+{
+	"shortcut1": {
+		"source": "/usr/share/applications/ubuntu-software-center.desktop",
+		"name": "Software Center",
+		"name[fr]": "Logithèque",
+		"icon": "/usr/share/icons/Humanity/places/64/start-here.svg"
+	},
+	"shortcut2": {
+		"source": "music.lens",
+		"filter": "genre:rock",
+		"name": "Rock Music"
+	},
+	"shortcut3": {
+		"source": "files.lens",
+		"filter": "type:videos",
+		"name": "Vidéos",
+		"icon": "/usr/share/icons/Humanity/actions/64/help-about.svg"
+	},
+	"shortcut4": {
+		"source": "transmission-gtk.desktop"
+	},
+	"shortcut5": {
+		"source": "/usr/share/applications/eog.desktop",
+		"name": "Eye Of Gnome",
+		"name[de]": "Auge des Zwergs",
+		"icon": "/usr/share/icons/hicolor/scalable/apps/eog.svg"
+	},
+	"shortcut6": {
+		"source": "/usr/share/applications/jockey-gtk.desktop",
+		"name": "Jockey",
+		"name[de]": "Jockey",
+		"icon": "/usr/share/icons/hicolor/scalable/apps/jockey.svg"
+	},
+	"shortcut7": {
+		"source": "/usr/share/applications/gwibber.desktop",
+		"name": "gwibber",
+		"icon": "/usr/share/icons/hicolor/scalable/apps/gwibber.svg"
+	},
+	"shortcut8": {
+		"source": "/usr/share/applications/giggle.desktop",
+		"name": "Giggle",
+		"icon": "/usr/share/icons/hicolor/scalable/apps/giggle.svg"
+	}
+}
 
=== added file 'manual-tests/custom-dash-home/HomeShortcutsCustomized-broken.json'
--- manual-tests/custom-dash-home/HomeShortcutsCustomized-broken.json	1970-01-01 00:00:00 +0000
+++ manual-tests/custom-dash-home/HomeShortcutsCustomized-broken.json	2013-01-18 15:43:30 +0000
@@ -0,0 +1,23 @@
+this is some intentional garbage with lots of errors
+{
+	"shortcut1": {
+		"source": "/usr/share/applications/ubuntu-software-center.desktop",
+		"name": "Software Center",
+		"name[fr]": "Logithèque",
+		"icn": "/usr/share/icons/Humanity/places/64/start-here.svg"
+	},
+	"shortcut2": {
+		"sorce": "music.lens",
+		"filter": "genre:rock",
+		"name": "Rock Music"
+	},
+	"shortcut3": {
+		"source": "files.lens",
+		"filter": "type:videos",
+		"name": "Vidéos",
+		"icon": "/usr/share/icons/Humanity/actions/64/hep-about.svg"
+	},
+	"shortcut12": {
+		"source": "transmission-gtk.destop"
+	}
+}
 
=== added file 'manual-tests/custom-dash-home/custom-dash-home.txt'
--- manual-tests/custom-dash-home/custom-dash-home.txt	1970-01-01 00:00:00 +0000
+++ manual-tests/custom-dash-home/custom-dash-home.txt	2013-01-18 15:43:30 +0000
@@ -0,0 +1,46 @@
+Manual tests for the 'dash custom home screen' functionality
+============================================================
+
+How to test
+-----------
+
+To test the functionality, create the folder $HOME/.config/unity/, and copy the
+three files HomeShortcutsCustomized*.json there.
+
+Then for each of them repeat the following steps:
+
+    cd $HOME/.config/unity/
+    rm HomeShortcutsCustomized.json
+    ln -s $FILE HomeShortcutsCustomized.json # replace $FILE with the json file being considered
+    # restart unity
+    # open the dash
+    # check the visual appearance against the expected results detailed below
+
+
+Expected results
+----------------
+
+With 'HomeShortcutsCustomized-4-entries.json', the home screen of the dash
+contains 4 icons that fill the first row. The second row is empty.
+Those icons are:
+ - "Software Center": launches the Ubuntu Software Center, the icon is the
+   Ubuntu Circle Of Friends, and if you are running with a French locale the
+   name is localized to "Logithèque".
+ - "Rock Music": opens the music lens with the genre filter set to "Rock".
+ - "Vidéos": opens the files lens with the type filter set to "videos", the icon
+   is a yellow star.
+ - "Transmission BitTorrent Client": launches transmission-gtk.
+
+With 'HomeShortcutsCustomized-8-entries.json', the home screen of the dash
+contains 8 icons that fill the two rows. The first row contains the exact same
+icons as 'HomeShortcutsCustomized-4-entries.json' (see details above). The icons
+on the second row are:
+ - "Eye Of Gnome": launches eog, if you are running with a German locale the
+   name is localized to "Auge des Zwergs".
+ - "Jockey": launches jockey-gtk.
+ - "gwibber": launches gwibber.
+ - "Giggle": this icon appears only if giggle is installed, it launches giggle.
+
+With 'HomeShortcutsCustomized-broken.json', the home screen of the dash contains
+the default icons because the file fails to be parsed.
+
 
=== renamed file 'manual-tests/Launcher.txt' => 'manual-tests/launcher.txt'
--- manual-tests/Launcher.txt	2012-08-11 11:56:31 +0000
+++ manual-tests/launcher.txt	2013-01-18 15:43:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 Test Launcher Icon with Windows in multiple workspaces
 ------------------------------------------------------
 This test shows how the launcher should draw when there are application windows
@@ -644,3 +645,16 @@
 
 Expected Results:
  * The launcher should autoscroll so you can reach the trash icon.
+=======
+Test Dash Key Focus
+-------------------
+This test shows that the search bar in the dash gets key focus when using the super key to start the dash on start up.
+
+#. Start on a fresh login
+#. Press the <super> key
+#. Wait for dash to appear
+#. Type "hello"
+
+Outcome
+  The dash will appear, and "hello" will be in the search box.
+>>>>>>> MERGE-SOURCE
 
=== modified file 'plugins/unityshell/src/BackgroundEffectHelper.cpp'
=== modified file 'plugins/unityshell/src/BackgroundEffectHelper.h'
=== modified file 'plugins/unityshell/src/DashView.cpp'
--- plugins/unityshell/src/DashView.cpp	2012-06-28 08:49:20 +0000
+++ plugins/unityshell/src/DashView.cpp	2013-01-18 15:43:30 +0000
@@ -80,10 +80,16 @@
   , home_lens_(new HomeLens(_("Home"), _("Home screen"), _("Search")))
   , active_lens_view_(0)
   , last_activated_uri_("")
+<<<<<<< TREE
   , searching_timeout_id_(0)
   , search_in_progress_(false)
   , activate_on_finish_(false)
   , hide_message_delay_id_(0)
+=======
+  , searching_timeout_id_(0)
+  , search_in_progress_(false)
+  , activate_on_finish_(false)
+>>>>>>> MERGE-SOURCE
   , visible_(false)
 {
   renderer_.SetOwner(this);
@@ -107,6 +113,7 @@
 
 DashView::~DashView()
 {
+<<<<<<< TREE
   if (searching_timeout_id_)
     g_source_remove (searching_timeout_id_);
   if (hide_message_delay_id_)
@@ -121,6 +128,12 @@
 {
   renderer_.x_offset = x;
   renderer_.y_offset = y;
+=======
+  if (searching_timeout_id_)
+    g_source_remove (searching_timeout_id_);
+  delete bg_layer_;
+  delete bg_darken_layer_;
+>>>>>>> MERGE-SOURCE
 }
 
 void DashView::AboutToShow()
@@ -430,9 +443,21 @@
   return FALSE;
 }
 
+gboolean DashView::ResetSearchStateCb(gpointer data)
+{
+  DashView *self = static_cast<DashView*>(data);
+
+  self->search_in_progress_ = false;
+  self->activate_on_finish_ = false;
+  self->searching_timeout_id_ = 0;
+
+  return FALSE;
+}
+
 void DashView::OnSearchChanged(std::string const& search_string)
 {
   LOG_DEBUG(logger) << "Search changed: " << search_string;
+<<<<<<< TREE
   if (active_lens_view_)
   {
     search_in_progress_ = true;
@@ -457,6 +482,20 @@
     // 150ms to hide the no reults message if its take a while to return results
     hide_message_delay_id_ = g_timeout_add (150, &DashView::HideResultMessageCb, this);
   }
+=======
+  if (active_lens_view_)
+  {
+    search_in_progress_ = true;
+    // it isn't guaranteed that we get a SearchFinished signal, so we need
+    // to make sure this isn't set even though we aren't doing any search
+    if (searching_timeout_id_)
+    {
+      g_source_remove (searching_timeout_id_);
+    }
+    // 250ms for the Search method call, rest for the actual search
+    searching_timeout_id_ = g_timeout_add (500, &DashView::ResetSearchStateCb, this);
+  }
+>>>>>>> MERGE-SOURCE
 }
 
 void DashView::OnLiveSearchReached(std::string const& search_string)
@@ -554,6 +593,7 @@
 
 void DashView::OnSearchFinished(Lens::Hints const& hints)
 {
+<<<<<<< TREE
   if (hide_message_delay_id_)
   {
     g_source_remove(hide_message_delay_id_);
@@ -567,7 +607,12 @@
 
   if (active_lens_view_->search_string == search_string)
   {
+=======
+  if (search_bar_->search_string == search_string)
+  {
+>>>>>>> MERGE-SOURCE
     search_bar_->SearchFinished();
+<<<<<<< TREE
     search_in_progress_ = false;
     if (activate_on_finish_)
       this->OnEntryActivated();
@@ -594,6 +639,18 @@
     if (activate_on_finish_)
       this->OnEntryActivated();
   }
+=======
+    search_in_progress_ = false;
+    if (activate_on_finish_)
+      this->OnEntryActivated();
+  }
+}
+
+void DashView::OnGlobalSearchFinished(std::string const& search_string)
+{
+  if (active_lens_view_ == home_view_)
+    OnSearchFinished(search_string);
+>>>>>>> MERGE-SOURCE
 }
 
 void DashView::OnUriActivated(std::string const& uri)
 
=== modified file 'plugins/unityshell/src/DashView.h'
--- plugins/unityshell/src/DashView.h	2012-03-30 11:40:10 +0000
+++ plugins/unityshell/src/DashView.h	2013-01-18 15:43:30 +0000
@@ -108,9 +108,14 @@
 
   nux::Area* KeyNavIteration(nux::KeyNavDirection direction);
 
+<<<<<<< TREE
   static gboolean ResetSearchStateCb(gpointer data);
   static gboolean HideResultMessageCb(gpointer data);
 
+=======
+  static gboolean ResetSearchStateCb(gpointer data);
+
+>>>>>>> MERGE-SOURCE
 private:
   UBusManager ubus_manager_;
   FilesystemLenses lenses_;
@@ -134,12 +139,18 @@
   OverlayRenderer renderer_;
 
   std::string last_activated_uri_;
+<<<<<<< TREE
   // we're passing this back to g_* functions, so we'll keep the g* type
   guint searching_timeout_id_;
   bool search_in_progress_;
   bool activate_on_finish_;
 
   guint hide_message_delay_id_;
+=======
+  guint searching_timeout_id_;
+  bool search_in_progress_;
+  bool activate_on_finish_;
+>>>>>>> MERGE-SOURCE
 
   bool visible_;
 };
 
=== modified file 'plugins/unityshell/src/ElapsedTimeMonitor.cpp'
--- plugins/unityshell/src/ElapsedTimeMonitor.cpp	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/ElapsedTimeMonitor.cpp	2013-01-18 15:43:30 +0000
@@ -39,7 +39,7 @@
 {
   struct timespec current;
   clock_gettime(CLOCK_MONOTONIC, &current);
-  int diff = TimeUtil::TimeDelta(&current, &_start);
+  DeltaTime diff = TimeUtil::TimeDelta(&current, &_start);
 
   variant::BuilderWrapper(builder)
     .add("elapsed-time", diff);
 
=== modified file 'plugins/unityshell/src/GeisAdapter.cpp'
--- plugins/unityshell/src/GeisAdapter.cpp	2012-04-10 01:41:16 +0000
+++ plugins/unityshell/src/GeisAdapter.cpp	2013-01-18 15:43:30 +0000
@@ -488,7 +488,7 @@
     GEIS_XCB_FULL_WINDOW,
     &xcb_win_info
   };
-  GeisInstance instance;
+  GeisInstance instance = nullptr;
 
   status = geis_init(&win_info, &instance);
   if (status != GEIS_STATUS_SUCCESS)
 
=== modified file 'plugins/unityshell/src/Launcher.cpp'
--- plugins/unityshell/src/Launcher.cpp	2012-11-12 12:20:38 +0000
+++ plugins/unityshell/src/Launcher.cpp	2013-01-18 15:43:30 +0000
@@ -111,6 +111,22 @@
 
 NUX_IMPLEMENT_OBJECT_TYPE(Launcher);
 
+<<<<<<< TREE
+=======
+void SetTimeBack(struct timespec* timeref, DeltaTime remove)
+{
+  timeref->tv_sec -= remove / 1000;
+  remove = remove % 1000;
+
+  if (remove > timeref->tv_nsec / 1000000)
+  {
+    timeref->tv_sec--;
+    timeref->tv_nsec += 1000000000;
+  }
+  timeref->tv_nsec -= remove * 1000000;
+}
+
+>>>>>>> MERGE-SOURCE
 const gchar Launcher::introspection_xml[] =
   "<node>"
   "  <interface name='com.canonical.Unity.Launcher'>"
@@ -615,6 +631,28 @@
   return false;
 }
 
+<<<<<<< TREE
+=======
+void Launcher::SetTimeStruct(struct timespec* timer, struct timespec* sister, DeltaTime sister_relation)
+{
+  struct timespec current;
+  clock_gettime(CLOCK_MONOTONIC, &current);
+
+  if (sister)
+  {
+    DeltaTime diff = unity::TimeUtil::TimeDelta(&current, sister);
+
+    if (diff < sister_relation)
+    {
+      DeltaTime remove = sister_relation - diff;
+      SetTimeBack(&current, remove);
+    }
+  }
+
+  timer->tv_sec = current.tv_sec;
+  timer->tv_nsec = current.tv_nsec;
+}
+>>>>>>> MERGE-SOURCE
 /* Min is when you are on the trigger */
 float Launcher::GetAutohidePositionMin() const
 {
@@ -635,6 +673,7 @@
 
 float Launcher::IconVisibleProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
+<<<<<<< TREE
   if (!icon->IsVisibleOnMonitor(monitor))
     return 0.0f;
 
@@ -647,12 +686,23 @@
   {
     struct timespec icon_visible_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_VISIBLE);
     int enter_ms = unity::TimeUtil::TimeDelta(&current, &icon_visible_time);
+=======
+  if (icon->GetQuirk(LauncherIcon::QUIRK_VISIBLE))
+  {
+    struct timespec icon_visible_time = icon->GetQuirkTime(LauncherIcon::QUIRK_VISIBLE);
+    DeltaTime enter_ms = unity::TimeUtil::TimeDelta(&current, &icon_visible_time);
+>>>>>>> MERGE-SOURCE
     return CLAMP((float) enter_ms / (float) ANIM_DURATION_SHORT, 0.0f, 1.0f);
   }
   else
   {
+<<<<<<< TREE
     struct timespec icon_hide_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_VISIBLE);
     int hide_ms = unity::TimeUtil::TimeDelta(&current, &icon_hide_time);
+=======
+    struct timespec icon_hide_time = icon->GetQuirkTime(LauncherIcon::QUIRK_VISIBLE);
+    DeltaTime hide_ms = unity::TimeUtil::TimeDelta(&current, &icon_hide_time);
+>>>>>>> MERGE-SOURCE
     return 1.0f - CLAMP((float) hide_ms / (float) ANIM_DURATION_SHORT, 0.0f, 1.0f);
   }
 }
@@ -684,8 +734,13 @@
 
 float Launcher::IconPresentProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
+<<<<<<< TREE
   struct timespec icon_present_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_PRESENTED);
   int ms = unity::TimeUtil::TimeDelta(&current, &icon_present_time);
+=======
+  struct timespec icon_present_time = icon->GetQuirkTime(LauncherIcon::QUIRK_PRESENTED);
+  DeltaTime ms = unity::TimeUtil::TimeDelta(&current, &icon_present_time);
+>>>>>>> MERGE-SOURCE
   float result = CLAMP((float) ms / (float) ANIM_DURATION, 0.0f, 1.0f);
 
   if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_PRESENTED))
@@ -696,8 +751,13 @@
 
 float Launcher::IconUrgentProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
+<<<<<<< TREE
   struct timespec urgent_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_URGENT);
   int urgent_ms = unity::TimeUtil::TimeDelta(&current, &urgent_time);
+=======
+  struct timespec urgent_time = icon->GetQuirkTime(LauncherIcon::QUIRK_URGENT);
+  DeltaTime urgent_ms = unity::TimeUtil::TimeDelta(&current, &urgent_time);
+>>>>>>> MERGE-SOURCE
   float result;
 
   if (options()->urgent_animation() == URGENT_ANIMATION_WIGGLE)
@@ -713,8 +773,13 @@
 
 float Launcher::IconDropDimValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
+<<<<<<< TREE
   struct timespec dim_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_DROP_DIM);
   int dim_ms = unity::TimeUtil::TimeDelta(&current, &dim_time);
+=======
+  struct timespec dim_time = icon->GetQuirkTime(LauncherIcon::QUIRK_DROP_DIM);
+  DeltaTime dim_ms = unity::TimeUtil::TimeDelta(&current, &dim_time);
+>>>>>>> MERGE-SOURCE
   float result = CLAMP((float) dim_ms / (float) ANIM_DURATION, 0.0f, 1.0f);
 
   if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_DROP_DIM))
@@ -725,11 +790,16 @@
 
 float Launcher::IconDesatValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
+<<<<<<< TREE
   if (!IsOverlayOpen())
     return 1.0f;
 
   struct timespec dim_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_DESAT);
   int ms = unity::TimeUtil::TimeDelta(&current, &dim_time);
+=======
+  struct timespec dim_time = icon->GetQuirkTime(LauncherIcon::QUIRK_DESAT);
+  DeltaTime ms = unity::TimeUtil::TimeDelta(&current, &dim_time);
+>>>>>>> MERGE-SOURCE
   float result = CLAMP((float) ms / (float) ANIM_DURATION_SHORT_SHORT, 0.0f, 1.0f);
 
   if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_DESAT))
@@ -740,15 +810,25 @@
 
 float Launcher::IconShimmerProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
+<<<<<<< TREE
   struct timespec shimmer_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_SHIMMER);
   int shimmer_ms = unity::TimeUtil::TimeDelta(&current, &shimmer_time);
+=======
+  struct timespec shimmer_time = icon->GetQuirkTime(LauncherIcon::QUIRK_SHIMMER);
+  DeltaTime shimmer_ms = unity::TimeUtil::TimeDelta(&current, &shimmer_time);
+>>>>>>> MERGE-SOURCE
   return CLAMP((float) shimmer_ms / (float) ANIM_DURATION_LONG, 0.0f, 1.0f);
 }
 
 float Launcher::IconCenterTransitionProgress(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
+<<<<<<< TREE
   struct timespec save_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_CENTER_SAVED);
   int save_ms = unity::TimeUtil::TimeDelta(&current, &save_time);
+=======
+  struct timespec save_time = icon->GetQuirkTime(LauncherIcon::QUIRK_CENTER_SAVED);
+  DeltaTime save_ms = unity::TimeUtil::TimeDelta(&current, &save_time);
+>>>>>>> MERGE-SOURCE
   return CLAMP((float) save_ms / (float) ANIM_DURATION, 0.0f, 1.0f);
 }
 
@@ -763,8 +843,13 @@
 
 float Launcher::IconPulseOnceValue(AbstractLauncherIcon::Ptr icon, struct timespec const &current) const
 {
+<<<<<<< TREE
   struct timespec pulse_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_PULSE_ONCE);
   int pulse_ms = unity::TimeUtil::TimeDelta(&current, &pulse_time);
+=======
+  struct timespec pulse_time = icon->GetQuirkTime(LauncherIcon::QUIRK_PULSE_ONCE);
+  DeltaTime pulse_ms = unity::TimeUtil::TimeDelta(&current, &pulse_time);
+>>>>>>> MERGE-SOURCE
   double pulse_progress = (double) CLAMP((float) pulse_ms / (ANIM_DURATION_LONG * PULSE_BLINK_LAMBDA * 2), 0.0f, 1.0f);
 
   if (pulse_progress == 1.0f)
@@ -784,8 +869,13 @@
 
 float Launcher::IconStartingBlinkValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
+<<<<<<< TREE
   struct timespec starting_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_STARTING);
   int starting_ms = unity::TimeUtil::TimeDelta(&current, &starting_time);
+=======
+  struct timespec starting_time = icon->GetQuirkTime(LauncherIcon::QUIRK_STARTING);
+  DeltaTime starting_ms = unity::TimeUtil::TimeDelta(&current, &starting_time);
+>>>>>>> MERGE-SOURCE
   double starting_progress = (double) CLAMP((float) starting_ms / (float)(ANIM_DURATION_LONG * STARTING_BLINK_LAMBDA), 0.0f, 1.0f);
   double val = IsBackLightModeToggles() ? 3.0f : 4.0f;
   return 0.5f + (float)(std::cos(M_PI * val * starting_progress)) * 0.5f;
@@ -793,8 +883,13 @@
 
 float Launcher::IconStartingPulseValue(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
+<<<<<<< TREE
   struct timespec starting_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_STARTING);
   int starting_ms = unity::TimeUtil::TimeDelta(&current, &starting_time);
+=======
+  struct timespec starting_time = icon->GetQuirkTime(LauncherIcon::QUIRK_STARTING);
+  DeltaTime starting_ms = unity::TimeUtil::TimeDelta(&current, &starting_time);
+>>>>>>> MERGE-SOURCE
   double starting_progress = (double) CLAMP((float) starting_ms / (float)(ANIM_DURATION_LONG * MAX_STARTING_BLINKS * STARTING_BLINK_LAMBDA * 2), 0.0f, 1.0f);
 
   if (starting_progress == 1.0f && !icon->GetQuirk(AbstractLauncherIcon::QUIRK_RUNNING))
@@ -810,8 +905,13 @@
 {
   float result = 0.0f;
 
+<<<<<<< TREE
   struct timespec running_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_RUNNING);
   int running_ms = unity::TimeUtil::TimeDelta(&current, &running_time);
+=======
+  struct timespec running_time = icon->GetQuirkTime(LauncherIcon::QUIRK_RUNNING);
+  DeltaTime running_ms = unity::TimeUtil::TimeDelta(&current, &running_time);
+>>>>>>> MERGE-SOURCE
   float running_progress = CLAMP((float) running_ms / (float) ANIM_DURATION_SHORT, 0.0f, 1.0f);
 
   if (!icon->GetQuirk(AbstractLauncherIcon::QUIRK_RUNNING))
@@ -875,8 +975,13 @@
 
 float Launcher::IconProgressBias(AbstractLauncherIcon::Ptr icon, struct timespec const& current) const
 {
+<<<<<<< TREE
   struct timespec icon_progress_time = icon->GetQuirkTime(AbstractLauncherIcon::QUIRK_PROGRESS);
   int ms = unity::TimeUtil::TimeDelta(&current, &icon_progress_time);
+=======
+  struct timespec icon_progress_time = icon->GetQuirkTime(LauncherIcon::QUIRK_PROGRESS);
+  DeltaTime ms = unity::TimeUtil::TimeDelta(&current, &icon_progress_time);
+>>>>>>> MERGE-SOURCE
   float result = CLAMP((float) ms / (float) ANIM_DURATION, 0.0f, 1.0f);
 
   if (icon->GetQuirk(AbstractLauncherIcon::QUIRK_PROGRESS))
@@ -1286,6 +1391,7 @@
 
 /* End Render Layout Logic */
 
+<<<<<<< TREE
 void Launcher::ForceReveal(bool force_reveal)
 {
   _hide_machine->SetQuirk(LauncherHideMachine::TRIGGER_BUTTON_SHOW, force_reveal);
@@ -1300,6 +1406,104 @@
 
 void Launcher::OnBGColorChanged(GVariant *data)
 {
+=======
+gboolean Launcher::TapOnSuper()
+{
+  struct timespec current;
+  clock_gettime(CLOCK_MONOTONIC, &current);
+
+  return (unity::TimeUtil::TimeDelta(&current, &_times[TIME_TAP_SUPER]) < SUPER_TAP_DURATION);
+}
+
+/* Launcher Show/Hide logic */
+
+void Launcher::StartKeyShowLauncher()
+{
+  _hide_machine->SetQuirk(LauncherHideMachine::LAST_ACTION_ACTIVATE, false);
+
+  SetTimeStruct(&_times[TIME_TAP_SUPER]);
+  SetTimeStruct(&_times[TIME_SUPER_PRESSED]);
+
+  if (_super_show_launcher_handle > 0)
+    g_source_remove(_super_show_launcher_handle);
+  _super_show_launcher_handle = g_timeout_add(SUPER_TAP_DURATION, &Launcher::SuperShowLauncherTimeout, this);
+
+  if (_super_show_shortcuts_handle > 0)
+    g_source_remove(_super_show_shortcuts_handle);
+  _super_show_shortcuts_handle = g_timeout_add(SHORTCUTS_SHOWN_DELAY, &Launcher::SuperShowShortcutsTimeout, this);
+
+  ubus_server_send_message(ubus_server_get_default(), UBUS_DASH_ABOUT_TO_SHOW, NULL);
+  ubus_server_force_message_pump(ubus_server_get_default());
+}
+
+void Launcher::EndKeyShowLauncher()
+{
+  int remaining_time_before_hide;
+  struct timespec current;
+  clock_gettime(CLOCK_MONOTONIC, &current);
+
+  _hover_machine->SetQuirk(LauncherHoverMachine::SHORTCUT_KEYS_VISIBLE, false);
+  _shortcuts_shown = false;
+  QueueDraw();
+
+  // remove further show launcher (which can happen when we close the dash with super)
+  if (_super_show_launcher_handle > 0)
+    g_source_remove(_super_show_launcher_handle);
+  if (_super_show_shortcuts_handle > 0)
+    g_source_remove(_super_show_shortcuts_handle);
+  _super_show_launcher_handle = 0;
+  _super_show_shortcuts_handle = 0;
+
+  // it's a tap on super and we didn't use any shortcuts
+  if (TapOnSuper() && !_latest_shortcut)
+    ubus_server_send_message(ubus_server_get_default(),
+                             UBUS_PLACE_ENTRY_ACTIVATE_REQUEST,
+                             g_variant_new("(sus)", "home.lens", 0, ""));
+
+  remaining_time_before_hide = BEFORE_HIDE_LAUNCHER_ON_SUPER_DURATION - CLAMP((DeltaTime)(unity::TimeUtil::TimeDelta(&current, &_times[TIME_SUPER_PRESSED])), 0, BEFORE_HIDE_LAUNCHER_ON_SUPER_DURATION);
+
+  if (_super_hide_launcher_handle > 0)
+    g_source_remove(_super_hide_launcher_handle);
+  _super_hide_launcher_handle = g_timeout_add(remaining_time_before_hide, &Launcher::SuperHideLauncherTimeout, this);
+}
+
+gboolean Launcher::SuperHideLauncherTimeout(gpointer data)
+{
+  Launcher* self = (Launcher*) data;
+
+  self->_hide_machine->SetQuirk(LauncherHideMachine::TRIGGER_BUTTON_SHOW, false);
+
+  self->_super_hide_launcher_handle = 0;
+  return false;
+}
+
+gboolean Launcher::SuperShowLauncherTimeout(gpointer data)
+{
+  Launcher* self = (Launcher*) data;
+
+  self->_hide_machine->SetQuirk(LauncherHideMachine::TRIGGER_BUTTON_SHOW, true);
+
+  self->_super_show_launcher_handle = 0;
+  return false;
+}
+
+gboolean Launcher::SuperShowShortcutsTimeout(gpointer data)
+{
+  Launcher* self = (Launcher*) data;
+
+  self->_shortcuts_shown = true;
+  self->_hover_machine->SetQuirk(LauncherHoverMachine::SHORTCUT_KEYS_VISIBLE, true);
+
+  self->QueueDraw();
+
+  self->_super_show_shortcuts_handle = 0;
+  return false;
+}
+
+void Launcher::OnBGColorChanged(GVariant *data, void *val)
+{
+  Launcher *self = (Launcher*)val;
+>>>>>>> MERGE-SOURCE
   double red = 0.0f, green = 0.0f, blue = 0.0f, alpha = 0.0f;
 
   g_variant_get(data, "(dddd)", &red, &green, &blue, &alpha);
 
=== modified file 'plugins/unityshell/src/LauncherIcon.cpp'
--- plugins/unityshell/src/LauncherIcon.cpp	2012-09-11 10:38:44 +0000
+++ plugins/unityshell/src/LauncherIcon.cpp	2013-01-18 15:43:30 +0000
@@ -537,6 +537,7 @@
     return;
   }
 
+<<<<<<< TREE
   ShowTooltip();
 }
 
@@ -551,22 +552,60 @@
 
 bool LauncherIcon::OpenQuicklist(bool select_first_item, int monitor)
 {
+=======
+  if (!_skip_tooltip_delay)
+    _tooltip_delay_handle = g_timeout_add(500, &LauncherIcon::OnTooltipTimeout, this);
+  else
+    OnTooltipTimeout(this);
+}
+
+void LauncherIcon::RecvMouseLeave()
+{
+  if (_tooltip_delay_handle)
+    g_source_remove(_tooltip_delay_handle);
+  _tooltip_delay_handle = 0;
+
+  _tooltip->ShowWindow(false);
+}
+
+bool LauncherIcon::OpenQuicklist(bool default_to_first_item)
+{
+>>>>>>> MERGE-SOURCE
   std::list<DbusmenuMenuitem*> menus = Menus();
+<<<<<<< TREE
 
   if (!_quicklist)
     LoadQuicklist();
 
+=======
+
+>>>>>>> MERGE-SOURCE
   if (menus.empty())
     return false;
 
+<<<<<<< TREE
   if (_tooltip)
     _tooltip->ShowWindow(false);
   _quicklist->RemoveAllMenuItem();
 
   for (auto menu_item : menus)
+=======
+  if (_tooltip_delay_handle)
+    g_source_remove(_tooltip_delay_handle);
+  _tooltip_delay_handle = 0;
+  _skip_tooltip_delay = false;
+
+  _tooltip->ShowWindow(false);
+  _quicklist->RemoveAllMenuItem();
+
+  for (auto menu_item : menus)
+>>>>>>> MERGE-SOURCE
   {
+<<<<<<< TREE
     QuicklistMenuItem* ql_item;
 
+=======
+>>>>>>> MERGE-SOURCE
     const gchar* type = dbusmenu_menuitem_property_get(menu_item, DBUSMENU_MENUITEM_PROP_TYPE);
     const gchar* toggle_type = dbusmenu_menuitem_property_get(menu_item, DBUSMENU_MENUITEM_PROP_TOGGLE_TYPE);
     gboolean prop_visible = dbusmenu_menuitem_property_get_bool(menu_item, DBUSMENU_MENUITEM_PROP_VISIBLE);
@@ -628,6 +667,28 @@
   {
     QuicklistManager::Default()->ShowQuicklist(_quicklist.GetPointer(), tip_x, tip_y);
   }
+<<<<<<< TREE
+=======
+
+  auto win_manager = WindowManager::Default();
+
+  if (win_manager->IsScaleActive())
+    win_manager->TerminateScale();
+
+  /* If the expo plugin is active, we need to wait it to be termated, before
+   * shwing the icon quicklist. */
+  if (win_manager->IsExpoActive())
+  {
+    on_expo_terminated_connection = win_manager->terminate_expo.connect([&, tip_x, tip_y]() {
+        QuicklistManager::Default()->ShowQuicklist(_quicklist, tip_x, tip_y);
+        on_expo_terminated_connection.disconnect();
+    });
+  }
+  else
+  {
+    QuicklistManager::Default()->ShowQuicklist(_quicklist, tip_x, tip_y);
+  }
+>>>>>>> MERGE-SOURCE
 
   return true;
 }
 
=== modified file 'plugins/unityshell/src/LauncherIcon.h'
--- plugins/unityshell/src/LauncherIcon.h	2012-07-18 15:25:17 +0000
+++ plugins/unityshell/src/LauncherIcon.h	2013-01-18 15:43:30 +0000
@@ -194,6 +194,7 @@
 
   void SetIconType(IconType type);
 
+<<<<<<< TREE
   virtual std::string DesktopFile() { return std::string(""); }
 
   virtual bool IsSticky() const { return false; }
@@ -209,6 +210,19 @@
   virtual void Stick(bool save = true) {}
 
   virtual void UnStick() {}
+=======
+  std::vector<nux::Vector4> & GetTransform(TransformIndex index);
+
+  static void SetSkipTooltipDelay(gboolean skip_tooltip_delay);
+
+  sigc::signal<void, LauncherIcon*> remove;
+
+  sigc::connection needs_redraw_connection;
+  sigc::connection on_icon_added_connection;
+  sigc::connection on_icon_removed_connection;
+  sigc::connection on_order_changed_connection;
+  sigc::connection on_expo_terminated_connection;
+>>>>>>> MERGE-SOURCE
 
 protected:
   std::vector<nux::Point3> GetCenters();
 
=== modified file 'plugins/unityshell/src/PanelMenuView.cpp'
--- plugins/unityshell/src/PanelMenuView.cpp	2012-04-27 11:42:56 +0000
+++ plugins/unityshell/src/PanelMenuView.cpp	2013-01-18 15:43:30 +0000
@@ -1531,6 +1531,52 @@
   FullRedraw();
 }
 
+<<<<<<< TREE
+=======
+void
+PanelMenuView::OnMouseDoubleClicked(int x, int y, unsigned long button_flags, unsigned long)
+{
+  if (nux::GetEventButton(button_flags) != 1 || _places_showing)
+    return;
+
+  guint32 window_xid = GetMaximizedWindow();
+
+  if (window_xid != 0)
+  {
+    WindowManager::Default()->Restore(window_xid);
+    _is_inside = true;
+  }
+}
+
+void
+PanelMenuView::OnMouseClicked(int x, int y, unsigned long button_flags, unsigned long)
+{
+  if (nux::GetEventButton(button_flags) != 1 || _places_showing)
+    return;
+
+  guint32 window_xid = GetMaximizedWindow();
+
+  if (window_xid != 0)
+  {
+    WindowManager::Default()->Raise(window_xid);
+  }
+}
+
+void
+PanelMenuView::OnMouseMiddleClicked(int x, int y, unsigned long button_flags, unsigned long)
+{
+  if (nux::GetEventButton(button_flags) != 2 || _places_showing)
+    return;
+
+  guint32 window_xid = GetMaximizedWindow();
+
+  if (window_xid != 0)
+  {
+    WindowManager::Default()->Lower(window_xid);
+  }
+}
+
+>>>>>>> MERGE-SOURCE
 // Introspectable
 std::string
 PanelMenuView::GetName() const
 
=== modified file 'plugins/unityshell/src/PanelTray.cpp'
--- plugins/unityshell/src/PanelTray.cpp	2012-04-12 13:23:29 +0000
+++ plugins/unityshell/src/PanelTray.cpp	2013-01-18 15:43:30 +0000
@@ -81,6 +81,16 @@
 
 PanelTray::~PanelTray()
 {
+<<<<<<< TREE
+=======
+  if (_tray)
+  {
+    g_signal_handler_disconnect(na_tray_get_manager(_tray), _tray_icon_added_id);
+    g_object_unref(_tray);
+    _tray = NULL;
+  }
+
+>>>>>>> MERGE-SOURCE
   g_idle_remove_by_data(this);
   g_strfreev(whitelist_);
 
 
=== modified file 'plugins/unityshell/src/PanelView.cpp'
--- plugins/unityshell/src/PanelView.cpp	2012-04-27 11:42:56 +0000
+++ plugins/unityshell/src/PanelView.cpp	2013-01-18 15:43:30 +0000
@@ -638,7 +638,12 @@
     return;
 
   _opacity = opacity;
+<<<<<<< TREE
   _bg_effect_helper.enabled = (_opacity < 1.0f || _overlay_is_open);
+=======
+
+  bg_effect_helper_.enabled = (_opacity < 1.0f || _dash_is_open);
+>>>>>>> MERGE-SOURCE
 
   ForceUpdateBackground();
 }
 
=== modified file 'plugins/unityshell/src/ScreenEffectFramebufferObject.cpp'
--- plugins/unityshell/src/ScreenEffectFramebufferObject.cpp	2012-07-18 15:25:17 +0000
+++ plugins/unityshell/src/ScreenEffectFramebufferObject.cpp	2013-01-18 15:43:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /* Compiz unity plugin
  * unity.h
@@ -236,3 +237,239 @@
 
 #endif // USE_GLES
 
+=======
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/* Compiz unity plugin
+ * unity.h
+ *
+ * Copyright (c) 2010-11 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "ScreenEffectFramebufferObject.h"
+#include "BackgroundEffectHelper.h"
+#include <NuxCore/Logger.h>
+#include <dlfcn.h>
+
+namespace
+{
+  nux::logging::Logger logger ("unity.screeneffectframebufferobject");
+}
+
+void ScreenEffectFramebufferObject::paint (const nux::Geometry &output)
+{
+  /* Draw the bit of the relevant framebuffer for each output */
+
+  glPushAttrib (GL_VIEWPORT_BIT);
+  glViewport (0, mScreenSize.height - (output.y + output.height), mScreenSize.width, mScreenSize.height);
+
+  if (mFBTexture)
+  {
+    glEnable (GL_TEXTURE_2D);
+    activeTexture (GL_TEXTURE0_ARB);
+    glBindTexture (GL_TEXTURE_2D, mFBTexture);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+
+    glPushAttrib (GL_SCISSOR_BIT);
+    glEnable (GL_SCISSOR_TEST);
+
+    glScissor (output.x, mScreenSize.height - (output.y + output.height),
+	       output.width, output.height);
+
+    /* FIXME: This needs to be GL_TRIANGLE_STRIP */
+    glBegin (GL_QUADS);
+    glTexCoord2f (0, 1);
+    glVertex2i   (mGeometry.x, mGeometry.y);
+    glTexCoord2f (0, 0);
+    glVertex2i   (mGeometry.x, mGeometry.y + mGeometry.height);
+    glTexCoord2f (1, 0);
+    glVertex2i   (mGeometry.x + mGeometry.width, mGeometry.y + mGeometry.height);
+    glTexCoord2f (1, 1);
+    glVertex2i   (mGeometry.x + mGeometry.width, mGeometry.y);
+    glEnd ();
+
+    activeTexture (GL_TEXTURE0_ARB);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glBindTexture (GL_TEXTURE_2D, 0);
+    glDisable (GL_TEXTURE_2D);
+    glPopAttrib ();
+  }
+  glPopAttrib ();
+}
+
+void ScreenEffectFramebufferObject::onScreenSizeChanged(const nux::Geometry& screenSize)
+{
+  mScreenSize = screenSize;
+}
+
+
+void ScreenEffectFramebufferObject::unbind ()
+{
+  if (!mBoundCnt)
+    return;
+
+  mBoundCnt--;
+
+  (*bindFramebuffer) (GL_FRAMEBUFFER_EXT, 0);
+
+  glDrawBuffer (GL_BACK);
+  glReadBuffer (GL_BACK);
+
+  /* Matches the viewport set we did in ::bind () */
+  glPopAttrib ();
+
+}
+
+bool ScreenEffectFramebufferObject::status ()
+{
+  return mFboStatus;
+}
+
+void ScreenEffectFramebufferObject::bind (const nux::Geometry &output)
+{
+  if (!BackgroundEffectHelper::HasDirtyHelpers())
+    return;
+
+  /* Clear the error bit */
+  glGetError ();
+
+  if (!mFBTexture)
+  {
+    glGenTextures (1, &mFBTexture);
+
+    glBindTexture (GL_TEXTURE_2D, mFBTexture);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+    glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+    glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA, mGeometry.width, mGeometry.height, 0, GL_BGRA,
+#if IMAGE_BYTE_ORDER == MSBFirst
+                 GL_UNSIGNED_INT_8_8_8_8_REV,
+#else
+                 GL_UNSIGNED_BYTE,
+#endif
+                 NULL);
+
+    glBindTexture (GL_TEXTURE_2D, 0);
+
+    if (glGetError () != GL_NO_ERROR)
+    {
+      mFboHandle = 0;
+      mFboStatus = false;
+      return;
+    }
+  }
+
+  (*bindFramebuffer) (GL_FRAMEBUFFER_EXT, mFboHandle);
+
+  (*framebufferTexture2D) (GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT,
+                               GL_TEXTURE_2D, mFBTexture, 0);
+
+  (*framebufferTexture2D) (GL_FRAMEBUFFER_EXT, GL_DEPTH_ATTACHMENT_EXT,
+                               GL_TEXTURE_2D, 0, 0);
+
+  /* Ensure that a framebuffer is actually available */
+  if (!mFboStatus)
+  {
+    GLint status = (*checkFramebufferStatus) (GL_DRAW_FRAMEBUFFER);
+
+    if (status != GL_FRAMEBUFFER_COMPLETE)
+    {
+      switch (status)
+      {
+        case GL_FRAMEBUFFER_UNDEFINED:
+          LOG_WARN (logger) <<  "no window";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT:
+          LOG_WARN (logger) <<  "attachment incomplete";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT:
+          LOG_WARN (logger) <<  "no buffers attached to fbo";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER:
+          LOG_WARN (logger) <<  "some attachment in glDrawBuffers doesn't exist in FBO";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER:
+          LOG_WARN (logger) <<  "some attachment in glReadBuffers doesn't exist in FBO";
+          break;
+        case GL_FRAMEBUFFER_UNSUPPORTED:
+          LOG_WARN (logger) <<  "unsupported internal format";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE:
+          LOG_WARN (logger) <<  "different levels of sampling for each attachment";
+          break;
+        case GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS:
+          LOG_WARN (logger) <<  "number of layers is different";
+          break;
+        default:
+          LOG_WARN (logger) <<  "unable to bind the framebuffer for an unknown reason";
+          break;
+      }
+
+      bindFramebuffer (GL_FRAMEBUFFER_EXT, 0);
+      deleteFramebuffers (1, &mFboHandle);
+
+      glDrawBuffer (GL_BACK);
+      glReadBuffer (GL_BACK);
+
+      mFboHandle = 0;
+
+      mFboStatus = false;
+    }
+    else
+      mFboStatus = true;
+  }
+
+  if (mFboStatus)
+  {
+    glPushAttrib (GL_VIEWPORT_BIT);
+
+    glViewport (output.x,
+	       mScreenSize.height - (output.y + output.height),
+	       output.width,
+	       output.height);
+  }
+
+  mBoundCnt++;
+}
+
+
+ScreenEffectFramebufferObject::ScreenEffectFramebufferObject (GLXGetProcAddressProc p, const nux::Geometry &geom)
+ : getProcAddressGLX (p)
+ , mFboStatus (false)
+ , mFBTexture (0)
+ , mGeometry (geom)
+ , mBoundCnt (0)
+ , mScreenSize (geom)
+{
+  activeTexture = (GLActiveTextureProc) (*getProcAddressGLX) ((GLubyte *) "glActiveTexture");
+  genFramebuffers = (GLGenFramebuffersProc) (*getProcAddressGLX) ((GLubyte *)"glGenFramebuffersEXT");
+  deleteFramebuffers = (GLDeleteFramebuffersProc) (*getProcAddressGLX) ((GLubyte *)"glDeleteFramebuffersEXT");
+  bindFramebuffer = (GLBindFramebufferProc) (*getProcAddressGLX) ((GLubyte *)"glBindFramebufferEXT");
+  checkFramebufferStatus = (GLCheckFramebufferStatusProc) (*getProcAddressGLX) ((GLubyte *) "glCheckFramebufferStatusEXT");
+  framebufferTexture2D = (GLFramebufferTexture2DProc) (*getProcAddressGLX) ((GLubyte *) "glFramebufferTexture2DEXT");
+  
+  (*genFramebuffers) (1, &mFboHandle);
+}
+
+ScreenEffectFramebufferObject::~ScreenEffectFramebufferObject ()
+{
+  (*deleteFramebuffers) (1, &mFboHandle);
+
+  if (mFBTexture)
+    glDeleteTextures (1, &mFBTexture);
+}
+>>>>>>> MERGE-SOURCE
 
=== modified file 'plugins/unityshell/src/ScreenEffectFramebufferObject.h'
--- plugins/unityshell/src/ScreenEffectFramebufferObject.h	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/ScreenEffectFramebufferObject.h	2013-01-18 15:43:30 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 // -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
 /* Compiz unity plugin
  * unity.h
@@ -87,3 +88,89 @@
 
 #endif // USE_GLES
 #endif
+=======
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/* Compiz unity plugin
+ * unity.h
+ *
+ * Copyright (c) 2010-11 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#ifndef UNITY_SCREENEFFECT_FRAMEBUFFER_H
+#define UNITY_SCREENEFFECT_FRAMEBUFFER_H
+
+#include <Nux/Nux.h>
+
+class ScreenEffectFramebufferObject
+{
+public:
+
+  typedef boost::shared_ptr <ScreenEffectFramebufferObject> Ptr;
+  typedef void (*FuncPtr) (void);
+  typedef FuncPtr (*GLXGetProcAddressProc) (const GLubyte *procName);
+
+  ScreenEffectFramebufferObject (GLXGetProcAddressProc, const nux::Geometry &geom);
+  ~ScreenEffectFramebufferObject ();
+
+public:
+
+  void bind (const nux::Geometry &geom);
+  void unbind ();
+
+  bool status ();
+  void paint (const nux::Geometry &geom);
+  bool bound () { return mBoundCnt > 0; }
+
+  GLuint texture () { return mFBTexture; }
+  
+  void onScreenSizeChanged (const nux::Geometry &screenSize);
+
+private:
+
+  FuncPtr getProcAddr (const std::string &);
+
+  typedef void (*GLActiveTextureProc) (GLenum texture);
+  typedef void (*GLGenFramebuffersProc) (GLsizei n,
+                                         GLuint  *framebuffers);
+  typedef void (*GLDeleteFramebuffersProc) (GLsizei n,
+                                            GLuint  *framebuffers);
+  typedef void (*GLBindFramebufferProc) (GLenum target,
+                                         GLuint framebuffer);
+  typedef GLenum (*GLCheckFramebufferStatusProc) (GLenum target);
+  typedef void (*GLFramebufferTexture2DProc) (GLenum target,
+                                              GLenum attachment,
+                                              GLenum textarget,
+                                              GLuint texture,
+                                              GLint  level);
+  
+  GLXGetProcAddressProc getProcAddressGLX;
+  GLActiveTextureProc activeTexture;
+  GLGenFramebuffersProc genFramebuffers;
+  GLDeleteFramebuffersProc deleteFramebuffers;
+  GLBindFramebufferProc bindFramebuffer;
+  GLCheckFramebufferStatusProc checkFramebufferStatus;
+  GLFramebufferTexture2DProc framebufferTexture2D;
+  /* compiz fbo handle that goes through to nux */
+  GLuint   mFboHandle; // actual handle to the framebuffer_ext
+  bool    mFboStatus; // did the framebuffer texture bind succeed
+  GLuint   mFBTexture;
+  nux::Geometry mGeometry;
+  unsigned int mBoundCnt;
+  
+  nux::Geometry mScreenSize;
+};
+
+#endif
+>>>>>>> MERGE-SOURCE
 
=== modified file 'plugins/unityshell/src/SwitcherController.cpp'
--- plugins/unityshell/src/SwitcherController.cpp	2012-07-18 15:25:17 +0000
+++ plugins/unityshell/src/SwitcherController.cpp	2013-01-18 15:43:30 +0000
@@ -55,6 +55,7 @@
   ,  view_idle_timer_(0)
   ,  bg_color_(0, 0, 0, 0.5)
 {
+<<<<<<< TREE
   ubus_manager_.RegisterInterest(UBUS_BACKGROUND_COLOR_CHANGED, sigc::mem_fun(this, &Controller::OnBackgroundUpdate));
 
   /* Construct the view after a prefixed timeout, to improve the startup time */
@@ -64,10 +65,24 @@
     self->ConstructWindow();
     return FALSE;
   }, this, nullptr);
+=======
+  timeout_length = 150;
+  detail_on_timeout = true;
+  detail_timeout_length = 1500;
+
+  bg_color_ = nux::Color(0.0, 0.0, 0.0, 0.5);
+
+  UBusServer *ubus = ubus_server_get_default();
+  bg_update_handle_ =
+  ubus_server_register_interest(ubus, UBUS_BACKGROUND_COLOR_CHANGED,
+                                (UBusCallback)&SwitcherController::OnBackgroundUpdate,
+                                this);
+>>>>>>> MERGE-SOURCE
 }
 
 Controller::~Controller()
 {
+  ubus_server_unregister_interest(ubus_server_get_default(), bg_update_handle_);
   if (view_window_)
     view_window_->UnReference();
 
 
=== modified file 'plugins/unityshell/src/SwitcherController.h'
--- plugins/unityshell/src/SwitcherController.h	2012-06-25 23:18:15 +0000
+++ plugins/unityshell/src/SwitcherController.h	2013-01-18 15:43:30 +0000
@@ -137,6 +137,7 @@
   guint view_idle_timer_;
   nux::Color bg_color_;
   DetailMode detail_mode_;
+  guint bg_update_handle_;
 
   static bool CompareSwitcherItemsPriority(launcher::AbstractLauncherIcon::Ptr first, launcher::AbstractLauncherIcon::Ptr second);
 };
 
=== modified file 'plugins/unityshell/src/SwitcherModel.cpp'
--- plugins/unityshell/src/SwitcherModel.cpp	2012-08-15 18:26:01 +0000
+++ plugins/unityshell/src/SwitcherModel.cpp	2013-01-18 15:43:30 +0000
@@ -169,10 +169,17 @@
 {
   if (!detail_selection || DetailXids ().empty())
     return 0;
+<<<<<<< TREE
 
   if (detail_selection_index > DetailXids().size() - 1)
     return 0;
 
+=======
+
+  if (detail_selection_index >= DetailXids().size())
+    return 0;
+  
+>>>>>>> MERGE-SOURCE
   return DetailXids()[detail_selection_index];
 }
 
 
=== modified file 'plugins/unityshell/src/SwitcherView.cpp'
--- plugins/unityshell/src/SwitcherView.cpp	2012-03-23 12:26:38 +0000
+++ plugins/unityshell/src/SwitcherView.cpp	2013-01-18 15:43:30 +0000
@@ -251,7 +251,7 @@
 {
   std::vector<Window> xids = model_->DetailXids ();
 
-  int ms_since_change = TimeUtil::TimeDelta(&current, &save_time_);
+  DeltaTime ms_since_change = TimeUtil::TimeDelta(&current, &save_time_);
   float progress = MIN (1.0f, (float) ms_since_change / (float) animation_length());
 
   for (Window window : xids)
@@ -508,7 +508,7 @@
       ++i;
     }
 
-    int ms_since_change = TimeUtil::TimeDelta(&current, &save_time_);
+    DeltaTime ms_since_change = TimeUtil::TimeDelta(&current, &save_time_);
     if (saved_args_.size () == results.size () && ms_since_change < animation_length)
     {
       float progress = (float) ms_since_change / (float) animation_length();
@@ -630,7 +630,11 @@
   text_view_->SetBaseY(last_background_.y + last_background_.height - 45);
   text_view_->Draw(GfxContext, force_draw);
 
+<<<<<<< TREE
   int ms_since_change = TimeUtil::TimeDelta(&current_, &save_time_);
+=======
+  DeltaTime ms_since_change = TimeUtil::TimeDelta(&current, &save_time_);
+>>>>>>> MERGE-SOURCE
 
   if (ms_since_change < animation_length && redraw_handle_ == 0)
     redraw_handle_ = g_idle_add_full (G_PRIORITY_DEFAULT, &SwitcherView::OnDrawTimeout, this, NULL);
 
=== modified file 'plugins/unityshell/src/TimeUtil.h'
--- plugins/unityshell/src/TimeUtil.h	2012-03-14 06:24:18 +0000
+++ plugins/unityshell/src/TimeUtil.h	2013-01-18 15:43:30 +0000
@@ -19,12 +19,16 @@
  */
 
 #include <time.h>
+#include <cstdint>
+
+typedef int64_t DeltaTime
 
 namespace unity {
 
 class TimeUtil
 {
 public:
+<<<<<<< TREE
   static int TimeDelta (struct timespec const* x, struct timespec const* y)
   {
     return ((x->tv_sec - y->tv_sec) * 1000) + ((x->tv_nsec - y->tv_nsec) / 1000000);
@@ -62,7 +66,20 @@
     }
     timeref->tv_nsec -= remove * 1000000;
   }
+=======
+static DeltaTime TimeDelta (struct timespec const* x, struct timespec const* y);
+>>>>>>> MERGE-SOURCE
 };
 
+<<<<<<< TREE
+=======
+inline
+DeltaTime TimeUtil::TimeDelta (struct timespec const* x, struct timespec const* y)
+{
+  DeltaTime d_sec = (x->tv_sec - y->tv_sec);
+  DeltaTime d_nsec = (x->tv_nsec - y->tv_nsec);
+  return (d_sec * 1000) + (d_nsec / 1000000);
+}
+>>>>>>> MERGE-SOURCE
 
 }
 
=== modified file 'plugins/unityshell/src/unityshell.cpp'
--- plugins/unityshell/src/unityshell.cpp	2012-11-12 12:20:38 +0000
+++ plugins/unityshell/src/unityshell.cpp	2013-01-18 15:43:30 +0000
@@ -119,9 +119,14 @@
   , allowWindowPaint(false)
   , _key_nav_mode_requested(false)
   , _last_output(nullptr)
+<<<<<<< TREE
 #ifndef USE_GLES
   , _active_fbo (0)
 #endif
+=======
+  , _active_fbo (0)
+  , dash_is_open_ (false)
+>>>>>>> MERGE-SOURCE
   , grab_index_ (0)
   , painting_tray_ (false)
   , last_scroll_event_(0)
@@ -247,6 +252,7 @@
      uScreen = this;
      _in_paint = false;
 
+<<<<<<< TREE
 #ifndef USE_GLES
     void *dlhand = dlopen ("libunityshell.so", RTLD_LAZY);
 
@@ -258,6 +264,18 @@
         glXGetProcAddressP = NULL;
     }
 
+=======
+    void *dlhand = dlopen ("libunityshell.so", RTLD_LAZY);
+
+    if (dlhand)
+    {
+      dlerror ();
+      glXGetProcAddressP = (ScreenEffectFramebufferObject::GLXGetProcAddressProc) dlsym (dlhand, "glXGetProcAddress");
+      if (dlerror () != NULL)
+        glXGetProcAddressP = NULL;
+    }
+
+>>>>>>> MERGE-SOURCE
      if (GL::fbo)
      {
        nux::Geometry geometry (0, 0, screen->width (), screen->height ());
@@ -370,6 +388,7 @@
 
      BackgroundEffectHelper::updates_enabled = true;
 
+<<<<<<< TREE
      ubus_manager_.RegisterInterest(UBUS_OVERLAY_SHOWN, [&](GVariant * data)
      {
        unity::glib::String overlay_identity;
@@ -386,6 +405,14 @@
     Display* display = gdk_x11_display_get_xdisplay(gdk_display_get_default());;
     XSelectInput(display, GDK_ROOT_WINDOW(), PropertyChangeMask);
     LOG_INFO(logger) << "UnityScreen constructed: " << timer.ElapsedSeconds() << "s";
+=======
+     ubus_manager_.RegisterInterest(UBUS_PLACE_VIEW_SHOWN, [&](GVariant * args) { 
+       dash_is_open_ = true; 
+       RaiseInputWindows(); 
+     });
+     ubus_manager_.RegisterInterest(UBUS_PLACE_VIEW_HIDDEN, [&](GVariant * args) { dash_is_open_ = false; });
+      LOG_INFO(logger) << "UnityScreen constructed: " << timer.ElapsedSeconds() << "s";
+>>>>>>> MERGE-SOURCE
   }
 
   panel::Style::Instance().changed.connect(sigc::mem_fun(this, &UnityScreen::OnPanelStyleChanged));
@@ -521,8 +548,12 @@
 
 void UnityScreen::nuxEpilogue()
 {
+<<<<<<< TREE
 #ifndef USE_GLES
   (*GL::bindFramebuffer)(GL_FRAMEBUFFER_EXT, _active_fbo);
+=======
+  (*GL::bindFramebuffer)(GL_FRAMEBUFFER_EXT, _active_fbo);
+>>>>>>> MERGE-SOURCE
 
   glMatrixMode(GL_PROJECTION);
   glLoadIdentity();
@@ -581,6 +612,9 @@
   float y1 = output->y() + panel_h;
   float x2 = x1 + output->width();
   float y2 = y1 + h;
+  GLMatrix sTransform = GLMatrix ();
+
+  sTransform.toScreenSpace(output, -DEFAULT_Z_CAMERA);
 
   glPushMatrix ();
   glLoadMatrixf (panel_shadow_matrix_.getMatrix ());
@@ -640,6 +674,7 @@
       glDisable(GL_BLEND);
     }
   }
+<<<<<<< TREE
   glPopMatrix();
 #else
 #warning Panel shadow not properly implemented for GLES2
@@ -737,6 +772,8 @@
   }
   nuxEpilogue();
 #endif
+=======
+>>>>>>> MERGE-SOURCE
 }
 
 void
@@ -764,6 +801,7 @@
 #endif
 {
   CompOutput *output = _last_output;
+<<<<<<< TREE
 
 #ifndef USE_GLES
   bool was_bound = _fbo->bound ();
@@ -820,10 +858,34 @@
       nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID(_fbo->texture(),
                                                                        screen->width (), screen->height(), 1, nux::BITFMT_R8G8B8A8);
 #else
+=======
+  Window     tray_xid = panelController->GetTrayXid ();
+
+  bool was_bound = _fbo->bound ();
+  _fbo->unbind ();
+
+  /* Draw the bit of the relevant framebuffer for each output */
+
+  if (was_bound)
+  {
+    GLMatrix sTransform;
+    sTransform.toScreenSpace (&screen->fullscreenOutput (), -DEFAULT_Z_CAMERA);
+    glPushMatrix ();
+    glLoadMatrixf (sTransform.getMatrix ());
+    _fbo->paint (nux::Geometry (output->x (), output->y (), output->width (), output->height ()));
+    glPopMatrix ();
+  }
+
+>>>>>>> MERGE-SOURCE
   nux::ObjectPtr<nux::IOpenGLTexture2D> device_texture =
+<<<<<<< TREE
     nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID(gScreen->fbo ()->tex ()->name (),
       output->width(), output->height(), 1, nux::BITFMT_R8G8B8A8);
 #endif
+=======
+      nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID(_fbo->texture(),
+                                                                       screen->width (), screen->height(), 1, nux::BITFMT_R8G8B8A8);
+>>>>>>> MERGE-SOURCE
 
   nux::GetGraphicsDisplay()->GetGpuDevice()->backup_texture0_ = device_texture;
 
@@ -831,6 +893,7 @@
   nux::Geometry oGeo = nux::Geometry (output->x (), output->y (), output->width (), output->height ());
   BackgroundEffectHelper::monitor_rect_ = geo;
 
+<<<<<<< TREE
 #ifdef USE_GLES
   GLint fboID;
   // Nux renders to the referenceFramebuffer when it's embedded.
@@ -839,6 +902,9 @@
 #endif
 
   nuxPrologue();
+=======
+  nuxPrologue();
+>>>>>>> MERGE-SOURCE
   _in_paint = true;
   wt->RenderInterfaceFromForeignCmd (&oGeo);
   _in_paint = false;
@@ -1020,6 +1086,7 @@
 
 void UnityScreen::leaveShowDesktopMode (CompWindow *w)
 {
+<<<<<<< TREE
   /* Where a window is inhibiting, only allow the window
    * that is inhibiting the leave show desktop to actually
    * fade in again - all other windows should remain faded out */
@@ -1051,6 +1118,39 @@
       }
     }
   }
+=======
+  /* Where a window is inhibiting, only allow the window
+   * that is inhibiting the leave show desktop to actually
+   * fade in again - all other windows should remain faded out */
+  if (!UnityShowdesktopHandler::inhibitingXid ())
+  {
+    for (CompWindow *cw : screen->windows ())
+    {
+      if (cw->inShowDesktopMode ())
+      {
+	UnityWindow::get (cw)->leaveShowDesktop ();
+	// the animation plugin does strange things here ...
+	// if this notification is sent
+	//cw->windowNotify (CompWindowNotifyLeaveShowDesktopMode);
+      }
+    }
+
+    PluginAdapter::Default()->OnLeaveDesktop();
+
+    screen->leaveShowDesktopMode (w);
+  }
+  else
+  {
+    CompWindow *cw = screen->findWindow (UnityShowdesktopHandler::inhibitingXid ());
+    if (cw)
+    {
+      if (cw->inShowDesktopMode ())
+      {
+	UnityWindow::get (cw)->leaveShowDesktop ();
+      }
+    }
+  }
+>>>>>>> MERGE-SOURCE
 }
 
 void UnityWindow::enterShowDesktop ()
@@ -1072,6 +1172,7 @@
   }
 }
 
+<<<<<<< TREE
 void UnityWindow::activate ()
 {
   ShowdesktopHandler::InhibitLeaveShowdesktopMode (window->id ());
@@ -1172,7 +1273,19 @@
 {
   ShowdesktopHandlerWindowInterface::PostPaintAction action = ShowdesktopHandlerWindowInterface::PostPaintAction::Wait;
 
+=======
+void UnityWindow::activate ()
+{
+  UnityShowdesktopHandler::inhibitLeaveShowdesktopMode (window->id ());
+  window->activate ();
+  UnityShowdesktopHandler::allowLeaveShowdesktopMode (window->id ());
+}
+
+bool UnityWindow::handleAnimations (unsigned int ms)
+{
+>>>>>>> MERGE-SOURCE
   if (mShowdesktopHandler)
+<<<<<<< TREE
     action = mShowdesktopHandler->Animate (ms);
 
   return action;
@@ -1212,6 +1325,168 @@
 {
   if (screen->XShape () &&
       event->type == screen->shapeEvent () + ShapeNotify &&
+=======
+    if (mShowdesktopHandler->animate (ms))
+    { 
+      delete mShowdesktopHandler;
+      mShowdesktopHandler = NULL;
+      return true;
+    }
+
+  return false;
+}
+
+/* 300 ms */
+const unsigned int UnityShowdesktopHandler::fade_time = 300;
+CompWindowList UnityShowdesktopHandler::animating_windows (0);
+
+bool UnityShowdesktopHandler::shouldHide (CompWindow *w)
+{
+  if (w->overrideRedirect ())
+    return false;
+
+  if (!w->managed ())
+    return false;
+
+  if (w->grabbed ())
+    return false;
+
+  if (w->wmType () & (CompWindowTypeDesktopMask |
+                      CompWindowTypeDockMask))
+   return false;
+
+  if (w->state () & (CompWindowStateSkipPagerMask |
+		     CompWindowStateSkipTaskbarMask))
+    return false;
+
+  if ((w->state () & CompWindowStateHiddenMask))
+    if (!(w->inShowDesktopMode () || w->shaded ()))
+      return false;
+
+  return true;
+}
+
+guint32 UnityShowdesktopHandler::mInhibitingXid = 0;
+
+void
+UnityShowdesktopHandler::inhibitLeaveShowdesktopMode (guint32 xid)
+{
+  if (!mInhibitingXid)
+    mInhibitingXid = xid;
+}
+
+void
+UnityShowdesktopHandler::allowLeaveShowdesktopMode (guint32 xid)
+{
+  if (mInhibitingXid == xid)
+    mInhibitingXid = 0;
+}
+
+guint32
+UnityShowdesktopHandler::inhibitingXid ()
+{
+  return mInhibitingXid;
+}
+
+UnityShowdesktopHandler::UnityShowdesktopHandler (CompWindow *w) :
+  mWindow (w),
+  mRemover (new compiz::WindowInputRemover (screen->dpy (), w->id ())),
+  mState (Visible),
+  mProgress (0.0f)
+{
+}
+
+UnityShowdesktopHandler::~UnityShowdesktopHandler ()
+{
+  if (mRemover)
+    delete mRemover;
+}
+
+void UnityShowdesktopHandler::fadeOut ()
+{
+  mState = UnityShowdesktopHandler::FadeOut;
+  mProgress = 1.0f;
+
+  mWasHidden = mWindow->state () & CompWindowStateHiddenMask;
+
+  if (!mWasHidden)
+  {
+    mWindow->changeState (mWindow->state () | CompWindowStateHiddenMask);
+    mWindow->windowNotify (CompWindowNotifyHide);
+    mRemover->save ();
+    mRemover->remove ();
+  }
+
+  CompositeWindow::get (mWindow)->addDamage ();
+
+  if (std::find (animating_windows.begin(),
+                 animating_windows.end(),
+                 mWindow) == animating_windows.end())
+    animating_windows.push_back(mWindow);
+}
+
+void UnityShowdesktopHandler::fadeIn ()
+{
+  mState = UnityShowdesktopHandler::FadeIn;
+
+  if (!mWasHidden)
+  {
+    mWindow->changeState (mWindow->state () & ~CompWindowStateHiddenMask);
+    mWindow->windowNotify (CompWindowNotifyShow);
+    mRemover->restore ();
+  }
+
+  CompositeWindow::get (mWindow)->addDamage ();
+}
+
+bool UnityShowdesktopHandler::animate (unsigned int ms)
+{
+  float inc = fade_time / (float) ms;
+
+  if (mState == UnityShowdesktopHandler::FadeOut)
+  {
+    mProgress -= inc;
+    if (mProgress <= 0.0f)
+    {
+      mProgress = 0.0f;
+      mState = Invisible;
+    }
+    else
+      CompositeWindow::get (mWindow)->addDamage ();
+  }
+  else if (mState == FadeIn)
+  {
+    mProgress += inc;
+    if (mProgress >= 1.0f)
+    {
+      mProgress = 1.0f;
+      mState = Visible;
+
+      return true;
+    }
+    else
+      CompositeWindow::get (mWindow)->addDamage ();
+  }
+
+  return false;
+}
+
+void UnityShowdesktopHandler::paintAttrib (GLWindowPaintAttrib &attrib)
+{
+  attrib.opacity = static_cast <int> (static_cast <float> (attrib.opacity) * mProgress);
+}
+
+unsigned int UnityShowdesktopHandler::getPaintMask ()
+{
+    return 0;
+}
+
+void UnityShowdesktopHandler::handleEvent (XEvent *event)
+{
+  /* Ignore sent events from the InputRemover */
+  if (screen->XShape () && event->type ==
+      screen->shapeEvent () + ShapeNotify &&
+>>>>>>> MERGE-SOURCE
       !event->xany.send_event)
   {
     if (mShowdesktopHandler)
@@ -1264,6 +1539,7 @@
 {
   bool ret;
 
+<<<<<<< TREE
   /*
    * Very important!
    * Don't waste GPU and CPU rendering the shell on every frame if you don't
@@ -1283,6 +1559,12 @@
   paint_panel_ = false;
 
 #ifndef USE_GLES
+=======
+  doShellRepaint = true;
+  allowWindowPaint = true;
+  _last_output = output;
+
+>>>>>>> MERGE-SOURCE
   /* bind the framebuffer here
    * - it will be unbound and flushed
    *   to the backbuffer when some
@@ -1292,6 +1574,7 @@
    *   once an fbo is bound any further
    *   attempts to bind it will only increment
    *   its bind reference so make sure that
+<<<<<<< TREE
    *   you always unbind as much as you bind
    *
    * But NOTE: It is only safe to bind the FBO if !shellCouldBeHidden.
@@ -1305,6 +1588,10 @@
   // CompRegion has no clear() method. So this is the fastest alternative.
   fullscreenRegion = CompRegion();
   nuxRegion = CompRegion();
+=======
+   *   you always unbind as much as you bind */
+  _fbo->bind (nux::Geometry (output->x (), output->y (), output->width (), output->height ()));
+>>>>>>> MERGE-SOURCE
 
   /* glPaintOutput is part of the opengl plugin, so we need the GLScreen base class. */
   ret = gScreen->glPaintOutput(attrib, transform, region, output, mask);
@@ -1698,12 +1985,53 @@
   {
     wt->ProcessForeignEvent(event, NULL);
   }
+<<<<<<< TREE
 }
 
 void UnityScreen::damageRegion(const CompRegion &region)
 {
   compizDamageNux(region);
   cScreen->damageRegion(region);
+=======
+
+  if (event->type == cScreen->damageEvent() + XDamageNotify)
+  {
+    XDamageNotifyEvent *de = (XDamageNotifyEvent *) event;
+    CompWindow* w = screen->findWindow (de->drawable);
+    std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();
+    CompWindow* lastNWindow = screen->findWindow (xwns.back ());
+    bool        processDamage = true;
+
+    if (w)
+    {
+      if (!w->overrideRedirect () &&
+          w->isViewable () &&
+          !w->invisible ())
+      {
+
+        for (; lastNWindow != NULL; lastNWindow = lastNWindow->next)
+        {
+          if (lastNWindow == w)
+          {
+            processDamage = false;
+            break;
+          }
+        }
+
+        if (processDamage)
+        {
+          nux::Geometry damage (de->area.x, de->area.y, de->area.width, de->area.height);
+
+          const CompWindow::Geometry &geom = w->geometry ();
+          damage.x += geom.x () + geom.border ();
+          damage.y += geom.y () + geom.border ();
+
+          BackgroundEffectHelper::ProcessDamage(damage);
+        }
+      }
+    }
+  }
+>>>>>>> MERGE-SOURCE
 }
 
 void UnityScreen::handleCompizEvent(const char* plugin,
@@ -1908,6 +2236,7 @@
 
   // maybe check launcher position/hide state?
 
+<<<<<<< TREE
   WindowManager *wm = WindowManager::Default();
   int monitor = wm->GetWindowMonitor(wm->GetActiveWindow());
   nux::Geometry monitor_geo = UScreen::GetDefault()->GetMonitorGeometry(monitor);
@@ -1932,6 +2261,15 @@
   if (!(results.size() == 1 && results[0]->GetIconType() == AbstractLauncherIcon::IconType::TYPE_DESKTOP))
     switcher_controller_->Show(show_mode, switcher::SortMode::FOCUS_ORDER, false, results);
 
+=======
+  int device = screen->outputDeviceForPoint (pointerX, pointerY);
+  switcherController->SetWorkspace(nux::Geometry(screen->outputDevs()[device].x1() + 100,
+                                                 screen->outputDevs()[device].y1() + 100,
+                                                 screen->outputDevs()[device].width() - 200,
+                                                 screen->outputDevs()[device].height() - 200));
+  switcherController->Show(SwitcherController::ALL, SwitcherController::FOCUS_ORDER, false, results);
+  RaiseInputWindows();
+>>>>>>> MERGE-SOURCE
   return true;
 }
 
@@ -2374,6 +2712,18 @@
   }
 }
 
+void UnityScreen::RaiseInputWindows()
+{
+  std::vector<Window> const& xwns = nux::XInputWindow::NativeHandleList();
+  
+  for (auto window : xwns)
+  {
+    CompWindow* cwin = screen->findWindow(window);
+    if (cwin)
+      cwin->raise();
+  }
+}
+
 /* detect occlusions
  *
  * core passes down the PAINT_WINDOW_OCCLUSION_DETECTION
@@ -2958,7 +3308,14 @@
 
 void UnityScreen::Relayout()
 {
-  nux::Geometry geometry (0, 0, screen->width (), screen->height ());
+<<<<<<< TREE
+  nux::Geometry geometry (0, 0, screen->width (), screen->height ());
+=======
+  GdkRectangle rect;
+  nux::Geometry lCurGeom;
+  int panel_height = 24;
+  nux::Geometry geometry (0, 0, screen->width (), screen->height ());
+>>>>>>> MERGE-SOURCE
 
   if (!needsRelayout)
     return;
@@ -2966,8 +3323,13 @@
 #ifndef USE_GLES
   if (GL::fbo)
   {
+<<<<<<< TREE
     uScreen->_fbo = ScreenEffectFramebufferObject::Ptr (new ScreenEffectFramebufferObject (glXGetProcAddressP, geometry));
     uScreen->_fbo->onScreenSizeChanged (geometry);
+=======
+    uScreen->_fbo.reset (new ScreenEffectFramebufferObject (glXGetProcAddressP, geometry));
+    uScreen->_fbo->onScreenSizeChanged (geometry);
+>>>>>>> MERGE-SOURCE
   }
 #endif
 
 
=== modified file 'plugins/unityshell/src/unityshell.h'
--- plugins/unityshell/src/unityshell.h	2012-09-11 10:38:44 +0000
+++ plugins/unityshell/src/unityshell.h	2013-01-18 15:43:30 +0000
@@ -50,13 +50,71 @@
 #include "DebugDBusInterface.h"
 #include "SwitcherController.h"
 #include "UBusWrapper.h"
+<<<<<<< TREE
 #include "UnityshellPrivate.h"
 #include "UnityShowdesktopHandler.h"
 #ifndef USE_GLES
 #include "ScreenEffectFramebufferObject.h"
 #endif
+=======
+#include <Nux/WindowThread.h>
+#include <sigc++/sigc++.h>
+#include <boost/shared_ptr.hpp>
+#include "ScreenEffectFramebufferObject.h"
+>>>>>>> MERGE-SOURCE
 
 #include "compizminimizedwindowhandler.h"
+<<<<<<< TREE
+=======
+#include <dlfcn.h>
+
+class UnityShowdesktopHandler
+{
+ public:
+
+  UnityShowdesktopHandler (CompWindow *w);
+  ~UnityShowdesktopHandler ();
+
+  typedef enum {
+    Visible = 0,
+    FadeOut = 1,
+    FadeIn = 2,
+    Invisible = 3
+  } State;
+
+public:
+
+  void fadeOut ();
+  void fadeIn ();
+  bool animate (unsigned int ms);
+  void paintAttrib (GLWindowPaintAttrib &attrib);
+  unsigned int getPaintMask ();
+  void handleEvent (XEvent *);
+  void windowNotify (CompWindowNotify n);
+  void updateFrameRegion (CompRegion &r);
+
+  UnityShowdesktopHandler::State state ();
+
+  static const unsigned int fade_time;
+  static CompWindowList     animating_windows;
+  static bool shouldHide (CompWindow *);
+  static void inhibitLeaveShowdesktopMode (guint32 xid);
+  static void allowLeaveShowdesktopMode (guint32 xid);
+  static guint32 inhibitingXid ();
+
+private:
+
+  CompWindow                     *mWindow;
+  compiz::WindowInputRemover     *mRemover;
+  UnityShowdesktopHandler::State mState;
+  float                          mProgress;
+  bool                           mWasHidden;
+  static guint32		 mInhibitingXid;
+};
+  
+
+
+>>>>>>> MERGE-SOURCE
 #include "BGHash.h"
 #include <compiztoolbox/compiztoolbox.h>
 #include <dlfcn.h>
@@ -106,6 +164,8 @@
 
   void RaiseInputWindows();
 
+  void RaiseInputWindows();
+
   void
   handleCompizEvent (const char         *pluginName,
                      const char         *eventName,
@@ -286,6 +346,7 @@
   bool    allowWindowPaint;
   bool    _key_nav_mode_requested;
   CompOutput* _last_output;
+<<<<<<< TREE
 
   CompRegion nuxRegion;
   CompRegion fullscreenRegion;
@@ -301,6 +362,18 @@
   ScreenEffectFramebufferObject::Ptr _fbo;
   GLuint                             _active_fbo;
 #endif
+=======
+  CompWindowList _withRemovedNuxWindows;
+
+  DesktopLauncherIcon* switcher_desktop_icon;
+
+  GdkRectangle _primary_monitor;
+
+  unity::BGHash _bghash;
+
+  ScreenEffectFramebufferObject::Ptr _fbo;
+  GLuint                             _active_fbo;
+>>>>>>> MERGE-SOURCE
 
   bool   queryForShader ();
 
@@ -326,6 +399,8 @@
   ScreenEffectFramebufferObject::GLXGetProcAddressProc glXGetProcAddressP;
 #endif
 
+  ScreenEffectFramebufferObject::GLXGetProcAddressProc glXGetProcAddressP;
+
   friend class UnityWindow;
 };
 
 
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2012-11-12 12:20:38 +0000
+++ tests/CMakeLists.txt	2013-01-18 15:43:30 +0000
@@ -74,6 +74,445 @@
                 )
 target_link_libraries (test-unit ${LIBS})
 add_dependencies (test-unit unity-core-${UNITY_API_VERSION})
+<<<<<<< TREE
+=======
+
+#
+# Standalone tests
+#
+add_executable (standalone-dash
+                standalone_dash.cpp
+                ${UNITY_SRC}/BackgroundEffectHelper.cpp
+                ${UNITY_SRC}/BackgroundEffectHelper.h
+                ${UNITY_SRC}/BGHash.cpp
+                ${UNITY_SRC}/BGHash.h
+                ${UNITY_SRC}/DashSearchBar.cpp
+                ${UNITY_SRC}/DashSearchBar.h
+                ${UNITY_SRC}/DashSearchBarSpinner.cpp
+                ${UNITY_SRC}/DashSearchBarSpinner.h
+                ${UNITY_SRC}/FilterExpanderLabel.cpp
+                ${UNITY_SRC}/FilterFactory.cpp
+                ${UNITY_SRC}/FilterBasicButton.cpp
+                ${UNITY_SRC}/FilterRatingsButton.cpp
+                ${UNITY_SRC}/FilterRatingsWidget.cpp
+                ${UNITY_SRC}/FilterMultiRangeWidget.cpp
+                ${UNITY_SRC}/FilterMultiRangeButton.cpp
+                ${UNITY_SRC}/FilterGenreButton.cpp
+                ${UNITY_SRC}/FilterGenreWidget.cpp
+                ${UNITY_SRC}/FilterBar.cpp
+                ${UNITY_SRC}/FontSettings.cpp
+                ${UNITY_SRC}/FontSettings.h
+                ${UNITY_SRC}/IMTextEntry.cpp
+                ${UNITY_SRC}/IMTextEntry.h
+                ${UNITY_SRC}/PlacesHomeView.cpp
+                ${UNITY_SRC}/PlacesHomeView.h
+                ${UNITY_SRC}/PlacesGroup.cpp
+                ${UNITY_SRC}/PlacesGroup.h
+                ${UNITY_SRC}/DashSettings.cpp
+                ${UNITY_SRC}/DashSettings.h
+                ${UNITY_SRC}/PlacesStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.h
+                ${UNITY_SRC}/PlacesTile.cpp
+                ${UNITY_SRC}/PlacesTile.h
+                ${UNITY_SRC}/PlacesSimpleTile.cpp
+                ${UNITY_SRC}/PlacesSimpleTile.h
+                ${UNITY_SRC}/PlacesVScrollBar.cpp
+                ${UNITY_SRC}/PlacesVScrollBar.h
+                ${UNITY_SRC}/DashView.cpp
+                ${UNITY_SRC}/DashView.h
+                ${UNITY_SRC}/HomeView.cpp
+                ${UNITY_SRC}/HomeView.h
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/IconLoader.cpp
+                ${UNITY_SRC}/IconLoader.h
+                ${UNITY_SRC}/IconTexture.cpp
+                ${UNITY_SRC}/IconTexture.h
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/Introspectable.h
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/LensBar.cpp
+                ${UNITY_SRC}/LensBar.h
+                ${UNITY_SRC}/LensBarIcon.cpp
+                ${UNITY_SRC}/LensBarIcon.h
+                ${UNITY_SRC}/LensView.cpp
+                ${UNITY_SRC}/LensView.h
+                ${UNITY_SRC}/PreviewApplications.cpp
+                ${UNITY_SRC}/PreviewBase.cpp
+                ${UNITY_SRC}/PreviewBasicButton.cpp
+                ${UNITY_SRC}/ResultView.cpp
+                ${UNITY_SRC}/ResultViewGrid.cpp
+                ${UNITY_SRC}/ResultRenderer.cpp
+                ${UNITY_SRC}/ResultRendererTile.cpp
+                ${UNITY_SRC}/ResultRendererHorizontalTile.cpp
+                ${UNITY_SRC}/TextureCache.h
+                ${UNITY_SRC}/TextureCache.cpp
+                ${UNITY_SRC}/Timer.cpp
+                ${UNITY_SRC}/Timer.h
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/StaticCairoText.h
+                ${UNITY_SRC}/UBusMessages.h
+                ${UNITY_SRC}/UBusWrapper.cpp
+                ${UNITY_SRC}/UBusWrapper.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                ${UNITY_SRC}/UScreen.cpp
+                ${UNITY_SRC}/UScreen.h
+                )
+add_dependencies (standalone-dash unity-core-${UNITY_API_VERSION})
+
+
+#
+# Please use "standalone-$foo" naming convention for standalone tests
+#
+add_executable (test-panel
+                TestPanel.cpp
+                ${UNITY_SRC}/Animator.cpp
+                ${UNITY_SRC}/Animator.h
+                ${UNITY_SRC}/BackgroundEffectHelper.cpp
+                ${UNITY_SRC}/BackgroundEffectHelper.h
+                ${UNITY_SRC}/DashSettings.cpp
+                ${UNITY_SRC}/DashSettings.h
+                ${UNITY_SRC}/PanelStyle.cpp
+                ${UNITY_SRC}/PanelStyle.h
+                ${UNITY_SRC}/PanelView.cpp
+                ${UNITY_SRC}/PanelView.h
+                ${UNITY_SRC}/PanelIndicatorsView.cpp
+                ${UNITY_SRC}/PanelIndicatorsView.h
+                ${UNITY_SRC}/PanelIndicatorEntryView.cpp
+                ${UNITY_SRC}/PanelIndicatorEntryView.h
+                ${UNITY_SRC}/PanelTitlebarGrabAreaView.h
+                ${UNITY_SRC}/PanelTitlebarGrabAreaView.cpp
+                ${UNITY_SRC}/PanelTray.cpp
+                ${UNITY_SRC}/PanelTray.h
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/Introspectable.h
+                ${UNITY_SRC}/PanelMenuView.cpp
+                ${UNITY_SRC}/PanelMenuView.h
+                ${UNITY_SRC}/Timer.cpp
+                ${UNITY_SRC}/Timer.h
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/StaticCairoText.h
+                ${UNITY_SRC}/WindowButtons.cpp
+                ${UNITY_SRC}/WindowButtons.h
+                ${UNITY_SRC}/WindowManager.cpp
+                ${UNITY_SRC}/WindowManager.h
+                ${UNITY_SRC}/UScreen.cpp
+                ${UNITY_SRC}/UScreen.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies (test-panel unity-core-${UNITY_API_VERSION})
+
+add_executable (test-switcher
+                TestSwitcher.cpp
+                ${UNITY_SRC}/AbstractLauncherIcon.h
+                ${UNITY_SRC}/AbstractIconRenderer.h
+                ${UNITY_SRC}/SwitcherController.cpp
+                ${UNITY_SRC}/SwitcherController.h
+                ${UNITY_SRC}/SwitcherModel.cpp
+                ${UNITY_SRC}/SwitcherModel.h
+                ${UNITY_SRC}/SwitcherView.cpp
+                ${UNITY_SRC}/SwitcherView.h
+                ${UNITY_SRC}/LayoutSystem.h
+                ${UNITY_SRC}/LayoutSystem.cpp
+                ${UNITY_SRC}/WindowManager.h
+                ${UNITY_SRC}/WindowManager.cpp
+                ${UNITY_SRC}/IconRenderer.cpp
+                ${UNITY_SRC}/IconRenderer.h
+                ${UNITY_SRC}/MockLauncherIcon.h
+                ${UNITY_SRC}/BackgroundEffectHelper.h
+                ${UNITY_SRC}/BackgroundEffectHelper.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/StaticCairoText.h
+                ${UNITY_SRC}/UBusMessages.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies (test-switcher unity-core-${UNITY_API_VERSION})
+
+add_executable (test-launcher
+                TestLauncher.cpp
+                ${UNITY_SRC}/AbstractLauncherIcon.h
+                ${UNITY_SRC}/AbstractIconRenderer.h
+                ${UNITY_SRC}/LauncherIcon.cpp
+                ${UNITY_SRC}/LauncherIcon.h
+                ${UNITY_SRC}/SimpleLauncherIcon.cpp
+                ${UNITY_SRC}/SimpleLauncherIcon.h
+                ${UNITY_SRC}/BamfLauncherIcon.cpp
+                ${UNITY_SRC}/BamfLauncherIcon.h
+                ${UNITY_SRC}/BFBLauncherIcon.cpp
+                ${UNITY_SRC}/BFBLauncherIcon.h
+                ${UNITY_SRC}/SpacerLauncherIcon.cpp
+                ${UNITY_SRC}/SpacerLauncherIcon.h
+                ${UNITY_SRC}/DndData.cpp
+                ${UNITY_SRC}/DndData.h
+                ${UNITY_SRC}/TrashLauncherIcon.cpp
+                ${UNITY_SRC}/TrashLauncherIcon.h
+                ${UNITY_SRC}/DNDCollectionWindow.cpp
+                ${UNITY_SRC}/DNDCollectionWindow.h
+                ${UNITY_SRC}/DeviceLauncherIcon.cpp
+                ${UNITY_SRC}/DeviceLauncherIcon.h
+                ${UNITY_SRC}/DeviceLauncherSection.cpp
+                ${UNITY_SRC}/DeviceLauncherSection.h
+                ${UNITY_SRC}/DevicesSettings.cpp
+                ${UNITY_SRC}/DevicesSettings.h
+                ${UNITY_SRC}/FavoriteStore.cpp
+                ${UNITY_SRC}/FavoriteStore.h
+                ${UNITY_SRC}/FavoriteStoreGSettings.cpp
+                ${UNITY_SRC}/FavoriteStoreGSettings.h
+                ${UNITY_SRC}/LauncherEntryRemoteModel.cpp
+                ${UNITY_SRC}/LauncherEntryRemoteModel.h
+                ${UNITY_SRC}/LauncherEntryRemote.cpp
+                ${UNITY_SRC}/LauncherEntryRemote.h
+                ${UNITY_SRC}/LauncherController.cpp
+                ${UNITY_SRC}/LauncherController.h
+                ${UNITY_SRC}/LauncherModel.cpp
+                ${UNITY_SRC}/LauncherModel.h
+                ${UNITY_SRC}/Launcher.cpp
+                ${UNITY_SRC}/Launcher.h
+                ${UNITY_SRC}/LauncherHideMachine.cpp
+                ${UNITY_SRC}/LauncherHideMachine.h
+                ${UNITY_SRC}/LauncherHoverMachine.cpp
+                ${UNITY_SRC}/LauncherHoverMachine.h
+                ${UNITY_SRC}/LauncherDragWindow.cpp
+                ${UNITY_SRC}/LauncherDragWindow.h
+                ${UNITY_SRC}/GeisAdapter.cpp
+                ${UNITY_SRC}/GeisAdapter.h
+                ${UNITY_SRC}/WindowManager.h
+                ${UNITY_SRC}/WindowManager.cpp
+                ${UNITY_SRC}/IconRenderer.cpp
+                ${UNITY_SRC}/IconRenderer.h
+                ${UNITY_SRC}/Tooltip.cpp
+                ${UNITY_SRC}/Tooltip.h
+                ${UNITY_SRC}/BackgroundEffectHelper.h
+                ${UNITY_SRC}/BackgroundEffectHelper.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/StaticCairoText.h
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/Introspectable.h
+                ${UNITY_SRC}/QuicklistMenuItem.cpp
+                ${UNITY_SRC}/QuicklistMenuItem.h
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.cpp
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.h
+                ${UNITY_SRC}/QuicklistMenuItemLabel.cpp
+                ${UNITY_SRC}/QuicklistMenuItemLabel.h
+                ${UNITY_SRC}/QuicklistMenuItemRadio.cpp
+                ${UNITY_SRC}/QuicklistMenuItemRadio.h
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.cpp
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.h
+                ${UNITY_SRC}/QuicklistView.cpp
+                ${UNITY_SRC}/QuicklistView.h
+                ${UNITY_SRC}/QuicklistManager.cpp
+                ${UNITY_SRC}/QuicklistManager.h
+                ${UNITY_SRC}/UBusMessages.h
+                ${UNITY_SRC}/UBusWrapper.cpp
+                ${UNITY_SRC}/UBusWrapper.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies (test-launcher unity-core-${UNITY_API_VERSION})
+
+add_executable (test-keyutil
+                TestKeyboardUtil.cpp
+                ${UNITY_SRC}/KeyboardUtil.h
+                ${UNITY_SRC}/KeyboardUtil.cpp
+                )
+add_dependencies (test-keyutil unity-core-${UNITY_API_VERSION})
+
+add_executable (test-quicklist
+                ui/TestQuicklist.cpp
+                ui/EventFaker.cpp
+                ui/EventFaker.h
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/Introspectable.h
+                ${UNITY_SRC}/QuicklistMenuItem.cpp
+                ${UNITY_SRC}/QuicklistMenuItem.h
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.cpp
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.h
+                ${UNITY_SRC}/QuicklistMenuItemLabel.cpp
+                ${UNITY_SRC}/QuicklistMenuItemLabel.h
+                ${UNITY_SRC}/QuicklistMenuItemRadio.cpp
+                ${UNITY_SRC}/QuicklistMenuItemRadio.h
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.cpp
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.h
+                ${UNITY_SRC}/QuicklistView.cpp
+                ${UNITY_SRC}/QuicklistView.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies (test-quicklist unity-core-${UNITY_API_VERSION})
+
+add_executable (test-quicklist-visuals
+                ui/TestQuicklistVisuals.cpp
+                ui/EventFaker.cpp
+                ui/EventFaker.h
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/Introspectable.h
+                ${UNITY_SRC}/QuicklistMenuItem.cpp
+                ${UNITY_SRC}/QuicklistMenuItem.h
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.cpp
+                ${UNITY_SRC}/QuicklistMenuItemCheckmark.h
+                ${UNITY_SRC}/QuicklistMenuItemLabel.cpp
+                ${UNITY_SRC}/QuicklistMenuItemLabel.h
+                ${UNITY_SRC}/QuicklistMenuItemRadio.cpp
+                ${UNITY_SRC}/QuicklistMenuItemRadio.h
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.cpp
+                ${UNITY_SRC}/QuicklistMenuItemSeparator.h
+                ${UNITY_SRC}/QuicklistView.cpp
+                ${UNITY_SRC}/QuicklistView.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies (test-quicklist-visuals unity-core-${UNITY_API_VERSION})
+
+add_executable (test-filters
+                TestFilters.cpp
+                ${UNITY_SRC}/FilterExpanderLabel.cpp
+                ${UNITY_SRC}/FilterBasicButton.cpp
+                ${UNITY_SRC}/FilterRatingsButton.cpp
+                ${UNITY_SRC}/FilterRatingsWidget.cpp
+                ${UNITY_SRC}/FilterGenreButton.cpp
+                ${UNITY_SRC}/FilterGenreWidget.cpp
+                ${UNITY_SRC}/FilterMultiRangeButton.cpp
+                ${UNITY_SRC}/FilterMultiRangeWidget.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/PlacesStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.h
+                )
+add_dependencies(test-filters unity-core-${UNITY_API_VERSION})
+
+add_executable (test-filter-bar
+                TestFilterBar.cpp
+                ${UNITY_SRC}/FilterExpanderLabel.cpp
+                ${UNITY_SRC}/FilterFactory.cpp
+                ${UNITY_SRC}/FilterBasicButton.cpp
+                ${UNITY_SRC}/FilterRatingsButton.cpp
+                ${UNITY_SRC}/FilterRatingsWidget.cpp
+                ${UNITY_SRC}/FilterMultiRangeWidget.cpp
+                ${UNITY_SRC}/FilterMultiRangeButton.cpp
+                ${UNITY_SRC}/FilterGenreButton.cpp
+                ${UNITY_SRC}/FilterGenreWidget.cpp
+                ${UNITY_SRC}/FilterBar.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/PlacesStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.h
+                )
+add_dependencies(test-filter-bar unity-core-${UNITY_API_VERSION})
+
+add_executable (test-preview-applicaiton
+                TestPreviewApplications.cpp
+                ${UNITY_SRC}/PreviewApplications.cpp
+                ${UNITY_SRC}/PreviewBase.cpp
+                ${UNITY_SRC}/PreviewBasicButton.cpp
+                ${UNITY_SRC}/IconTexture.cpp
+                ${UNITY_SRC}/IconLoader.cpp
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/TextureCache.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/Timer.cpp
+                )
+add_dependencies(test-preview-applicaiton unity-core-${UNITY_API_VERSION})
+
+add_executable (test-preview-generic
+                TestPreviewGeneric.cpp
+                ${UNITY_SRC}/PreviewGeneric.cpp
+                ${UNITY_SRC}/PreviewBase.cpp
+                ${UNITY_SRC}/PreviewBasicButton.cpp
+                ${UNITY_SRC}/IconTexture.cpp
+                ${UNITY_SRC}/IconLoader.cpp
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/TextureCache.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/Timer.cpp
+                )
+add_dependencies(test-preview-generic unity-core-${UNITY_API_VERSION})
+
+add_executable (test-preview-music
+                TestPreviewMusic.cpp
+                ${UNITY_SRC}/PreviewBase.cpp
+                ${UNITY_SRC}/PreviewBasicButton.cpp
+                ${UNITY_SRC}/PreviewMusic.cpp
+                ${UNITY_SRC}/PreviewMusicTrack.cpp
+                ${UNITY_SRC}/PreviewMusicTrackWidget.cpp
+                ${UNITY_SRC}/IconTexture.cpp
+                ${UNITY_SRC}/IconLoader.cpp
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/TextureCache.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/Timer.cpp
+                )
+add_dependencies(test-preview-music unity-core-${UNITY_API_VERSION})
+
+add_executable (test-result-view
+                TestResultView.cpp
+                ${UNITY_SRC}/PlacesStyle.cpp
+                ${UNITY_SRC}/PlacesStyle.h
+                ${UNITY_SRC}/PreviewApplications.cpp
+                ${UNITY_SRC}/PreviewBase.cpp
+                ${UNITY_SRC}/PreviewBasicButton.cpp
+                ${UNITY_SRC}/ResultView.cpp
+                ${UNITY_SRC}/ResultViewGrid.cpp
+                ${UNITY_SRC}/ResultRenderer.cpp
+                ${UNITY_SRC}/ResultRendererTile.cpp
+                ${UNITY_SRC}/ResultRendererHorizontalTile.cpp
+                ${UNITY_SRC}/IconTexture.cpp
+                ${UNITY_SRC}/IconLoader.cpp
+                ${UNITY_SRC}/Introspectable.cpp
+                ${UNITY_SRC}/StaticCairoText.cpp
+                ${UNITY_SRC}/TextureCache.cpp
+                ${UNITY_SRC}/Timer.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/JSONParser.cpp
+                ${UNITY_SRC}/UBusMessages.h
+                ${UNITY_SRC}/UBusWrapper.cpp
+                ${UNITY_SRC}/UBusWrapper.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+                )
+add_dependencies(test-result-view unity-core-${UNITY_API_VERSION})
+
+add_executable (test-dash-style
+                TestDashStyle.cpp
+                ${UNITY_SRC}/DashStyle.cpp
+                ${UNITY_SRC}/DashStyle.h
+                ${UNITY_SRC}/JSONParser.cpp
+                ${PLACES_COMMON_SOURCE}
+                )
+add_dependencies (test-dash-style unity-core-${UNITY_API_VERSION})
+
+add_executable (test-bg-hash
+                TestBGHash.cpp
+                ${UNITY_SRC}/BGHash.cpp
+                ${UNITY_SRC}/BGHash.h
+                ${UNITY_SRC}/ubus-server.cpp
+                ${UNITY_SRC}/ubus-server.h
+               )
+add_dependencies (test-bg-hash unity-core-${UNITY_API_VERSION})
+
+find_package (OpenGL)
+
+include_directories (${OPENGL_gl_INCDIRS})
+add_library (glfuncloader SHARED
+	     ${CMAKE_CURRENT_SOURCE_DIR}/GLFuncLoader.cpp)
+add_dependencies (glfuncloader unity-core-${UNITY_API_VERSION})
+target_link_libraries (glfuncloader dl ${OPENGL_gl_LIBRARY})
+add_executable (screen-effect-fbo
+		TestScreenEffectFramebufferObject.cpp
+		${UNITY_SRC}/ScreenEffectFramebufferObject.cpp
+		${UNITY_SRC}/BackgroundEffectHelper.cpp)
+
+target_link_libraries (screen-effect-fbo glfuncloader ${OPENGL_gl_LIBRARY})
+add_dependencies (screen-effect-fbo unity-core-${UNITY_API_VERSION})
+
+>>>>>>> MERGE-SOURCE
 add_subdirectory (test-input-remover)
 add_subdirectory (test-minimize-window-handler)
 add_subdirectory (test-get-transients)
@@ -188,6 +627,11 @@
                  test_lens.cpp
                  test_main_dbus.cpp
                  test_model.cpp
+<<<<<<< TREE
+=======
+                 test_texture_cache.cpp
+                 test_time_util.cpp
+>>>>>>> MERGE-SOURCE
                  test_utils.h
                  test_ratings_filter.cpp
                  test_results.cpp
 
=== added file 'tests/GLFuncLoader.cpp'
--- tests/GLFuncLoader.cpp	1970-01-01 00:00:00 +0000
+++ tests/GLFuncLoader.cpp	2013-01-18 15:43:30 +0000
@@ -0,0 +1,51 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/* Compiz unity plugin
+ * unity.h
+ *
+ * Copyright (c) 2010-11 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "GLFuncLoader.h"
+#include <dlfcn.h>
+
+unity::GLLoader::FuncPtr unity::GLLoader::getProcAddr(const std::string &name)
+{
+  static void *dlhand = NULL;
+  FuncPtr funcPtr = NULL;
+
+  glGetError ();
+
+  if (!funcPtr)
+  {
+    if (!dlhand)
+      dlhand = dlopen ("libglfuncloader.so", RTLD_LAZY);
+
+    char *error =  dlerror ();
+
+    if (dlhand)
+    {
+      dlerror ();
+      funcPtr = (FuncPtr) dlsym (dlhand, name.c_str ());
+
+      error = dlerror ();
+      if (error != NULL)
+        funcPtr = NULL;
+    }
+  }
+
+  return funcPtr;
+}
+
+
 
=== added file 'tests/GLFuncLoader.h'
--- tests/GLFuncLoader.h	1970-01-01 00:00:00 +0000
+++ tests/GLFuncLoader.h	2013-01-18 15:43:30 +0000
@@ -0,0 +1,33 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/* Compiz unity plugin
+ * unity.h
+ *
+ * Copyright (c) 2010-11 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include <string>
+#include <GL/gl.h>
+#include <GL/glx.h>
+
+namespace unity
+{
+namespace GLLoader
+{
+typedef void (*FuncPtr) (void);
+typedef FuncPtr (*GLXGetProcAddressProc) (const GLubyte *procName);
+
+FuncPtr getProcAddr(const std::string &name);
+}
+}
 
=== added file 'tests/TestScreenEffectFramebufferObject.cpp'
--- tests/TestScreenEffectFramebufferObject.cpp	1970-01-01 00:00:00 +0000
+++ tests/TestScreenEffectFramebufferObject.cpp	2013-01-18 15:43:30 +0000
@@ -0,0 +1,671 @@
+// -*- Mode: C++; indent-tabs-mode: nil; tab-width: 2 -*-
+/* Compiz unity plugin
+ * unity.h
+ *
+ * Copyright (c) 2010-11 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * 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.
+ *
+ * Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "ScreenEffectFramebufferObject.h"
+#include "BackgroundEffectHelper.h"
+#include "GLFuncLoader.h"
+#include <Nux/Nux.h>
+#include <Nux/VLayout.h>
+#include <Nux/View.h>
+#include <Nux/BaseWindow.h>
+#include <Nux/WindowCompositor.h>
+#include <NuxCore/Logger.h>
+#include <NuxCore/Object.h>
+#include <X11/Xlib.h>
+#include <X11/Xutil.h>
+#include <GL/glx.h>
+#include <GL/gl.h>
+#include <dlfcn.h>
+#include <sys/poll.h>
+#include <unistd.h>
+#include <glib.h>
+#include <gtk/gtk.h>
+#include <cmath>
+
+using namespace unity::GLLoader;
+
+namespace
+{
+  nux::logging::Logger logger ("unity.test-screeneffectframebufferobject");
+
+  const static int attributes[] = { GLX_RENDER_TYPE, GLX_RGBA_BIT,
+                                    GLX_X_RENDERABLE, True,
+                                    GLX_DRAWABLE_TYPE, GLX_WINDOW_BIT,
+                                    GLX_DOUBLEBUFFER, True,
+                                    GLX_RED_SIZE, 8,
+                                    GLX_GREEN_SIZE, 8,
+                                    GLX_BLUE_SIZE, 8, 0};
+}
+
+namespace GLFuncs
+{
+  GLXGetProcAddressProc           glXGetProcAddressP;
+  PFNGLXCHOOSEFBCONFIGPROC        glXChooseFBConfigP;
+  PFNGLXGETVISUALFROMFBCONFIGPROC glXGetVisualFromFBConfigP;
+  PFNGLXCREATEWINDOWPROC          glXCreateWindowP;
+  PFNGLXDESTROYWINDOWPROC         glXDestroyWindowP;
+  PFNGLXMAKECONTEXTCURRENTPROC    glXMakeContextCurrentP;
+
+  void init ()
+  {
+    glXGetProcAddressP = (GLXGetProcAddressProc) getProcAddr ("glXGetProcAddress");
+    glXChooseFBConfigP = (PFNGLXCHOOSEFBCONFIGPROC) (*glXGetProcAddressP) ((const GLubyte *) "glXChooseFBConfig");
+    glXGetVisualFromFBConfigP = (PFNGLXGETVISUALFROMFBCONFIGPROC) (*glXGetProcAddressP) ((const GLubyte *) "glXGetVisualFromFBConfig");
+    glXCreateWindowP = (PFNGLXCREATEWINDOWPROC) (*glXGetProcAddressP) ((const GLubyte *) "glXCreateWindow");
+    glXMakeContextCurrentP = (PFNGLXMAKECONTEXTCURRENTPROC) (*glXGetProcAddressP) ((const GLubyte *) "glXMakeContextCurrent");
+    glXDestroyWindowP      = (PFNGLXDESTROYWINDOWPROC) (*glXGetProcAddressP) ((const GLubyte *) "glXDestroyWindow");
+  }
+}
+
+class EffectView :
+  public nux::View
+{
+public:
+  EffectView (NUX_FILE_LINE_PROTO);
+  virtual ~EffectView ();
+
+  void Draw (nux::GraphicsEngine &context, bool force) { return; };
+  void DrawContent(nux::GraphicsEngine& GfxContext, bool force_draw);
+private:
+  BackgroundEffectHelper bg_effect_helper_;
+};
+
+class Shape
+{
+  public:
+
+    typedef boost::shared_ptr <Shape> Ptr;
+
+    Shape ();
+    virtual ~Shape ();
+
+    float rotation () { return mRotation; }
+
+    void draw (unsigned int width, unsigned int height) { glDraw (width, height); }
+    void rotate () { applyRotation (); }
+
+  protected:
+
+    float mRotation;
+
+    virtual void glDraw (unsigned int width, unsigned int height) = 0;
+    virtual void applyRotation () = 0;
+    virtual void getRotationAxes (float &x, float &y, float &z) = 0;
+};
+
+Shape::Shape () :
+ mRotation (0.0f)
+{
+}
+
+Shape::~Shape ()
+{
+}
+
+class Triangle :
+  public Shape
+{
+  public:
+
+    typedef boost::shared_ptr <Triangle> Ptr;
+
+  protected:
+
+    void glDraw (unsigned int width, unsigned int height);
+    void applyRotation () { mRotation += 5.0f; }
+    void getRotationAxes (float &x, float &y, float &z) { x = 0.0f; y = 1.0f; z = 0.0f; }
+};
+
+void
+Triangle::glDraw (unsigned int width, unsigned int height)
+{
+  glBegin(GL_TRIANGLES);
+      glColor3f(1.0f, 0.0f, 0.0f);
+      glVertex3f(width / 4, height, 0.0f);
+      glColor3f(0.0f, 1.0f, 0.0f);
+      glVertex3f(0.0f, 0.0f, 0.0f);
+      glColor3f(0.0f, 0.0f, 1.0f);
+      glVertex3f(width / 2, 0.0f, 0.0f);
+  glEnd();
+}
+
+class Square :
+  public Shape
+{
+  public:
+
+    typedef boost::shared_ptr <Square> Ptr;
+
+  protected:
+
+    void glDraw (unsigned int width, unsigned int height);
+    void applyRotation () { mRotation -= 2.5f; }
+    void getRotationAxes (float &x, float &y, float &z) { x = 1.0f; y = 0.0f; z = 0.0f; }
+    
+};
+
+void
+Square::glDraw (unsigned int width, unsigned int height)
+{
+  glBegin(GL_QUADS);
+    glColor3f(sin (rotation () / 100.0f), -sin (rotation () / 100.0f), cos (rotation () / 100.0f));
+    glVertex3f(width / 2, height, 0.0f);
+    glColor3f(-sin (rotation () / 100.0f), sin (rotation () / 100.0f), cos (rotation () / 100.0f));
+    glVertex3f(width, height, 0.0f);
+    glColor3f(sin (rotation () / 100.0f), sin (rotation () / 100.0f), sin (rotation () / 100.0f));
+    glVertex3f(width, 0.0f, 0.0f);
+    glColor3f(-sin (rotation () / 100.0f), cos (rotation () / 100.0f), cos (rotation () / 100.0f));
+    glVertex3f(width / 2, 0.0f, 0.0f);
+  glEnd();
+}
+
+class BaseContext
+{
+  public:
+
+    BaseContext (Display *);
+    ~BaseContext ();
+
+    void run ();
+
+  protected:
+
+    bool eventHandler ();
+    bool paintDispatch ();
+
+    enum class ModifierApplication
+    {
+      Square,
+      Triangle,
+      Both
+    };
+
+    void nextWindowPosition ();
+    void nextShapeRotation ();
+    void setupContextForSize (unsigned int width,
+                              unsigned int height);
+    void drawShape (const Shape::Ptr &) {};
+
+  private:
+
+    static gboolean onNewEvents (GIOChannel   *channel,
+                                 GIOCondition condition,
+                                 gpointer     data);
+
+    static gboolean onPaintTimeout (gpointer data);
+
+    static void onWindowThreadCreation (nux::NThread *thread, void *d);
+
+    Display                                   *mDisplay;
+    Window                                    mWindow;
+    Colormap                                  mColormap;
+    nux::WindowThread                         *mWindowThread;
+    nux::View                                 *mRootView;
+    ScreenEffectFramebufferObject::Ptr mFbo;
+    GLXWindow                                 mGlxWindow;
+    GLXContext                                mContext;
+    ModifierApplication                       mRotating;
+    ModifierApplication                       mBlur;
+    unsigned int                              mWidth;
+    unsigned int                              mHeight;
+    bool                                      mNuxReady;
+    Shape::Ptr                                mTriangle;
+    Shape::Ptr                                mSquare;
+};
+
+BaseContext::BaseContext (Display *display) :
+  mDisplay (display),
+  mWindowThread (NULL),
+  mRotating (ModifierApplication::Both),
+  mBlur (ModifierApplication::Both),
+  mWidth (640),
+  mHeight (480),
+  mNuxReady (false),
+  mTriangle  (new Triangle ()),
+  mSquare (new Square ())
+{
+  int            numFBConfig = 0;  
+  GLXFBConfig    *fbConfigs = (*GLFuncs::glXChooseFBConfigP) (mDisplay,
+                                                              DefaultScreen (mDisplay),
+                                                              attributes,
+                                                              &numFBConfig);
+  XVisualInfo    *visinfo = (*GLFuncs::glXGetVisualFromFBConfigP) (mDisplay,
+                                                                   fbConfigs[0]);
+
+  mContext = glXCreateContext (mDisplay, visinfo, 0, GL_TRUE);
+  mColormap = XCreateColormap (mDisplay,
+                               DefaultRootWindow (mDisplay),
+                               visinfo->visual,
+                               AllocNone);
+
+  XSetWindowAttributes wa;
+
+  wa.colormap = mColormap;
+  wa.border_pixel = 0;
+  wa.event_mask = StructureNotifyMask | KeyPressMask | ExposureMask;
+
+  mWindow = XCreateWindow (mDisplay, DefaultRootWindow (mDisplay),
+                           0, 0, mWidth, mHeight, 0, visinfo->depth, InputOutput,
+                           visinfo->visual, CWColormap | CWEventMask | CWBorderPixel,
+                           &wa);
+
+  mGlxWindow = (*GLFuncs::glXCreateWindowP) (mDisplay, fbConfigs[0], mWindow, NULL);
+
+  XStoreName (mDisplay, mWindow, "F1: Toggle Effect, F2: Rotation, F3: Effect");
+  XMapWindow (mDisplay, mWindow);
+
+  bool ready = false;
+
+  do
+  {
+    XEvent ev;
+    XNextEvent (mDisplay, &ev);
+    switch (ev.type)
+    {
+      case MapNotify:
+      case ConfigureNotify:
+      case Expose:
+        ready = true;
+        break;
+      default:
+        break;
+    }
+
+  } while (!ready);
+
+  (*GLFuncs::glXMakeContextCurrentP) (mDisplay, mGlxWindow, mGlxWindow, mContext);
+
+  setupContextForSize (mWidth, mHeight);
+}
+
+void
+BaseContext::run ()
+{
+  GIOChannel        *channel;
+  mWindowThread = nux::CreateFromForeignWindow (mWindow,
+                                                mContext,
+                                                &BaseContext::onWindowThreadCreation,
+                                                (void *) this);
+
+  mWindowThread->Run(NULL);
+
+  while (!mNuxReady);
+  g_timeout_add (128, &BaseContext::onPaintTimeout, (gpointer) this);
+
+  channel = g_io_channel_unix_new (ConnectionNumber (mDisplay));
+
+  g_io_add_watch (channel, (GIOCondition) (G_IO_IN | G_IO_HUP | G_IO_ERR),
+                  &BaseContext::onNewEvents, (gpointer) this);
+  gtk_main ();
+}
+
+BaseContext::~BaseContext ()
+{
+  delete mWindowThread;
+
+  (*GLFuncs::glXMakeContextCurrentP) (mDisplay, None, None, mContext);
+  glXDestroyContext (mDisplay, mContext);
+  (*GLFuncs::glXDestroyWindowP) (mDisplay, mGlxWindow);
+
+  XFreeColormap (mDisplay, mColormap);
+  XDestroyWindow (mDisplay, mWindow);
+}
+
+void
+BaseContext::setupContextForSize (unsigned int width,
+                                  unsigned int height)
+{
+  mWidth = width;
+  mHeight = height;
+
+  glViewport(0, 0, width, height);
+  glDrawBuffer (GL_BACK);
+  glReadBuffer (GL_BACK);
+  glMatrixMode(GL_PROJECTION);
+  glLoadIdentity();
+  gluPerspective(60.0f, 1.0f, 0.1f, 100.0f);
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity ();
+  glClearColor (1, 1, 1, 1);
+  glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glXSwapBuffers (mDisplay, mGlxWindow);
+
+  if (mFbo)
+    mFbo.reset (new ScreenEffectFramebufferObject (GLFuncs::glXGetProcAddressP, nux::Geometry (0, 0, mWidth, mHeight)));
+
+  if (mRootView && mNuxReady)
+  {
+    switch (mBlur)
+    {
+      case ModifierApplication::Both:
+        mRootView->SetGeometry (nux::Geometry (0, 0, mWidth / 2, mHeight));
+        break;
+      case ModifierApplication::Triangle:
+        mRootView->SetGeometry (nux::Geometry (mWidth / 2, 0, mWidth / 2, mHeight));
+        break;
+      case ModifierApplication::Square:
+        mRootView->SetGeometry (nux::Geometry (0, 0, mWidth, mHeight));
+        break;
+      default:
+        break;
+    }
+  }
+}
+
+bool
+BaseContext::eventHandler ()
+{
+  XEvent event;
+  XEvent *ev = &event;
+
+  XNextEvent (mDisplay, &event);
+
+  switch (ev->type)
+  {
+    case KeyPress:
+      if (XLookupKeysym (&ev->xkey, 0) == XK_Escape)
+        return false;
+      else if (XLookupKeysym (&ev->xkey, 0) == XK_F1)
+      {
+        if (!mFbo)
+        {
+          BackgroundEffectHelper::blur_type = unity::BLUR_ACTIVE;
+          mFbo.reset (new ScreenEffectFramebufferObject (GLFuncs::glXGetProcAddressP, nux::Geometry (0, 0, mWidth, mHeight)));
+        }
+        else
+        {
+          BackgroundEffectHelper::blur_type = unity::BLUR_NONE;
+          mFbo.reset ();
+        }
+      }
+      else if (XLookupKeysym (&ev->xkey, 0) == XK_F2)
+        nextShapeRotation ();
+      else if (XLookupKeysym (&ev->xkey, 0) == XK_F3)
+        nextWindowPosition ();
+      break;
+    case ConfigureNotify:
+      setupContextForSize (ev->xconfigure.width, ev->xconfigure.height);
+    default:
+      break;
+  }
+
+  return true;
+}
+
+gboolean
+BaseContext::onNewEvents (GIOChannel   *channel,
+                          GIOCondition condition,
+                          gpointer     data)
+{
+  BaseContext *self = static_cast <BaseContext *> (data);
+
+  if (condition & G_IO_IN)
+  {
+    if (self->eventHandler ())
+      return TRUE;
+    else
+      return FALSE;
+  }
+
+  return TRUE;
+}
+
+gboolean
+BaseContext::onPaintTimeout (gpointer data)
+{
+  BaseContext *self = static_cast <BaseContext *> (data);
+
+  if (self->paintDispatch ())
+    return TRUE;
+
+  return FALSE;
+}
+
+void
+BaseContext::nextShapeRotation ()
+{
+  switch (mRotating)
+  {
+    case ModifierApplication::Both:
+      mRotating = ModifierApplication::Triangle;
+      break;
+    case ModifierApplication::Triangle:
+      mRotating = ModifierApplication::Square;
+      break;
+    case ModifierApplication::Square:
+      mRotating = ModifierApplication::Both;
+      break;
+    default:
+      break;
+  }
+}
+
+void
+BaseContext::nextWindowPosition ()
+{
+  switch (mBlur)
+  {
+    case ModifierApplication::Both:
+      mBlur = ModifierApplication::Triangle;
+      mRootView->SetGeometry (nux::Geometry (0, 0, mWidth / 2, mHeight));
+      break;
+    case ModifierApplication::Triangle:
+      mBlur = ModifierApplication::Square;
+      mRootView->SetGeometry (nux::Geometry (mWidth / 2, 0, mWidth / 2, mHeight));
+      break;
+    case ModifierApplication::Square:
+      mBlur = ModifierApplication::Both;
+      mRootView->SetGeometry (nux::Geometry (0, 0, mWidth, mHeight));
+      break;
+    default:
+      break;
+  }
+}
+
+EffectView::EffectView (NUX_FILE_LINE_DECL)
+  : View (NUX_FILE_LINE_PARAM)
+{
+  bg_effect_helper_.owner = this;
+}
+
+EffectView::~EffectView ()
+{
+}
+
+void EffectView::DrawContent (nux::GraphicsEngine &GfxContext, bool force_draw)
+{
+  nux::Geometry base = GetGeometry();
+  GfxContext.PushClippingRectangle(base);
+  nux::Geometry blur_geo (base.x, base.y, base.width, base.height);
+
+  if (BackgroundEffectHelper::blur_type == unity::BLUR_ACTIVE)
+  {
+    bg_effect_helper_.enabled = true;
+
+    auto blur_texture = bg_effect_helper_.GetBlurRegion(blur_geo);
+
+    if (blur_texture.IsValid ())
+    {
+      nux::TexCoordXForm texxform_blur_bg;
+      texxform_blur_bg.flip_v_coord = true;
+      texxform_blur_bg.SetTexCoordType(nux::TexCoordXForm::OFFSET_COORD);
+      texxform_blur_bg.uoffset = ((float) base.x) / (base.width);
+      texxform_blur_bg.voffset = ((float) base.y) / (base.height);
+
+      nux::ROPConfig rop;
+      rop.Blend = false;
+      rop.SrcBlend = GL_ONE;
+      rop.DstBlend = GL_ONE_MINUS_SRC_ALPHA;
+
+      gPainter.PushDrawTextureLayer(GfxContext, base,
+                                    blur_texture,
+                                    texxform_blur_bg,
+                                    nux::color::White,
+                                    true,
+                                    rop);
+    }
+  }
+  else
+    bg_effect_helper_.enabled = false;
+  GfxContext.PopClippingRectangle();
+}
+
+bool
+BaseContext::paintDispatch ()
+{
+  if (mFbo)
+  {
+    switch (mRotating)
+    {
+      case ModifierApplication::Both:
+        BackgroundEffectHelper::ProcessDamage (nux::Geometry (0, 0, mWidth, mHeight));
+        break;
+      case ModifierApplication::Triangle:
+        BackgroundEffectHelper::ProcessDamage (nux::Geometry (0, 0, mWidth / 2, mHeight));
+        break;
+      case ModifierApplication::Square:
+        BackgroundEffectHelper::ProcessDamage (nux::Geometry (mWidth / 2, 0, mWidth / 2, mHeight));
+        break;
+    }
+
+    mFbo->bind (nux::Geometry (0, 0, mWidth, mHeight));
+
+    if (!mFbo->status ())
+    {
+      LOG_INFO (logger) << "FBO not ok!";
+    }
+  }
+
+  glClearColor (1, 1, 1, 1);
+  glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+  glPushMatrix ();
+  glLoadIdentity();
+  glTranslatef(-0.5f, -0.5f, -0.866025404f);
+  glScalef (1.0f / mWidth, 1.0f / mHeight, 0.0f);
+  glTranslatef(mWidth * 0.25, 0, 0);
+  glRotatef(mTriangle->rotation (), 0.0f, 1.0f, 0.0f);
+  glTranslatef(-(mWidth * 0.25), 0, 0);
+
+  mTriangle->draw (mWidth, mHeight);
+
+  glLoadIdentity();
+  glTranslatef(-0.5f, -0.5f, -0.866025404f);
+  glScalef (1.0f / mWidth, 1.0f / mHeight, 0.0f);
+  glTranslatef(mWidth * 0.75, 0, 0);
+  glRotatef(mSquare->rotation (), 0.0f, 1.0f, 0.0f);
+  glTranslatef(-(mWidth * 0.75), 0, 0);
+
+  mSquare->draw (mWidth, mHeight);
+
+  glColor4f (1.0f, 1.0f, 1.0f, 5.0f);
+  glPopMatrix ();
+
+  if (mFbo)
+    mFbo->unbind ();
+
+  if (mFbo && mFbo->status ())
+  {
+    glClearColor (1, 1, 1, 1);
+    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+    glPushMatrix ();
+    glLoadIdentity();
+    glTranslatef(-0.5f, 0.5f, -0.866025404f);
+    glScalef (1.0f / mWidth, -(1.0f / mHeight), 0.0f);
+    mFbo->paint (nux::Geometry (0, 0, mWidth, mHeight));
+    glPopMatrix ();
+
+    nux::ObjectPtr<nux::IOpenGLTexture2D> device_texture =
+        nux::GetGraphicsDisplay()->GetGpuDevice()->CreateTexture2DFromID (mFbo->texture(),
+                                                                          mWidth, mHeight, 1, nux::BITFMT_R8G8B8A8);
+
+    nux::GetGraphicsDisplay()->GetGpuDevice()->backup_texture0_ = device_texture;
+
+    nux::Geometry geo = nux::Geometry (0, 0, mWidth, mHeight);
+    BackgroundEffectHelper::monitor_rect_ = geo;
+  }
+
+  glMatrixMode(GL_PROJECTION);
+  glPushMatrix();
+
+  glMatrixMode(GL_MODELVIEW);
+  glPushMatrix();
+  glPushAttrib(GL_VIEWPORT_BIT | GL_ENABLE_BIT |
+               GL_TEXTURE_BIT | GL_COLOR_BUFFER_BIT | GL_SCISSOR_BIT);
+  mRootView->ProcessDraw (mWindowThread->GetGraphicsEngine (), true);
+  glMatrixMode(GL_PROJECTION);
+  glPopMatrix();
+  glMatrixMode(GL_MODELVIEW);
+  glPopMatrix();
+
+  glDrawBuffer(GL_BACK);
+  glReadBuffer(GL_BACK);
+
+  glPopAttrib();
+
+  glXSwapBuffers (mDisplay, mGlxWindow);
+
+  switch (mRotating)
+  {
+    case ModifierApplication::Both:
+      mTriangle->rotate ();
+      mSquare->rotate ();
+      break;
+    case ModifierApplication::Triangle:
+      mTriangle->rotate ();
+      break;
+    case ModifierApplication::Square:
+      mSquare->rotate ();
+      break;
+  }
+
+  return true;
+}
+
+void
+BaseContext::onWindowThreadCreation (nux::NThread *thread, void *data)
+{
+  BaseContext *bc = static_cast <BaseContext *> (data);
+
+  bc->mRootView = new EffectView ();
+  bc->mRootView->SetGeometry (nux::Geometry (0, 0, 640, 480));
+  bc->mNuxReady = true;
+  BackgroundEffectHelper::blur_type = unity::BLUR_ACTIVE;
+}
+
+int main (int argc, char **argv)
+{
+  Display *display = XOpenDisplay (NULL);
+  nux::NuxInitialize (0);
+  GLFuncs::init ();
+	g_type_init ();
+  g_thread_init (NULL);
+  gtk_init(&argc, &argv);
+
+  BaseContext *bc = new BaseContext (display);
+
+  bc->run ();
+
+  delete bc;
+
+  XCloseDisplay (display);
+
+  return 0;
+}
+
+
 
=== modified file 'tests/test-get-transients/CMakeLists.txt'
--- tests/test-get-transients/CMakeLists.txt	2011-10-26 16:17:24 +0000
+++ tests/test-get-transients/CMakeLists.txt	2013-01-18 15:43:30 +0000
@@ -20,5 +20,6 @@
         add_dependencies (test-get-transients unity-core-${UNITY_API_VERSION})
 	target_link_libraries (test-get-transients
 			       ${COMPIZ_TEST_GET_TRANSIENTS_LIBRARIES})
+	add_dependencies (test-get-transients unity-core-${UNITY_API_VERSION})
 
 endif (COMPIZ_TEST_GET_TRANSIENTS_FOUND)
 
=== modified file 'tests/test-input-remover/CMakeLists.txt'
--- tests/test-input-remover/CMakeLists.txt	2011-10-26 16:17:24 +0000
+++ tests/test-input-remover/CMakeLists.txt	2013-01-18 15:43:30 +0000
@@ -16,5 +16,6 @@
         add_dependencies (test-input-remover unity-core-${UNITY_API_VERSION})
 	target_link_libraries (test-input-remover
 			       ${COMPIZ_TEST_INPUT_REMOVER_LIBRARIES})
+	add_dependencies (test-input-remover unity-core-${UNITY_API_VERSION})
 
 endif (COMPIZ_TEST_INPUT_REMOVER_FOUND)
 
=== modified file 'tests/test-minimize-window-handler/CMakeLists.txt'
--- tests/test-minimize-window-handler/CMakeLists.txt	2011-10-26 16:17:24 +0000
+++ tests/test-minimize-window-handler/CMakeLists.txt	2013-01-18 15:43:30 +0000
@@ -21,5 +21,6 @@
         add_dependencies (test-minimize-handler unity-core-${UNITY_API_VERSION})
 	target_link_libraries (test-minimize-handler
 			       ${COMPIZ_TEST_MINIMIZED_HANDER_LIBRARIES})
+	add_dependencies (test-minimize-handler unity-core-${UNITY_API_VERSION})
 
 endif (COMPIZ_TEST_MINIMIZED_HANDER_FOUND)
 
=== added file 'tests/test_time_util.cpp'
--- tests/test_time_util.cpp	1970-01-01 00:00:00 +0000
+++ tests/test_time_util.cpp	2013-01-18 15:43:30 +0000
@@ -0,0 +1,37 @@
+// -*- 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: Brandon Schaefer <[e-mail]>
+*
+*/
+
+
+#include <cinttypes>
+#include <gtest/gtest.h>
+#include "TimeUtil.h"
+
+using namespace testing;
+
+TEST(TestTimeUtil, Testin32BufferOverflow)
+{
+  struct timespec start, end;
+  unity::TimeUtil::SetTimeStruct(&start);
+  unity::TimeUtil::SetTimeStruct(&end);
+
+  end.tv_sec = start.tv_sec + INT32_MAX;
+
+  EXPECT_GT(unity::TimeUtil::TimeDelta(&end, &start), 0);
+}