Merge lp:~compiz-team/compiz-core/compiz-core.fix_883102 into lp:compiz-core/0.9.5

[Sam Spilsbury]

Fix bug 883102

    Move to a test-driven-development type buildsystem which allows for
    modules to be build interternally and statically linked to plugins and to
    testcases.

    Use compiz_module to add a new module, with the following directory structure:

    module/
     src/
     include/
     tests/
     CMakeLists.txt

    Use compiz_test_base to add a library for all tests for that module to
    link to, and add each test in a separate subdirectory in tests/

    Use compiz_test to add a new test in a name subdirectory for a module and
    prefix.

    prefix: plugin / core
    module: module of functionality
    test: test name

    Removed compiz.h and compiz-common.h . Use core/string.h core/timer.h
    core/logmessage.h core/screen.h for timeval diff functionality, CompString,
    compLogMessage and wraparound modulus.

    Added workaround for core xml file race condition

[lp:~compiz-team/compiz-core/compiz-core.fix_883102]

2892. By Sam Spilsbury on 2011-10-31

Removed useless file

2893. By Sam Spilsbury on 2011-11-01

Added compPrintf test

[Tim Penhey (thumper)]

I find the string test remarkably hard to follow. Have you considered using google-test and google-mock for the testing framework?

The CMake stuff is way over my understanding, and I can't comfortably review the code.

A +1 for removing compiz.h, but is this used in unity at all?

[Sam Spilsbury (smspillaz)]

On Wed, Nov 9, 2011 at 6:55 AM, Tim Penhey <email address hidden> wrote:
> I find the string test remarkably hard to follow.  Have you considered using google-test and google-mock for the testing framework?

Yeah, the string test could probably be reworked slightly. I am not
sure about using google-mock or google-test as I am not sure how
available they are on other distributions.

>
> The CMake stuff is way over my understanding, and I can't comfortably review the code.
>
> A +1 for removing compiz.h, but is this used in unity at all?

It is used by some compiz code, but was mostly just a random
assortment of #defines and typedefs that needed to die.

> --
> https://code.launchpad.net/~compiz-team/compiz-core/compiz-core.fix_883102/+merge/80803
> Your team Compiz Maintainers is requested to review the proposed merge of lp:~compiz-team/compiz-core/compiz-core.fix_883102 into lp:compiz-core.
>

--
Sam Spilsbury

[Tim Penhey (thumper)]

I don't feel confident about reviewing the CMake changes. We should get someone who knows cmake to look at it.

review: Abstain

[Jussi Pakkanen (jpakkane)]

The CMake functions seem to be duplicating a lot of stuff that CMake already does. For example there is a lot of code to build compiler flag prefixes which you really should not need to do. As an example is this line:

list (APPEND ${_prefix}_LIBRARY_LDFLAGS -l${_library})

It seems (not having read all of the build system code thoroughly) that these are then added to a target with set_target_properties. You really should not need to do this. Simply do target_link_libraries(foo library_of_bar). It's the same, but portable and consistency checked by CMake.

In the same vein, why are linker flags set with set_target_properties and not target_link_libraries? The arguments to the latter can be linker flags and they are handled appropriately by CMake. The same applies for include paths and other properties. Why have a function for include expansion (that basically just adds a "-I" to a list of strings) when all you would need to do is include_directories(${foobar})? These definitions do not propagate to parent directories so you can just set them in a test subdirectory and they remain isolated.

On this line the word "library" is misspelt:

list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LIBARY_FLAGS})

[Sam Spilsbury (smspillaz)]

> The CMake functions seem to be duplicating a lot of stuff that CMake already
> does. For example there is a lot of code to build compiler flag prefixes which
> you really should not need to do. As an example is this line:
>
> list (APPEND ${_prefix}_LIBRARY_LDFLAGS -l${_library})
>
> It seems (not having read all of the build system code thoroughly) that these
> are then added to a target with set_target_properties. You really should not
> need to do this. Simply do target_link_libraries(foo library_of_bar). It's the
> same, but portable and consistency checked by CMake.
>
> In the same vein, why are linker flags set with set_target_properties and not
> target_link_libraries? The arguments to the latter can be linker flags and
> they are handled appropriately by CMake. The same applies for include paths
> and other properties. Why have a function for include expansion (that
> basically just adds a "-I" to a list of strings) when all you would need to do
> is include_directories(${foobar})? These definitions do not propagate to
> parent directories so you can just set them in a test subdirectory and they
> remain isolated.

Yes, that is ugly.

The reason I did it that way was because CMake seems to have a preference for storing the include dirs and link libraries on a per-directory basis rather than a per-target basis. Or at least, I was hitting problems where I would end up with absurdly long linker lines because it was pulling in all the stuff from the directories before it.

I'll need to have another look at whether or not I was just hacking around some problem that I may have fixed later on.

>
> On this line the word "library" is misspelt:
>
> list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LIBARY_FLAGS})

ack.

[Thomas Voß (thomas-voss)]

+1 for Jussi's remarks.

Regarding Google Test: It is recommended in [*] that Google Test is distributed together with the respective project. It provides a simple CMake setup that allows for adding it in by means of add_subdirectory in compiz' CMake setup.

[*] http://code.google.com/p/googletest/wiki/V1_6_Primer#Setting_up_a_New_Test_Project

review: Needs Fixing

[Jussi Pakkanen (jpakkane)]

There's nothing wrong with keeping target definitions to a minimum. But you should still set them with the default commands.

You can control which settings propagate to subdirectories quite easily. If you have something like this:

add_definitions(-DTHING1)
add_subdirectory(foo)
add_definitions(-DTHING2)

add_executable(thing thing.c)

then only THING1 is defined in subdirectory foo and both THING1 and THING2 are defined for "thing" executable. Include directories and others work the same way.

And further, if you have multiple targets in one subdirectory that have massively different (and possibly conflicting) build requirements, it's a pretty strong indication that they should be moved further away from each other.

[Sam Spilsbury (smspillaz)]

On Mon, Nov 21, 2011 at 6:18 PM, Thomas Voß <email address hidden>wrote:

>
> Regarding Google Test: It is recommended in [*] that Google Test is
> distributed together with the respective project. It provides a simple
> CMake setup that allows for adding it in by means of add_subdirectory in
> compiz' CMake setup.
>
> [*]
> http://code.google.com/p/googletest/wiki/V1_6_Primer#Setting_up_a_New_Test_Project
>
>
Hmmmm, this seems all kinds of wrong, it shouldn't be necessary to
statically link it in.

> --
>
> https://code.launchpad.net/~compiz-team/compiz-core/compiz-core.fix_883102/+merge/80803<https://code.launchpad.net/%7Ecompiz-team/compiz-core/compiz-core.fix_883102/+merge/80803>
> Your team Compiz Maintainers is requested to review the proposed merge of
> lp:~compiz-team/compiz-core/compiz-core.fix_883102 into lp:compiz-core.
>

--
Sam Spilsbury

[Thomas Voß (thomas-voss)]

> On Mon, Nov 21, 2011 at 6:18 PM, Thomas Voß <email address hidden>wrote:
>
> >
> > Regarding Google Test: It is recommended in [*] that Google Test is
> > distributed together with the respective project. It provides a simple
> > CMake setup that allows for adding it in by means of add_subdirectory in
> > compiz' CMake setup.
> >
> > [*]
> > http://code.google.com/p/googletest/wiki/V1_6_Primer#Setting_up_a_New_Test_P
> roject
> >
> >
> Hmmmm, this seems all kinds of wrong, it shouldn't be necessary to
> statically link it in.
>
>

Wouldn't do it by default. How about introducing a cmake option then?

  Thomas

> > --
> >
> > https://code.launchpad.net/~compiz-team/compiz-core/compiz-
> core.fix_883102/+merge/80803<https://code.launchpad.net/%7Ecompiz-team/compiz-
> core/compiz-core.fix_883102/+merge/80803>
> > Your team Compiz Maintainers is requested to review the proposed merge of
> > lp:~compiz-team/compiz-core/compiz-core.fix_883102 into lp:compiz-core.
> >
>
>
>
> --
> Sam Spilsbury

Unmerged revisions

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-09-09 09:54:02 +0000
+++ CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -82,16 +82,6 @@
 compiz_configure_file (${compiz_SOURCE_DIR}/config.h.core.in ${compiz_BINARY_DIR}/generated/config.h)
 
 compiz_configure_file (
-    ${CMAKE_SOURCE_DIR}/include/compiz-common.h.in
-    ${CMAKE_BINARY_DIR}/generated/compiz-common.h
-)
-
-install (
-    FILES ${CMAKE_BINARY_DIR}/generated/compiz-common.h
-    DESTINATION ${COMPIZ_DESTDIR}${includedir}/compiz
-)
-
-compiz_configure_file (
     ${CMAKE_SOURCE_DIR}/compiz.pc.in
     ${CMAKE_BINARY_DIR}/compiz.pc
     COMPIZ_REQUIRES
@@ -115,10 +105,6 @@
 add_subdirectory (xslt)
 add_subdirectory (plugins)
 
-if (BUILD_TESTING)
-	add_subdirectory (tests)
-endif (BUILD_TESTING)
-
 compiz_ensure_linkage ()
 compiz_package_generation ("Compiz")
 compiz_add_uninstall ()

=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2011-09-19 13:00:51 +0000
+++ cmake/CompizCommon.cmake	2011-11-01 23:21:23 +0000
@@ -489,6 +489,380 @@
     endif ()
 endfunction ()
 
+#### modules / tests
+macro (_get_parameters _prefix)
+    set (_current_var _foo)
+    set (_supported_var PKGDEPS PLUGINDEPS MODULES LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS DEFSADD)
+    foreach (_val ${_supported_var})
+	set (${_prefix}_${_val})
+    endforeach (_val)
+    foreach (_val ${ARGN})
+	set (_found FALSE)
+	foreach (_find ${_supported_var})
+	    if ("${_find}" STREQUAL "${_val}")
+		set (_found TRUE)
+	    endif ("${_find}" STREQUAL "${_val}")
+	endforeach (_find)
+
+	if (_found)
+	    set (_current_var ${_prefix}_${_val})
+	else (_found)
+	    list (APPEND ${_current_var} ${_val})
+	endif (_found)
+    endforeach (_val)
+endmacro (_get_parameters)
+
+macro (_check_pkg_deps _prefix)
+    set (${_prefix}_HAS_PKG_DEPS TRUE)
+    foreach (_val ${ARGN})
+        string (REGEX REPLACE "[<>=\\.]" "_" _name ${_val})
+	string (TOUPPER ${_name} _name)
+
+	compiz_pkg_check_modules (_${_name} ${_val})
+
+	if (_${_name}_FOUND)
+	    list (APPEND ${_prefix}_PKG_LIBDIRS "${_${_name}_LIBRARY_DIRS}")
+	    list (APPEND ${_prefix}_PKG_LIBRARIES "${_${_name}_LIBRARIES}")
+	    list (APPEND ${_prefix}_PKG_INCDIRS "${_${_name}_INCLUDE_DIRS}")
+	else (_${_name}_FOUND)
+	    set (${_prefix}_HAS_PKG_DEPS FALSE)
+	    compiz_set (${_prefix}_MISSING_DEPS "${${_prefix}_MISSING_DEPS} ${_val}")
+	    set(__pkg_config_checked__${_name} 0 CACHE INTERNAL "" FORCE)
+	endif (_${_name}_FOUND)
+    endforeach ()
+endmacro (_check_pkg_deps)
+
+macro (_build_include_flags _prefix)
+    foreach (_include ${ARGN})
+	if (NOT ${_prefix}_INCLUDE_CFLAGS)
+	    compiz_set (${_prefix}_INCLUDE_CFLAGS "" PARENT_SCOPE)
+	endif (NOT ${_prefix}_INCLUDE_CFLAGS)
+	list (APPEND ${_prefix}_INCLUDE_CFLAGS -I${_include})
+    endforeach (_include)
+endmacro (_build_include_flags)
+
+macro (_build_definitions_flags _prefix)
+    foreach (_def ${ARGN})
+	if (NOT ${_prefix}_DEFINITIONS_CFLAGS)
+	    compiz_set (${_prefix}_DEFINITIONS_CFLAGS "")
+	endif (NOT ${_prefix}_DEFINITIONS_CFLAGS)
+	list (APPEND ${_prefix}_DEFINITIONS_CFLAGS -D${_def})
+    endforeach (_def)
+endmacro (_build_definitions_flags)
+
+macro (_build_link_dir_flags _prefix)
+    foreach (_link_dir ${ARGN})
+	if (NOT ${_prefix}_LINK_DIR_LDFLAGS)
+	    compiz_set (${_prefix}_LINK_DIR_LDFLAGS "")
+	endif (NOT ${_prefix}_LINK_DIR_LDFLAGS)
+	list (APPEND ${_prefix}_LINK_DIR_LDFLAGS -L${_link_dir})
+    endforeach (_link_dir)
+endmacro (_build_link_dir_flags)
+
+macro (_build_library_flags _prefix)
+    foreach (_library ${ARGN})
+	if (NOT ${_prefix}_LIBRARY_LDFLAGS)
+	    compiz_set (${_prefix}_LIBRARY_LDFLAGS "")
+	endif (NOT ${_prefix}_LIBRARY_LDFLAGS)
+	list (APPEND ${_prefix}_LIBRARY_LDFLAGS -l${_library})
+    endforeach (_library)
+endmacro (_build_library_flags)
+
+function (_build_compiz_module _prefix _name _full_prefix)
+
+    if (${_full_prefix}_INCLUDE_DIRS)
+	_build_include_flags (${_full_prefix} ${${_full_prefix}_INCLUDE_DIRS})
+    endif (${_full_prefix}_INCLUDE_DIRS)
+    _build_include_flags (${_full_prefix} ${${_full_prefix}_SOURCE_DIR})
+    _build_include_flags (${_full_prefix} ${${_full_prefix}_INCLUDE_DIR})
+
+    if (${_full_prefix}_DEFSADD)
+	_build_definitions_flags (${_full_prefix} ${${_full_prefix}_DEFSADD})
+    endif (${_full_prefix}_DEFSADD)
+
+    if (${_full_prefix}_LIBRARY_DIRS)
+	_build_link_dir_flags (${_full_prefix} ${${_full_prefix}_LIBRARY_DIRS})
+    endif (${_full_prefix}_LIBRARY_DIRS)
+
+    if (${_full_prefix}_LIBRARIES)
+	_build_library_flags (${_full_prefix} ${${_full_prefix}_LIBRARIES})
+    endif (${_full_prefix}_LIBRARIES)			      
+
+    file (GLOB _cpp_files "${${_full_prefix}_SOURCE_DIR}/*.cpp")
+
+    add_library (${_prefix}_${_name}_internal STATIC ${_cpp_files})
+
+    target_link_libraries (${_prefix}_${_name}_internal
+			   ${${_full_prefix}_LIBRARIES} m pthread dl)
+
+    list (APPEND ${_full_prefix}_COMPILE_FLAGS ${${_full_prefix}_INCLUDE_CFLAGS})
+    list (APPEND ${_full_prefix}_COMPILE_FLAGS ${${_full_prefix}_DEFINITIONS_CFLAGS})
+    list (APPEND ${_full_prefix}_COMPILE_FLAGS ${${_full_prefix}_CFLAGSADD})
+
+    set (${_full_prefix}_COMPILE_FLAGS_STR " ")
+    foreach (_flag ${${_full_prefix}_COMPILE_FLAGS})
+	set (${_full_prefix}_COMPILE_FLAGS_STR "${_flag} ${${_full_prefix}_COMPILE_FLAGS_STR}")
+    endforeach (_flag)
+
+    list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LINK_LDFLAGS})
+    list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LDFLAGSADD})
+    list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LIBARY_FLAGS})
+
+    set (${_full_prefix}_LINK_FLAGS_STR " ")
+    foreach (_flag ${${_full_prefix}_LINK_FLAGS})
+	set (${_full_prefix}_LINK_FLAGS_STR "${_flag} ${${_full_prefix}_LINK_FLAGS_STR}")
+    endforeach (_flag)
+
+    set_target_properties (${_prefix}_${_name}_internal PROPERTIES
+			   COMPILE_FLAGS ${${_full_prefix}_COMPILE_FLAGS_STR}
+			   LINK_FLAGS ${${_full_prefix}_LINK_FLAGS_STR})
+
+    file (GLOB _h_files "${_full_prefix}_INCLUDE_DIR/*.h")
+
+    foreach (_file ${_h_files})
+
+	install (
+	    FILES ${_file}
+	    DESTINATION ${COMPIZ_DESTDIR}${includedir}/compiz/${_prefix}
+	)
+
+    endforeach (_file)
+
+endfunction (_build_compiz_module)
+
+macro (compiz_module _prefix _name)
+
+    string (TOUPPER ${_prefix} _PREFIX)
+    string (TOUPPER ${_name} _NAME)
+    set (_FULL_PREFIX ${_PREFIX}_${_NAME})
+
+    _get_parameters (${_FULL_PREFIX} ${ARGN})
+    _check_pkg_deps (${_FULL_PREFIX} ${${_FULL_PREFIX}_PKGDEPS})
+
+    if (${_FULL_PREFIX}_HAS_PKG_DEPS)
+
+	list (APPEND ${_FULL_PREFIX}_LIBRARIES ${${_FULL_PREFIX}_PKG_LIBRARIES})
+	list (APPEND ${_FULL_PREFIX}_INCLUDE_DIRS ${${_FULL_PREFIX}_INCDIRS})
+	list (APPEND ${_FULL_PREFIX}_INCLUDE_DIRS ${${_FULL_PREFIX}_PKG_INCDIRS})
+	list (APPEND ${_FULL_PREFIX}_LIBRARY_DIRS ${${_FULL_PREFIX}_LIBDIRS})
+	list (APPEND ${_FULL_PREFIX}_LIBRARY_DIRS ${${_FULL_PREFIX}_PKG_LIBDIRS})
+
+	# also add modules
+	foreach (_module ${${_FULL_PREFIX}_MODULES})
+	    string (TOUPPER ${_module} _MODULE)
+	    list (APPEND ${_FULL_PREFIX}_INCLUDE_DIRS ${${_MODULE}_INCLUDE_DIR})
+	    list (APPEND ${_FULL_PREFIX}_LIBRARY_DIRS ${${_MODULE}_BINARY_DIR})
+	    list (APPEND ${_FULL_PREFIX}_LIBRARIES ${_module}_internal)
+	endforeach (_module)
+
+	compiz_set (${_FULL_PREFIX}_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/${_name})
+	compiz_set (${_FULL_PREFIX}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${_name}/src)
+	compiz_set (${_FULL_PREFIX}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${_name}/include)
+	compiz_set (${_FULL_PREFIX}_TESTS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/${_name}tests)
+
+	# Need to abuse set_property here since set () with CACHE INTERNAL will save the 
+	# value to the cache which we will just read right back (but we need to regenerate that)
+	set_property (GLOBAL APPEND PROPERTY ${_PREFIX}_MOD_LIBRARY_DIRS ${${_FULL_PREFIX}_BINARY_DIR})
+	set_property (GLOBAL APPEND PROPERTY ${_PREFIX}_MOD_INCLUDE_DIRS ${${_FULL_PREFIX}_INCLUDE_DIR})
+	set_property (GLOBAL APPEND PROPERTY ${_PREFIX}_MOD_INCLUDE_DIRS ${${_FULL_PREFIX}_SOURCE_DIR})
+	set_property (GLOBAL APPEND PROPERTY ${_PREFIX}_MOD_LIBRARIES ${_prefix}_${_name}_internal)
+
+	_build_compiz_module (${_prefix} ${_name} ${_FULL_PREFIX})
+
+	add_subdirectory (${CMAKE_CURRENT_SOURCE_DIR}/${_name}/tests)
+
+    else (${_FULL_PREFIX}_HAS_PKG_DEPS)
+	message (STATUS "[WARNING] One or more dependencies for module ${_name} for ${_prefix} not found. Skipping module.")
+	message (STATUS "Missing dependencies :${${_FULL_PREFIX}_MISSING_DEPS}")
+	compiz_set (${_FULL_PREFIX}_BUILD FALSE)
+    endif (${_FULL_PREFIX}_HAS_PKG_DEPS)
+
+    
+endmacro (compiz_module)
+
+function (_build_compiz_test_base _prefix _module _full_prefix)
+
+    file (GLOB _cpp_files "${${_FULL_TEST_BASE_PREFIX}_SOURCE_DIR}/*.cpp")
+
+    if (${_full_prefix}_INCLUDE_DIRS)
+	_build_include_flags (${_full_prefix} ${${_full_prefix}_INCLUDE_DIRS})
+    endif (${_full_prefix}_INCLUDE_DIRS)
+    _build_include_flags (${_full_prefix} ${${_full_prefix}_SOURCE_DIR})
+    _build_include_flags (${_full_prefix} ${${_full_prefix}_INCLUDE_DIR})
+
+    if (${_full_prefix}_DEFSADD)
+	_build_definitions_flags (${_full_prefix} ${${_full_prefix}_DEFSADD})
+    endif (${_full_prefix}_DEFSADD)
+
+    if (${_full_prefix}_LIBRARY_DIRS)
+	_build_link_dir_flags (${_full_prefix} ${${_full_prefix}_LIBRARY_DIRS})
+    endif (${_full_prefix}_LIBRARY_DIRS)
+
+    if (${_full_prefix}_LIBRARIES)
+	_build_library_flags (${_full_prefix} ${${_full_prefix}_LIBRARIES})
+    endif (${_full_prefix}_LIBRARIES)
+
+    add_library (${_prefix}_${_module}_test_internal STATIC
+		 ${_cpp_files})
+
+    target_link_libraries (${_prefix}_${_module}_test_internal
+			   ${${_full_prefix}_LIBRARIES}
+			   ${_prefix}_${_module}_internal)
+
+
+    list (APPEND ${_full_prefix}_COMPILE_FLAGS ${${_full_prefix}_INCLUDE_CFLAGS})
+    list (APPEND ${_full_prefix}_COMPILE_FLAGS ${${_full_prefix}_DEFINITIONS_CFLAGS})
+    list (APPEND ${_full_prefix}_COMPILE_FLAGS ${${_full_prefix}_CFLAGSADD})
+
+    set (${_full_prefix}_COMPILE_FLAGS_STR "  ")
+    foreach (_flag ${${_full_prefix}_COMPILE_FLAGS})
+	set (${_full_prefix}_COMPILE_FLAGS_STR "${_flag} ${${_full_prefix}_COMPILE_FLAGS_STR}")
+    endforeach (_flag)
+
+    list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LINK_LDFLAGS})
+    list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LDFLAGSADD})
+    list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LIBARY_FLAGS})
+
+    set (${_full_prefix}_LINK_FLAGS_STR " ")
+    foreach (_flag ${${_full_prefix}_LINK_FLAGS})
+	set (${_full_prefix}_LINK_FLAGS_STR "${_flag} ${${_full_prefix}_LINK_FLAGS_STR}")
+    endforeach (_flag)
+
+    set_target_properties (${_prefix}_${_module}_test_internal PROPERTIES
+			   COMPILE_FLAGS "${${_full_prefix}_COMPILE_FLAGS_STR}"
+			   LINK_FLAGS "${${_full_prefix}_LINK_FLAGS_STR}")
+endfunction (_build_compiz_test_base)
+
+macro (compiz_test_base _prefix _module)
+
+    string (TOUPPER ${_prefix} _PREFIX)
+    string (TOUPPER ${_module} _MODULE)
+
+    set (_FULL_MODULE_PREFIX ${_PREFIX}_${_NAME})
+    set (_FULL_TEST_BASE_PREFIX ${_FULL_MODULE_PREFIX}_TEST_BASE)
+
+    _get_parameters (${_FULL_TEST_BASE_PREFIX} ${ARGN})
+    _check_pkg_deps (${_FULL_TEST_BASE_PREFIX} ${${_FULL_TEST_BASE_PREFIX}_PKGDEPS})
+
+    if (${_FULL_TEST_BASE_PREFIX}_HAS_PKG_DEPS)
+
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_LIBRARIES ${${_FULL_TEST_BASE_PREFIX}_PKG_LIBDIRS})
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_INCLUDE_DIRS ${${_FULL_TEST_BASE_PREFIX}_INCDIRS})
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_INCLUDE_DIRS ${${_FULL_TEST_BASE_PREFIX}_PKG_INCDIRS})
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_LIBRARY_DIRS ${${_FULL_TEST_BASE_PREFIX}_LIBDIRS})
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_LIBRARY_DIRS ${${_FULL_TEST_BASE_PREFIX}_PKG_LIBDIRS})
+
+	compiz_set (${_FULL_TEST_BASE_PREFIX}_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+	compiz_set (${_FULL_TEST_BASE_PREFIX}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+	compiz_set (${_FULL_TEST_BASE_PREFIX}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_INCLUDE_DIRS ${${_FULL_MODULE_PREFIX}_INCLUDE_DIRS})
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_INCLUDE_DIRS ${${_FULL_MODULE_PREFIX}_INCLUDE_DIR})
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_INCLUDE_DIRS ${${_FULL_MODULE_PREFIX}_SOURCE_DIR})
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_LIBRARY_DIRS ${${_FULL_MODULE_PREFIX}_LIBRARY_DIRS})
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_LIBRARY_DIRS ${${_FULL_MODULE_PREFIX}_BINARY_DIR})
+	list (APPEND ${_FULL_TEST_BASE_PREFIX}_LIBRARIES ${${_FULL_MODULE_PREFIX}_LIBRARIES})
+
+	_build_compiz_test_base (${_prefix} ${_module} ${_FULL_TEST_BASE_PREFIX})
+    else (${_FULL_TEST_BASE_PREFIX}_HAS_PKG_DEPS)
+	message (STATUS "[WARNING] One or more dependencies for test base on module ${_module} for ${_prefix} not found. Skipping test base.")
+	message (STATUS "Missing dependencies :${${_FULL_TEST_BASE_PREFIX}_MISSING_DEPS}")
+	compiz_set (${_FULL_TEST_BASE_PREFIX}_BUILD FALSE)
+    endif (${_FULL_TEST_BASE_PREFIX}_HAS_PKG_DEPS)
+endmacro (compiz_test_base)
+
+function (_build_compiz_test _prefix _module _test _full_prefix)
+    file (GLOB _cpp_files "${${_FULL_TEST_PREFIX}_SOURCE_DIR}/*.cpp")
+
+    if (${_full_prefix}_INCLUDE_DIRS)
+	_build_include_flags (${_full_prefix} ${${_full_prefix}_INCLUDE_DIRS})
+    endif (${_full_prefix}_INCLUDE_DIRS)
+    _build_include_flags (${_full_prefix} ${${_full_prefix}_SOURCE_DIR})
+    _build_include_flags (${_full_prefix} ${${_full_prefix}_INCLUDE_DIR})
+
+    if (${_full_prefix}_DEFSADD)
+	_build_definitions_flags (${_full_prefix} ${${_full_prefix}_DEFSADD})
+    endif (${_full_prefix}_DEFSADD)
+
+    if (${_full_prefix}_LIBRARY_DIRS)
+	_build_link_dir_flags (${_full_prefix} ${${_full_prefix}_LIBRARY_DIRS})
+    endif (${_full_prefix}_LIBRARY_DIRS)
+
+    if (${_full_prefix}_LIBRARIES)
+	_build_library_flags (${_full_prefix} ${${_full_prefix}_LIBRARIES})
+    endif (${_full_prefix}_LIBRARIES)
+
+    add_executable (${_prefix}_${_module}_${_test}_test
+		    ${_cpp_files})
+
+    target_link_libraries (${_prefix}_${_module}_${_test}_test
+			   ${${_full_prefix}_LIBRARIES}
+			   ${_prefix}_${_module}_internal
+			   ${_prefix}_${_module}_test_internal)
+
+    list (APPEND ${_full_prefix}_COMPILE_FLAGS ${${_full_prefix}_INCLUDE_CFLAGS})
+    list (APPEND ${_full_prefix}_COMPILE_FLAGS ${${_full_prefix}_DEFINITIONS_CFLAGS})
+    list (APPEND ${_full_prefix}_COMPILE_FLAGS ${${_full_prefix}_CFLAGSADD})
+
+    set (${_full_prefix}_COMPILE_FLAGS_STR " ")
+    foreach (_flag ${${_full_prefix}_COMPILE_FLAGS})
+	set (${_full_prefix}_COMPILE_FLAGS_STR "${_flag} ${${_full_prefix}_COMPILE_FLAGS_STR}")
+    endforeach (_flag)
+
+    list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LINK_LDFLAGS})
+    list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LDFLAGSADD})
+    list (APPEND ${_full_prefix}_LINK_FLAGS ${${_full_prefix}_LIBARY_FLAGS})
+
+    set (${_full_prefix}_LINK_FLAGS_STR " ")
+    foreach (_flag ${${_full_prefix}_LINK_FLAGS})
+	set (${_full_prefix}_LINK_FLAGS_STR "${_flag} ${${_full_prefix}_LINK_FLAGS_STR}")
+    endforeach (_flag)
+
+    set_target_properties (${_prefix}_${_module}_${_test}_test PROPERTIES
+			   COMPILE_FLAGS "${${_full_prefix}_COMPILE_FLAGS_STR}"
+			   LINK_FLAGS "${${_full_prefix}_LINK_FLAGS_STR}")
+
+    add_test (test-${_prefix}-${_module}-${_test}
+	      ${CMAKE_CURRENT_BINARY_DIR}/${_prefix}_${_module}_${_test}_test)
+endfunction (_build_compiz_test)
+
+macro (compiz_test _prefix _module _test)
+
+    set (_supported_var PKGDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS DEFSADD)
+
+    set (_FULL_TEST_PREFIX ${_FULL_MODULE_PREFIX}_TEST)
+
+    _get_parameters (${_FULL_TEST_PREFIX} ${ARGN})
+    _check_pkg_deps (${_FULL_TEST_PREFIX} ${${_FULL_TEST_PREFIX}_PKGDEPS})
+
+    if (${_FULL_TEST_PREFIX}_HAS_PKG_DEPS)
+	list (APPEND ${_FULL_TEST_PREFIX}_LIBRARIES ${${_FULL_TEST_PREFIX}_PKG_LIBDIRS})
+	list (APPEND ${_FULL_TEST_PREFIX}_INCLUDE_DIRS ${${_FULL_TEST_PREFIX}_INCDIRS})
+	list (APPEND ${_FULL_TEST_PREFIX}_INCLUDE_DIRS ${${_FULL_TEST_PREFIX}_PKG_INCDIRS})
+	list (APPEND ${_FULL_TEST_PREFIX}_LIBRARY_DIRS ${${_FULL_TEST_PREFIX}_LIBDIRS})
+	list (APPEND ${_FULL_TEST_PREFIX}_LIBRARY_DIRS ${${_FULL_TEST_PREFIX}_PKG_LIBDIRS})
+
+	compiz_set (${_FULL_TEST_PREFIX}_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+	compiz_set (${_FULL_TEST_PREFIX}_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src)
+	compiz_set (${_FULL_TEST_PREFIX}_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+
+	list (APPEND ${_FULL_TEST_PREFIX}_INCLUDE_DIRS ${${_FULL_TEST_BASE_PREFIX}_INCLUDE_DIRS})
+	list (APPEND ${_FULL_TEST_PREFIX}_INCLUDE_DIRS ${${_FULL_TEST_BASE_PREFIX}_INCLUDE_DIR})
+	list (APPEND ${_FULL_TEST_PREFIX}_INCLUDE_DIRS ${${_FULL_TEST_BASE_PREFIX}_SOURCE_DIR})
+	list (APPEND ${_FULL_TEST_PREFIX}_LIBRARY_DIRS ${${_FULL_TEST_BASE_PREFIX}_LIBRARY_DIRS})
+	list (APPEND ${_FULL_TEST_PREFIX}_LIBRARY_DIRS ${${_FULL_TEST_BASE_PREFIX}_BINARY_DIR})
+	list (APPEND ${_FULL_TEST_PREFIX}_LIBRARIES ${${_FULL_TEST_BASE_PREFIX}_LIBRARIES})
+
+	_build_compiz_test (${_prefix} ${_module} ${_test} ${_FULL_TEST_PREFIX})
+
+    else (${_FULL_TEST_PREFIX}_HAS_PKG_DEPS)
+	message (STATUS "[WARNING] One or more dependencies for test ${_test} on module ${_name} for ${_prefix} not found. Skipping test.")
+	message (STATUS "Missing dependencies :${${_FULL_TEST_PREFIX}_MISSING_DEPS}")
+	compiz_set (${_FULL_TEST_PREFIX}_BUILD FALSE)
+    endif (${_FULL_TEST_PREFIX}_HAS_PKG_DEPS)
+
+endmacro (compiz_test)
+
 #### optional file install
 
 function (compiz_opt_install_file _src _dst)

=== modified file 'cmake/CompizPlugin.cmake'
--- cmake/CompizPlugin.cmake	2011-09-01 19:52:58 +0000
+++ cmake/CompizPlugin.cmake	2011-11-01 23:21:23 +0000
@@ -136,50 +136,6 @@
     endif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "package")
 endmacro (_prepare_directories)
 
-# parse plugin macro parameter
-macro (_get_plugin_parameters _prefix)
-    set (_current_var _foo)
-    set (_supported_var PKGDEPS PLUGINDEPS LDFLAGSADD CFLAGSADD LIBRARIES LIBDIRS INCDIRS)
-    foreach (_val ${_supported_var})
-	set (${_prefix}_${_val})
-    endforeach (_val)
-    foreach (_val ${ARGN})
-	set (_found FALSE)
-	foreach (_find ${_supported_var})
-	    if ("${_find}" STREQUAL "${_val}")
-		set (_found TRUE)
-	    endif ("${_find}" STREQUAL "${_val}")
-	endforeach (_find)
-
-	if (_found)
-	    set (_current_var ${_prefix}_${_val})
-	else (_found)
-	    list (APPEND ${_current_var} ${_val})
-	endif (_found)
-    endforeach (_val)
-endmacro (_get_plugin_parameters)
-
-# check pkgconfig dependencies
-macro (_check_plugin_pkg_deps _prefix)
-    set (${_prefix}_HAS_PKG_DEPS TRUE)
-    foreach (_val ${ARGN})
-        string (REGEX REPLACE "[<>=\\.]" "_" _name ${_val})
-	string (TOUPPER ${_name} _name)
-
-	compiz_pkg_check_modules (_${_name} ${_val})
-
-	if (_${_name}_FOUND)
-	    list (APPEND ${_prefix}_PKG_LIBDIRS "${_${_name}_LIBRARY_DIRS}")
-	    list (APPEND ${_prefix}_PKG_LIBRARIES "${_${_name}_LIBRARIES}")
-	    list (APPEND ${_prefix}_PKG_INCDIRS "${_${_name}_INCLUDE_DIRS}")
-	else ()
-	    set (${_prefix}_HAS_PKG_DEPS FALSE)
-	    compiz_set (COMPIZ_${_prefix}_MISSING_DEPS "${COMPIZ_${_prefix}_MISSING_DEPS} ${_val}")
-	    set(__pkg_config_checked__${_name} 0 CACHE INTERNAL "" FORCE)
-	endif ()
-    endforeach ()
-endmacro ()
-
 # check plugin dependencies
 macro (_check_plugin_plugin_deps _prefix)
     set (${_prefix}_HAS_PLUGIN_DEPS TRUE)
@@ -216,9 +172,6 @@
     endforeach ()
 endmacro ()
 
-
-
-
 # main function
 function (_build_compiz_plugin plugin)
     string (TOUPPER ${plugin} _PLUGIN)
@@ -235,7 +188,7 @@
 	)
     endif (COMPIZ_PLUGIN_INSTALL_TYPE)
 
-    _get_plugin_parameters (${_PLUGIN} ${ARGN})
+    _get_parameters (${_PLUGIN} ${ARGN})
     _prepare_directories ()
 
     find_file (
@@ -259,7 +212,7 @@
     # check dependencies
     compiz_unset (COMPIZ_${_PLUGIN}_MISSING_DEPS)
     _check_plugin_plugin_deps (${_PLUGIN} ${${_PLUGIN}_PLUGINDEPS})
-    _check_plugin_pkg_deps (${_PLUGIN} ${${_PLUGIN}_PKGDEPS})
+    _check_pkg_deps (${_PLUGIN} ${${_PLUGIN}_PKGDEPS})
 
     if (${_PLUGIN}_HAS_PKG_DEPS AND ${_PLUGIN}_HAS_PLUGIN_DEPS)
 
@@ -357,6 +310,30 @@
 	add_definitions (-DPREFIX='\"${PLUGIN_PREFIX}\"'
 			 ${COMPIZ_DEFINITIONS_ADD})
 
+	foreach (_def ${_PLUGIN}_DEFSADD)
+	    add_definitions (-D${_def})
+	endforeach (_def)
+
+	# Need to know the include-dirs for the internal
+	# modules to this plugin, core (if built with core)
+	# and any other plugins that we depend on
+
+	get_property (${_PLUGIN}_MOD_INCLUDE_DIRS
+		      GLOBAL
+		      PROPERTY ${_PLUGIN}_MOD_INCLUDE_DIRS)
+
+	get_property (CORE_MOD_INCLUDE_DIRS
+		      GLOBAL
+		      PROPERTY CORE_MOD_INCLUDE_DIRS)
+
+	foreach (_plugindep ${${_PLUGIN}_PLUGINDEPS})
+	    string (TOUPPER ${_plugindep} _PLUGINDEP)
+	    get_property (${_PLUGINDEP}_MOD_INCLUDE_DIRS
+			  GLOBAL
+			  PROPERTY ${_PLUGINDEP}_MOD_INCLUDE_DIRS)
+	    list (APPEND ${_PLUGIN}_PLUGINDEP_MOD_INCLUDE_DIRS ${${_PLUGINDEP}_MOD_INCLUDE_DIRS})
+	endforeach (_plugindep)
+
 	include_directories (
             ${CMAKE_CURRENT_SOURCE_DIR}/src
             ${CMAKE_CURRENT_SOURCE_DIR}/include
@@ -367,8 +344,15 @@
             ${COMPIZ_INCLUDE_DIRS}
             ${CMAKE_PREFIX_PATH}/include
             ${CMAKE_INCLUDE_PATH}
+	    ${${_PLUGIN}_MOD_INCLUDE_DIRS}
+	    ${CORE_MOD_INCLUDE_DIRS}
+	    ${${_PLUGIN}_PLUGINDEP_MOD_INCLUDE_DIRS}
 	)
 
+	get_property (${_PLUGIN}_MOD_LIBRARY_DIRS
+		      GLOBAL
+		      PROPERTY ${_PLUGIN}_MOD_LIBRARY_DIRS)
+
 	link_directories (
             ${COMPIZ_LINK_DIRS}
             ${${_PLUGIN}_PKG_LIBDIRS}
@@ -378,6 +362,7 @@
             ${CMAKE_PREFIX_PATH}/lib
             ${CMAKE_PREFIX_PATH}/lib32
             ${CMAKE_PREFIX_PATH}/lib64
+	    ${${_PLUGIN}_MOD_LIBRARY_DIRS}
 	)
 
 	add_library (
@@ -409,11 +394,16 @@
 	    )
 	endif (COMPIZ_BUILD_WITH_RPATH)
 
+	get_property (${_PLUGIN}_MOD_LIBRARIES
+		      GLOBAL
+		      PROPERTY ${_PLUGIN}_MOD_LIBRARIES)
+
 	target_link_libraries (
 	    ${plugin} ${COMPIZ_LIBRARIES}
 		      ${${_PLUGIN}_LOCAL_LIBRARIES}
 		      ${${_PLUGIN}_PKG_LIBRARIES}
 		      ${${_PLUGIN}_LIBRARIES}
+		      ${${_PLUGIN}_MOD_LIBRARIES}
 	)
 
 	install (

=== modified file 'include/CMakeLists.txt'
--- include/CMakeLists.txt	2010-05-18 11:30:17 +0000
+++ include/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,5 +1,4 @@
 set (_headers
-    compiz.h
     decoration.h
 )
 

=== removed file 'include/compiz-common.h.in'
--- include/compiz-common.h.in	2011-07-06 22:55:10 +0000
+++ include/compiz-common.h.in	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-#ifndef COMPIZ_COMMON_H
-#define COMPIZ_COMMON_H
-
-#define COMPIZ_VERSION_STRING "@VERSION@"
-#endif

=== removed file 'include/compiz.h'
--- include/compiz.h	2011-06-25 05:06:53 +0000
+++ include/compiz.h	1970-01-01 00:00:00 +0000
@@ -1,103 +0,0 @@
-/*
- * Copyright © 2007 Novell, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Novell, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Novell, Inc. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: David Reveman <[e-mail]>
- */
-
-#ifndef _COMPIZ_H
-#define _COMPIZ_H
-
-#include <compiz-common.h>
-
-#include <string>
-#include <list>
-#include <cstdarg>
-
-#define STRINGIFY(x) #x
-#define TOSTRING(x) STRINGIFY (x)
-
-#define RESTRICT_VALUE(value, min, max)				     \
-    (((value) < (min)) ? (min): ((value) > (max)) ? (max) : (value))
-
-#define MOD(a,b) ((a) < 0 ? ((b) - ((-(a) - 1) % (b))) - 1 : (a) % (b))
-
-#define TIMEVALDIFF(tv1, tv2)						   \
-    ((tv1)->tv_sec == (tv2)->tv_sec || (tv1)->tv_usec >= (tv2)->tv_usec) ? \
-    ((((tv1)->tv_sec - (tv2)->tv_sec) * 1000000) +			   \
-     ((tv1)->tv_usec - (tv2)->tv_usec)) / 1000 :			   \
-    ((((tv1)->tv_sec - 1 - (tv2)->tv_sec) * 1000000) +			   \
-     (1000000 + (tv1)->tv_usec - (tv2)->tv_usec)) / 1000
-
-#define TIMESPECDIFF(ts1, ts2)						   \
-    ((ts1)->tv_sec == (ts2)->tv_sec || (ts1)->tv_nsec >= (ts2)->tv_nsec) ? \
-    ((((ts1)->tv_sec - (ts2)->tv_sec) * 1000000) +			   \
-     ((ts1)->tv_nsec - (ts2)->tv_nsec)) / 1000000 :			   \
-    ((((ts1)->tv_sec - 1 - (ts2)->tv_sec) * 1000000) +			   \
-     (1000000 + (ts1)->tv_nsec - (ts2)->tv_nsec)) / 1000000
-
-#define MULTIPLY_USHORT(us1, us2)		 \
-    (((GLuint) (us1) * (GLuint) (us2)) / 0xffff)
-
-#define DEG2RAD (M_PI / 180.0f)
-
-#if defined(HAVE_SCANDIR_POSIX)
-  // POSIX (2008) defines the comparison function like this:
-  #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const dirent **, const dirent **))(d));
-#else
-  #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const void*,const void*))(d));
-#endif
-
-typedef std::string CompString;
-typedef std::list<CompString> CompStringList;
-
-CompString compPrintf (const char *format, ...);
-CompString compPrintf (const char *format, va_list ap);
-
-extern bool debugOutput;
-
-typedef enum {
-    CompLogLevelFatal = 0,
-    CompLogLevelError,
-    CompLogLevelWarn,
-    CompLogLevelInfo,
-    CompLogLevelDebug
-} CompLogLevel;
-
-void
-logMessage (const char   *componentName,
-	    CompLogLevel level,
-	    const char   *message);
-
-void
-compLogMessage (const char   *componentName,
-		CompLogLevel level,
-		const char   *format,
-		...);
-
-const char *
-logLevelToString (CompLogLevel level);
-
-extern char       *programName;
-extern char       **programArgv;
-extern int        programArgc;
-
-#endif

=== modified file 'include/core/CMakeLists.txt'
--- include/core/CMakeLists.txt	2011-07-07 16:59:41 +0000
+++ include/core/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -10,8 +10,6 @@
     output.h
     plugin.h
     point.h
-    pluginclasshandler.h
-    pluginclasses.h
     propertywriter.h
     privateunion.h
     rect.h
@@ -20,9 +18,6 @@
     serialization.h
     session.h
     size.h
-    timeouthandler.h
-    timer.h
-    valueholder.h
     window.h
     wrapsystem.h
 )

=== modified file 'include/core/core.h'
--- include/core/core.h	2011-10-13 09:53:38 +0000
+++ include/core/core.h	2011-11-01 23:21:23 +0000
@@ -32,6 +32,10 @@
 #include <stdio.h>
 #include <assert.h>
 
+#include <string>
+#include <list>
+#include <cstdarg>
+
 #include <X11/Xlib-xcb.h>
 #include <X11/Xutil.h>
 #include <X11/extensions/Xdamage.h>
@@ -69,6 +73,23 @@
 #  define BITMAP_BIT_ORDER LSBFirst
 #endif
 
+#define STRINGIFY(x) #x
+#define TOSTRING(x) STRINGIFY (x)
+#define DEG2RAD (M_PI / 180.0f)
+
+#if defined(HAVE_SCANDIR_POSIX)
+  // POSIX (2008) defines the comparison function like this:
+  #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const dirent **, const dirent **))(d));
+#else
+  #define scandir(a,b,c,d) scandir((a), (b), (c), (int(*)(const void*,const void*))(d));
+#endif
+
+extern bool debugOutput;
+
+extern char       *programName;
+extern char       **programArgv;
+extern int        programArgc;
+
 #include <core/pluginclasses.h>
 #include <core/screen.h>
 #include <core/window.h>
@@ -85,5 +106,7 @@
 #include <core/region.h>
 #include <core/countedlist.h>
 #include <core/timeouthandler.h>
+#include <core/logmessage.h>
+#include <core/string.h>
 
 #endif

=== modified file 'include/core/match.h'
--- include/core/match.h	2010-03-24 01:31:41 +0000
+++ include/core/match.h	2011-11-01 23:21:23 +0000
@@ -28,6 +28,7 @@
 #ifndef _COMPMATCH_H
 #define _COMPMATCH_H
 
+#include <core/string.h>
 #include <core/core.h>
 
 class PrivateMatch;

=== modified file 'include/core/option.h'
--- include/core/option.h	2011-03-16 19:39:25 +0000
+++ include/core/option.h	2011-11-01 23:21:23 +0000
@@ -28,8 +28,7 @@
 #ifndef _COMPOPTION_H
 #define _COMPOPTION_H
 
-#include <compiz.h>
-
+#include <core/string.h>
 #include <vector>
 
 class PrivateOption;

=== modified file 'include/core/plugin.h'
--- include/core/plugin.h	2011-06-25 02:31:02 +0000
+++ include/core/plugin.h	2011-11-01 23:21:23 +0000
@@ -26,7 +26,7 @@
 #ifndef _COMPIZ_PLUGIN_H
 #define _COMPIZ_PLUGIN_H
 
-#include <compiz.h>
+#include <core/string.h>
 #include <core/option.h>
 #include <core/privateunion.h>
 

=== modified file 'include/core/session.h'
--- include/core/session.h	2009-03-05 19:42:59 +0000
+++ include/core/session.h	2011-11-01 23:21:23 +0000
@@ -28,6 +28,7 @@
 
 #define SN_API_NOT_YET_FROZEN
 #include <libsn/sn.h>
+#include <core/string.h>
 
 namespace CompSession {
 

=== added file 'include/core/string.h'
--- include/core/string.h	1970-01-01 00:00:00 +0000
+++ include/core/string.h	2011-11-01 23:21:23 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright © 2007 Novell, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_STRING_H
+#define _COMPIZ_STRING_H
+
+#include <string>
+#include <list>
+#include <cstdarg>
+
+typedef std::string CompString;
+typedef std::list<CompString> CompStringList;
+
+CompString compPrintf (const char *format, ...);
+CompString compPrintf (const char *format, va_list ap);
+
+#endif

=== modified file 'metadata/CMakeLists.txt'
--- metadata/CMakeLists.txt	2011-08-18 18:15:11 +0000
+++ metadata/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -9,9 +9,9 @@
 if (XSLTPROC_EXECUTABLE)
 
     add_custom_command (
-	OUTPUT ${CMAKE_BINARY_DIR}/generated/core.xml.in
+	OUTPUT ${compiz_BINARY_DIR}/generated/core.xml.in
 	COMMAND ${XSLTPROC_EXECUTABLE}
-		-o ${CMAKE_BINARY_DIR}/generated/core.xml.in
+		-o ${compiz_BINARY_DIR}/generated/core.xml.in
 		--param default_plugins "\"'${COMPIZ_DEFAULT_PLUGINS}'\""
 		${CMAKE_SOURCE_DIR}/xslt/default_plugins.xslt
 		${CMAKE_CURRENT_SOURCE_DIR}/core.xml.in

=== modified file 'plugins/composite/src/screen.cpp'
--- plugins/composite/src/screen.cpp	2011-10-15 11:00:51 +0000
+++ plugins/composite/src/screen.cpp	2011-11-01 23:21:23 +0000
@@ -43,6 +43,8 @@
 #include <X11/extensions/shape.h>
 #include <X11/extensions/Xrandr.h>
 
+#include <core/timer.h>
+
 CompWindow *lastDamagedWindow = 0;
 
 void
@@ -696,7 +698,7 @@
 {
     int diff;
 
-    diff = TIMEVALDIFF (tv, &lastRedraw);
+    diff = compiz::core::timer::timeval_diff (tv, &lastRedraw);
 
     /* handle clock rollback */
     if (diff < 0)
@@ -791,7 +793,7 @@
 	if (priv->pHnd)
 	    priv->pHnd->prepareDrawing ();
 
-	timeDiff = TIMEVALDIFF (&tv, &priv->lastRedraw);
+	timeDiff = compiz::core::timer::timeval_diff (&tv, &priv->lastRedraw);
 
 	/* handle clock rollback */
 	if (timeDiff < 0)

=== modified file 'plugins/opengl/src/matrix.cpp'
--- plugins/opengl/src/matrix.cpp	2010-10-24 14:42:07 +0000
+++ plugins/opengl/src/matrix.cpp	2011-11-01 23:21:23 +0000
@@ -46,7 +46,6 @@
  * From Mesa 3-D graphics library.
  */
 
-#include <compiz.h>
 #include <string.h>
 #include <math.h>
 #include <core/core.h>

=== modified file 'plugins/opengl/src/texture.cpp'
--- plugins/opengl/src/texture.cpp	2011-02-24 07:52:09 +0000
+++ plugins/opengl/src/texture.cpp	2011-11-01 23:21:23 +0000
@@ -27,8 +27,6 @@
 #  include <config.h>
 #endif
 
-#include <compiz.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2009-10-18 20:23:24 +0000
+++ po/POTFILES.in	2011-11-01 23:21:23 +0000
@@ -1,7 +1,3 @@
-gtk/gnome/50-compiz-desktop-key.xml.in
-gtk/gnome/50-compiz-key.xml.in
-gtk/gnome/compiz.desktop.in
-gtk/gnome/compiz-wm.desktop.in
 gtk/window-decorator/gwd.schemas.in
 gtk/window-decorator/gtk-window-decorator.c
 metadata/core.xml.in

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2011-09-19 12:54:22 +0000
+++ src/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,11 +1,29 @@
 include (CompizBcop)
 
+compiz_module (core string LIBRARIES ${Boost_LIBRARIES}
+		     	   INCDIRS ${Boost_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include)
+
+compiz_module (core logmessage LIBRARIES ${Boost_LIBRARIES}
+		     	       INCDIRS ${Boost_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include)
+
+compiz_module (core timer PKGDEPS glibmm-2.4
+		     LIBRARIES ${Boost_LIBRARIES}
+		     INCDIRS ${Boost_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include)
+
+compiz_module (core pluginclasshandler MODULES core_string core_logmessage
+		     LIBRARIES ${Boost_LIBRARIES}
+		     INCDIRS ${Boost_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/include)
+
 compiz_add_bcop_targets (
     core
     ${compiz_BINARY_DIR}/generated/core.xml.in
     _bcop_sources
 )
 
+get_property (CORE_MOD_INCLUDE_DIRS
+	      GLOBAL
+	      PROPERTY CORE_MOD_INCLUDE_DIRS)
+
 include_directories (
     ${compiz_SOURCE_DIR}/include
     ${compiz_BINARY_DIR}
@@ -14,6 +32,7 @@
     ${COMPIZ_INCLUDE_DIRS}
     ${CMAKE_PREFIX_PATH}/include
     ${CMAKE_INCLUDE_PATH}
+    ${CORE_MOD_INCLUDE_DIRS}
 )
 
 add_definitions (
@@ -23,23 +42,25 @@
     -DMETADATADIR=\\\"${compiz_metadatadir}\\\"
 )
 
+get_property (CORE_MOD_LIBRARY_DIRS
+	      GLOBAL
+	      PROPERTY CORE_MOD_LIBRARY_DIRS)
+
 link_directories (
     ${COMPIZ_LINK_DIRS}
+    ${CORE_MOD_LIBRARY_DIRS}
 )
 
 add_executable (compiz
     region.cpp
     atoms.cpp
-    timer.cpp
     main.cpp
     actions.cpp
     screen.cpp
     window.cpp
     action.cpp
     option.cpp
-    string.cpp
     match.cpp
-    pluginclasses.cpp
     event.cpp
     plugin.cpp
     session.cpp
@@ -52,17 +73,28 @@
     modifierhandler.cpp
     propertywriter.cpp
     eventsource.cpp
-    timeouthandler.cpp
-    valueholder.cpp
-    logmessage.cpp
     stackdebugger.cpp
     ${_bcop_sources}
 )
 
+# workaround for build race
+add_dependencies (compiz core-xml-file)
+
+get_property (CORE_MOD_LIBRARIES
+	      GLOBAL
+	      PROPERTY CORE_MOD_LIBRARIES)
+
 target_link_libraries (
     compiz ${COMPIZ_LIBRARIES} m pthread dl
+    ${CORE_MOD_LIBRARIES}
 )
 
+foreach (_lib ${CORE_MOD_LIBRARIES})
+    target_link_libraries (
+	compiz ${_lib}
+    )
+endforeach (_lib)
+
 install (
     TARGETS compiz
     DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}

=== modified file 'src/action.cpp'
--- src/action.cpp	2010-11-09 14:13:19 +0000
+++ src/action.cpp	2011-11-01 23:21:23 +0000
@@ -27,8 +27,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <compiz.h>
-
 #include <core/option.h>
 #include <core/action.h>
 #include <core/screen.h>

=== added directory 'src/logmessage'
=== added directory 'src/logmessage/include'
=== added directory 'src/logmessage/include/core'
=== added file 'src/logmessage/include/core/logmessage.h'
--- src/logmessage/include/core/logmessage.h	1970-01-01 00:00:00 +0000
+++ src/logmessage/include/core/logmessage.h	2011-11-01 23:21:23 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2007 Novell, Inc.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Novell, Inc. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Novell, Inc. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Author: David Reveman <[e-mail]>
+ */
+
+#ifndef _COMPIZ_LOGMESSAGE_H
+#define _COMPIZ_LOGMESSAGE_H
+
+typedef enum {
+    CompLogLevelFatal = 0,
+    CompLogLevelError,
+    CompLogLevelWarn,
+    CompLogLevelInfo,
+    CompLogLevelDebug
+} CompLogLevel;
+
+void
+logMessage (const char   *componentName,
+	    CompLogLevel level,
+	    const char   *message);
+
+void
+compLogMessage (const char   *componentName,
+		CompLogLevel level,
+		const char   *format,
+		...);
+
+const char *
+logLevelToString (CompLogLevel level);
+
+#endif

=== added directory 'src/logmessage/src'
=== renamed file 'src/logmessage.cpp' => 'src/logmessage/src/logmessage.cpp'
--- src/logmessage.cpp	2011-07-05 19:49:12 +0000
+++ src/logmessage/src/logmessage.cpp	2011-11-01 23:21:23 +0000
@@ -23,7 +23,8 @@
  * Author: David Reveman <[e-mail]>
  */
 
-#include <compiz.h>
+#include <core/logmessage.h>
+#include <core/core.h>
 #include <cstdio>
 
 const char *

=== added directory 'src/logmessage/tests'
=== added file 'src/logmessage/tests/CMakeLists.txt'
=== added file 'src/logmessage/tests/test-logmessage.cpp'
=== modified file 'src/main.cpp'
--- src/main.cpp	2011-10-13 14:46:33 +0000
+++ src/main.cpp	2011-11-01 23:21:23 +0000
@@ -27,8 +27,6 @@
 #  include <config.h>
 #endif
 
-#include <compiz.h>
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <signal.h>

=== renamed directory 'tests/pluginclasshandler' => 'src/pluginclasshandler'
=== added directory 'src/pluginclasshandler/include'
=== added directory 'src/pluginclasshandler/include/core'
=== renamed file 'include/core/pluginclasses.h' => 'src/pluginclasshandler/include/core/pluginclasses.h'
=== renamed file 'include/core/pluginclasshandler.h' => 'src/pluginclasshandler/include/core/pluginclasshandler.h'
--- include/core/pluginclasshandler.h	2011-09-16 00:51:33 +0000
+++ src/pluginclasshandler/include/core/pluginclasshandler.h	2011-11-01 23:21:23 +0000
@@ -29,7 +29,7 @@
 #include <typeinfo>
 #include <boost/preprocessor/cat.hpp>
 
-#include <compiz.h>
+#include <core/string.h>
 #include <core/valueholder.h>
 #include <core/pluginclasses.h>
 

=== renamed file 'include/core/valueholder.h' => 'src/pluginclasshandler/include/core/valueholder.h'
--- include/core/valueholder.h	2011-06-25 02:31:02 +0000
+++ src/pluginclasshandler/include/core/valueholder.h	2011-11-01 23:21:23 +0000
@@ -26,7 +26,8 @@
 #ifndef _COMPIZ_VALUEHOLDER_H
 #define _COMPIZ_VALUEHOLDER_H
 
-#include <compiz.h>
+#include <core/string.h>
+#include <core/logmessage.h>
 #include <core/privateunion.h>
 
 class PrivateValueHolder;
@@ -50,4 +51,4 @@
 	PrivateValueHolder *priv;
 };
 
-#endif
\ No newline at end of file
+#endif

=== added directory 'src/pluginclasshandler/src'
=== renamed file 'src/pluginclasses.cpp' => 'src/pluginclasshandler/src/pluginclasses.cpp'
=== renamed file 'src/valueholder.cpp' => 'src/pluginclasshandler/src/valueholder.cpp'
=== renamed file 'src/valueholder.h' => 'src/pluginclasshandler/src/valueholder.h'
=== added directory 'src/pluginclasshandler/tests'
=== renamed file 'tests/pluginclasshandler/CMakeLists.txt' => 'src/pluginclasshandler/tests/CMakeLists.txt'
--- tests/pluginclasshandler/CMakeLists.txt	2011-07-06 18:53:03 +0000
+++ src/pluginclasshandler/tests/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,4 +1,4 @@
-set (COMPIZ_TEST_PCH_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+compiz_test_base (core pluginclasshandler)
 
 add_subdirectory (construct)
 add_subdirectory (get)

=== renamed directory 'tests/pluginclasshandler/construct' => 'src/pluginclasshandler/tests/construct'
=== modified file 'src/pluginclasshandler/tests/construct/CMakeLists.txt'
--- tests/pluginclasshandler/construct/CMakeLists.txt	2011-07-06 19:52:01 +0000
+++ src/pluginclasshandler/tests/construct/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,25 +1,1 @@
-link_directories (${COMPIZ_TEST_PCH_LINK_DIRS})
-
-include_directories (${COMPIZ_TEST_PCH_INCLUDE_DIRS}
-		     ${compiz_SOURCE_DIR}/include
-		     ${compiz_BINARY_DIR}
-		     ${compiz_BINARY_DIR}/generated
-		     ${compiz_SOURCE_DIR}/src
-		     ${COMPIZ_TEST_PCH_BASE_DIR})
-
-set (OBJECT CompizPCHTestConstruct)
-add_definitions (-DOBJECT=${OBJECT})
-
-add_executable (test-pch-construct
-		test-pch-construct.cpp
-		../test-pluginclasshandler.cpp 
-	        ${compiz_SOURCE_DIR}/src/valueholder.cpp
-	        ${compiz_SOURCE_DIR}/src/pluginclasses.cpp
-		${compiz_SOURCE_DIR}/src/string.cpp
-		${compiz_SOURCE_DIR}/src/logmessage.cpp)
-
-target_link_libraries (test-pch-construct
-		       ${COMPIZ_TEST_PCH_LIBRARIES})
-
-add_test (test-pch-construct
-	  ${CMAKE_CURRENT_BINARY_DIR}/test-pch-construct)
+compiz_test (core pluginclasshandler construct)

=== added directory 'src/pluginclasshandler/tests/construct/src'
=== renamed file 'tests/pluginclasshandler/construct/test-pch-construct.cpp' => 'src/pluginclasshandler/tests/construct/src/test-pch-construct.cpp'
--- tests/pluginclasshandler/construct/test-pch-construct.cpp	2011-07-06 18:53:03 +0000
+++ src/pluginclasshandler/tests/construct/src/test-pch-construct.cpp	2011-11-01 23:21:23 +0000
@@ -62,3 +62,9 @@
 
     std::cout << "PASS: Basic construction" << std::endl;
 }
+
+CompizPCHTest *
+get_object (Global *g)
+{
+    return new CompizPCHTestConstruct (g);
+}

=== renamed directory 'tests/pluginclasshandler/get' => 'src/pluginclasshandler/tests/get'
=== modified file 'src/pluginclasshandler/tests/get/CMakeLists.txt'
--- tests/pluginclasshandler/get/CMakeLists.txt	2011-07-06 19:52:01 +0000
+++ src/pluginclasshandler/tests/get/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,25 +1,1 @@
-link_directories (${COMPIZ_TEST_PCH_LINK_DIRS})
-
-include_directories (${COMPIZ_TEST_PCH_INCLUDE_DIRS}
-		     ${compiz_SOURCE_DIR}/include
-		     ${compiz_BINARY_DIR}
-		     ${compiz_BINARY_DIR}/generated
-		     ${compiz_SOURCE_DIR}/src
-		     ${COMPIZ_TEST_PCH_BASE_DIR})
-
-set (OBJECT CompizPCHTestGet)
-add_definitions (-DOBJECT=${OBJECT})
-
-add_executable (test-pch-get
-		test-pch-get.cpp
-		../test-pluginclasshandler.cpp 
-	        ${compiz_SOURCE_DIR}/src/valueholder.cpp
-	        ${compiz_SOURCE_DIR}/src/pluginclasses.cpp
-		${compiz_SOURCE_DIR}/src/string.cpp
-		${compiz_SOURCE_DIR}/src/logmessage.cpp)
-
-target_link_libraries (test-pch-get
-		       ${COMPIZ_TEST_PCH_LIBRARIES})
-
-add_test (test-pch-get
-	  ${CMAKE_CURRENT_BINARY_DIR}/test-pch-get)
+compiz_test (core pluginclasshandler get)

=== added directory 'src/pluginclasshandler/tests/get/src'
=== renamed file 'tests/pluginclasshandler/get/test-pch-get.cpp' => 'src/pluginclasshandler/tests/get/src/test-pch-get.cpp'
--- tests/pluginclasshandler/get/test-pch-get.cpp	2011-07-06 18:53:03 +0000
+++ src/pluginclasshandler/tests/get/src/test-pch-get.cpp	2011-11-01 23:21:23 +0000
@@ -62,3 +62,9 @@
 
     std::cout << "PASS: Object Retreival" << std::endl;
 }
+
+CompizPCHTest *
+get_object (Global *g)
+{
+    return new CompizPCHTestGet (g);
+}

=== renamed directory 'tests/pluginclasshandler/indexes' => 'src/pluginclasshandler/tests/indexes'
=== modified file 'src/pluginclasshandler/tests/indexes/CMakeLists.txt'
--- tests/pluginclasshandler/indexes/CMakeLists.txt	2011-07-06 19:52:01 +0000
+++ src/pluginclasshandler/tests/indexes/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,28 +1,5 @@
-link_directories (${COMPIZ_TEST_PCH_LINK_DIRS})
-
-include_directories (${COMPIZ_TEST_PCH_INCLUDE_DIRS}
-		     ${compiz_SOURCE_DIR}/include
-		     ${compiz_BINARY_DIR}
-		     ${compiz_BINARY_DIR}/generated
-		     ${compiz_SOURCE_DIR}/src
-		     ${COMPIZ_TEST_PCH_BASE_DIR})
-
-set (OBJECT CompizPCHTestIndexes)
-add_definitions (-DOBJECT=${OBJECT})
 # hack
 add_definitions (-Dprivate=public)
 add_definitions (-Dprotected=public)
 
-add_executable (test-pch-indexes
-		test-pch-indexes.cpp
-		../test-pluginclasshandler.cpp 
-	        ${compiz_SOURCE_DIR}/src/valueholder.cpp
-	        ${compiz_SOURCE_DIR}/src/pluginclasses.cpp
-		${compiz_SOURCE_DIR}/src/string.cpp
-		${compiz_SOURCE_DIR}/src/logmessage.cpp)
-
-target_link_libraries (test-pch-indexes
-		       ${COMPIZ_TEST_PCH_LIBRARIES})
-
-add_test (test-pch-indexes
-	  ${CMAKE_CURRENT_BINARY_DIR}/test-pch-indexes)
+compiz_test (core pluginclasshandler indexes)

=== added directory 'src/pluginclasshandler/tests/indexes/src'
=== renamed file 'tests/pluginclasshandler/indexes/test-pch-indexes.cpp' => 'src/pluginclasshandler/tests/indexes/src/test-pch-indexes.cpp'
--- tests/pluginclasshandler/indexes/test-pch-indexes.cpp	2011-07-06 18:53:03 +0000
+++ src/pluginclasshandler/tests/indexes/src/test-pch-indexes.cpp	2011-11-01 23:21:23 +0000
@@ -432,3 +432,9 @@
 
     std::cout << "PASS: Index Sanity" << std::endl;
 }
+
+CompizPCHTest *
+get_object (Global *g)
+{
+    return new CompizPCHTestIndexes (g);
+}

=== renamed file 'tests/pluginclasshandler/test-pluginclasshandler.cpp' => 'src/pluginclasshandler/tests/test-pluginclasshandler.cpp'
--- tests/pluginclasshandler/test-pluginclasshandler.cpp	2011-07-06 18:53:03 +0000
+++ src/pluginclasshandler/tests/test-pluginclasshandler.cpp	2011-11-01 23:21:23 +0000
@@ -76,7 +76,7 @@
 {
     programName = argv[0];
 
-    gTest = static_cast <CompizPCHTest *> (new OBJECT (new Global ()));
+    gTest = static_cast <CompizPCHTest *> (get_object (new Global ()));
     gTest->run ();
 
     while (gTest->plugins.size ())

=== renamed file 'tests/pluginclasshandler/test-pluginclasshandler.h' => 'src/pluginclasshandler/tests/test-pluginclasshandler.h'
--- tests/pluginclasshandler/test-pluginclasshandler.h	2011-07-06 18:53:03 +0000
+++ src/pluginclasshandler/tests/test-pluginclasshandler.h	2011-11-01 23:21:23 +0000
@@ -112,3 +112,6 @@
 	unsigned int ePcIndex;
 	bool	 eLoadFailed;
 };
+
+CompizPCHTest *
+get_object (Global *);

=== renamed directory 'tests/pluginclasshandler/typenames' => 'src/pluginclasshandler/tests/typenames'
=== modified file 'src/pluginclasshandler/tests/typenames/CMakeLists.txt'
--- tests/pluginclasshandler/typenames/CMakeLists.txt	2011-07-06 19:52:01 +0000
+++ src/pluginclasshandler/tests/typenames/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,25 +1,1 @@
-link_directories (${COMPIZ_TEST_PCH_LINK_DIRS})
-
-include_directories (${COMPIZ_TEST_PCH_INCLUDE_DIRS}
-		     ${compiz_SOURCE_DIR}/include
-		     ${compiz_BINARY_DIR}
-		     ${compiz_BINARY_DIR}/generated
-		     ${compiz_SOURCE_DIR}/src
-		     ${COMPIZ_TEST_PCH_BASE_DIR})
-
-set (OBJECT CompizPCHTestTypenames)
-add_definitions (-DOBJECT=${OBJECT})
-
-add_executable (test-pch-typenames
-		test-pch-typenames.cpp
-		../test-pluginclasshandler.cpp 
-	        ${compiz_SOURCE_DIR}/src/valueholder.cpp
-	        ${compiz_SOURCE_DIR}/src/pluginclasses.cpp
-		${compiz_SOURCE_DIR}/src/string.cpp
-		${compiz_SOURCE_DIR}/src/logmessage.cpp)
-
-target_link_libraries (test-pch-typenames
-		       ${COMPIZ_TEST_PCH_LIBRARIES})
-
-add_test (test-pch-typenames
-	  ${CMAKE_CURRENT_BINARY_DIR}/test-pch-typenames)
+compiz_test (core pluginclasshandler typenames)

=== added directory 'src/pluginclasshandler/tests/typenames/src'
=== renamed file 'tests/pluginclasshandler/typenames/test-pch-typenames.cpp' => 'src/pluginclasshandler/tests/typenames/src/test-pch-typenames.cpp'
--- tests/pluginclasshandler/typenames/test-pch-typenames.cpp	2011-07-06 18:53:03 +0000
+++ src/pluginclasshandler/tests/typenames/src/test-pch-typenames.cpp	2011-11-01 23:21:23 +0000
@@ -81,3 +81,9 @@
 
     std::cout << "PASS: Typenames" << std::endl;
 }
+
+CompizPCHTest *
+get_object (Global *g)
+{
+    return new CompizPCHTestTypenames (g);
+}

=== modified file 'src/privatescreen.h'
--- src/privatescreen.h	2011-10-10 14:56:06 +0000
+++ src/privatescreen.h	2011-11-01 23:21:23 +0000
@@ -103,6 +103,20 @@
 
 namespace compiz
 {
+namespace core
+{
+namespace screen
+{
+    inline int wraparound_mod (int a, int b)
+    {
+	if (a < 0)
+	    return (b - ((-a - 1) % (b))) - 1;
+	else
+	    return a % b;
+    };
+}
+}
+
 namespace X11
 {
 class PendingEvent {

=== modified file 'src/screen.cpp'
--- src/screen.cpp	2011-10-13 14:28:30 +0000
+++ src/screen.cpp	2011-11-01 23:21:23 +0000
@@ -3502,11 +3502,11 @@
     CompPoint pnt;
 
     tx = priv->vp.x () - tx;
-    tx = MOD (tx, priv->vpSize.width ());
+    tx = compiz::core::screen::wraparound_mod (tx, priv->vpSize.width ());
     tx -= priv->vp.x ();
 
     ty = priv->vp.y () - ty;
-    ty = MOD (ty, priv->vpSize.height ());
+    ty = compiz::core::screen::wraparound_mod (ty, priv->vpSize.height ());
     ty -= priv->vp.y ();
 
     if (!tx && !ty)

=== modified file 'src/session.cpp'
--- src/session.cpp	2011-03-16 20:27:14 +0000
+++ src/session.cpp	2011-11-01 23:21:23 +0000
@@ -27,8 +27,6 @@
 #  include <config.h>
 #endif
 
-#include <compiz.h>
-
 #include <stdlib.h>
 #include <stdio.h>
 #include <poll.h>

=== added directory 'src/string'
=== added directory 'src/string/include'
=== added directory 'src/string/src'
=== renamed file 'src/string.cpp' => 'src/string/src/string.cpp'
--- src/string.cpp	2009-08-08 05:52:48 +0000
+++ src/string/src/string.cpp	2011-11-01 23:21:23 +0000
@@ -23,12 +23,12 @@
  * Authors: Dennis Kasprzyk <[e-mail]>
  */
 
-#include <compiz.h>
-
 #include <cstring>
 #include <cstdarg>
 #include <cstdio>
 
+#include <core/string.h>
+
 CompString compPrintf (const char *format, ...)
 {
     va_list    ap;

=== added directory 'src/string/tests'
=== added file 'src/string/tests/CMakeLists.txt'
--- src/string/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/string/tests/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -0,0 +1,3 @@
+compiz_test_base (core string)
+
+add_subdirectory (printf)

=== added directory 'src/string/tests/printf'
=== added file 'src/string/tests/printf/CMakeLists.txt'
--- src/string/tests/printf/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/string/tests/printf/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -0,0 +1,1 @@
+compiz_test (core string printf LIBRARIES ${Boost_LIBRARIES} INCDIRS ${Boost_INCLUDE_DIRS})

=== added directory 'src/string/tests/printf/src'
=== added file 'src/string/tests/printf/src/test-string-printf.cpp'
--- src/string/tests/printf/src/test-string-printf.cpp	1970-01-01 00:00:00 +0000
+++ src/string/tests/printf/src/test-string-printf.cpp	2011-11-01 23:21:23 +0000
@@ -0,0 +1,193 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "test-string.h"
+#include <string>
+#include <iostream>
+#include <map>
+#include <boost/shared_ptr.hpp>
+#include <boost/pointer_cast.hpp>
+#include <typeinfo>
+
+namespace compiz
+{
+namespace string
+{
+namespace printf_test
+{
+
+class Value
+{
+    public:
+	virtual ~Value ();
+
+	typedef boost::shared_ptr <Value> Ptr;
+
+    protected:
+
+	Value () {};
+
+	void           *v;
+};
+
+template <typename T>
+class TValue :
+    public Value
+{
+    public:
+	TValue (const T &);
+	~TValue ();
+
+	const T & value ();
+};
+
+template <typename T>
+TValue<T>::TValue (const T &av)
+{
+    v = new T (av);
+}
+
+template <typename T>
+TValue<T>::~TValue ()
+{
+    delete (reinterpret_cast <T *> (v));
+}
+
+template <typename T>
+const T &
+TValue<T>::value ()
+{
+    return *(reinterpret_cast <T *> (v));
+}
+
+Value::~Value ()
+{
+}
+
+CompString get_format (const CompString &fmt, Value::Ptr v)
+{
+    if (fmt == "%i" || fmt == "%d")
+	return compPrintf (fmt.c_str (), (boost::shared_static_cast <TValue<int> > (v))->value ());
+    if (fmt == "%f")
+	return compPrintf (fmt.c_str (), (boost::shared_static_cast <TValue<float> > (v))->value ());
+    if (fmt == "%s")
+	return compPrintf (fmt.c_str (), (boost::shared_static_cast <TValue<std::string> > (v))->value ().c_str ());
+    if (fmt == "%x")
+	return compPrintf (fmt.c_str (), (boost::shared_static_cast <TValue<int> > (v))->value ());
+
+    return "not_reached";
+}
+
+}
+}
+}
+
+bool
+CompStringTestPrintf::test ()
+{
+    CompString s1;
+    CompString s2;
+    std::map <CompString, compiz::string::printf_test::Value::Ptr> formatValues;
+    std::map <CompString, CompString> formatStrings;
+
+    std::cout << "-= TEST: compPrintf" << std::endl;
+
+    s1 = "foo";
+
+    const char *other_foo = "foo";
+    s2 = compPrintf ("%s", other_foo);
+
+    if (s1 == s2)
+	std::cout << "PASS: %s" << std::endl;
+    else
+    {
+	std::cout << "FAIL: %s" << std::endl;
+	return false;
+    }
+
+    s1 = "3";
+    s2 = compPrintf ("%i", 3, NULL);
+
+    if (s1 == s2)
+	std::cout << "PASS: %i" << std::endl;
+    else
+    {
+	std::cout << "FAIL: %%i" << std::endl;
+	return false;
+    }
+
+    s1 = "3.012600";
+    s2 = compPrintf ("%f", 3.0126, NULL);
+
+    if (s1 == s2)
+	std::cout << "PASS: %f" << std::endl;
+    else
+    {
+	std::cout << "FAIL: %f " << s2 << std::endl;
+	return false;
+    }
+
+    s1 = "0x4f567";
+    s2 = compPrintf ("0x%x", 0x4f567, NULL);
+
+    if (s1 == s2)
+	std::cout << "PASS: %x" << std::endl;
+    else
+    {
+	std::cout << "FAIL: %x" << std::endl;
+	return false;
+    }
+
+    formatValues["%i"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (6)));
+    formatStrings["%i"] = CompString ("6");
+    formatValues["%f"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<float> (6.532)));
+    formatStrings["%f"] = CompString ("6.532000");
+    formatValues["%x"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (0x34fe5aa)));
+    formatStrings["%x"] = CompString ("34fe5aa");
+    formatValues["%d"] = boost::shared_static_cast <compiz::string::printf_test::Value> (compiz::string::printf_test::Value::Ptr (new compiz::string::printf_test::TValue<int> (2)));
+    formatStrings["%d"] = CompString ("2");
+
+    for (std::map <CompString, CompString>::iterator it = formatStrings.begin ();
+	 it != formatStrings.end (); it++)
+    {
+	CompString str = compiz::string::printf_test::get_format (it->first, formatValues[it->first]);
+	if (str != it->second)
+	{
+	    std::cout << "FAIL: format " << it->first << " result " << str << " expected " << it->second << std::endl;
+	    return false;
+	}
+	else
+	    std::cout << "PASS: format " << it->first << std::endl;
+    }
+
+    return true;
+
+}
+
+CompStringTest *
+getTestObject ()
+{
+    return new CompStringTestPrintf ();
+}

=== added file 'src/string/tests/test-string.cpp'
--- src/string/tests/test-string.cpp	1970-01-01 00:00:00 +0000
+++ src/string/tests/test-string.cpp	2011-11-01 23:21:23 +0000
@@ -0,0 +1,47 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "test-string.h"
+
+CompStringTest::CompStringTest ()
+{
+}
+
+CompStringTest::~CompStringTest ()
+{
+}
+
+int
+main (int argc, char **argv)
+{
+    CompStringTest  *cst = static_cast <CompStringTest *> (getTestObject ());
+    bool ret = false;
+
+    ret = cst->test ();
+
+    delete cst;
+
+    return ret ? 0 : 1;
+}

=== added file 'src/string/tests/test-string.h'
--- src/string/tests/test-string.h	1970-01-01 00:00:00 +0000
+++ src/string/tests/test-string.h	2011-11-01 23:21:23 +0000
@@ -0,0 +1,52 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#ifndef _COMPIZ_TEST_STRING_H
+#define _COMPIZ_TEST_STRING_H
+
+#include <core/string.h>
+
+class CompStringTest
+{
+public:
+
+    CompStringTest ();
+    virtual ~CompStringTest ();
+
+    virtual bool test () = 0;
+};
+
+class CompStringTestPrintf :
+    public CompStringTest
+{
+public:
+
+    bool test ();
+};
+
+CompStringTest *
+getTestObject ();
+
+#endif

=== added directory 'src/timer'
=== added directory 'src/timer/include'
=== added directory 'src/timer/include/core'
=== renamed file 'include/core/timeouthandler.h' => 'src/timer/include/core/timeouthandler.h'
=== renamed file 'include/core/timer.h' => 'src/timer/include/core/timer.h'
--- include/core/timer.h	2011-07-04 18:17:44 +0000
+++ src/timer/include/core/timer.h	2011-11-01 23:21:23 +0000
@@ -32,6 +32,24 @@
 
 class CompTimeoutSource;
 class PrivateTimer;
+
+namespace compiz {
+namespace core {
+namespace timer {
+
+    inline int timeval_diff (struct timeval *tv1, struct timeval *tv2)
+    {
+	if (tv1->tv_sec == tv2->tv_sec || tv1->tv_usec >= tv2->tv_usec)
+	    return (((tv1->tv_sec - tv2->tv_sec) * 1000000) +			   
+	      (tv1->tv_usec - tv2->tv_usec)) / 1000;
+	else
+	    return (((tv1->tv_sec - 1 - tv2->tv_sec) * 1000000) +
+		   (1000000 + tv1->tv_usec - tv2->tv_usec)) / 1000;
+    }
+}
+}
+}
+
 /**
  * A simple timer for use with invoking a CallBack during a timed duration.
  */

=== added directory 'src/timer/src'
=== renamed file 'src/privatetimeouthandler.h' => 'src/timer/src/privatetimeouthandler.h'
=== renamed file 'src/privatetimeoutsource.h' => 'src/timer/src/privatetimeoutsource.h'
=== renamed file 'src/privatetimer.h' => 'src/timer/src/privatetimer.h'
=== renamed file 'src/timeouthandler.cpp' => 'src/timer/src/timeouthandler.cpp'
=== renamed file 'src/timer.cpp' => 'src/timer/src/timer.cpp'
=== added directory 'src/timer/tests'
=== renamed file 'tests/timer/CMakeLists.txt' => 'src/timer/tests/CMakeLists.txt'
--- tests/timer/CMakeLists.txt	2011-07-06 18:58:47 +0000
+++ src/timer/tests/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,15 +1,17 @@
-include (CompizCommon)
-include (FindPkgConfig)
-
-pkg_check_modules (COMPIZ_TEST_TIMER glibmm-2.4)
-
-if (COMPIZ_TEST_TIMER_FOUND)
-
-	set (COMPIZ_TIMER_TEST_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
-
-	add_subdirectory (callbacks)
-	add_subdirectory (diffs)
-	add_subdirectory (set-values)
-	add_subdirectory (while-calling)
-
-endif (COMPIZ_TEST_TIMER_FOUND)
+#include (CompizCommon)
+#include (FindPkgConfig)
+
+#set (COMPIZ_TEST_TIMER_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
+#set (COMPIZ_TEST_TIMER_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
+
+#include_directories (${COMPIZ_TIMER_SOURCE_DIR}
+#		     ${COMPIZ_TIMER_INCLUDE_DIR})
+
+#add_library (timer_test_internal STATIC
+#	     test-timer.cpp)
+
+compiz_test_base (core timer)
+add_subdirectory (callbacks)
+add_subdirectory (diffs)
+add_subdirectory (set-values)
+add_subdirectory (while-calling)

=== renamed directory 'tests/timer/callbacks' => 'src/timer/tests/callbacks'
=== modified file 'src/timer/tests/callbacks/CMakeLists.txt'
--- tests/timer/callbacks/CMakeLists.txt	2011-07-06 18:58:47 +0000
+++ src/timer/tests/callbacks/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,23 +1,1 @@
-link_directories (${COMPIZ_TEST_TIMER_LINK_DIRS})
-
-include_directories (${COMPIZ_TEST_TIMER_INCLUDE_DIRS}
-		     ${compiz_SOURCE_DIR}/include
-		     ${compiz_BINARY_DIR}
-		     ${compiz_BINARY_DIR}/generated
-		     ${compiz_SOURCE_DIR}/src
-		     ${COMPIZ_TIMER_TEST_BASE_DIR})
-
-set (OBJECT CompTimerTestCallbacks)
-add_definitions (-DOBJECT=${OBJECT})
-
-add_executable (test-timer-callbacks
-		test-timer-callbacks.cpp
-		../test-timer.cpp 
-		${compiz_SOURCE_DIR}/src/timer.cpp
-		${compiz_SOURCE_DIR}/src/timeouthandler.cpp)
-
-target_link_libraries (test-timer-callbacks
-		       ${COMPIZ_TEST_TIMER_LIBRARIES})
-
-add_test (test-timer-callbacks
-	  ${CMAKE_CURRENT_BINARY_DIR}/test-timer-callbacks)
+compiz_test (core timer callbacks)

=== added directory 'src/timer/tests/callbacks/src'
=== renamed file 'tests/timer/callbacks/test-timer-callbacks.cpp' => 'src/timer/tests/callbacks/src/test-timer-callbacks.cpp'
--- tests/timer/callbacks/test-timer-callbacks.cpp	2011-07-06 18:58:47 +0000
+++ src/timer/tests/callbacks/src/test-timer-callbacks.cpp	2011-11-01 23:21:23 +0000
@@ -104,3 +104,9 @@
 	exit (1);
     }
 }
+
+CompTimerTest *
+getTestObject ()
+{
+    return new CompTimerTestCallbacks ();
+}

=== renamed directory 'tests/timer/diffs' => 'src/timer/tests/diffs'
=== modified file 'src/timer/tests/diffs/CMakeLists.txt'
--- tests/timer/diffs/CMakeLists.txt	2011-07-06 18:58:47 +0000
+++ src/timer/tests/diffs/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,23 +1,1 @@
-link_directories (${COMPIZ_TEST_TIMER_LINK_DIRS})
-
-include_directories (${COMPIZ_TEST_TIMER_INCLUDE_DIRS}
-		     ${compiz_SOURCE_DIR}/include
-		     ${compiz_BINARY_DIR}
-		     ${compiz_BINARY_DIR}/generated
-		     ${compiz_SOURCE_DIR}/src
-		     ${COMPIZ_TIMER_TEST_BASE_DIR})
-
-set (OBJECT CompTimerTestDiffs)
-add_definitions (-DOBJECT=${OBJECT})
-
-add_executable (test-timer-diffs
-		test-timer-diffs.cpp
-		../test-timer.cpp 
-		${compiz_SOURCE_DIR}/src/timer.cpp
-		${compiz_SOURCE_DIR}/src/timeouthandler.cpp)
-
-target_link_libraries (test-timer-diffs
-		       ${COMPIZ_TEST_TIMER_LIBRARIES})
-
-add_test (test-timer-diffs
-	  ${CMAKE_CURRENT_BINARY_DIR}/test-timer-diffs)
+compiz_test (core timer diffs)

=== added directory 'src/timer/tests/diffs/src'
=== added file 'src/timer/tests/diffs/src/test-timer-diffs.cpp'
--- src/timer/tests/diffs/src/test-timer-diffs.cpp	1970-01-01 00:00:00 +0000
+++ src/timer/tests/diffs/src/test-timer-diffs.cpp	2011-11-01 23:21:23 +0000
@@ -0,0 +1,88 @@
+/*
+ * Copyright © 2011 Canonical Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include "test-timer.h"
+
+bool
+CompTimerTestDiffs::cb (int timernum, CompTimer *t1, CompTimer *t2, CompTimer *t3)
+{
+    if (timernum == 1 || timernum == 2 || timernum == 3)
+    {
+	std::cout << "INFO: executing timer " << timernum << std::endl;
+
+	std::cout << "INFO: t1->minLeft " << t1->minLeft () << std::endl << \
+		     "INFO: t1->maxLeft " << t1->maxLeft () << std::endl << \
+		     "INFO: t1->minTime " << t1->minTime () << std::endl << \
+		     "INFO: t1->maxTime " << t1->maxTime () << std::endl;
+
+	std::cout << "INFO: t2->minLeft " << t2->minLeft () << std::endl << \
+		     "INFO: t2->maxLeft " << t2->maxLeft () << std::endl << \
+		     "INFO: t2->minTime " << t2->minTime () << std::endl << \
+		     "INFO: t2->maxTime " << t2->maxTime () << std::endl;
+
+	std::cout << "INFO: t3->minLeft " << t3->minLeft () << std::endl << \
+		     "INFO: t3->maxLeft " << t3->maxLeft () << std::endl << \
+		     "INFO: t3->minTime " << t3->minTime () << std::endl << \
+		     "INFO: t3->maxTime " << t3->maxTime () << std::endl;
+    }
+
+    if (timernum == 3)
+	ml->quit ();
+
+    std::cout << "return false" << std::endl;
+    return false;
+}
+
+void
+CompTimerTestDiffs::precallback ()
+{
+    CompTimer      *t1, *t2, *t3;
+
+    std::cout << "-= TEST: checking timeout diff" << std::endl;
+
+    t1 = new CompTimer ();
+    t2 = new CompTimer ();
+    t3 = new CompTimer ();
+
+    timers.push_back (t1);
+    timers.push_back (t2);
+    timers.push_back (t3);
+
+    t1->setCallback (boost::bind (&CompTimerTestDiffs::cb, this, 1, t1, t2, t3));
+    t1->setTimes (1000, 1100);
+    t1->start ();
+    t2->setCallback (boost::bind (&CompTimerTestDiffs::cb, this, 2, t1, t2, t3));
+    t2->setTimes (2000, 2100);
+    t2->start ();
+    t3->setCallback (boost::bind (&CompTimerTestDiffs::cb, this, 3, t1, t2, t3));
+    t3->setTimes (3000, 3100);
+    t3->start ();
+}
+
+CompTimerTest *
+getTestObject ()
+{
+    return new CompTimerTestDiffs ();
+}

=== renamed directory 'tests/timer/set-values' => 'src/timer/tests/set-values'
=== modified file 'src/timer/tests/set-values/CMakeLists.txt'
--- tests/timer/set-values/CMakeLists.txt	2011-07-06 18:58:47 +0000
+++ src/timer/tests/set-values/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,23 +1,1 @@
-link_directories (${COMPIZ_TEST_TIMER_LINK_DIRS})
-
-include_directories (${COMPIZ_TEST_TIMER_INCLUDE_DIRS}
-		     ${compiz_SOURCE_DIR}/include
-		     ${compiz_BINARY_DIR}
-		     ${compiz_BINARY_DIR}/generated
-		     ${compiz_SOURCE_DIR}/src
-		     ${COMPIZ_TIMER_TEST_BASE_DIR})
-
-set (OBJECT CompTimerTestSetValues)
-add_definitions (-DOBJECT=${OBJECT})
-
-add_executable (test-timer-set-values
-		test-timer-set-values.cpp
-		../test-timer.cpp 
-		${compiz_SOURCE_DIR}/src/timer.cpp
-		${compiz_SOURCE_DIR}/src/timeouthandler.cpp)
-
-target_link_libraries (test-timer-set-values
-		       ${COMPIZ_TEST_TIMER_LIBRARIES})
-
-add_test (test-timer-set-values
-	  ${CMAKE_CURRENT_BINARY_DIR}/test-timer-set-values)
+compiz_test (core timer set-values)

=== added directory 'src/timer/tests/set-values/src'
=== renamed file 'tests/timer/set-values/test-timer-set-values.cpp' => 'src/timer/tests/set-values/src/test-timer-set-values.cpp'
--- tests/timer/set-values/test-timer-set-values.cpp	2011-07-06 18:58:47 +0000
+++ src/timer/tests/set-values/src/test-timer-set-values.cpp	2011-11-01 23:21:23 +0000
@@ -137,3 +137,9 @@
     timers.push_back (t2);
     timers.push_back (t3);
 }
+
+CompTimerTest *
+getTestObject ()
+{
+    return new CompTimerTestSetValues ();
+}

=== renamed file 'tests/timer/test-timer.cpp' => 'src/timer/tests/test-timer.cpp'
--- tests/timer/test-timer.cpp	2011-07-06 18:58:47 +0000
+++ src/timer/tests/test-timer.cpp	2011-11-01 23:21:23 +0000
@@ -47,7 +47,7 @@
 int
 main (int argc, char **argv)
 {
-    CompTimerTest  *ctt = static_cast <CompTimerTest *> (new OBJECT ());
+    CompTimerTest  *ctt = static_cast <CompTimerTest *> (getTestObject ());
     TimeoutHandler *th = new TimeoutHandler ();
     TimeoutHandler::SetDefault (th);
 

=== renamed file 'tests/timer/test-timer.h' => 'src/timer/tests/test-timer.h'
--- tests/timer/test-timer.h	2011-07-06 18:58:47 +0000
+++ src/timer/tests/test-timer.h	2011-11-01 23:21:23 +0000
@@ -86,4 +86,7 @@
     bool cb (int timernum, CompTimer *t1, CompTimer *t2, CompTimer *t3);
 };
 
+CompTimerTest *
+getTestObject ();
+
 #endif

=== renamed directory 'tests/timer/while-calling' => 'src/timer/tests/while-calling'
=== modified file 'src/timer/tests/while-calling/CMakeLists.txt'
--- tests/timer/while-calling/CMakeLists.txt	2011-07-06 18:58:47 +0000
+++ src/timer/tests/while-calling/CMakeLists.txt	2011-11-01 23:21:23 +0000
@@ -1,23 +1,1 @@
-link_directories (${COMPIZ_TEST_TIMER_LINK_DIRS})
-
-include_directories (${COMPIZ_TEST_TIMER_INCLUDE_DIRS}
-		     ${compiz_SOURCE_DIR}/include
-		     ${compiz_BINARY_DIR}
-		     ${compiz_BINARY_DIR}/generated
-		     ${compiz_SOURCE_DIR}/src
-		     ${COMPIZ_TIMER_TEST_BASE_DIR})
-
-set (OBJECT CompTimerTestSetCalling)
-add_definitions (-DOBJECT=${OBJECT})
-
-add_executable (test-timer-set-times-while-calling
-		test-timer-set-times-while-calling.cpp
-		../test-timer.cpp 
-		${compiz_SOURCE_DIR}/src/timer.cpp
-		${compiz_SOURCE_DIR}/src/timeouthandler.cpp)
-
-target_link_libraries (test-timer-set-times-while-calling
-		       ${COMPIZ_TEST_TIMER_LIBRARIES})
-
-add_test (test-timer-set-times-while-calling
-	  ${CMAKE_CURRENT_BINARY_DIR}/test-timer-set-times-while-calling)
+compiz_test (core timer while-calling)

=== added directory 'src/timer/tests/while-calling/src'
=== renamed file 'tests/timer/while-calling/test-timer-set-times-while-calling.cpp' => 'src/timer/tests/while-calling/src/test-timer-set-times-while-calling.cpp'
--- tests/timer/while-calling/test-timer-set-times-while-calling.cpp	2011-07-06 18:58:47 +0000
+++ src/timer/tests/while-calling/src/test-timer-set-times-while-calling.cpp	2011-11-01 23:21:23 +0000
@@ -122,3 +122,9 @@
     t3->setTimes (3000, 3100);
     t3->start ();
 }
+
+CompTimerTest *
+getTestObject ()
+{
+    return new CompTimerTestSetCalling ();
+}

=== modified file 'src/window.cpp'
--- src/window.cpp	2011-10-26 23:18:47 +0000
+++ src/window.cpp	2011-11-01 23:21:23 +0000
@@ -23,8 +23,6 @@
  * Author: David Reveman <[e-mail]>
  */
 
-#include <compiz.h>
-
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 #include <X11/Xproto.h>
@@ -6141,14 +6139,14 @@
     if (screen->vpSize ().width () != 1)
     {
 	x += screen->vp ().x () * screen->width ();
-	x = MOD (x, vWidth);
+	x = compiz::core::screen::wraparound_mod (x, vWidth);
 	x -= screen->vp ().x () * screen->width ();
     }
 
     if (screen->vpSize ().height () != 1)
     {
 	y += screen->vp ().y () * screen->height ();
-	y = MOD (y, vHeight);
+	y = compiz::core::screen::wraparound_mod (y, vHeight);
 	y -= screen->vp ().y () * screen->height ();
     }
 

=== removed directory 'tests'
=== removed file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2011-07-06 19:52:01 +0000
+++ tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-add_subdirectory (pluginclasshandler)
-add_subdirectory (timer)

=== removed directory 'tests/timer'
=== removed file 'tests/timer/diffs/test-timer-diffs.cpp'
--- tests/timer/diffs/test-timer-diffs.cpp	2011-07-06 18:58:47 +0000
+++ tests/timer/diffs/test-timer-diffs.cpp	1970-01-01 00:00:00 +0000
@@ -1,82 +0,0 @@
-/*
- * Copyright © 2011 Canonical Ltd.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Canonical Ltd. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Canonical Ltd. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL CANONICAL, LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authored by: Sam Spilsbury <[e-mail]>
- */
-
-#include "test-timer.h"
-
-bool
-CompTimerTestDiffs::cb (int timernum, CompTimer *t1, CompTimer *t2, CompTimer *t3)
-{
-    if (timernum == 1 || timernum == 2 || timernum == 3)
-    {
-	std::cout << "INFO: executing timer " << timernum << std::endl;
-
-	std::cout << "INFO: t1->minLeft " << t1->minLeft () << std::endl << \
-		     "INFO: t1->maxLeft " << t1->maxLeft () << std::endl << \
-		     "INFO: t1->minTime " << t1->minTime () << std::endl << \
-		     "INFO: t1->maxTime " << t1->maxTime () << std::endl;
-
-	std::cout << "INFO: t2->minLeft " << t2->minLeft () << std::endl << \
-		     "INFO: t2->maxLeft " << t2->maxLeft () << std::endl << \
-		     "INFO: t2->minTime " << t2->minTime () << std::endl << \
-		     "INFO: t2->maxTime " << t2->maxTime () << std::endl;
-
-	std::cout << "INFO: t3->minLeft " << t3->minLeft () << std::endl << \
-		     "INFO: t3->maxLeft " << t3->maxLeft () << std::endl << \
-		     "INFO: t3->minTime " << t3->minTime () << std::endl << \
-		     "INFO: t3->maxTime " << t3->maxTime () << std::endl;
-    }
-
-    if (timernum == 3)
-	ml->quit ();
-
-    std::cout << "return false" << std::endl;
-    return false;
-}
-
-void
-CompTimerTestDiffs::precallback ()
-{
-    CompTimer      *t1, *t2, *t3;
-
-    std::cout << "-= TEST: checking timeout diff" << std::endl;
-
-    t1 = new CompTimer ();
-    t2 = new CompTimer ();
-    t3 = new CompTimer ();
-
-    timers.push_back (t1);
-    timers.push_back (t2);
-    timers.push_back (t3);
-
-    t1->setCallback (boost::bind (&CompTimerTestDiffs::cb, this, 1, t1, t2, t3));
-    t1->setTimes (1000, 1100);
-    t1->start ();
-    t2->setCallback (boost::bind (&CompTimerTestDiffs::cb, this, 2, t1, t2, t3));
-    t2->setTimes (2000, 2100);
-    t2->start ();
-    t3->setCallback (boost::bind (&CompTimerTestDiffs::cb, this, 3, t1, t2, t3));
-    t3->setTimes (3000, 3100);
-    t3->start ();
-}