[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

compiz: Changes to 'upstream-unstable'



 AUTHORS                                                          |  114 
 CMakeLists.txt                                                   |   22 
 ChangeLog                                                        |19315 +++++++++-
 NEWS                                                             |  501 
 VERSION                                                          |    1 
 cmake/CompizCommon.cmake                                         |  340 
 cmake/CompizPlugin.cmake                                         |   18 
 gtk/window-decorator/actionmenu.c                                |    3 
 gtk/window-decorator/cairo.c                                     |    7 
 gtk/window-decorator/decorator.c                                 |  297 
 gtk/window-decorator/decorprops.c                                |   34 
 gtk/window-decorator/frames.c                                    |    2 
 gtk/window-decorator/gtk-window-decorator.c                      |   26 
 gtk/window-decorator/gtk-window-decorator.h                      |   25 
 gtk/window-decorator/metacity.c                                  |   36 
 gtk/window-decorator/wnck.c                                      |   19 
 include/compiz-common.h.in                                       |    6 
 include/compiz.h                                                 |    7 
 include/core/CMakeLists.txt                                      |    3 
 include/core/core.h                                              |    3 
 include/core/option.h                                            |    1 
 include/core/plugin.h                                            |   24 
 include/core/pluginclasshandler.h                                |  122 
 include/core/privateunion.h                                      |   36 
 include/core/rect.h                                              |    2 
 include/core/screen.h                                            |    1 
 include/core/timeouthandler.h                                    |   57 
 include/core/timer.h                                             |   34 
 include/core/valueholder.h                                       |   53 
 include/core/window.h                                            |    9 
 include/decoration.h                                             |   69 
 kde/window-decorator-kde4/decorator.cpp                          |   23 
 kde/window-decorator-kde4/decorator.h                            |   21 
 kde/window-decorator-kde4/switcher.cpp                           |   15 
 kde/window-decorator-kde4/utils.cpp                              |    2 
 kde/window-decorator-kde4/window.cpp                             |  122 
 kde/window-decorator-kde4/window.h                               |    2 
 libdecoration/decoration.c                                       |  188 
 plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h      |    6 
 plugins/compiztoolbox/src/compiztoolbox.cpp                      |   17 
 plugins/composite/CMakeLists.txt                                 |    2 
 plugins/composite/include/composite/composite.h                  |    8 
 plugins/composite/src/privates.h                                 |    1 
 plugins/composite/src/window.cpp                                 |   20 
 plugins/copytex/src/copytex.cpp                                  |   62 
 plugins/copytex/src/copytex.h                                    |   29 
 plugins/dbus/src/dbus.cpp                                        |    1 
 plugins/decor/src/decor.cpp                                      |  554 
 plugins/decor/src/decor.h                                        |   43 
 plugins/fade/fade.xml.in                                         |    2 
 plugins/fade/src/fade.cpp                                        |   67 
 plugins/fade/src/fade.h                                          |    1 
 plugins/move/src/move.cpp                                        |   32 
 plugins/opengl/src/paint.cpp                                     |    8 
 plugins/opengl/src/window.cpp                                    |   13 
 plugins/place/src/place.cpp                                      |  147 
 plugins/place/src/place.h                                        |    6 
 plugins/resize/resize.xml.in                                     |  263 
 plugins/resize/src/resize.cpp                                    |  167 
 plugins/scale/src/scale.cpp                                      |    3 
 plugins/switcher/src/switcher.cpp                                |   10 
 plugins/switcher/switcher.xml.in                                 |    4 
 plugins/water/src/water.cpp                                      |    6 
 plugins/wobbly/src/wobbly.cpp                                    |   50 
 src/CMakeLists.txt                                               |    5 
 src/event.cpp                                                    |  233 
 src/logmessage.cpp                                               |   85 
 src/privateeventsource.h                                         |   56 
 src/privateiosource.h                                            |   55 
 src/privatescreen.h                                              |   97 
 src/privatetimeouthandler.h                                      |   36 
 src/privatetimeoutsource.h                                       |   57 
 src/privatetimer.h                                               |   48 
 src/privatewindow.h                                              |   28 
 src/rect.cpp                                                     |    2 
 src/screen.cpp                                                   |  203 
 src/session.cpp                                                  |    2 
 src/timeouthandler.cpp                                           |   94 
 src/timer.cpp                                                    |  185 
 src/valueholder.cpp                                              |  110 
 src/valueholder.h                                                |   41 
 src/window.cpp                                                   |  454 
 src/windowgeometry.cpp                                           |   63 
 tests/CMakeLists.txt                                             |    2 
 tests/pluginclasshandler/CMakeLists.txt                          |    6 
 tests/pluginclasshandler/construct/CMakeLists.txt                |   25 
 tests/pluginclasshandler/construct/test-pch-construct.cpp        |   64 
 tests/pluginclasshandler/get/CMakeLists.txt                      |   25 
 tests/pluginclasshandler/get/test-pch-get.cpp                    |   64 
 tests/pluginclasshandler/indexes/CMakeLists.txt                  |   28 
 tests/pluginclasshandler/indexes/test-pch-indexes.cpp            |  434 
 tests/pluginclasshandler/test-pluginclasshandler.cpp             |  101 
 tests/pluginclasshandler/test-pluginclasshandler.h               |  114 
 tests/pluginclasshandler/typenames/CMakeLists.txt                |   25 
 tests/pluginclasshandler/typenames/test-pch-typenames.cpp        |   83 
 tests/timer/CMakeLists.txt                                       |   15 
 tests/timer/callbacks/CMakeLists.txt                             |   23 
 tests/timer/callbacks/test-timer-callbacks.cpp                   |  106 
 tests/timer/diffs/CMakeLists.txt                                 |   23 
 tests/timer/diffs/test-timer-diffs.cpp                           |   82 
 tests/timer/set-values/CMakeLists.txt                            |   23 
 tests/timer/set-values/test-timer-set-values.cpp                 |  139 
 tests/timer/test-timer.cpp                                       |   61 
 tests/timer/test-timer.h                                         |   89 
 tests/timer/while-calling/CMakeLists.txt                         |   23 
 tests/timer/while-calling/test-timer-set-times-while-calling.cpp |  124 
 xslt/bcop.xslt                                                   |    2 
 107 files changed, 23380 insertions(+), 3237 deletions(-)

New commits:
commit 222b70bc49e0b3cac371e53cc1453a05a4202491
Author: Janos Guljas <janos@resenje.org>
Date:   Tue Aug 2 04:11:24 2011 +0200

    Imported Upstream version 0.9.5.0

diff --git a/AUTHORS b/AUTHORS
index 1500f90..2c25941 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,29 +1,97 @@
-compiz and the standard set of plugins are designed and written by
-
+Adam Williamson <awilliam@redhat.com>
+Adel Gadllah <adel.gadllah@gmail.com>
+Alyssa Hung <deciare@isisview.org>
+Bellegarde Cedric <gnumdk@gmail.com>
+Bellegarde Cedric <gnumdk@puffy.homelinux.org>
+C-F Language team <i18n@opencompositing.org>
+Cedric <gnumdk@gmail.com>
+Christopher Williams <christopherw@verizon.net>
+Christopher Williams <crdlb@compiz-fusion.org>
+Compiz Fusion l10n team <i18n@opencompositing.org>
+Dan Winship <danw@novell.com>
+Dan Winship <danw@twelve-monkeys.boston.ximian.com>
+Daniel Lea <danlea@gmail.com>
+Daniel Nylander <po@danielnylander.se>
+Danny Baumann <daba@mobilrechner.localdomain>
+Danny Baumann <daba@rechenknecht.peppercon.de>
+Danny Baumann <dannybaumann@web.de>
+David Reveman <c99drn@cs.umu.se>
+David Reveman <david@ion.(none)>
 David Reveman <davidr@novell.com>
-
-with additional functionality by
-
-Radek Doulik <rodo@novell.com> IO multiplexing
-Mirco Müller <macslow@bangang.de> Skydome support in cube plugin
-Søren Sandmann <sandmann@redhat.com> plane plugin
-Dan Winship <danw@novell.com> gconf-dump plugin
-Brian Paul <brian.paul@tungstengraphics.com> Matrix functions
-
-and other contributions by
-
-Mike Cook <mcook@novell.com>
-Mike Dransfield <mike@blueroot.co.uk>
-Diogo Ferreira <diogo@underdev.org>
-gandalfn <gandalfn@club-internet.fr>
-Guillaume <ixcemix@gmail.com>
-Kristian Høgsberg <krh@redhat.com>
 Dennis Kasprzyk <onestone@beryl-project.org>
+Dennis Kasprzyk <onestone@compiz-fusion.org>
+Dennis Kasprzyk <onestone@opencompositing.org>
+Didier Roche <didrocks@ubuntu.com>
+Diogo Ferreira <diogo@underdev.org>
+Dominique Leuenberger <dimstar@opensuse.org>
+Dominique Leuenberger <dominique@leuenberger.net>
+Dominique Leuenberger <dominique@messiah.leuenberger.net>
+Eduardo Gurgel Pinho <eduardo@mad4.Chagas>
+Erkin Bahceci <erkinbah@gmail.com>
 Gerd Kohlberger <lowfi@chello.at>
-Volker Krause <vkrause@kde.org>
-moppsy <moppsy@comcast.net>
+Guillaume <ixcemix@gmail.com>
+Guillaume Seguin <guillaume@segu.in>
+James Jones <jajones@jatest.nvidia.com>
+Jason Smith <jason.smith@canonical.com>
+Jay Catherwood <jay.catherwood@gmail.com>
 Jeremy C. Reed <reed@reedmedia.net>
-Thierry Reding <thierry@gilfi.de>
+Jigish Gohil <cyberorg@opensuse.org name = Jigish Gohil>
+Jigish Gohil <cyberorg@prime.cyberorg.info>
+Joel Bosveld <Joel.Bosveld@gmail.com>
+Joel Bosveld <joel.bosveld@gmail.com>
 Julian Sikorski <lordzanon@poczta.onet.pl>
+Jürgen Kreileder <jk@blackdown.de>
+Kristian Hogsberg <krh@bitplanet.net>
+Kristian Høgsberg <krh@redhat.com>
+Kristian Lyngstol <kristian@beryl-project.org>
+Kristian Lyngstol <kristian@bohemians.org>
+Kristopher Ives <kris@leetbook2.(none)>
+Kristopher Ives <kristopher.ives@gmail.com>
+Lubos Lunak <llunak@novell.com>
+Michael Vogt <mvo@ubuntu.com>
+Mike Cook <mcook@novell.com>
+Mike Dransfield <mike@blueroot.co.uk>
+Mirco Muller <macslow@bangang.de>
+Nicolas Viennot <nicolas@viennot.biz>
+Owen W. Taylor <otaylor@fishsoup.net>
+Patrick Niklaus <marex@beryl-project.org>
+Patrick Niklaus <marex@opencompositing.org>
+Patrick Niklaus <patrick.niklaus@googlemail.com>
+Per Wigren <per.wigren@gmail.com>
 Quinn Storm <livinglatexkali@gmail.com>
-Erkin Bahceci <erkinbah@gmail.com>
+Quinn Storm <quinn@quinn-laptop.(none)>
+Randolph Chung <randolph@tausq.org>
+Rob Taylor <rob.taylor@codethink.co.uk>
+Robert Carr <racarr@gorbie.(none)>
+Robert Carr <robb@gorbachev.(none)>
+Robert Noland <rnoland@rnoland-ibm.acs.internap.com>
+Roi Cohen <racarr@gorbie.(none)>
+Roi Cohen <roico.beryl@gmail.com>
+Roland Baer <roland@Vista.(none)>
+Roland Bar <roland@verifysoft.de>
+Roland Bär <roland@Vista.(none)>
+Roland Bär <roland@verifysoft.de>
+Sam <smspillaz@gmail.com>
+Sam Spilsbury <Sam@XPS-SUSE.site>
+Sam Spilsbury <SmSpillaz@gmail.com>
+Sam Spilsbury <sam.spilsbury@canonical.com>
+Sam Spilsbury <smspillaz@XPS-FEDORA.(none)>
+Sam Spilsbury <smspillaz@XPS-U.(none)>
+Sam Spilsbury <smspillaz@gmail.com>
+Sam Spilsbury <smspillaz@smspillaz-desktop.(none)>
+Scott Moreau <oreaus@gmail.com>
+Sebasian Billaudelle <stein@cream-project.org>
+Steven Robertson <nihilismwow@gmail.com>
+Stjepan Glavina <stjepang@gmail.com>
+Søren Sandmann <sandmann@redhat.com>
+Thierry Reding <thierry@gilfi.de>
+Tomas Carnecky <tom@dbservice.com>
+Travis Watkins <amaranth@ubuntu.com>
+Unity <unity@VB-U1010.(none)>
+Zack Rusin <zack@kde.org>
+dragoran <drago01@gmail.com>
+gandalfn <gandalfn@club-internet.fr>
+mike@blueroot.co.uk <mike@blueroot.co.uk>
+moppsy <moppsy@comcast.net>
+scott <scott@box1.localdomain>
+Δημήτρης (djdoo) <jimdusis@yahoo.gr>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f6d63d5..3544717 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ include (CompizCommon)
 include (CompizPackage)
 include (cmake/base.cmake)
 include (CheckFunctionExists)
+include (CTest)
 
 
 set (CMAKE_CONFIGURATION_TYPES "Debug;Release;RelWithDebInfo;MinSizeRe" CACHE INTERNAL "" FORCE)
@@ -14,16 +15,12 @@ if (NOT CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE "Debug" CACHE STRING "Build type (Debug/Release/RelWithDebInfo/MinSizeRe)" FORCE)
 endif (NOT CMAKE_BUILD_TYPE)
 
-# compiz package version number
-# An odd micro number indicates in-progress development.
-# An even micro number indicates a released version.
-set (COMPIZ_VERSION_MAJOR 0)
-set (COMPIZ_VERSION_MINOR 9)
-set (COMPIZ_VERSION_MICRO 4)
-set (COMPIZ_VERSION_MACRO 0)
-set (VERSION ${COMPIZ_VERSION_MAJOR}.${COMPIZ_VERSION_MINOR}.${COMPIZ_VERSION_MICRO}.${COMPIZ_VERSION_MACRO})
+file (READ ${CMAKE_SOURCE_DIR}/VERSION COMPIZ_RELEASE_VERSION LIMIT 12 OFFSET 0)
+string (STRIP ${COMPIZ_RELEASE_VERSION} COMPIZ_RELEASE_VERSION)
 
-set (DECOR_INTERFACE_VERSION 20110130)
+set (VERSION ${COMPIZ_RELEASE_VERSION})
+
+set (DECOR_INTERFACE_VERSION 20110504)
 
 if (COMPIZ_PACKAGING_ENABLED)
     set (prefix ${CMAKE_INSTALL_PREFIX}                   CACHE PATH "prefix")
@@ -118,10 +115,17 @@ add_subdirectory (src)
 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 ()
 compiz_add_git_dist ()
+compiz_add_distcheck ()
+compiz_add_release ()
+compiz_add_release_signoff ()
 
 _print_configure_results ()
 
diff --git a/ChangeLog b/ChangeLog
index bbfa473..41cf13c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,1795 +1,18598 @@
-2006-06-21  David Reveman  <davidr@novell.com>
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-14
 
-	* src/window.c: Add updateTransientHint to protect against circular
-	transient dependencies. (bnc 186825)
+    Merge in build fix and debug message removal
 
-2006-06-20  David Reveman  <davidr@novell.com>
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-14
 
-	* src/window.c (addWindowSizeChanges): Constrain window
-	dimensions if they are too large.
+    Fix for bad merge, unbreak plugin build
 
-	* gnome/window-decorator/gnome-window-decorator.c (get_mwm_prop):
-	Trap X errors.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-14
 
-2006-06-20  Dan Winship  <danw@novell.com>
+    Merge in build changes
 
-	* configure.ac (ALL_LINGUAS): Add pl
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-13
 
-2006-06-16  David Reveman  <davidr@novell.com>
+    Disable BUILD_KDE4 in the distcheck target for now as upstream KDE has moved
+    some header files around and this is breaking the build check
 
-	* plugins/compiz.schemas.in.in: Regen.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-08
 
-	* plugins/switcher.c:
-	* plugins/scale.c: Add modal dialogs and fullscreen windows
-	to default window types. (bnc 185749)
+    Merge in fix to ftbfs in some cases
 
-	* gnome/window-decorator/gnome-window-decorator.c: Track motif
-	WM hints and disable decorations when application wants no
-	titlebar. (bnc 185852)
+Merge: ee98496 e43159f
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-08
 
-2006-06-15  David Reveman  <davidr@novell.com>
+    Merge in lp:~smspillaz/compiz-core/compiz-core.dist-buildsystem and turn
+    CTest on by default for everything
 
-	* plugins/cube.c (cubePaintTransformedScreen): Remove
-	PAINT_SCREEN_CLEAR_MASK from mask.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-08
 
-	* plugins/switcher.c (switchPaintScreen): Add PAINT_SCREEN_CLEAR_MASK
-	when zooming. (bnc 183676)
+    Nitpicking and fix FTBFS on bzr
 
-	* src/paint.c (paintTransformedScreen): Clear color buffer if
-	PAINT_SCREEN_CLEAR_MASK is present.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-08
 
-	* include/compiz.h: Add PAINT_SCREEN_CLEAR_MASK.
+    Drop support for bz2, add targets for release uploads, cleanup
 
-	* gnome/window-decorator/gnome-window-decorator.c: Add DM selection
-	support and --repalce option so it's possible to replace an
-	existing window decorator in the same way as it's possible to replace
-	a window manager. (bnc 185296)
-	(close_button_event):
-	(max_button_event):
-	(min_button_event): De-highlight on NotifyGrab. (bnc 185293)
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-2006-06-12  Dan Winship  <danw@novell.com>
+    Add various fixes for distcheck, source distributions without a VCS
+    and non-C sources (eg python bindings where we can't do try_compile
+    because C and CXX are not in the enabled languages)
 
-	* plugins/cube.c: 
-	* plugins/switcher.c: Mark cube as needing to load before switcher
-	rather than marking switcher as requiring cube. bnc #183676.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-	* plugins/gconf-dump.c (dumpPluginOptions): Output load_before and
-	requires for all plugins, even if the list is empty, to ensure
-	that an empty value in a new release overrides a non-empty value
-	in an older release.
+    Add a proper set of a release targets in the CMake buildsystem for all compiz
+    projects to use
+    
+    make release-prep: generates NEWS ChangeLog and AUTHORS file
+    make distcheck: generates a tarball
+    make release-signoff: signs the tarball using the key in RELEASE_KEY and if
+    in a git repository, creates tags and branches for that
 
-	* plugins/compiz.schemas.in.in: regen
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-2006-06-09  Dan Winship  <danw@novell.com>
+    Add VERSION file
 
-	* configure.ac: add translations
+Merge: 0550e09 b9d6583
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-2006-06-09  David Reveman  <davidr@novell.com>
+    Merge in lp:~unity-team/compiz-core/compiz-core.fix_706918 and hook
+    PluginClassHandler tests into make test
 
-	* plugins/move.c (moveHandleMotionEvent): Handle shaded windows
-	better.
+Merge: a1268e2 7844ea3
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-	* src/window.c (maximizeWindow):
-	* src/event.c (handleEvent): Allow windows to be both maximized
-	and shaded.
+    Merge in lp:~unity-team/compiz-core/compiz-core.fix_722830
 
-	* src/window.c:  Update addWindowSizeChanges so it can be used by
-	moveResizeWindow.
-	(updateWindowAttributes): Add missing sendSyncRequest call.
-	(addWindowSizeChanges): Make maximized window placement a bit better.
-	(moveResizeWindow): Adjust window geometry using
-	addWindowSizeChanges. (bnc 183121)
+Merge: f914d15 ab21ddc
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-	* src/window.c: Only allow shading on windows with top decoration.
+    Merge in lp:~unity-team/compiz-core/compiz-core.fix_802373
 
-	* src/event.c (handleEvent): Check that shade action is allowed
-	before shading a window.
+Merge: faf527f 82a73b8
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-2006-06-08  David Reveman  <davidr@novell.com>
+    Merge in lp:~smpillaz/compiz-core/compiz-core.fix_804683
 
-	* plugins/decoration.c (decorInitWindow):
-	* plugins/minimize.c (minInitWindow):
-	* src/window.c (addWindow): Handle initially shaded windows
-	correctly.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-	* plugins/switcher.c (switchTerminate): Only use hideWindow
-	if switcher window is managed and mapped.
-	(switchInitiate): Only use showWindow if switcher window is
-	hidden. (bnc 182519)
+    Remove debugging code
 
-	* plugins/minimize.c (minHandleEvent): Make sure we adjust the window
-	region correctly when it's being unshaded.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-2006-06-07  David Reveman  <davidr@novell.com>
+    Move timer tests into tests/timer/
 
-	* configure.ac: Bump version to 0.0.13.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-	* plugins/compiz.schemas.in.in: Regen.
+    Revamp the unit tests, split into four separate tests, one for
+    implicit creation on get, one for construction, one for type names
+    and one for index sanity checking
 
-	* src/window.c: Add window shading support.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-07
 
-	* src/screen.c:
-	* src/paint.c:
-	* src/event.c: Adjust for window shading support.
-	(handleEvent): Handle RESTACK client messages with sibling None
-	correctly.
+    Initialize index even if allocating the plugin class failed due to a buggy
+    base class
 
-	* src/event.c:
-	* src/display.c: Add toggle window shade binding.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-06
 
-	* plugins/minimize.c: Add window shading animation support.
+    Add missing files
 
-	* plugins/fade.c:
-	* plugins/place.c:
-	* plugins/resize.c:
-	* plugins/scale.c:
-	* plugins/switcher.c:
-	* plugins/decoration.c: Adjust for window shading support.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-06
 
-	* include/compiz.h: Add window shading support.
+    Remove useless #warning
 
-	* gnome/window-decorator/gnome-window-decorator.c: lower_window ->
-	restack_window and change it so it can be used for both
-	raising and lowering a window.
-	Add support for double_click_titlebar setting.
-	(title_event): Don't activate window on titlebar click only
-	raise it. Use double_click_action to determine what should be
-	done when titlebar is double clicked.
-	(update_event_windows): Remove vertical resize event windows
-	when top level window is shaded.
-	(window_state_changed): Update event windows when window state
-	changed.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-06
 
-	* gnome/window-decorator/gnome-window-decorator.c:
-	* gnome/compiz-window-manager.c: Add support for shade double click
-	setting.
+    Split tests up into files, poke timer.cpp, make test-timer link to the tests
+    and enable CTest
 
-	* plugins/compiz.schemas.in.in: Regen.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-06
 
-	* plugins/cube.c (cubePaintTransformedScreen):
-	* plugins/wobbly.c (wobblyDrawWindowGeometry):
-	* plugins/switcher.c (switchPaintWindow):
-	* src/paint.c (drawWindowGeometry): Disable client-side texture
-	coordinate arrays that are not used. (bnc #182430)
+    Add missing file
 
-	* plugins/compiz.schemas.in.in:
-	* plugins/resize.c:
-	* plugins/move.c: Add initiate_keyboard binding which is more
-	appropriate for key-binding as it moves the cursor to middle of
-	window.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-05
 
-2006-06-06  David Reveman  <davidr@novell.com>
+    Test for basic value modification
 
-	* plugins/switcher.c: Track thumbnail damage correctly.
-	(switchPaintScreen): Only intercept paintScreen when screen is
-	grabbed or we're zooming and ss->translate > 0.001.
-	(switchPaintScreen): Paint switcher window correctly when we're
-	not zooming.
-	Add cube as a dependency to make sure background is rendered
-	correctly when zooming.
-	(bnc #181909)
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-05
 
-	* src/window.c (moveResizeWindow, ensureWindowVisibility):
-	Don't make sure fullscreen windows are in workarea.
-	(fdo #7115) (bnc #181907)
+    Return 1 on the program if the test fails
 
-	* src/event.c (handleEvent): Track XA_WM_CLASS property changes.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-05
 
-	* src/window.c:
-	* include/compiz.h: remove updateWindowClass and update
-	updateWindowClassHints.
+    Add more tests for timers
 
-2006-06-02  David Reveman  <davidr@novell.com>
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-05
 
-	* configure.ac: Bump version to 0.0.12.
+    Add unit tests for timers
 
-	* src/event.c (handleEvent): Fix typo.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-05
 
-	* gnome/window-decorator/gnome-window-decorator.c:
-	Hide tooltips on NotifyGrab. (bnc #180692)
+    Break the dependency between CompTimeoutSource and CompTimer
 
-2006-06-01  Dan Winship  <danw@novell.com>
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-05
 
-	* src/event.c (handleEvent): If we receive a _NET_SHOWING_DESKTOP
-	request with no window set, set the flag on all screens. (Fixes
-	the KDE "show desktop" applet.) Also, don't allow a client to
-	change its _NET_WM_DESKTOP.
+    Use a private implementation for CompTimer
 
-	* src/window.c (addWindow): Set _NET_WM_DESKTOP on all windows to
-	0; KDE's pager and tasklist require this to be set. (bnc 178320)
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-05
 
-2006-06-01  David Reveman  <davidr@novell.com>
+    Further break the dependency of timers on screen
 
-	* include/compiz.h:
-	* src/window.c: Add updateWindowClass.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-04
 
-2006-05-31  David Reveman  <davidr@novell.com>
+    Break CompTimer's dependency on CompScreen
 
-	* include/compiz.h:
-	* src/screen.c:
-	* src/display.c: Add hide_skip_taskbar_windows option. (bnc 180055)
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-04
 
-	* include/compiz.h:
-	* src/window.c: Add getStartupId.
+    Avoid useless calls to ::stop (). Also put ::get_time after ::attach
+    because the source must always be attached before the monotonic
+    time can be retreived
 
-	* src/screen.c: Save initial viewport when startup notification
-	is received. Fix implementation of applyStartupProperties.
-	(bnc 180224)
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-07-04
 
-	* src/event.c (handleEvent): Handle startup ID property changes.
+    Don't use clock_getttime () directly, as there are some cases where
+    that clock can run backwards and cause our timers to mess up. GLib
+    handles this case for us, use Glib::Source::get_time in that case
 
-	* plugins/place.c: Adjust work area to initial viewport.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-29
 
-	* plugins/cube.c (cubePaintTransformedScreen): Disable skydome
-	animation while cube is unfolded. (bnc 179833)
+    Added a distcheck target
 
-	* plugins/switcher.c (switchPaintWindow): Make sure selected window is
-	not clipped incorrectly when some window is transformed. (bnc 179828)
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-29
 
-	* plugins/move.c (moveHandleEvent): Initialize xRoot and yRoot.
-	(bnc 179902)
+    Add a more comprehensive dist target which detects running in
+    bzr, git, git with submodules and in no vcs and makes a tarball
+    no matter what and the right way
 
-	* src/Makefile.am (INCLUDES): Add @GL_CFLAGS@. (Eric Work)
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-27
 
-2006-05-30  Dan Winship  <danw@novell.com>
+    Convert to bell option
 
-	* configure.ac: Check libwnck for wnck_window_has_name (new in
-	HEAD).
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-25
 
-	* gnome/window-decorator/gnome-window-decorator.c
-	(wnck_window_get_real_name): #if HAVE_WNCK_WINDOW_HAS_NAME,
-	redefine wnck_window_get_name to return NULL if the window only
-	has a fallback name. bnc 173059.
+    Added PluginClassHandler test
 
-	* src/event.c (handleEvent): call moveInputFocusToOtherWindow()
-	before destroyWindow() when processing a DestroyNotify, or else
-	the input focus can get stranded.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-25
 
-2006-05-26  David Reveman  <davidr@novell.com>
+    Abstract out CompPrivate storage from CompScreen so we can make it testable
 
-	* plugins/compiz.schemas.in.in: Regen.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-24
 
-	* plugins/scale.c (SCALE_SLOPPY_FOCUS_DEFAULT): TRUE.
+    Use priv->border instead of priv->input as the EWMH says that applications
+    which request to move their windows (through a normal ConfigureRequest)
+    should take into account the decoration extents and not the border extents.
+    
+    Fixes LP#722830
 
-	* plugins/decoration.c (decorWindowUpdate): No drop-shadow decoration
-	on windows with below state.
+Merge: d0f83cc 4d0f3bb
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-23
 
-	* src/window.c (recalcWindowType): Treat dock windows with below state
-	as normal windows. (bnc #178316)
+    Merge in fix for LP#800592
 
-	* plugins/cube.c (cubePaintTransformedScreen): Avoid optimized case
-	when more than 4 cube sides.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-23
 
-2006-05-25  David Reveman  <davidr@novell.com>
+    Fix double call to ::updateAttributes where raise on click is enabled and
+    grabbing a window to move it would also raise the window
 
-	* plugins/compiz.schemas.in.in: Regen.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-23
 
-	* src/window.c (moveResizeWindow): Don't adjust position for NorthWest
-	gravity. (bnc 178765) (fdo #6992)
+    Fix warnings
 
-	* plugins/compiz.schemas.in.in:
-	* include/compiz.h:
-	* src/event.c (handleEvent):
-	* src/display.c: Add maximize_window_horizontally,
-	maximize_window_vertically, toggle_window_maximized,
-	toggle_window_maximized_horizontally,
-	toggle_window_maximized_vertically.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-23
 
-	* src/event.c (handleEvent): Track changes to maximizeWindow function.
+    Fix typo which caused docks to be stacked relative to override redirect windows
+    and unmapped windows or other docks when shuffling stacking to be below
+    fullscreen windows that are active
 
-	* plugins/move.c (moveHandleMotionEvent): Make sure we have a saved
-	width before we use it. Track changes to maximizeWindow function.
+Merge: 291627c 40849c0
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-18
 
-	* plugins/wobbly.c (wobblyHandleEvent): Handle the case where
-	window is not both vertically and horizontally maximized better.
+    Merge in fix for bad merge
 
-	* include/compiz.h: Add MAXIMIZE_STATE macro.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-18
 
-	* include/compiz.h:
-	* src/window.c: Remove unmaximizeWindow and make maximizeWindow
-	take a state mask so it can be used for both maximizing and
-	unmaximizing.
+    Fix typo which caused decorations to be updated recursively because
+    CompWindow::resize () would always send fake resize notify events to
+    core which would then cause CompWindow::resize () to be called again
+    with no geometry change etc etc
 
-	* plugins/switcher.c: Don't add windows that appear after the switcher
-	is popped up. (bnc 178350)
-	(switchWindowRemove): Don't create a new list. Instead remove
-	window from the existing list and make sure we're positioned
-	correctly.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-17
 
-2006-05-24  David Reveman  <davidr@novell.com>
+    Refactor the code somewhat
 
-	* plugins/scale.c (scaleMoveFocusWindow): When moving to window on
-	left, make sure the window we're moving to is completely left of
-	currently selected window. And same thing when moving to window on
-	right, top, bottom.
-	 (layoutThumbs): Set slot->x2 and slot->y2 correctly. (bnc 178216)
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-17
 
-2006-05-23  David Reveman  <davidr@novell.com>
+    Make ::get () return a new class instance and initialize the index
+    if it hasn't been done already for this particular kind of class.
+    
+    Fixes LP#706918
 
-	* plugins/water.c: GL_UNSIGNED_INT_8_8_8_8_REV as pixel data type on
-	MSBFirst machines.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-16
 
-	* src/texture.c: Include config.h before compiz.h so that
-	IMAGE_BYTE_ORDER is defined correctly. (bnc 178171)
+    Fix typo which caused decorations to be updated recursively because
+    CompWindow::resize () would always send fake resize notify events to
+    core which would then cause CompWindow::resize () to be called again
+    with no geometry change etc etc
 
-	* include/compiz.h: Define LSBFirst, MSBFirst, IMAGE_BYTE_ORDER,
-	BITMAP_BIT_ORDER. (bnc 178171)
+Merge: 6fc939d 9dfc108
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-09
 
-2006-05-23  Dan Winship  <danw@novell.com>
+    Fixes LP#795065
+    
+    -------------  This line and the following will be ignored --------------
+    
+    modified:
+      src/window.cpp
+    unknown:
+      build/
+      po/compiz.pot
+    pending merges:
+      Sam Spilsbury 2011-05-25 Fix events going to frame windows when they sho...
 
-	* plugins/switcher.c (switchToWindow): use ss->windows here as
-	well so that multiple activeNum==0 windows don't get skipped.
-	(switchTerminate): Remove the screen grab right away so that
-	keystrokes don't get dropped. bnc 177650
-	(switchPreparePaintScreen, switchPaintScreen,
-	switchDonePaintScreen): update for that
+Merge: 9e6c11d a282aba
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-09
 
-2006-05-22  Dan Winship  <danw@novell.com>
+    Fixes LP#761616
+    
+    ------------ This line and the following will be ignored --------------
+    
+    modified:
+      src/screen.cpp
+      src/window.cpp
+    unknown:
+      build/
+      po/compiz.pot
+    pending merges:
+      Sam Spilsbury 2011-05-25 Restore selected event masks already rather tha...
 
-	* src/window.c (moveResizeWindow): deal with both vertical and
-	horizontal struts; but not when moving a dock window
+Merge: 79fe2cd 08828ed
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-09
 
-	* plugins/switcher.c (switchHandleEvent): Check init_all binding
-	before init, so you can bind "<Alt>" to init_all and so end up
-	with "<Alt>Tab" being init_all rather than init (but with no way
-	to get "init"...). bnc 173376
+    Merge in lp:~unity-team/compiz-core/compiz-core.one_property_decor
 
-2006-05-21  David Reveman  <davidr@novell.com>
+Merge: 901d4a1 c6291da
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-09
 
-	* src/display.c (addDisplay): Select for button events on root windows.
+    Merge in ~unity-team/compiz-core/compiz-core.bits_and_pieces_2011_05_21
 
-	* configure.ac: Bump version to 0.0.11.
+Merge: 2e57966 0545c16
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-09
 
-	* gnome/window-decorator/gnome-window-decorator.c: Fix shadow
-	performance by separating the convolution filter into one vertical and
-	one horizontal pass.
+    Merge in dock stacking fix
 
-	* src/window.c (mapWindow): Give sync request on map another try, it
-	seems to be working now.
+Merge: 67e833c 32affe0
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-09
 
-	* src/window.c (addWindow): Allow XGetWindowAttributes to fail.
-	(bnc 173416).
+    Merge in emacs fix
 
-	* src/window.c (addWindow): Initialize managed to false. Set managed
-	to true if widows is viewable.
+Merge: c6f456e a02b427
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-09
 
-	* src/event.c (handleEvent): Set managed to false when window
-	transitions to withdrawn state.
-	(handleEvent): Set managed to true when we get MapRequest.
-	(handleEvent): Constrain configure request if window is managed.
+    Merge in Scott's change from upstream
 
-	* include/compiz.h: Add "managed" variable that is true while
-	windows is managed.
+Merge: f3a1776 f3a1776
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-09
 
-2006-05-19  David Reveman  <davidr@novell.com>
+    Merge in relevant branches
 
-	* plugins/switcher.c (ICON_SIZE): Allow use of larger window icons.
+Scott Moreau <oreaus@gmail.com>	2011-05-27
 
-2006-05-18  Dan Winship  <danw@novell.com>
+    Redetect devices unconditionally when handling ConfigureNotify event. This fixes the case where an output was moved but outputChangeNotify is not called.
 
-	* plugins/wobbly.c (WOBBLY_FOCUS_DEFAULT): Set this to "None" to
-	match wobblyInitScreen() so that it actually works right.
+Merge: 2550d7e e6afcfd
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-01
 
-	* plugins/compiz.schemas.in.in: regen
+    Merge in bell fix
 
-2006-05-18  Dan Winship  <danw@novell.com>
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-06-01
 
-	* src/session.c (saveYourselfCallback): if we have a
-	RestartCommand registered with the session manager, update the
-	--sm-client-id in it to match the id we were assigned. bnc 176746
+    Fix typo in initBellValue which stopped bell actions from working
 
-	* src/main.c (main, usage): remove unused --sm-save-file arg and
-	fix documentation of --sm-client-id.
+Merge: 17a6530 b4d9e29
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-31
 
-2006-05-17  David Reveman  <davidr@novell.com>
+    Merge in from lp:compiz-core
 
-	* plugins/compiz.schemas.in.in: Regen (Overlay Icon).
+Merge: 763acbb 6e4da8c
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-31
 
-	* plugins/switcher.c (switchPaintScreen): Don't remove switcher
-	from window list, just temporarily mark it as destroyed. This fixes
-	issue with switcher decorations disappearing when some window is
-	unmapped.
+    Merge in frame fix for switcher decorations
 
-	* src/screen.c (updateDefaultIcon): width and height should be
-	unsigned.
+Merge: b4d9e29 a9ac70d
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-31
 
-	* gnome/window-decorator/gnome-window-decorator.c: Add minimal
-	option that can be used to run g-w-d with drop-shadows but without full
-	window decorations.
+    Merge to fix broken copytex plugin
 
-	* plugins/minimize.c (minHandleEvent): Restore window position
-	when transitioning to withdrawn state.
+Merge: 698db76 dd8ec2a
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-31
 
-	* plugins/scale.c: Remove next_window binding and fix so that arrow
-	keys can be used to select window.
-	Focus new window when pointer enter window decorations and sloppy focus
-	is used.
-	Remove scaleSelectWindow.
+    Fix some tray icons appearing at 1px, check the override redirect state
+    and window parent at unreparent and reparent time.
 
-	* plugins/scale.c: Icon support (Nat Friedman).
+Merge: a39f7e3 a39f7e3
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-31
 
-2006-05-17  Dan Winship  <danw@novell.com>
+    Merge
 
-	* src/display.c (handleSelectionClear, eventLoop): don't process
-	exit-on-selection-clear until the event queue is empty, or else
-	MapRequest and ConfigureRequest events could get lost. bnc 175558
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-31
 
-2006-05-14  David Reveman  <davidr@novell.com>
+    Fix crash with copytex. Use shared_ptr
 
-	* src/event.c (handleEvent): mapNum might be 0 if we found the window
-	unmapped when trying to bind it to a texture.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-30
 
-2006-05-12  David Reveman  <davidr@novell.com>
+    Ensure the switcher window is unmapped after the switcher goes away
 
-	* src/screen.c (enterShowDesktopMode): Only go into show desktop mode
-	when some window is being hidden.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-30
 
-	* src/event.c (handleWindowDamageRect): Make sure placed is set to true
-	when no plugin is doing placement.
-	(handleEvent): Don't set WM_STATE on override redirect windows.
+    Fix windows appearing at small sizes
 
-	* plugins/switcher.c (isSwitchWin): Don't show windows that ask not to
-	be in tasklists.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-28
 
-	* plugins/rotate.c (rotateHandleEvent): Only adjust viewport if window
-	has been placed.
+    Fix typo in comment
 
-	* plugins/minimize.c (minHandleEvent): Reset everything when going
-	into withdrawn state.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-28
 
-	* src/window.c (moveResizeWindow): Handle west and north gravity
-	correctly.
+    Typo
 
-2006-05-11  David Reveman  <davidr@novell.com>
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-28
 
-	* src/display.c (addDisplay):
-	* src/screen.c (addScreen): Move server grab to addDisplay to make
-	sure that no windows are created between XSelectInput and XQueryTree
-	as that would result in them being added two times.
+    Read the current override redirect state as the client may have
+    changed it while CreateNotify is being processed and thus
+    we could be reparenting and override redirect window.
+    
+    Also ensure that when unreparenting windows that their
+    parent is still the wrapper window, otherwise
+    don't bother to reparent them back into the root
+    window, this will only cause trouble.
+    
+    Fixes LP#767095
 
-	* src/window.c (moveResizeWindow): Fix typo, CWY should be CWX.
-	(moveResizeWindow): Constrain Y position so that window titlebar is
-	visible.
-	(restoreWindowGeometry): Fix issue with going from maximized state
-	to non-maximized state without changing the window size.
+Sam Spilsbury <sam.spilsbury@canonical.com>	2011-05-26
 
-	* gnome/window-decorator/gnome-window-decorator.c
-	(max_window_name_width): Make sure title text fit in titlebar.
+      XSync right after configureXWindow in cases where we
+      need to immediately reorder the window stack.
+    
+      This isn't a real fix, but at least fixes the following situation without
+      breaking the API and ABI
+    
+      Windows stacked A, B, C
+    
+      Plugin does: C->raise (), B->raise (), A->raise ()
+      Window list should read at this point: ... C, B, A ... (screen->windows ())
+      However, the output buffer hasn't been flushed at this point
+      so server side we will have A, B, C.
+    
+      Now if a sneaky client tries to restack A above C, we will get the


Reply to: