Index: /cvsroot/mozilla/content/smil/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/content/smil/Makefile.in diff -N content/smil/Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/Makefile.in 9 Oct 2005 01:12:32 -0000 @@ -0,0 +1,48 @@ +# +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is +# Netscape Communications Corporation. +# Portions created by the Initial Developer are Copyright (C) 1999 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either of the GNU General Public License Version 2 or later (the "GPL"), +# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +DIRS = public src + +include $(topsrcdir)/config/rules.mk + Index: /cvsroot/mozilla/content/smil/public/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/Makefile.in diff -N content/smil/public/Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/Makefile.in 9 Oct 2005 01:12:33 -0000 @@ -0,0 +1,62 @@ +# +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is +# Netscape Communications Corporation. +# Portions created by the Initial Developer are Copyright (C) 1998 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either of the GNU General Public License Version 2 or later (the "GPL"), +# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = content + +EXPORTS = \ + nsISMILAnimAttr.h \ + nsISMILAnimElement.h \ + nsISMILAnimVal.h \ + nsISMILAnimationController.h \ + nsISMILAnimationFunction.h \ + nsISMILAnimationObserver.h \ + nsISMILAnimationRegistry.h \ + nsISMILComposable.h \ + nsISMILTimeClient.h \ + nsISMILTimeContainer.h \ + nsISMILTimedElement.h \ + $(NULL) + +include $(topsrcdir)/config/rules.mk + Index: /cvsroot/mozilla/content/smil/public/nsISMILAnimAttr.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILAnimAttr.h diff -N content/smil/public/nsISMILAnimAttr.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILAnimAttr.h 9 Oct 2005 01:12:33 -0000 @@ -0,0 +1,104 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILANIMATTR_H__ +#define __NS_ISMILANIMATTR_H__ + +#include "nsISupports.h" + +class nsISMILAnimVal; + +//////////////////////////////////////////////////////////////////////// +// nsISMILAnimAttr: Interfaces for data types that can have a base and animated +// value. + +// {c487920a-7d12-40ff-bf3b-c39dd4797cff} +#define NS_ISMILANIMATTR_IID \ +{ 0xc487920a, 0x7d12, 0x40ff, { 0xbf, 0x3b, 0xc3, 0x9d, 0xd4, 0x79, 0x7c, 0xff } } + +/** + * Interfaces for data types that can have a base and animated value. + * + * This interface is like a stepping stone between nsISMILAnimElement and + * nsISMILAnimVal. It should be possible to do without this interface altogether + * and I think this would produce a simpler design. However, keeping it should + * mean that nsISMILAnimVal can be implemented by a separate lightweight object, + * perhaps even implemented as a tear off from the class implementing + * nsISMILAnimAttr. + */ +class nsISMILAnimAttr : public nsISupports +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILANIMATTR_IID) + + /** + * Gets the underlying value of this attribute. It is the same as Create() but + * avoids allocating memory. + * + * @param aValue The value to fill. + * @return NS_OK on success or an error code if getting failed. + */ + virtual nsresult GetBaseValue(nsISMILAnimVal& aValue) = 0; + + /** + * Sets the presentation value of this attribute. + * + * @param aValue The value to set. + * @return NS_OK on success or an error code if setting failed. + */ + virtual nsresult SetAnimValue(const nsISMILAnimVal& aValue) = 0; + + /* + * Factory methods + */ + + /** + * Creates a new nsISMILAnimVal initialized to the base value of this + * attribute. + * + * @return The newly created object or null if creation failed. + */ + virtual nsISMILAnimVal* Create() const = 0; + + /** + * Creates a new nsISMILAnimVal from the given specification. + * + * @param aSpec A string representation that should be parsed to determine + * the value of the newly created object. + * @return The newly created object or null if creation failed. + */ + virtual nsISMILAnimVal* CreateFromSpec(const nsAString& aSpec) const = 0; +}; + +#endif // __NS_ISMILANIMATTR_H__ + Index: /cvsroot/mozilla/content/smil/public/nsISMILAnimElement.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILAnimElement.h diff -N content/smil/public/nsISMILAnimElement.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILAnimElement.h 9 Oct 2005 01:12:33 -0000 @@ -0,0 +1,74 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILANIMELEMENT__ +#define __NS_ISMILANIMELEMENT__ + +#include "nsISupports.h" +#include "nsISMILAnimAttr.h" + +//////////////////////////////////////////////////////////////////////// +// nsISMILAnimElement: interface of elements that have attributes +// that can be animated. + +// {5DD94E10-FD8D-42FB-B054-8D29F771033A} +#define NS_ISMILANIMELEMENT_IID \ +{ 0x5dd94e10, 0xfd8d, 0x42fb, { 0xb0, 0x54, 0x8d, 0x29, 0xf7, 0x71, 0x03, 0x3a } } + +/** + * Interface for elements that have attributes that can be animated. + * + * This interface is not actually used by the SMIL module. Instead it is used by + * the host language to identify targets for animation. However, in a mixed + * namespace environment this interface might be used by several modules so it + * should probably stay here in SMIL. + */ +class nsISMILAnimElement : public nsISupports +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILANIMELEMENT_IID) + + /** + * Gets an animatable attribute identified by namespace and attribute name. + * + * @param aNamespaceID The namespace of the attribute + * @param aName The attribute name + * @return The attribute or NULL if this attribute does not exist or is not + * animatable. + */ + virtual nsISMILAnimAttr* + GetAnimAttribute(PRInt32 aNamespaceID, nsIAtom* aName)=0; +}; + +#endif // __NS_ISMILANIMELEMENT__ + Index: /cvsroot/mozilla/content/smil/public/nsISMILAnimVal.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILAnimVal.h diff -N content/smil/public/nsISMILAnimVal.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILAnimVal.h 9 Oct 2005 01:12:33 -0000 @@ -0,0 +1,127 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILANIMVAL_H__ +#define __NS_ISMILANIMVAL_H__ + +#include "nsISupports.h" + +//////////////////////////////////////////////////////////////////////// +// nsISMILAnimVal + +// {01d2aae5-9de4-4e8f-a1e9-ae660ad27925} +#define NS_ISMILANIMVAL_IID \ +{ 0x01d2aae5, 0x9de4, 0x4e8f, { 0xa1, 0xe9, 0xae, 0x66, 0x0a, 0xd2, 0x79, 0x25 } } + +class nsISMILAnimVal : public nsISupports +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILANIMVAL_IID) + + /** + * Calculates the 'distance' between this value and another. This is the + * distance used in paced interpolation. + * + * @param aTo The end of the interval for which the distance should be + * calculated. + * @param aDistance The result of the calculation. + * @return NS_OK on success, or an appropriate code if there is no notion of + * distance for the underlying data type or the distance could not be + * calculated. + */ + virtual nsresult ComputeDistance(const nsISMILAnimVal& aTo, + PRFloat64& aDistance) const = 0; + + /** + * Calculates an interpolates value between this value and the specified end + * value using the specified proportion. + * + * @param aEndVal The value defining the end of the interval of + * interpolation. + * @param aUnitDistance A number between 0.0 and 1.0 (inclusive) defining + * the distance of the interpolated value in the + * interval. + * @param aResult The interpolated value. + * @result NS_OK on success, NS_ERROR_FAILURE if this data type cannot be + * interpolated or NS_ERROR_OUT_OF_MEMORY if insufficient memory was + * available for storing the result. + */ + virtual nsresult Interpolate(const nsISMILAnimVal& aEndVal, + float aUnitDistance, + nsISMILAnimVal& aResult) = 0; + + /** + * Add the given value to this value. This method facilitates additive and + * cumulative animation. + * + * This method will fail (return false) if the underlying datatype is not + * additive or was not specified using an additive syntax. + * + * See SVG 1.1, section 19.2.5. In particular, + * + * "If a given attribute or property can take values of keywords (which are + * not additive) or numeric values (which are additive), then additive + * animations are possible if the subsequent animation uses a numeric value + * even if the base animation uses a keyword value; however, if the subsequent + * animation uses a keyword value, additive animation is not possible." + * + * @param aAddedVal The value to add to this value. + * @return NS_OK on success, an error code on failure. + */ + virtual nsresult Add(const nsISMILAnimVal& aAddedVal) = 0; + + /** + * Assign this object the value of another. Think of this as the assignment + * operator. + * + * @param aNewVal The value to set. + * @return NS_OK on success, an error code on failure such as when the + * underlying type of the specified object differs. + */ + virtual nsresult Set(const nsISMILAnimVal& aNewVal) = 0; + + /** + * Repeats this value or the specified value a number of times. This method + * will fail (return false) if the underlying data type is not additive. + * + * @param aCount The number of times to repeat the value. + * @param aRepeatValue The value to repeat. If this parameter is null the + * current value will be repeated. + * @return NS_OK on success, an error code on failure. + */ + virtual nsresult Repeat(PRUint32 aCount, + const nsISMILAnimVal* aRepeatValue = nsnull) = 0; +}; + +#endif // __NS_ISMILANIMVAL_H__ + Index: /cvsroot/mozilla/content/smil/public/nsISMILAnimationController.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILAnimationController.h diff -N content/smil/public/nsISMILAnimationController.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILAnimationController.h 9 Oct 2005 01:12:34 -0000 @@ -0,0 +1,69 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILANIMATIONCONTROLLER_H__ +#define __NS_ISMILANIMATIONCONTROLLER_H__ + +#include "nsIAnimationController.h" + +#define NS_ISMILANIMATIONCONTROLLER_IID \ +{ 0xd2c81398, 0x1f30, 0x4303, { 0xbe, 0xbe, 0xc5, 0x0c, 0x01, 0xfd, 0xd8, 0x85 } } + +class nsISMILTimeContainer; + +//////////////////////////////////////////////////////////////////////// +// nsISMILAnimationController: Animation controller + +class nsISMILAnimationController : public nsIAnimationController +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILANIMATIONCONTROLLER_IID) + + // nsIAnimationController methods + virtual nsresult Pause()=0; + virtual nsresult Resume()=0; + + // + // Eventually, this will probably be all nsISMILTimedElements so that it is + // possible to have hierarchies of containers (which will implement + // nsISMILTimedElement), and then these methods will be replaced with + // SetRootElement. + // + virtual nsresult AddTimeContainer(nsISMILTimeContainer* aContainer)=0; + virtual nsresult RemoveTimeContainer(nsISMILTimeContainer* aContainer)=0; +}; + +nsISMILAnimationController* NS_NewSMILAnimationController(); + +#endif // __NS_ISMILANIMATIONCONTROLLER_H__ + Index: /cvsroot/mozilla/content/smil/public/nsISMILAnimationFunction.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILAnimationFunction.h diff -N content/smil/public/nsISMILAnimationFunction.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILAnimationFunction.h 9 Oct 2005 01:12:34 -0000 @@ -0,0 +1,103 @@ + +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILANIMFUNCTION_H__ +#define __NS_ISMILANIMFUNCTION_H__ + +#include "nsISupports.h" + +class nsISMILAnimAttr; + +// {14eb1aab-e4ba-4c77-be89-195ef975c90d} +#define NS_ISMILANIMFUNCTION_IID \ +{ 0x14eb1aab, 0xe4ba, 0x4c77, { 0xbe, 0x89, 0x19, 0x5e, 0xf9, 0x75, 0xc9, 0x0d } } + +/** + * Provides the animation function for an interpolating animation element. This + * includes the animation-related attributes. It is intended to be used by + * elements such as , and so on. + * + * It will likely be split into nsISMILInterpolatingAnimFunc and + * nsISMILSimpleAnimFunc when is introduced. Extra parameters or perhaps + * a subclass will probably be needed to support , + * and the like. + */ +class nsISMILAnimationFunction : public nsISupports +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILANIMFUNCTION_IID) + + virtual nsresult SetTargetAttribute(nsISMILAnimAttr* aAttribute)=0; + virtual nsISMILAnimAttr* GetTargetAttribute()=0; + virtual void SetDocumentPosition(PRUint16 aDocPosition)=0; + + /* + * Property setters + */ + virtual nsresult SetAccumulate(const nsAString& aAccumulate)=0; + virtual nsresult SetAdditive(const nsAString& aAdditive)=0; + virtual nsresult SetBy(const nsAString& aBy)=0; + virtual nsresult SetCalcMode(const nsAString& aCalcMode)=0; + virtual nsresult SetFrom(const nsAString& aFrom)=0; + virtual nsresult SetKeyTimes(const nsAString& aKeyTimes)=0; + virtual nsresult SetKeySplines(const nsAString& aKeySplines)=0; + virtual nsresult SetTo(const nsAString& aTo)=0; + virtual nsresult SetValues(const nsAString& aValues)=0; + + /* + * Property unsetters + * + * Unsetters are used instead of simply passing an empty string to the setters + * as in some cases an empty string is an error whereas not specifying an + * attribute is not. + * + * Unsetters are used in preference to setting a default value so that this + * object is responsible for supplying default values and not all the + * different animation elements that use it. + */ + virtual void UnsetAdditive()=0; + virtual void UnsetBy()=0; + virtual void UnsetCalcMode()=0; + virtual void UnsetAccumulate()=0; + virtual void UnsetFrom()=0; + virtual void UnsetKeyTimes()=0; + virtual void UnsetKeySplines()=0; + virtual void UnsetTo()=0; + virtual void UnsetValues()=0; +}; + +nsISMILAnimationFunction* NS_NewSMILAnimationFunction(); + +#endif //__NS_ISMILANIMFUNCTION_H__ + Index: /cvsroot/mozilla/content/smil/public/nsISMILAnimationObserver.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILAnimationObserver.h diff -N content/smil/public/nsISMILAnimationObserver.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILAnimationObserver.h 9 Oct 2005 01:12:34 -0000 @@ -0,0 +1,59 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILANIMATIONOBSERVER_H__ +#define __NS_ISMILANIMATIONOBSERVER_H__ + +#include "nsISupports.h" +#include "nsWeakReference.h" + +#define NS_ISMILANIMATIONOBSERVER_IID \ +{ 0x8f96dd0c, 0x9c70, 0x4b3a, { 0xa0, 0x72, 0xce, 0x71, 0x0f, 0x47, 0xa0, 0x06 } } + +//////////////////////////////////////////////////////////////////////// +// nsISMILAnimationObserver: Interfaces for clients that want to be informed of +// stages in the animation's life cycle + +class nsISMILAnimationObserver : public nsSupportsWeakReference +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILANIMATIONOBSERVER_IID) + + virtual void StartSample()=0; + virtual void StartCompositing()=0; + virtual void EndCompositing()=0; + virtual void EndSample()=0; +}; + +#endif // __NS_ISMILANIMATIONOBSERVER_H__ + Index: /cvsroot/mozilla/content/smil/public/nsISMILAnimationRegistry.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILAnimationRegistry.h diff -N content/smil/public/nsISMILAnimationRegistry.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILAnimationRegistry.h 9 Oct 2005 01:12:34 -0000 @@ -0,0 +1,143 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILANIMATIONREGISTRY_H__ +#define __NS_ISMILANIMATIONREGISTRY_H__ + +#include "nsISupports.h" + +class nsISMILAnimationController; +class nsISMILAnimationObserver; +class nsISMILComposable; +class nsISMILAnimAttr; +class nsISMILTimedElement; + +#define NS_ISMILANIMATIONREGISTRY_IID \ +{ 0xdd3c7124, 0xcc1f, 0x447b, { 0xa1, 0x35, 0x4a, 0xd8, 0xfc, 0xd4, 0x9f, 0x31 } } + +//////////////////////////////////////////////////////////////////////// +// nsISMILAnimationRegistry: Entry point for SMIL animated documents + +class nsISMILAnimationRegistry : public nsISupports +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILANIMATIONREGISTRY_IID) + + /** + * Sets the animation controller which is needed for registering the time + * container managed by this registry. + * + * @param aController The animation controller. May be NULL to disassociate + * this registry from any controller. + */ + virtual nsresult SetController(nsISMILAnimationController* aController)=0; + + /** + * Sets the object which will receive notifications when samples begin and end + * and when compositing takes place. Currently only one observer can be set at + * a time. + * + * @param aObserver The observer to receive notifications. May be null to + * remove the currently set observer if any. + */ + virtual void SetObserver(nsISMILAnimationObserver* aObserver)=0; + + /* + * The next five methods correspond to methods in the nsIDOMSVGSVGElement + * interface. + */ + + /** + * Pauses animation. + */ + virtual void Pause()=0; + + /** + * Unpauses animation. + */ + virtual void Unpause()=0; + + /** + * @return true if the animation is in a paused state. + */ + virtual PRBool IsPaused()=0; + + /** + * Returns the current time in seconds relative to the start time of the + * animation. + */ + virtual float GetCurrentTime()=0; + + /** + * Adjusts the clock for the animation to the specified time. + * + * @param aSeconds The new current time in seconds relative to the start time + * for this animation. + */ + virtual nsresult SetCurrentTime(float aSeconds)=0; + + /** + * Registers a composable object with the compositor for the specified target + * attribute. The composable object may be registered with several target + * attributes and each target attribute may have several composable objects + * associated with it. + */ + virtual nsresult RegisterComposable(nsISMILAnimAttr* aTargetAttr, + nsISMILComposable* aComposable)=0; + + /** + * Removes the specified composable object from all compositors with which is + * it registered. + */ + virtual nsresult UnregisterComposable(nsISMILComposable* aComposable)=0; + + /** + * Registers the timed element with the time container managed by this + * registry. + */ + virtual nsresult RegisterTimedElement(nsISMILTimedElement* aElement)=0; + + /** + * Unregisters the timed element from the time container managed by this + * registry. + */ + virtual nsresult UnregisterTimedElement(nsISMILTimedElement* aElement)=0; +}; + +/** + * Creates a new animation registry object. + */ +nsISMILAnimationRegistry* NS_NewSMILAnimationRegistry(); + +#endif // __NS_ISMILANIMATIONREGISTRY_H__ + Index: /cvsroot/mozilla/content/smil/public/nsISMILComposable.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILComposable.h diff -N content/smil/public/nsISMILComposable.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILComposable.h 9 Oct 2005 01:12:35 -0000 @@ -0,0 +1,132 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILCOMPOSABLE_H__ +#define __NS_ISMILCOMPOSABLE_H__ + +#include "nsISupports.h" +#include "nsWeakReference.h" + +class nsISMILAnimVal; + +//////////////////////////////////////////////////////////////////////// +// nsISMILComposable : Interface for animations that can be composited +// by the compositor + +// {4b05aa22-712e-4a9e-8452-f7c4b2e507e7} +#define NS_ISMILCOMPOSABLE_IID \ +{ 0x4b05aa22, 0x712e, 0x4a9e, { 0x84, 0x52, 0xf7, 0xc4, 0xb2, 0xe5, 0x07, 0xe7 } } + +class nsISMILComposable : public nsSupportsWeakReference +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILCOMPOSABLE_IID) + + /** + * Combines the result of this animation function for the last sample with the + * specified value. + * + * @param aResult The value to compose with. + */ + virtual void ComposeResult(nsISMILAnimVal &aResult)=0; + + /** + * Returns the relative priority of this animation to another. The priority is + * used for determining the position of the animation in the animation + * sandwich. + * + * @return -1 if this animation has lower priority or 1 if this animation has + * higher priority + * + * This method should never return 0. + */ + virtual PRInt8 CompareTo(const nsISMILComposable& composable) const=0; + + /* + * The following three methods are used in sorting. + */ + + /** + * Indicates if this animation is a 'to animation'. Such animations appear + * 'higher' in the animation sandwich than all other animations. + * + * @return True if this animation is a to animation, false otherwise. + */ + virtual PRBool IsToAnimation() const=0; + + /** + * Returns the begin time of this animation for the interval it is currently + * animating. For inactive animations this will be LL_MinInt but such + * animations should be filtered from compositing anyway. + * + * @return A 64-bit integer representing the begin time of this animation. + */ + virtual const PRInt64& GetBeginTime() const=0; + + /** + * Returns a unique (0-based) index indicating the position of this animation + * in the document. The first animation will have index 0 as so on. Positions + * are recalculated when the document structure is changed. + * + * @return An unsigned integer representing this animation's position in the + * document. + */ + virtual PRUint16 GetDocumentPosition() const=0; + + /* + * The following methods are provided so that the compositor can optimise its + * operations by only composing those animation that will affect the final + * result. + */ + + /** + * Indicates if the animation is currently active. Inactive animations will + * not contribute to the composed result. + * + * @return True if the animation active, false otherwise. + */ + virtual PRBool IsActive() const=0; + + /** + * Indicates if this animation will replace the passed in result rather than + * adding to it. Animations that replace the underlying value may be called + * without first calling lower priority animations. + * + * @return True if the animation will replace, false if it will add or + * otherwise build on the passed in value. + */ + virtual PRBool WillReplace() const=0; +}; + +#endif // __NS_ISMILCOMPOSABLE_H__ + Index: /cvsroot/mozilla/content/smil/public/nsISMILTimeClient.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILTimeClient.h diff -N content/smil/public/nsISMILTimeClient.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILTimeClient.h 9 Oct 2005 01:12:35 -0000 @@ -0,0 +1,102 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILTIMECLIENT_H__ +#define __NS_ISMILTIMECLIENT_H__ + +#include "nsISupports.h" + +class nsSMILTimeValue; + +//////////////////////////////////////////////////////////////////////// +// nsISMILTimeClient + +// {196f66f4-e6f6-420b-a337-da42a2efccde} +#define NS_ISMILTIMECLIENT_IID \ +{ 0x196f66f4, 0xe6f6, 0x420b, { 0xa3, 0x37, 0xda, 0x42, 0xa2, 0xef, 0xcc, 0xde } } + +class nsISMILTimeClient : public nsISupports +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILTIMECLIENT_IID) + + /** + * Indicate a new sample has occurred. + * + * @param aSimpleTime The sample time for this timed element expressed in + * simple time. + * @param aSimpleDuration The simple duration for this timed element. + * @param aRepeatIteration The repeat iteration for this sample. The first + * iteration has a value of 0. + */ + virtual void SampleAt(const PRInt64& aSimpleTime, + const nsSMILTimeValue& aSimpleDuration, + const PRUint32& aRepeatIteration)=0; + + /** + * Indicate to sample using the last value defined for the animation function. + * This value is not normally sampled due to the end-point exclusive timing + * model but only occurs when the fill mode is "freeze" and the active + * duration is an even multiple of the simple duration. + * + * @param aRepeatIteration The repeat iteration for this sample. The first + * iteration has a value of 0. + */ + virtual void SampleLastValue(const PRUint32& aRepeatIteration)=0; + + /** + * Indicate that the timed element is now active. This is used, for example, + * to instruct the animation function that it should now add its result to the + * animation sandwich. The begin time is also provided for proper + * prioritisation of animation functions and for this reason this method must + * be called before either of the Sample methods. + * + * @param aBeginTime The begin time for the newly active interval. + */ + virtual void ToActive(const PRInt64& aBeginTime)=0; + + /** + * Indicate that the timed element is no longer active. This is used, for + * example, to instruct the animation function that it should no longer add + * its result to the animation sandwich. + * + * @param aIsFrozen True if this animation should continue to contribute to + * the animation sandwich using the most recent sample + * parameters even though these parameters are unlikely to + * change between samples. + */ + virtual void ToInactive(PRBool aIsFrozen)=0; +}; + +#endif // __NS_ISMILTIMECLIENT_H__ + Index: /cvsroot/mozilla/content/smil/public/nsISMILTimeContainer.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILTimeContainer.h diff -N content/smil/public/nsISMILTimeContainer.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILTimeContainer.h 9 Oct 2005 01:12:35 -0000 @@ -0,0 +1,96 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILTIMECONTAINER_H__ +#define __NS_ISMILTIMECONTAINER_H__ + +#include "nsISupports.h" +#include "nsISMILTimedElement.h" + +//////////////////////////////////////////////////////////////////////// +// nsISMILTimeContainer: Time container + +// {46b51a7b-d857-45f1-9c7d-4d0d12719238} +#define NS_ISMILTIMECONTAINER_IID \ +{ 0x46b51a7b, 0xd857, 0x45f1, { 0x9c, 0x7d, 0x4d, 0x0d, 0x12, 0x71, 0x92, 0x38 } } + +/** + * A SMIL time container. + * + * When implementing SMIL 2.0 time containers, this interface will most likely + * inherit from nsISMILTimedElement, amongst other changes + */ +class nsISMILTimeContainer : public nsISupports +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILTIMECONTAINER_IID) + + /** + * Pause the time container. + */ + virtual nsresult Pause()=0; + + /** + * Resume the time container. + */ + virtual nsresult Resume()=0; + + /** + * We may later change this to SampleAt and maintain separate host document + * and document fragment times. This would allow more advanced time + * manipulations for documents with several animated SVG document fragments. + */ + virtual void Sample()=0; + + /** + * Add a timed element to this container. No attempt is made to check if the + * timed element is already a child of this container--in that case the timed + * element will be added twice and will be sampled twice. + * + * @param aElement The element to add. + * @return NS_OK if the element was successfully added or an error otherwise. + */ + virtual nsresult AddTimedElement(nsISMILTimedElement* aElement)=0; + + /** + * Remove the specified timed element from this container. + * + * @param aElement The element to remove. + * @return NS_OK if the element is found and successfully removed or an error + * otherwise. + */ + virtual nsresult RemoveTimedElement(nsISMILTimedElement* aElement)=0; +}; + +#endif // __NS_ISMILTIMECONTAINER_H__ + Index: /cvsroot/mozilla/content/smil/public/nsISMILTimedElement.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/public/nsISMILTimedElement.h diff -N content/smil/public/nsISMILTimedElement.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/public/nsISMILTimedElement.h 9 Oct 2005 01:12:36 -0000 @@ -0,0 +1,131 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISMILTIMEDELEMENT_H__ +#define __NS_ISMILTIMEDELEMENT_H__ + +#include "nsWeakReference.h" + +class nsISMILTimeClient; +class nsSMILTimeValue; +class nsSMILInstanceTime; + +//////////////////////////////////////////////////////////////////////// +// nsISMILTimedElement + +// {c5f60446-5c1a-4f3b-8ce3-646199ac97f2} +#define NS_ISMILTIMEDELEMENT_IID \ +{ 0xc5f60446, 0x5c1a, 0x4f3b, { 0x8c, 0xe3, 0x64, 0x61, 0x99, 0xac, 0x97, 0xf2 } } + +class nsISMILTimedElement : public nsSupportsWeakReference +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISMILTIMEDELEMENT_IID) + + /** + * Adds an instance time object this this element's list of instance times. + * These instance times are used when creating intervals. + * + * This method is typically called by an nsSMILTimeValueSpec to register an + * instance time corresponding its specification. + * + * @param aInstanceTime The time to add. + * + * @param aIsBegin True if the time to be added represents a begin time + * or false if it represents an end time. + */ + virtual void AddInstanceTime(nsSMILInstanceTime* aInstanceTime, + PRBool aIsBegin)=0; + + /** + * Sets the object that will be called by this timed element each time it is + * sampled. + * + * In Schmitz's model it is possible to associate several time clients with + * a timed element but for now we only allow one. + * + * @param aClient The time client to associate. Any previous time client + * will be disassociated and no longer sampled. Setting this + * to NULL will simply disassociate the previous client, if + * any. + */ + virtual void SetTimeClient(nsISMILTimeClient* aClient)=0; + + /** + * Samples the object at the given document time. Timing intervals are updated + * and if this element is active at the given time the associated time client + * will be sampled with the appropriate simple time. + * + * @param aDocumentTime The document time at which to sample. + */ + virtual void SampleAt(const PRInt64& aDocumentTime)=0; + + /* + * Property setters + */ + virtual nsresult SetBeginSpec(const nsAString& aBeginSpec)=0; + virtual nsresult SetEndSpec(const nsAString& aEndSpec)=0; + virtual nsresult SetSimpleDuration(const nsAString& aDurSpec)=0; + virtual nsresult SetMin(const nsAString& aMinSpec)=0; + virtual nsresult SetMax(const nsAString& aMaxSpec)=0; + virtual nsresult SetRestart(const nsAString& aRestartSpec)=0; + virtual nsresult SetRepeatCount(const nsAString& aRepeatCountSpec)=0; + virtual nsresult SetRepeatDur(const nsAString& aRepeatDurSpec)=0; + virtual nsresult SetFillMode(const nsAString& aFillModeSpec)=0; + + /* + * Property unsetters + * + * Unsetters are used instead of simply passing an empty string to the setters + * as in some cases an empty string is an error whereas not specifying an + * attribute is not. + * + * Unsetters are used in preference to setting a default value so that this + * object is responsible for supplying default values and not all the + * different animation elements that use it. + */ + virtual void UnsetBeginSpec()=0; + virtual void UnsetEndSpec()=0; + virtual void UnsetSimpleDuration()=0; + virtual void UnsetMin()=0; + virtual void UnsetMax()=0; + virtual void UnsetRestart()=0; + virtual void UnsetRepeatCount()=0; + virtual void UnsetRepeatDur()=0; + virtual void UnsetFillMode()=0; +}; + +nsISMILTimedElement* NS_NewSMILTimedElement(); + +#endif // __NS_ISMILTIMEDELEMENT_H__ + Index: /cvsroot/mozilla/content/smil/src/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/Makefile.in diff -N content/smil/src/Makefile.in --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/Makefile.in 9 Oct 2005 01:12:36 -0000 @@ -0,0 +1,84 @@ +# +# ***** BEGIN LICENSE BLOCK ***** +# Version: MPL 1.1/GPL 2.0/LGPL 2.1 +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# The Original Code is mozilla.org code. +# +# The Initial Developer of the Original Code is +# Netscape Communications Corporation. +# Portions created by the Initial Developer are Copyright (C) 1998 +# the Initial Developer. All Rights Reserved. +# +# Contributor(s): +# +# Alternatively, the contents of this file may be used under the terms of +# either of the GNU General Public License Version 2 or later (the "GPL"), +# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), +# in which case the provisions of the GPL or the LGPL are applicable instead +# of those above. If you wish to allow use of your version of this file only +# under the terms of either the GPL or the LGPL, and not to allow others to +# use your version of this file under the terms of the MPL, indicate your +# decision by deleting the provisions above and replace them with the notice +# and other provisions required by the GPL or the LGPL. If you do not delete +# the provisions above, a recipient may use your version of this file under +# the terms of any one of the MPL, the GPL or the LGPL. +# +# ***** END LICENSE BLOCK ***** + +DEPTH = ../../.. +topsrcdir = @top_srcdir@ +srcdir = @srcdir@ +VPATH = @srcdir@ + +include $(DEPTH)/config/autoconf.mk + +MODULE = content +LIBRARY_NAME = gkconsmil_s +LIBXUL_LIBRARY = 1 + +REQUIRES = xpcom \ + string \ + layout \ + content \ + unicharutil \ + $(NULL) + +CPPSRCS = \ + nsSMILAnimationController.cpp \ + nsSMILAnimationFunction.cpp \ + nsSMILAnimationRegistry.cpp \ + nsSMILAtoms.cpp \ + nsSMILCompositor.cpp \ + nsSMILEnum.cpp \ + nsSMILInstanceTime.cpp \ + nsSMILInterval.cpp \ + nsSMILTimedDocumentRoot.cpp \ + nsSMILTimedElement.cpp \ + nsSMILTimeValue.cpp \ + nsSMILTimeValueSpec.cpp \ + $(NULL) + +include $(topsrcdir)/config/config.mk + +# we don't want the shared lib, but we want to force the creation of a static lib. +FORCE_STATIC_LIB = 1 + +include $(topsrcdir)/config/rules.mk + +DEFINES += -D_IMPL_NS_LAYOUT + +# XXXbb remove +# 4127 = conditional expression is constant +# 4512 = assignment operator could not be generated +# CXXFLAGS += -W4 -wd4127 -wd4512 + Index: /cvsroot/mozilla/content/smil/src/nsSMILAnimationController.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILAnimationController.cpp diff -N content/smil/src/nsSMILAnimationController.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILAnimationController.cpp 9 Oct 2005 01:12:36 -0000 @@ -0,0 +1,257 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsISMILAnimationController.h" +#include "nsComponentManagerUtils.h" +#include "nsWeakReference.h" +#include "nsITimer.h" +#include "nsISMILTimeContainer.h" +#include "nsCOMArray.h" +#include "nsISimpleEnumerator.h" +#include "nsArrayEnumerator.h" + +class nsSMILAnimationController : public nsISMILAnimationController, + public nsSupportsWeakReference +{ +public: + ~nsSMILAnimationController(); + + NS_DECL_ISUPPORTS + + // nsISMILAnimationController + virtual nsresult Pause(); + virtual nsresult Resume(); + virtual nsresult AddTimeContainer(nsISMILTimeContainer* aContainer); + virtual nsresult RemoveTimeContainer(nsISMILTimeContainer* aContainer); + +protected: + friend nsISMILAnimationController* NS_NewSMILAnimationController(); + + nsresult Init(); + nsresult StartTimer(); + nsresult StopTimer(); + void SampleChildren(); + static void Notify(nsITimer* aTimer, void* aClosure); + + nsCOMPtr mTimer; + nsCOMArray mTimeContainers; +}; + +//////////////////////////////////////////////////////////////////////// +// nsSMILAnimationController implementation + +//---------------------------------------------------------------------- +// ctors, dtors, factory methods + +nsSMILAnimationController::~nsSMILAnimationController() +{ + if (mTimer) { + mTimer->Cancel(); + mTimer = nsnull; + } + + // XXXbb [threadsafety] what if the callback is called one more time after + // we're destroyed? +} + +nsISMILAnimationController* NS_NewSMILAnimationController() +{ + nsSMILAnimationController* animationController = + new nsSMILAnimationController(); + NS_ENSURE_TRUE(animationController, nsnull); + + nsresult rv = animationController->Init(); + if (NS_FAILED(rv)) { + delete animationController; + animationController = nsnull; + } + + return animationController; +} + +//---------------------------------------------------------------------- +// nsISupports methods: + +NS_IMPL_ISUPPORTS3(nsSMILAnimationController, + nsISMILAnimationController, + nsIAnimationController, + nsISupportsWeakReference); + +//---------------------------------------------------------------------- +// Timer callback + +// +// We use the function callback rather than implementing nsITimerCallback to +// avoid circular ownership between the timer and this object. +// + +/*static*/ void +nsSMILAnimationController::Notify(nsITimer* timer, void* aClosure) +{ + nsSMILAnimationController* controller = (nsSMILAnimationController*)aClosure; + + NS_ASSERTION(controller->mTimer == timer, + "nsSMILAnimationController::Notify called with incorrect timer"); + + controller->SampleChildren(); +} + +//---------------------------------------------------------------------- +// nsISMILAnimationController methods: + +nsresult +nsSMILAnimationController::Pause() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILAnimationController::Pause"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +nsresult +nsSMILAnimationController::Resume() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILAnimationController::Resume"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +nsresult +nsSMILAnimationController::AddTimeContainer(nsISMILTimeContainer* aContainer) +{ + NS_ENSURE_ARG_POINTER(aContainer); + + nsresult rv; + nsCOMPtr weakRef( + getter_AddRefs(do_GetWeakReference(aContainer, &rv)) ); + + if (NS_SUCCEEDED(rv)) + rv = (mTimeContainers.AppendObject(weakRef)) ? NS_OK : NS_ERROR_FAILURE; + + if (NS_SUCCEEDED(rv) && mTimeContainers.Count() == 1) + rv = StartTimer(); + + return rv; +} + +nsresult +nsSMILAnimationController::RemoveTimeContainer(nsISMILTimeContainer* aContainer) +{ + NS_ENSURE_ARG_POINTER(aContainer); + + nsresult rv; + nsCOMPtr weakRef( + getter_AddRefs(do_GetWeakReference(aContainer, &rv)) ); + + if (NS_SUCCEEDED(rv)) + rv = (mTimeContainers.RemoveObject(weakRef)) ? NS_OK : NS_ERROR_FAILURE; + + if (NS_SUCCEEDED(rv) && mTimeContainers.Count() == 0) + rv = StopTimer(); + + return rv; +} + +//---------------------------------------------------------------------- +// Implementation helpers: + +nsresult +nsSMILAnimationController::Init() +{ + mTimer = do_CreateInstance("@mozilla.org/timer;1"); + return (mTimer) ? NS_OK : NS_ERROR_OUT_OF_MEMORY; +} + +nsresult +nsSMILAnimationController::StartTimer() +{ + NS_ENSURE_TRUE(mTimer, NS_ERROR_FAILURE); + + // XXXbb Remove magic number, make timer self-tuning + return mTimer->InitWithFuncCallback(nsSMILAnimationController::Notify, + this, + 25, + nsITimer::TYPE_REPEATING_SLACK); +} + +nsresult +nsSMILAnimationController::StopTimer() +{ + NS_ENSURE_TRUE(mTimer, NS_ERROR_FAILURE); + + return mTimer->Cancel(); +} + +void +nsSMILAnimationController::SampleChildren() +{ + // Creating a new enumerator each sample provides thread-safety but I'm not + // sure what the cost is + + // XXXbb [threadsafety] + + nsCOMPtr enumerator; + nsresult rv = + NS_NewArrayEnumerator(getter_AddRefs(enumerator), mTimeContainers); + NS_ENSURE_SUCCESS(rv,); + + PRBool more = PR_FALSE; + nsCOMPtr container; + nsCOMPtr weakRef; + + while (NS_SUCCEEDED(enumerator->HasMoreElements(&more)) && more) { + if (NS_FAILED(enumerator->GetNext(getter_AddRefs(weakRef))) || !weakRef) + break; + + container = do_QueryReferent(weakRef); + + if (container) + container->Sample(); + } + + /* Non-thread safe version + PRUint32 i = mTimeContainers.Count(); + while (i > 0) { + --i; + nsCOMPtr + container( do_QueryReferent(mTimeContainers[i]) ); + // The above could be replaced with mTimeContainers.SafeObjectAt(i) to + // provide a little more safety + + if (container) + container->Sample(); + else + mTimeContainers.RemoveObjectAt(i); + } + */ +} + Index: /cvsroot/mozilla/content/smil/src/nsSMILAnimationFunction.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILAnimationFunction.cpp diff -N content/smil/src/nsSMILAnimationFunction.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILAnimationFunction.cpp 9 Oct 2005 01:12:38 -0000 @@ -0,0 +1,812 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsISMILAnimationFunction.h" +#include "nsISMILComposable.h" +#include "nsISMILTimeClient.h" +#include "nsSMILTimeValue.h" +#include "nsISMILAnimVal.h" +#include "nsISMILAnimAttr.h" +#include "nsSMILEnum.h" +#include "nsSMILAtoms.h" +#include "nsCOMPtr.h" +#include "nsCOMArray.h" +#include "nsReadableUtils.h" +#include "nsString.h" +#include "nsCRT.h" +#include + +// XXXbb remove +#include "nsITimelineService.h" + +//---------------------------------------------------------------------- +// nsSMILAnimationFunction + +class nsSMILAnimationFunction : public nsISMILAnimationFunction, + public nsISMILComposable, + public nsISMILTimeClient +{ +public: + nsSMILAnimationFunction(); + + NS_DECL_ISUPPORTS + + // nsISMILAnimationFunction + virtual nsresult SetTargetAttribute(nsISMILAnimAttr* aAttribute); + virtual nsISMILAnimAttr* GetTargetAttribute(); + virtual void SetDocumentPosition(PRUint16 aDocPosition); + + virtual nsresult SetAccumulate(const nsAString& aAccumulate); + virtual nsresult SetAdditive(const nsAString& aAdditive); + virtual nsresult SetBy(const nsAString& aBy); + virtual nsresult SetCalcMode(const nsAString& aCalcMode); + virtual nsresult SetFrom(const nsAString& aFrom); + virtual nsresult SetKeyTimes(const nsAString& aKeyTimes); + virtual nsresult SetKeySplines(const nsAString& aKeySplines); + virtual nsresult SetTo(const nsAString& aTo); + virtual nsresult SetValues(const nsAString& aValues); + + virtual void UnsetAdditive(); + virtual void UnsetBy(); + virtual void UnsetCalcMode(); + virtual void UnsetAccumulate(); + virtual void UnsetFrom(); + virtual void UnsetKeyTimes(); + virtual void UnsetKeySplines(); + virtual void UnsetTo(); + virtual void UnsetValues(); + + // nsISMILTimeClient methods + virtual void SampleAt(const PRInt64& aSimpleTime, + const nsSMILTimeValue& aSimpleDuration, + const PRUint32& aRepeatIteration); + virtual void SampleLastValue(const PRUint32& aRepeatIteration); + virtual void ToActive(const PRInt64& aBeginTime); + virtual void ToInactive(PRBool aIsFrozen); + + // nsISMILComposable methods + virtual void ComposeResult(nsISMILAnimVal &aResult); + virtual PRInt8 CompareTo(const nsISMILComposable& composable) const; + virtual PRBool IsToAnimation() const; + virtual const PRInt64& GetBeginTime() const; + virtual PRUint16 GetDocumentPosition() const; + virtual PRBool IsActive() const; + virtual PRBool WillReplace() const; + +protected: + // Implementation helpers + nsISMILAnimationFunction* NS_NewSMILAnimationFunction(); + virtual void FillValuesArray(); + virtual PRBool IsAdditive() const; + + // Members + + /** + * The attribute being targeted. This is needed for parsing animation function + * values and creating temporary objects. + */ + nsCOMPtr mAttribute; + + // + // Animation function values. + // + nsCOMPtr mFrom; + nsCOMPtr mTo; + nsCOMPtr mBy; + nsCOMArray mValues; + + // + // When the values attribute isn't set explicitly, the mValues array is filled + // with an equivalent set of values based on the from, to and by attributes. + // This flag indicates if the values array is filled with values from an + // actual values attribute (in which case it is true) or if it has been filled + // with the values of from, to and by (in which case it is false). + // + PRBool mValuesIsSet; + + enum nsSMILCalcMode + { + calc_linear, + calc_discrete, + calc_paced, + calc_spline + }; + static nsSMILEnumMapping sCalcModeMap[]; + nsSMILEnum mCalcMode; + + static nsSMILEnumMapping sAdditiveMap[]; + nsSMILEnum mAdditive; + + PRBool mIsActive; + PRBool mIsFrozen; + + // + // These are the parameters provided by the previous sample. Currently we + // perform lazy calculation. That is, we only calculate the result if and when + // instructed by the compositor. This allows us to apply the result directly + // to the animation value and allows the compositor to filter out functions + // that it determines will not contribute to the final result. + // + PRInt64 mSimpleTime; + nsSMILTimeValue mSimpleDuration; + PRUint32 mRepeatIteration; + PRBool mLastValue; + + PRInt64 mBeginTime; + PRUint16 mDocumentPosition; + + // + // This is for the very specific case where we have a 'to' animation that is + // frozen part way through the simple duration and there are other active + // lower-priority animations targetting the same attribute. In this case + // SMILANIM 3.3.6 says: + // + // The value for F(t) when a to-animation is frozen (at the end of the + // simple duration) is just the to value. If a to-animation is frozen + // anywhere within the simple duration (e.g., using a repeatCount of "2.5"), + // the value for F(t) when the animation is frozen is the value computed for + // the end of the active duration. Even if other, lower priority animations + // are active while a to-animation is frozen, the value for F(t) does not + // change. + // + // To implement properly this we'd need to force a resample of all the lower + // priority animations at the active end of this animation--something which + // would introduce unwanted coupling between the timing and animation model. + // Instead we just save the value calculated when this animation is frozen (in + // which case this animation will be sampled at the active end and the lower + // priority animations should be sampled at a time pretty close to this, + // provided we have a reasonable frame rate). + // + // @see + // http://www.w3.org/TR/2001/REC-smil-animation-20010904/#FromToByAndAdditive + // + nsCOMPtr mFrozenValue; +}; + +//---------------------------------------------------------------------- +// Static members + +nsSMILEnumMapping nsSMILAnimationFunction::sCalcModeMap[] = { + {&nsSMILAtoms::linear, calc_linear}, + {&nsSMILAtoms::discrete, calc_discrete}, + {&nsSMILAtoms::paced, calc_paced}, + {&nsSMILAtoms::spline, calc_spline}, + {nsnull, 0} +}; + +nsSMILEnumMapping nsSMILAnimationFunction::sAdditiveMap[] = { + {&nsSMILAtoms::replace, PR_FALSE}, + {&nsSMILAtoms::sum, PR_TRUE}, + {nsnull, 0} +}; + +//---------------------------------------------------------------------- +// Constructors etc. + +nsSMILAnimationFunction::nsSMILAnimationFunction() + : mValuesIsSet(PR_FALSE), + mCalcMode(calc_linear, sCalcModeMap), + mAdditive(PR_FALSE, sAdditiveMap), + mIsActive(PR_FALSE), + mIsFrozen(PR_FALSE), + mSimpleTime(-1), + mRepeatIteration(0), + mLastValue(PR_FALSE), + mBeginTime(LL_MinInt()), + mDocumentPosition(PR_UINT16_MAX) +{ +} + +nsISMILAnimationFunction* +NS_NewSMILAnimationFunction() +{ + return new nsSMILAnimationFunction(); +} + +//---------------------------------------------------------------------- +// nsISupports methods: + +NS_IMPL_ISUPPORTS4(nsSMILAnimationFunction, + nsISMILAnimationFunction, + nsISMILComposable, + nsISMILTimeClient, + nsISupportsWeakReference) + +//---------------------------------------------------------------------- +// nsISMILAnimationFunction methods: + +nsresult +nsSMILAnimationFunction::SetTargetAttribute(nsISMILAnimAttr* aAttribute) +{ + mAttribute = aAttribute; + mValues.Clear(); + mValuesIsSet = PR_FALSE; + mFrom = nsnull; + mTo = nsnull; + mBy = nsnull; + + return NS_OK; +} + +nsISMILAnimAttr* +nsSMILAnimationFunction::GetTargetAttribute() +{ + return mAttribute; +} + +void +nsSMILAnimationFunction::SetDocumentPosition(PRUint16 aDocPosition) +{ + mDocumentPosition = aDocPosition; +} + +nsresult +nsSMILAnimationFunction::SetAdditive(const nsAString& aAdditive) +{ + return mAdditive.SetStringValue(aAdditive); +} + +void +nsSMILAnimationFunction::UnsetAdditive() +{ + mAdditive.SetIntegerValue((PRUint16)PR_FALSE); +} + +nsresult +nsSMILAnimationFunction::SetBy(const nsAString& aBy) +{ + NS_ENSURE_TRUE(mAttribute, NS_ERROR_FAILURE); + + mBy = mAttribute->CreateFromSpec(aBy); + if (!mBy) + return NS_ERROR_FAILURE; + + FillValuesArray(); + + return NS_OK; +} + +void +nsSMILAnimationFunction::UnsetBy() +{ + mBy = nsnull; + FillValuesArray(); +} + +nsresult +nsSMILAnimationFunction::SetCalcMode(const nsAString& aCalcMode) +{ + // XXXbb + (void)aCalcMode; + NS_NOTYETIMPLEMENTED("nsSMILAnimationFunction::SetCalcMode"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +void +nsSMILAnimationFunction::UnsetCalcMode() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILAnimationFunction::UnsetCalcMode"); +} + +nsresult +nsSMILAnimationFunction::SetAccumulate(const nsAString& aAccumulate) +{ + // XXXbb + (void)aAccumulate; + NS_NOTYETIMPLEMENTED("nsSMILAnimationFunction::SetAccumulate"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +void +nsSMILAnimationFunction::UnsetAccumulate() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILAnimationFunction::UnsetAccumulate"); +} + + +nsresult +nsSMILAnimationFunction::SetFrom(const nsAString& aFrom) +{ + NS_ENSURE_TRUE(mAttribute, NS_ERROR_FAILURE); + + mFrom = mAttribute->CreateFromSpec(aFrom); + if (!mFrom) + return NS_ERROR_FAILURE; + + FillValuesArray(); + + return NS_OK; +} + +void +nsSMILAnimationFunction::UnsetFrom() +{ + mFrom = nsnull; + FillValuesArray(); +} + +nsresult +nsSMILAnimationFunction::SetKeySplines(const nsAString& aKeySplines) +{ + // XXXbb + (void)aKeySplines; + NS_NOTYETIMPLEMENTED("nsSMILAnimationFunction::SetKeySplines"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +void +nsSMILAnimationFunction::UnsetKeySplines() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILAnimationFunction::UnsetKeySplines"); +} + +nsresult +nsSMILAnimationFunction::SetKeyTimes(const nsAString& aKeyTimes) +{ + // XXXbb + (void)aKeyTimes; + NS_NOTYETIMPLEMENTED("nsSMILAnimationFunction::SetKeyTimes"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +void +nsSMILAnimationFunction::UnsetKeyTimes() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILAnimationFunction::UnsetKeyTimes"); +} + +nsresult +nsSMILAnimationFunction::SetTo(const nsAString& aTo) +{ + NS_ENSURE_TRUE(mAttribute, NS_ERROR_FAILURE); + + mTo = mAttribute->CreateFromSpec(aTo); + if (!mTo) + return NS_ERROR_FAILURE; + + FillValuesArray(); + + return NS_OK; +} + +void +nsSMILAnimationFunction::UnsetTo() +{ + mTo = nsnull; + FillValuesArray(); +} + +nsresult +nsSMILAnimationFunction::SetValues(const nsAString& aValues) +{ + NS_ENSURE_TRUE(mAttribute, NS_ERROR_FAILURE); + + nsresult rv = NS_ERROR_FAILURE; + nsAString::const_iterator start; + nsAString::const_iterator end; + nsAString::const_iterator substr_end; + nsAString::const_iterator next; + + aValues.BeginReading(start); + aValues.EndReading(end); + + mValues.Clear(); + mValuesIsSet = PR_FALSE; + + while (start != end) { + rv = NS_ERROR_FAILURE; + + while (*start && NS_IS_SPACE(*start)) + ++start; + + if (*start == '\0' || *start == ';') + break; + + substr_end = start; + + while (substr_end != end && *substr_end != ';') + ++substr_end; + + next = substr_end; + if (*substr_end == ';') { + ++next; + if (next == end) + break; + } + + do --substr_end; while (start != substr_end && NS_IS_SPACE(*substr_end)); + ++substr_end; + + nsCOMPtr newValue ( + mAttribute->CreateFromSpec(Substring(start, substr_end))); + + if (!newValue) + break; + + mValues.AppendObject(newValue); + + rv = NS_OK; + start = next; + } + + if (NS_SUCCEEDED(rv)) + mValuesIsSet = PR_TRUE; + else + mValues.Clear(); + + return rv; +} + +void +nsSMILAnimationFunction::UnsetValues() +{ + mValuesIsSet = PR_FALSE; + FillValuesArray(); +} + +//---------------------------------------------------------------------- +// nsISMILTimeClient methods + +void +nsSMILAnimationFunction::SampleAt(const PRInt64& aSimpleTime, + const nsSMILTimeValue& aSimpleDuration, + const PRUint32& aRepeatIteration) +{ + mSimpleTime = aSimpleTime; + mSimpleDuration = aSimpleDuration; + mRepeatIteration = aRepeatIteration; + mLastValue = PR_FALSE; +} + +void +nsSMILAnimationFunction::SampleLastValue(const PRUint32& aRepeatIteration) +{ + mRepeatIteration = aRepeatIteration; + mLastValue = PR_TRUE; +} + +void +nsSMILAnimationFunction::ToActive(const PRInt64& aBeginTime) +{ + mBeginTime = aBeginTime; + mIsActive = PR_TRUE; + mIsFrozen = PR_FALSE; + mFrozenValue = nsnull; +} + +void +nsSMILAnimationFunction::ToInactive(PRBool aIsFrozen) +{ + mIsActive = PR_FALSE; + mIsFrozen = aIsFrozen; + mFrozenValue = nsnull; +} + +//---------------------------------------------------------------------- +// nsISMILComposable methods + +void +nsSMILAnimationFunction::ComposeResult(nsISMILAnimVal &aResult) +{ + NS_TIMELINE_START_TIMER("nsSMILAnimationFunction::ComposeResult"); + + // This checks if mValues is empty so we don't need to check it again + if (!IsActive()) { + NS_TIMELINE_STOP_TIMER("nsSMILAnimationFunction::ComposeResult"); + return; + } + + if (!mAttribute) { + NS_TIMELINE_STOP_TIMER("nsSMILAnimationFunction::ComposeResult"); + return; + } + + NS_ENSURE_TRUE(mSimpleTime >= 0,); + NS_ENSURE_TRUE(mSimpleDuration.IsResolved() || + mSimpleDuration.IsIndefinite(), ); + + nsCOMPtr result(mAttribute->Create()); + NS_ENSURE_TRUE(result,); + + if (mSimpleDuration.IsIndefinite() || + (mValuesIsSet && mValues.Count() == 1)) { + nsISMILAnimVal* firstValue = mValues.SafeObjectAt(0); + NS_ENSURE_TRUE(firstValue,); + NS_ENSURE_SUCCESS(result->Set(*firstValue),); + } else if (mLastValue) { + nsISMILAnimVal* lastValue = mValues.SafeObjectAt(mValues.Count() - 1); + NS_ENSURE_TRUE(lastValue,); + // if accumulate == sum + // result->Repeat(mRepeatIteration + 1, lastValue); + // else + NS_ENSURE_SUCCESS(result->Set(*lastValue),); + } else if (mFrozenValue) { + NS_ENSURE_SUCCESS(result->Set(*mFrozenValue),); + } else { + const PRInt64& dur = mSimpleDuration.GetMillis(); + + if (LL_CMP(mSimpleTime, >=, dur) || !LL_GE_ZERO(mSimpleTime)) { + NS_ERROR("Animation sampled outside interval."); + return; + } + + double fTime; + double fDur; + double simpleDistance; + double intervalDistance; + PRInt32 index; + nsISMILAnimVal* from = nsnull; + nsISMILAnimVal* to = nsnull; + + LL_L2D(fTime, mSimpleTime); + LL_L2D(fDur, dur); + + NS_ASSERTION(mValues.Count() >= 2 || IsToAnimation(), + "Unexpected number of values."); + + simpleDistance = (fDur > 0.0) ? fTime / fDur : 0.0; + + if (IsToAnimation()) { + from = &aResult; + to = mValues.SafeObjectAt(0); + NS_ENSURE_TRUE(to,); + intervalDistance = simpleDistance; + } else { + index = (PRInt32) floor(simpleDistance * (mValues.Count() - 1)); + + from = mValues.SafeObjectAt(index); + NS_ENSURE_TRUE(from,); + + to = mValues.SafeObjectAt(index + 1); + NS_ENSURE_TRUE(to,); + + intervalDistance = simpleDistance * (mValues.Count() - 1) - index; + } + + nsresult rv = from->Interpolate(*to, + NS_STATIC_CAST(float, intervalDistance), + *result); + NS_ENSURE_SUCCESS(rv,); + + if (IsToAnimation() && mIsFrozen) { + mFrozenValue = mAttribute->Create(); + NS_ENSURE_TRUE(mFrozenValue,); + NS_ENSURE_SUCCESS(mFrozenValue->Set(*result),); + } + } + + // + // If additive animation isn't required or fails, just set the value. + // + if (!IsAdditive() || NS_FAILED(aResult.Add(*result))) + aResult.Set(*result); + NS_TIMELINE_STOP_TIMER("nsSMILAnimationFunction::ComposeResult"); +} + +PRInt8 +nsSMILAnimationFunction::CompareTo(const nsISMILComposable& composable) const +{ + // + // Inactive animations sort first + // + if (!IsActive()) + return -1; + + if (!composable.IsActive()) + return 1; + + // + // To animations sort last + // + if (!IsToAnimation() && composable.IsToAnimation()) + return -1; + + if (IsToAnimation() && !composable.IsToAnimation()) + return 1; + + // + // We sort using the same rules if both animations _are_ 'to animations' or + // both animations are _not_ 'to animations'. + // + if (LL_NE(mBeginTime, composable.GetBeginTime())) + return LL_CMP(mBeginTime, >, composable.GetBeginTime()) ? 1 : -1; + + // XXX When syncbase timing is implemented, we next need to sort based on + // dependencies + + // + // Animations that appear later in the document sort after those earlier in + // the document + // + NS_ASSERTION(mDocumentPosition != composable.GetDocumentPosition(), + "Two animations cannot have the same document position!"); + + return (mDocumentPosition <= composable.GetDocumentPosition()) ? -1 : 1; +} + +PRBool +nsSMILAnimationFunction::IsToAnimation() const +{ + return (!mValuesIsSet && mTo && !mFrom); +} + +const PRInt64& +nsSMILAnimationFunction::GetBeginTime() const +{ + return mBeginTime; +} + +PRUint16 +nsSMILAnimationFunction::GetDocumentPosition() const +{ + return mDocumentPosition; +} + +PRBool +nsSMILAnimationFunction::IsActive() const +{ + // + // Even if an animation should be active, if its attributes are set + // incorrectly, it will have no effect and should be considered by the + // compositor to be inactive. + // + // Frozen animations should be considered active for the purposes of + // compositing. + // + return ((mIsActive || mIsFrozen) && mValues.Count() > 0); +} + + +PRBool +nsSMILAnimationFunction::WillReplace() const +{ + // XXXbb this is not quite right as IsAdditive returns false for to animation + // + // also, for the purposes of this method, to animations don't replace unless + // they are frozen and it isn't the first frame + return !IsAdditive(); +} + +// XXX What we need is HasChanged. In SampleAt and SampleLastValue (what about +// ToActive and ToInactive()? -- I think not) we compare the values and set +// a flag to true if it's changed. We never set it to false in that method even +// if nothing's changed. If the flag was true when we entered the method it +// stays true--in fact we could save comparing in that case, e.g. +// +// if (mHasChanged || (mSimpleTime != aSimpleTime) || .... +// mHasChanged = PR_TRUE; +// +// Then after compositing we set it to false. +// +// That way the flag indicates if the parameters have changed since the last +// composite. +// +// In the compositor we do a first pass and if none of the composables for +// attribute have changed we don't composite. Alternatively we always composite +// and accumulate a bool indicating if any of them have changed and then if none +// have we just don't set the anim value. I think the first method will be more +// efficient as the HasChanged method will simply return a member variable. +// +// This hasChanged member could be re-used later for optimising by storing the +// last result if it wasn't additive. +// +// We can also use it in WillReplace. The condition would be something like +// +// WillReplace = (!IsAdditive && !IsToAnimation) || (IsToAnimation && mIsFrozen +// && !mHasChanged) +// +// likewise in the compositing loop we should only use the frozen value if +// mHasChanged is false, otherwise we should re-composite anyway---this sort of +// situation might arise when seeking backwards and although we may get the +// right quite wrong, it won't be _as_ wrong as if we just used the frozen value + +//---------------------------------------------------------------------- +// Implementation helpers + +/* + * SMILANIM specifies the following rules for animation function values: + * + * (1) if values is set, it overrides everything + * (2) for from/to/by animation at least to or by must be specified, from on its + * own (or nothing) is an error--which we will ignore + * (3) if both by and to are specified only to will be used, by will be ignored + * (4) if by is specified without from (by animation), forces additive behaviour + * (5) if to is specified without from (to animation), special care needs to be + * taken when compositing animation as such animations are composited last. + * + * This helper method applies these rules to fill in the values list and to set + * some internal state. + */ +void +nsSMILAnimationFunction::FillValuesArray() +{ + if (!mValuesIsSet) { + mValues.Clear(); + + if (mTo) { + if (mFrom) { + mValues.AppendObject(mFrom); + mValues.AppendObject(mTo); + } else { + mValues.AppendObject(mTo); + } + } else if (mBy) { + if (mFrom) { + // + // Set values to 'from; from + to' + // + mValues.AppendObject(mFrom); + nsCOMPtr to (mAttribute->Create()); + if (to && + NS_SUCCEEDED(to->Set(*mFrom)) && + NS_SUCCEEDED(to->Add(*mBy))) { + mValues.AppendObject(to); + } else { + mValues.Clear(); + } + } else { + // + // Set values to '0; by' + // + nsCOMPtr from (mAttribute->Create()); + if (from) { + mValues.AppendObject(from); + mValues.AppendObject(mBy); + } else { + mValues.Clear(); + } + } + } + // else, do nothing, mValues has been cleared already. + } +} + +inline PRBool +nsSMILAnimationFunction::IsAdditive() const +{ + /* + * Animation is additive if: + * + * (1) additive = "sum" (mAdditive == true), or + * (2) it is 'by animation' (by is set, from and values are not) + * + * Although animation is not additive if it is 'to animation' + */ + return (!IsToAnimation() && + (mAdditive.GetIntegerValue() || (!mValuesIsSet && mBy && !mFrom))); +} + Index: /cvsroot/mozilla/content/smil/src/nsSMILAnimationRegistry.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILAnimationRegistry.cpp diff -N content/smil/src/nsSMILAnimationRegistry.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILAnimationRegistry.cpp 9 Oct 2005 01:12:39 -0000 @@ -0,0 +1,314 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsSMILAnimationRegistry.h" +#include "nsISMILAnimationObserver.h" +#include "nsISMILAnimAttr.h" +#include "nsISMILComposable.h" +#include "nsSMILTimedDocumentRoot.h" +#include "nsSMILCompositor.h" + +// XXXbb Remove +#include "nsITimelineService.h" + +//////////////////////////////////////////////////////////////////////// +// nsSMILAnimationRegistry implementation + +struct CompositorEntry +{ + nsISMILAnimAttr* key; + nsSMILCompositor compositor; +}; + +//---------------------------------------------------------------------- +// ctors, dtors, factory methods + +nsSMILAnimationRegistry::~nsSMILAnimationRegistry() +{ + if (mController && mTimedDocumentRoot) + mController->RemoveTimeContainer(mTimedDocumentRoot); + + CompositorEntry* entry; + PRInt32 count = mCompositors.Count(); + + // XXXbb [threadsafety] ? + + for (PRInt32 i = 0; i < count; ++i) { + entry = NS_STATIC_CAST(CompositorEntry*, mCompositors[i]); + mCompositors.ReplaceElementAt(nsnull, i); + delete entry; + } + + mCompositors.Clear(); +} + +nsISMILAnimationRegistry* +NS_NewSMILAnimationRegistry() +{ + nsSMILAnimationRegistry* animationRegistry = new nsSMILAnimationRegistry(); + + if (!animationRegistry) + return nsnull; + + nsresult rv = animationRegistry->Init(); + if (NS_FAILED(rv)) { + delete animationRegistry; + animationRegistry = nsnull; + } + + return animationRegistry; +} + +nsresult +nsSMILAnimationRegistry::Init() +{ + mTimedDocumentRoot = new nsSMILTimedDocumentRoot(this); + NS_ENSURE_TRUE(mTimedDocumentRoot, NS_ERROR_OUT_OF_MEMORY); + + return NS_OK; +} + +//---------------------------------------------------------------------- +// nsISupports methods: + +NS_IMPL_ISUPPORTS1(nsSMILAnimationRegistry, + nsISMILAnimationRegistry); + +//---------------------------------------------------------------------- +// nsISMILAnimationRegistry methods: + +nsresult +nsSMILAnimationRegistry::SetController(nsISMILAnimationController* aController) +{ + nsresult rv = NS_OK; + + NS_ENSURE_TRUE(mTimedDocumentRoot, NS_ERROR_FAILURE); + + if (mController) { + rv = mController->RemoveTimeContainer(mTimedDocumentRoot); + NS_ENSURE_SUCCESS(rv,rv); + } + + mController = aController; + + if (mController) + rv = mController->AddTimeContainer(mTimedDocumentRoot); + + return rv; +} + +void +nsSMILAnimationRegistry::SetObserver(nsISMILAnimationObserver* aObserver) +{ + if (aObserver) { + mObserver = do_GetWeakReference(aObserver); + } else { + mObserver = nsnull; + } +} + +void +nsSMILAnimationRegistry::Pause() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILAnimationRegistry::Pause"); +} + +void +nsSMILAnimationRegistry::Unpause() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILAnimationRegistry::Unpause"); +} + +PRBool +nsSMILAnimationRegistry::IsPaused() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILAnimationRegistry::IsPaused"); + return false; +} + +float +nsSMILAnimationRegistry::GetCurrentTime() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILAnimationRegistry::GetCurrentTime"); + return 0.0f; +} + +nsresult +nsSMILAnimationRegistry::SetCurrentTime(float aSeconds) +{ + // XXXbb + (void)aSeconds; + NS_NOTYETIMPLEMENTED("nsSMILAnimationRegistry::SetCurrentTime"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +nsresult +nsSMILAnimationRegistry::RegisterComposable(nsISMILAnimAttr* aTargetAttr, + nsISMILComposable* aComposable) +{ + NS_ENSURE_ARG_POINTER(aTargetAttr); + NS_ENSURE_ARG_POINTER(aComposable); + + nsSMILCompositor* compositor = nsnull; + CompositorEntry* entry; + + // XXXbb [threadsafety] + + // + // Iterate in reverse as if a compositor already exists for this attribute it + // is most likely to be the most recently added entry. + // + for (PRInt32 i = mCompositors.Count() - 1; i >= 0 && !compositor; --i) { + entry = (CompositorEntry*)mCompositors[i]; + if (entry && entry->key == aTargetAttr) + compositor = &entry->compositor; + } + + if (!compositor) { + entry = new CompositorEntry(); + NS_ENSURE_TRUE(entry,NS_ERROR_OUT_OF_MEMORY); + + nsresult rv = entry->compositor.Init(aTargetAttr); + NS_ENSURE_SUCCESS(rv,rv); + + entry->key = aTargetAttr; + if (!mCompositors.AppendElement(entry)) { + delete entry; + return NS_ERROR_FAILURE; + } + + compositor = &entry->compositor; + } + + return compositor->AddComposable(aComposable); +} + +nsresult +nsSMILAnimationRegistry::UnregisterComposable(nsISMILComposable* aComposable) +{ + NS_ENSURE_ARG_POINTER(aComposable); + + PRBool found = PR_FALSE; + nsresult result = NS_OK; + nsresult rv = NS_ERROR_FAILURE; + CompositorEntry* entry; + PRInt32 count = mCompositors.Count(); + + // XXXbb [threadsafety] + + for (PRInt32 i = 0; i < count; ++i) { + entry = (CompositorEntry*)mCompositors[i]; + if (entry) { + rv = entry->compositor.RemoveComposable(aComposable); + + // + // This rather complicated error handling just ensures that we report the + // first error that occurs, or a generic error if the item wasn't found. + // + if (NS_SUCCEEDED(result)) + result = rv; + found = PR_TRUE; + } + + // + // Even if the entry now no longer has any compositors we don't bother + // deleting it as it may be re-used again later. + // + } + + return (found) ? rv : NS_ERROR_FAILURE; +} + +nsresult +nsSMILAnimationRegistry::RegisterTimedElement(nsISMILTimedElement *aElement) +{ + return (mTimedDocumentRoot) ? mTimedDocumentRoot->AddTimedElement(aElement) + : NS_ERROR_FAILURE; +} + +nsresult +nsSMILAnimationRegistry::UnregisterTimedElement(nsISMILTimedElement *aElement) +{ + return (mTimedDocumentRoot) ? mTimedDocumentRoot->RemoveTimedElement(aElement) + : NS_ERROR_FAILURE; +} + +void +nsSMILAnimationRegistry::StartSample() +{ + if (mObserver) { + nsCOMPtr observer = do_QueryReferent(mObserver); + if (observer) + observer->StartSample(); + } + + // Do any pre-animation actions here, e.g. acquiring locks, blocking scripts + // etc. +} + +void +nsSMILAnimationRegistry::EndSample() +{ + NS_TIMELINE_START_TIMER("nsSMILAnimationRegistry::EndSample"); + CompositorEntry* entry; + PRInt32 count = mCompositors.Count(); + nsCOMPtr observer; + + if (mObserver) + observer = do_QueryReferent(mObserver); + + if (observer) + observer->StartCompositing(); + + for (PRInt32 i = 0; i < count; ++i) { + entry = NS_STATIC_CAST(CompositorEntry*, mCompositors[i]); + if (entry) + entry->compositor.ComposeSample(); + } + + NS_TIMELINE_START_TIMER("nsSVGSVGElement::EndCompositing"); + if (observer) + observer->EndCompositing(); + NS_TIMELINE_STOP_TIMER("nsSVGSVGElement::EndCompositing"); + + // Release any locks etc. + + if (observer) + observer->EndSample(); + NS_TIMELINE_STOP_TIMER("nsSMILAnimationRegistry::EndSample"); +} + Index: /cvsroot/mozilla/content/smil/src/nsSMILAnimationRegistry.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILAnimationRegistry.h diff -N content/smil/src/nsSMILAnimationRegistry.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILAnimationRegistry.h 9 Oct 2005 01:12:39 -0000 @@ -0,0 +1,89 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_SMILANIMATIONREGISTRY_H__ +#define __NS_SMILANIMATIONREGISTRY_H__ + +#include "nsISMILAnimationRegistry.h" +#include "nsISMILAnimationController.h" +#include "nsVoidArray.h" +#include "nsAutoPtr.h" +#include "nsWeakPtr.h" + +class nsSMILTimedDocumentRoot; + +class nsSMILAnimationRegistry : public nsISMILAnimationRegistry +{ +public: + ~nsSMILAnimationRegistry(); + + NS_DECL_ISUPPORTS + + virtual void StartSample(); + virtual void EndSample(); + + // nsISMILAnimationRegistry + virtual nsresult SetController(nsISMILAnimationController* aController); + virtual void SetObserver(nsISMILAnimationObserver* aObserver); + virtual void Pause(); + virtual void Unpause(); + virtual PRBool IsPaused(); + virtual float GetCurrentTime(); + virtual nsresult SetCurrentTime(float aSeconds); + virtual nsresult RegisterComposable(nsISMILAnimAttr *aTargetAttr, + nsISMILComposable *aComposable); + virtual nsresult UnregisterComposable(nsISMILComposable *aComposable); + virtual nsresult RegisterTimedElement(nsISMILTimedElement *aElement); + virtual nsresult UnregisterTimedElement(nsISMILTimedElement *aElement); + +protected: + friend nsISMILAnimationRegistry* NS_NewSMILAnimationRegistry(); + + nsresult Init(); + + nsVoidArray mCompositors; + nsRefPtr mTimedDocumentRoot; + nsCOMPtr mController; + nsWeakPtr mObserver; + +private: + // This class should only be created by the factory method + nsSMILAnimationRegistry() {} + + // Pass by value and assignment should not be used + nsSMILAnimationRegistry(const nsSMILAnimationRegistry& other); + nsSMILAnimationRegistry& operator=(const nsSMILAnimationRegistry& right); +}; + +#endif // __NS_SMILANIMATIONREGISTRY_H__ + Index: /cvsroot/mozilla/content/smil/src/nsSMILAtomList.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILAtomList.h diff -N content/smil/src/nsSMILAtomList.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILAtomList.h 9 Oct 2005 01:12:39 -0000 @@ -0,0 +1,70 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1999 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +/****** + + This file contains the list of all SMIL nsIAtoms and their values + + It is designed to be used as inline input to nsSMILAtoms.cpp *only* + through the magic of C preprocessing. + + All entires must be enclosed in the macro SMIL_ATOM which will have cruel + and unusual things done to it + + It is recommended (but not strictly necessary) to keep all entries + in alphabetical order + + The first argument to SMIL_ATOM is the C++ identifier of the atom + The second argument is the string value of the atom + + ******/ + +// calc modes +SMIL_ATOM(discrete, "discrete") +SMIL_ATOM(linear, "linear") +SMIL_ATOM(paced, "paced") +SMIL_ATOM(spline, "spline") + +// fill modes +SMIL_ATOM(freeze, "freeze") +SMIL_ATOM(remove, "remove") + +// additive +SMIL_ATOM(replace, "replace") +SMIL_ATOM(sum, "sum") + Index: /cvsroot/mozilla/content/smil/src/nsSMILAtoms.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILAtoms.cpp diff -N content/smil/src/nsSMILAtoms.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILAtoms.cpp 9 Oct 2005 01:12:39 -0000 @@ -0,0 +1,63 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsSMILAtoms.h" +#include "nsStaticAtom.h" +#include "nsMemory.h" + +// define storage for all atoms +#define SMIL_ATOM(_name, _value) nsIAtom* nsSMILAtoms::_name; +#include "nsSMILAtomList.h" +#undef SMIL_ATOM + +static const nsStaticAtom SMILAtoms_info[] = { +#define SMIL_ATOM(name_, value_) { value_, &nsSMILAtoms::name_ }, +#include "nsSMILAtomList.h" +#undef SMIL_ATOM +}; + +void nsSMILAtoms::AddRefAtoms() +{ + static bool atomsRegistered = PR_FALSE; + + if (!atomsRegistered) { + NS_RegisterStaticAtoms(SMILAtoms_info, NS_ARRAY_LENGTH(SMILAtoms_info)); + atomsRegistered = PR_TRUE; + } +} + Index: /cvsroot/mozilla/content/smil/src/nsSMILAtoms.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILAtoms.h diff -N content/smil/src/nsSMILAtoms.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILAtoms.h 9 Oct 2005 01:12:40 -0000 @@ -0,0 +1,66 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- + * + * ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_SMILATOMS_H__ +#define __NS_SMILATOMS_H__ + +#include "prtypes.h" +#include "nsIAtom.h" + +class nsSMILAtoms +{ +public: + static void AddRefAtoms(); + + /* + * Declare all atoms + * + * The atom names and values are stored in nsSMILAtomList.h and are brought to + * you by the magic of C preprocessing + * + * Add new atoms to nsSMILAtomList and all support logic will be + * auto-generated + */ +#define SMIL_ATOM(_name, _value) static nsIAtom* _name; +#include "nsSMILAtomList.h" +#undef SMIL_ATOM + +}; + +#endif /* __NS_SMILATOMS_H__ */ + Index: /cvsroot/mozilla/content/smil/src/nsSMILCompositor.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILCompositor.cpp diff -N content/smil/src/nsSMILCompositor.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILCompositor.cpp 9 Oct 2005 01:12:40 -0000 @@ -0,0 +1,165 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsSMILCompositor.h" +#include "nsISMILComposable.h" +#include "nsISimpleEnumerator.h" +#include "nsArrayEnumerator.h" +#include "nsISMILAnimAttr.h" +#include "nsISMILAnimVal.h" + +// XXXbb Remove +#include "nsITimelineService.h" + +//////////////////////////////////////////////////////////////////////// +// nsSMILCompositor implementation + +nsresult +nsSMILCompositor::Init(nsISMILAnimAttr* aTargetAttribute) +{ + NS_ENSURE_ARG_POINTER(aTargetAttribute); + + nsresult rv; + mTargetAttribute = do_GetWeakReference(aTargetAttribute, &rv); + if (NS_FAILED(rv)) { + mTargetAttribute = nsnull; + return rv; + } + + mResult = aTargetAttribute->Create(); + + return NS_OK; +} + +nsresult +nsSMILCompositor::AddComposable(nsISMILComposable* aComposable) +{ + NS_ENSURE_ARG_POINTER(aComposable); + + nsresult rv; + nsCOMPtr weakRef( + getter_AddRefs(do_GetWeakReference(aComposable, &rv)) ); + + // XXXbb [threadsafety] + + if (NS_SUCCEEDED(rv)) + rv = (mChildren.AppendObject(weakRef)) ? NS_OK : NS_ERROR_FAILURE; + + return rv; +} + +nsresult +nsSMILCompositor::RemoveComposable(nsISMILComposable* aComposable) +{ + NS_ENSURE_ARG_POINTER(aComposable); + + nsresult rv; + nsCOMPtr weakRef( + getter_AddRefs(do_GetWeakReference(aComposable, &rv)) ); + + // XXXbb [threadsafety] + + if (NS_SUCCEEDED(rv)) + rv = (mChildren.RemoveObject(weakRef)) ? NS_OK : NS_ERROR_FAILURE; + + return rv; +} + +void +nsSMILCompositor::ComposeSample() +{ + NS_TIMELINE_START_TIMER("nsSMILCompositor::ComposeSample"); + + NS_TIMELINE_START_TIMER("nsSMILCompositor::Initialisation"); + NS_ENSURE_TRUE(mTargetAttribute,); + NS_ENSURE_TRUE(mResult,); + nsresult rv; + + nsCOMPtr targetAttribute( + do_QueryReferent(mTargetAttribute) ); + NS_ENSURE_TRUE(targetAttribute,); + + rv = targetAttribute->GetBaseValue(*mResult); + NS_ENSURE_SUCCESS(rv,); + NS_TIMELINE_STOP_TIMER("nsSMILCompositor::Initialisation"); + + // XXXbb [threadsafety] + + NS_TIMELINE_START_TIMER("nsSMILCompositor::SortCompositors"); + mChildren.Sort(SortCompositors, nsnull); + NS_TIMELINE_STOP_TIMER("nsSMILCompositor::SortCompositors"); + + NS_TIMELINE_START_TIMER("nsSMILCompositor::Getting the enumerator"); + nsCOMPtr enumerator; + rv = NS_NewArrayEnumerator(getter_AddRefs(enumerator), mChildren); + NS_ENSURE_SUCCESS(rv,); + + PRBool more = PR_FALSE; + nsCOMPtr composable; + nsCOMPtr weakRef; + NS_TIMELINE_STOP_TIMER("nsSMILCompositor::Getting the enumerator"); + + NS_TIMELINE_START_TIMER("nsSMILCompositor::Composing loop"); + while (NS_SUCCEEDED(enumerator->HasMoreElements(&more)) && more) { + if (NS_FAILED(enumerator->GetNext(getter_AddRefs(weakRef))) || !weakRef) + break; + + composable = do_QueryReferent(weakRef); + + if (composable) + composable->ComposeResult(*mResult); + } + NS_TIMELINE_STOP_TIMER("nsSMILCompositor::Composing loop"); + + // We can't just call Set on the animated value itself, because the observers + // of the animated object as a whole need to be updated too. + NS_TIMELINE_START_TIMER("nsSMILCompositor::Set value"); + targetAttribute->SetAnimValue(*mResult); + NS_TIMELINE_STOP_TIMER("nsSMILCompositor::Set value"); + NS_TIMELINE_STOP_TIMER("nsSMILCompositor::ComposeSample"); +} + +//---------------------------------------------------------------------- +// Implementation helpers + +PR_CALLBACK int +nsSMILCompositor::SortCompositors(nsIWeakReference* aRef1, + nsIWeakReference* aRef2, + void* /*aData*/) +{ + nsCOMPtr a = do_QueryReferent(aRef1); + nsCOMPtr b = do_QueryReferent(aRef2); + + return (a && b) ? a->CompareTo(*b) : -1; +} + Index: /cvsroot/mozilla/content/smil/src/nsSMILCompositor.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILCompositor.h diff -N content/smil/src/nsSMILCompositor.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILCompositor.h 9 Oct 2005 01:12:40 -0000 @@ -0,0 +1,74 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_SMILCOMPOSITOR_H__ +#define __NS_SMILCOMPOSITOR_H__ + +#include "nsCOMArray.h" +#include "nsWeakReference.h" +#include "nsISMILAnimVal.h" + +//////////////////////////////////////////////////////////////////////// +// nsSMILCompositor: Collection of nsISMILComposable animations + +class nsISMILComposable; +class nsISMILAnimAttr; + +class nsSMILCompositor +{ +public: + nsSMILCompositor() {} + + nsresult Init(nsISMILAnimAttr* aTargetAttribute); + + nsresult AddComposable(nsISMILComposable* aComposable); + nsresult RemoveComposable(nsISMILComposable* aComposable); + void ComposeSample(); + +protected: + PR_STATIC_CALLBACK(int) SortCompositors(nsIWeakReference* aRef1, + nsIWeakReference* aRef2, + void* aData); + + nsCOMArray mChildren; + nsCOMPtr mResult; + nsWeakPtr mTargetAttribute; + +private: + // Pass by value and assignment should not be used + nsSMILCompositor(const nsSMILCompositor& other); + nsSMILCompositor& operator=(const nsSMILCompositor& right); +}; + +#endif // __NS_SMILCOMPOSITOR_H__ + Index: /cvsroot/mozilla/content/smil/src/nsSMILEnum.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILEnum.cpp diff -N content/smil/src/nsSMILEnum.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILEnum.cpp 9 Oct 2005 01:12:40 -0000 @@ -0,0 +1,93 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * The Initial Developer of the Original Code is + * IBM Corporation + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Tim Rowley (original author) + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsSMILEnum.h" +#include "nsSMILAtoms.h" +#include "nsString.h" +#include "nsCRT.h" + +//---------------------------------------------------------------------- +// Implementation + +nsSMILEnum::nsSMILEnum(PRUint16 value, + nsSMILEnumMapping *mapping) + : mValue(value), mMapping(mapping) +{ + nsSMILAtoms::AddRefAtoms(); +} + +nsresult +nsSMILEnum::SetStringValue(const nsAString& aValue) +{ + // + // According to XML 1.0, section 3.3.3 we need to discard leading and trailing + // whitespace for this attribute. Currently nsSVGEnum doesn't do this + // otherwise we might try and re-use some of that functionality here + // + nsAString::const_iterator start; + nsAString::const_iterator end; + + aValue.BeginReading(start); + aValue.EndReading(end); + + while (*start && NS_IS_SPACE(*start)) + ++start; + + do --end; while (start != end && NS_IS_SPACE(*end)); + ++end; + + nsCOMPtr valAtom = do_GetAtom(Substring(start, end)); + + nsSMILEnumMapping *tmp = mMapping; + + if (!tmp) + return NS_ERROR_FAILURE; + + while (tmp->key) { + if (valAtom == *(tmp->key)) { + mValue = tmp->val; + return NS_OK; + } + tmp++; + } + + NS_ERROR("Unknown enumeration key"); + return NS_ERROR_FAILURE; +} + Index: /cvsroot/mozilla/content/smil/src/nsSMILEnum.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILEnum.h diff -N content/smil/src/nsSMILEnum.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILEnum.h 9 Oct 2005 01:12:41 -0000 @@ -0,0 +1,69 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * The Initial Developer of the Original Code is + * IBM Corporation + * Portions created by the Initial Developer are Copyright (C) 2004 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Tim Rowley (original author) + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_SMILENUM_H__ +#define __NS_SMILENUM_H__ + +#include "nsIAtom.h" + +struct nsSMILEnumMapping +{ + nsIAtom **key; + PRUint16 val; +}; + +//////////////////////////////////////////////////////////////////////// +// nsSMILEnum class + +class nsSMILEnum +{ +public: + nsSMILEnum(PRUint16 value, nsSMILEnumMapping *mapping); + + PRUint16 GetIntegerValue() const { return mValue; } + void SetIntegerValue(const PRUint16 &aValue) { mValue = aValue; } + nsresult SetStringValue(const nsAString &aValue); + +protected: + PRUint16 mValue; + nsSMILEnumMapping *mMapping; +}; + +#endif //__NS_SMILENUM_H__ + Index: /cvsroot/mozilla/content/smil/src/nsSMILInstanceTime.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILInstanceTime.cpp diff -N content/smil/src/nsSMILInstanceTime.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILInstanceTime.cpp 9 Oct 2005 01:12:41 -0000 @@ -0,0 +1,55 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsSMILInstanceTime.h" +#include "nsSMILTimeValueSpec.h" +#include "nsSMILTimeValue.h" + +//---------------------------------------------------------------------- +// Implementation + +nsSMILInstanceTime::nsSMILInstanceTime(const nsSMILTimeValue &aTime, + nsSMILTimeValueSpec *aCreator, + PRBool aClearOnReset /*=false*/) + : mTime(aTime), // Copy the time + mClearOnReset(aClearOnReset) +{ + if (aCreator) + mCreator = do_GetWeakReference(aCreator); +} + +//---------------------------------------------------------------------- +// nsSMILInstanceTime + +// So far all nsSMILInstanceTime methods are inline + Index: /cvsroot/mozilla/content/smil/src/nsSMILInstanceTime.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILInstanceTime.h diff -N content/smil/src/nsSMILInstanceTime.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILInstanceTime.h 9 Oct 2005 01:12:41 -0000 @@ -0,0 +1,105 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_SMILINSTANCETIME_H__ +#define __NS_SMILINSTANCETIME_H__ + +#include "nsSMILTimeValue.h" +#include "nsWeakReference.h" + +class nsSMILTimeValueSpec; + +//////////////////////////////////////////////////////////////////////// +// nsSMILInstanceTime : An instant in document simple time that may be +// used in creating a new interval + +class nsSMILInstanceTime +{ +public: + nsSMILInstanceTime(const nsSMILTimeValue &aTime, + nsSMILTimeValueSpec *aCreator, + PRBool aClearOnReset = false); + + const nsSMILTimeValue& Time() const { return mTime; } + + PRBool ClearOnReset() const { return mClearOnReset; } + + // void DependentUpdate(const nsSMILTimeValue& aNewTime); -- NOT YET IMPL. + + nsrefcnt AddRef() { return ++mRefCnt; } + nsrefcnt Release(); + +protected: + nsSMILTimeValue mTime; + + /** + * The nsSMILTimeValueSpec that created this instance time if any. This will + * be NULL for instance times that created via DOM calls etc. + */ + nsWeakPtr mCreator; + + /** + * Indicates if this instance time should be removed when the owning timed + * element is reset. True for events and DOM calls. + */ + PRBool mClearOnReset; + + /* + * This will only be used for for identifying the instance times associated + * with a deleting interval. We will never de-reference this pointer, but only + * use it for pointer comparisons. Therefore it's not necessary for instances + * of nsSMILInterval to be reference-counted. + */ + // nsSMILInterval *mTimebase -- NOT YET IMPLEMENTED + + nsAutoRefCnt mRefCnt; + +private: + // Pass by value and assignment should not be used + nsSMILInstanceTime(const nsSMILInstanceTime& other); + nsSMILInstanceTime& operator=(const nsSMILInstanceTime& right); +}; + +inline nsrefcnt +nsSMILInstanceTime::Release() +{ + if (--mRefCnt == 0) { + delete this; + return 0; + } + + return mRefCnt; +} + +#endif // __NS_SMILINSTANCETIME_H__ + Index: /cvsroot/mozilla/content/smil/src/nsSMILInterval.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILInterval.cpp diff -N content/smil/src/nsSMILInterval.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILInterval.cpp 9 Oct 2005 01:12:41 -0000 @@ -0,0 +1,87 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsSMILInterval.h" +#include "nsSMILInstanceTime.h" +#include "nsVoidArray.h" +#include "nsCRT.h" + +nsSMILInterval::nsSMILInterval(const nsSMILTimeValue& aBegin, + const nsSMILTimeValue& aEnd) +: mBegin(aBegin), + mEnd(aEnd) +{ +} + +//---------------------------------------------------------------------- +// Implementation + +PRBool +nsSMILInterval::Recalc(const nsVoidArray& aBeginTimes, + const nsVoidArray& aEndTimes, + const nsSMILInterval& aPrevInterval, + // nsSMILRestartMode &aRestartMode, + PRBool aHasEnds, + const nsSMILTimeValue& min, + const nsSMILTimeValue& max) +{ + // XXX syncbase timing + (void)aBeginTimes; + (void)aEndTimes; + (void)aPrevInterval; + (void)aHasEnds; + (void)min; + (void)max; + NS_NOTYETIMPLEMENTED("nsSMILInterval::Recalc"); + return PR_FALSE; +} + +void +nsSMILInterval::AddDependent(nsSMILInstanceTime& aDependent, + PRBool aForBegin) +{ + (void)aDependent; + (void)aForBegin; + // XXX syncbase timing + NS_NOTYETIMPLEMENTED("nsSMILInterval::AddDependent"); +} + +void +nsSMILInterval::RemoveDependent(nsSMILInstanceTime& aDependent, PRBool aForBegin) +{ + (void)aDependent; + (void)aForBegin; + // XXX syncbase timing + NS_NOTYETIMPLEMENTED("nsSMILInterval::RemoveDependent"); +} + Index: /cvsroot/mozilla/content/smil/src/nsSMILInterval.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILInterval.h diff -N content/smil/src/nsSMILInterval.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILInterval.h 9 Oct 2005 01:12:42 -0000 @@ -0,0 +1,85 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_SMILINTERVAL_H__ +#define __NS_SMILINTERVAL_H__ + +#include "nsSMILTimeValue.h" + +//////////////////////////////////////////////////////////////////////// +// nsSMILInterval class + +class nsVoidArray; +class nsSMILInstanceTime; + +class nsSMILInterval +{ +public: + nsSMILInterval() {} + + nsSMILInterval(const nsSMILTimeValue& aBegin, + const nsSMILTimeValue& aEnd); + + const nsSMILTimeValue& Begin() { return mBegin; } + const nsSMILTimeValue& End() { return mEnd; } + + /** + * From Schmitz's description: + * + * "This returns a true if the Interval is still valid, and false if the + * interval becomes invalid (negative duration). The owner TimedElement will + * delete any invalid interval, and then notify dependent + * TimeValueSpecifications. If this is the first interval, prevInterval is + * null. This may result in an Interval that ends immediately - it is up to + * the owner to handle this (creating a new Interval when the old one actually + * becomes inactive)." + */ + PRBool Recalc(const nsVoidArray& aBeginTimes, + const nsVoidArray& aEndTimes, + const nsSMILInterval& aPrevInterval, + // nsSMILRestartMode &aRestartMode, -- may be possible to use a + // bool when we come to this? + PRBool aHasEnds, + const nsSMILTimeValue& min, + const nsSMILTimeValue& max); + + void AddDependent(nsSMILInstanceTime& aDependent, PRBool aForBegin); + void RemoveDependent(nsSMILInstanceTime& aDependent, PRBool aForBegin); + +protected: + nsSMILTimeValue mBegin; + nsSMILTimeValue mEnd; +}; + +#endif // __NS_SMILINTERVAL_H__ + Index: /cvsroot/mozilla/content/smil/src/nsSMILTimeValue.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILTimeValue.cpp diff -N content/smil/src/nsSMILTimeValue.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILTimeValue.cpp 9 Oct 2005 01:12:42 -0000 @@ -0,0 +1,133 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsSMILTimeValue.h" +#include "nsDebug.h" + +PRInt64 nsSMILTimeValue::mUnresolvedSeconds = LL_MaxInt(); + +//---------------------------------------------------------------------- +// Implementation + +// Default constructor creates an unresolved time +nsSMILTimeValue::nsSMILTimeValue() + : mMilliseconds(LL_MaxInt()), + mIndefinite(PR_FALSE), + mResolved(PR_FALSE) +{ +} + +//---------------------------------------------------------------------- +// nsSMILTimeValue methods: + +// XXXbb [profiling] profile and move the most accessed methods inline + +PRBool +nsSMILTimeValue::IsIndefinite() const +{ + return mIndefinite; +} + +void +nsSMILTimeValue::SetIndefinite() +{ + mResolved = PR_FALSE; + mIndefinite = PR_TRUE; + mMilliseconds = LL_MaxInt(); +} + +PRBool +nsSMILTimeValue::IsResolved() const +{ + return mResolved; +} + +void +nsSMILTimeValue::SetUnresolved() +{ + mResolved = PR_FALSE; + mIndefinite = PR_FALSE; + mMilliseconds = LL_MaxInt(); +} + +const PRInt64& +nsSMILTimeValue::GetMillis() const +{ + NS_ASSERTION(mResolved, "GetMillis() called for unresolved time."); + + if (!mResolved) + return mUnresolvedSeconds; + + return mMilliseconds; +} + +void +nsSMILTimeValue::SetMillis(const PRInt64& aMillis) +{ + mResolved = PR_TRUE; + mIndefinite = PR_FALSE; + mMilliseconds = aMillis; +} + +PRInt8 +nsSMILTimeValue::CompareTo(const nsSMILTimeValue& aCompare) const +{ + PRInt8 result; + + if (mResolved) { + result = (aCompare.mResolved) + ? CmpLL(mMilliseconds, aCompare.mMilliseconds) + : -1; + } else if (mIndefinite) { + if (aCompare.mResolved) + result = 1; + else if (aCompare.mIndefinite) + result = 0; + else + result = -1; + } else { + result = (aCompare.mResolved || aCompare.mIndefinite) ? 1 : 0; + } + + return result; +} + +PR_CALLBACK int +nsSMILTimeValue::ComparisonCallback(const void *aElement1, + const void *aElement2, + void* /*aData*/) +{ + return NS_STATIC_CAST(const nsSMILTimeValue*, aElement1)->CompareTo + (*NS_STATIC_CAST(const nsSMILTimeValue*, aElement2)); +} + Index: /cvsroot/mozilla/content/smil/src/nsSMILTimeValue.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILTimeValue.h diff -N content/smil/src/nsSMILTimeValue.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILTimeValue.h 9 Oct 2005 01:12:42 -0000 @@ -0,0 +1,116 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_SMILTIMEVALUE_H__ +#define __NS_SMILTIMEVALUE_H__ + +#include "prtypes.h" +#include "prlong.h" + +/** + * nsSMILTimeValue class + * + * Objects of this class may be in one of three orthogonal states: + * + * 1) The time is resolved and has a millisecond value + * 2) The time is indefinite + * 3) The time in unresolved + * + * There is considerable chance for confusion with regards to the indefinite + * state. Is it resolved? We adopt the convention that it is NOT resolved (but + * nor is it unresolved). This simplifies implementation as you can then write: + * + * if (time.IsResolved()) + * x = time.GetMillis() + * + * instead of: + * + * if (time.IsResolved() && !time.IsIndefinite()) + * x = time.GetMillis() + * + * Testing if a time is unresolved becomes more complicated but this is tested + * much less often. + * + * In summary: + * + * State | GetMillis | IsResolved | IsIndefinite + * --------------+--------------------+--------------------+------------------- + * Resolved | The millisecond | PR_TRUE | PR_FALSE + * | time | | + * --------------+--------------------+--------------------+------------------- + * Indefinite | LL_MaxInt | PR_FALSE | PR_TRUE + * --------------+--------------------+--------------------+------------------- + * Unresolved | LL_MaxInt | PR_FALSE | PR_FALSE + * + */ + +class nsSMILTimeValue +{ +public: + // Creates an unresolved time value + nsSMILTimeValue(); + + PRBool IsIndefinite() const; + void SetIndefinite(); + + PRBool IsResolved() const; + void SetUnresolved(); + + const PRInt64& GetMillis() const; + void SetMillis(const PRInt64& aMillis); + + PRInt8 CompareTo(const nsSMILTimeValue& aCompare) const; + + PR_STATIC_CALLBACK(int) ComparisonCallback(const void *aElement1, + const void *aElement2, + void* aData); + +private: + PRInt8 CmpLL(const PRInt64& a, const PRInt64& b) const; + + static PRInt64 mUnresolvedSeconds; + + PRInt64 mMilliseconds; + PRBool mIndefinite; + PRBool mResolved; +}; + +// A signed comparison of two signed 64-bit integers +inline PRInt8 +nsSMILTimeValue::CmpLL(const PRInt64& a, const PRInt64& b) const +{ + return (LL_EQ(a, b)) ? 0 : (LL_CMP(a, >, b)) ? 1 : -1; +} + +#endif // __NS_SMILTIMEVALUE_H__ + Index: /cvsroot/mozilla/content/smil/src/nsSMILTimeValueSpec.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILTimeValueSpec.cpp diff -N content/smil/src/nsSMILTimeValueSpec.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILTimeValueSpec.cpp 9 Oct 2005 01:12:43 -0000 @@ -0,0 +1,394 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsSMILTimeValueSpec.h" +#include "nsSMILTimeValue.h" +#include "nsSMILInstanceTime.h" +#include "nsAutoPtr.h" +#include "nsCRT.h" +#include "prdtoa.h" + +const PRUint32 nsSMILTimeValueSpec::MSEC_PER_SEC = 1000; +const PRUint32 nsSMILTimeValueSpec::MSEC_PER_MIN = 1000 * 60; +const PRUint32 nsSMILTimeValueSpec::MSEC_PER_HOUR = 1000 * 60 * 60; + +//---------------------------------------------------------------------- +// Implementation + +already_AddRefed +NS_NewSMILTimeValueSpec(nsISMILTimedElement* aOwner, + PRBool aIsBegin, + const nsAString& aStringSpec) +{ + nsSMILTimeValueSpec* result = new nsSMILTimeValueSpec(aOwner, aIsBegin); + NS_ENSURE_TRUE(result, nsnull); + + NS_ADDREF(result); // Need to addref as SetSpec calls getWeakReference + nsresult rv = result->SetSpec(aStringSpec); + if (NS_FAILED(rv)) { + NS_RELEASE(result); + return nsnull; + } + return result; +} + +nsSMILTimeValueSpec::nsSMILTimeValueSpec(nsISMILTimedElement* aOwner, + PRBool aIsBegin) + : mIsBegin(aIsBegin), + mOffset() // initalises to zero +{ + if (aOwner) + mOwner = do_GetWeakReference(aOwner); +} + +//---------------------------------------------------------------------- +// nsISupports + +NS_IMPL_ISUPPORTS2(nsSMILTimeValueSpec, + nsSMILTimeValueSpec, + nsISupportsWeakReference) + +//---------------------------------------------------------------------- +// nsSMILTimeValueSpec + +nsresult +nsSMILTimeValueSpec::SetSpec(const nsAString& aStringSpec) +{ + // XXX Parse other specifiers, not just offset type + nsSMILTimeValue clockTime; + nsresult rv = ParseClockValue(aStringSpec, + &clockTime, + true, // allow + or - + true); // allow 'indefinite' + + if (NS_FAILED(rv) || (!clockTime.IsResolved() && !clockTime.IsIndefinite())) + return NS_ERROR_FAILURE; + + if (clockTime.IsResolved()) + mOffset = clockTime.GetMillis(); + + if (mOwner) { + nsRefPtr instance = + new nsSMILInstanceTime(clockTime, this); + NS_ENSURE_TRUE(instance, NS_ERROR_OUT_OF_MEMORY); + + nsCOMPtr owner = do_QueryReferent(mOwner); + NS_ENSURE_TRUE(owner, NS_ERROR_FAILURE); + + owner->AddInstanceTime(instance, mIsBegin); + } + + return rv; +} + +// +// This method can actually parse more than a clock value as defined in the +// SMIL Animation specification. It can also parse: +// - the + or - before an offset +// - the special value "indefinite" +// - the special value "media" +// +// Because the value "media" cannot be represented as part of an nsSMILTimeValue +// and has different meanings depending on where it is used, it is passed out as +// a separate parameter (which can be set to null if the media attribute is not +// allowed). +// +// aResult may be NULL, e.g. to check if the string is a valid clock value +// +nsresult +nsSMILTimeValueSpec::ParseClockValue(const nsAString& aStringSpec, + nsSMILTimeValue* aResult, + PRBool aAllowSign, // = false + PRBool aAllowIndefinite, // = false + PRBool aAllowMedia, // = false + PRBool* aIsMedia) // = nsnull +{ + PRInt64 offset = LL_Zero(); + PRFloat64 component = 0.0; + + PRInt8 sign = 0; + PRUint8 colonCount = 0; + + PRBool started = PR_FALSE; + PRBool isValid = PR_TRUE; + + PRInt32 metricMultiplicand = MSEC_PER_SEC; + + PRBool numIsReal = PR_FALSE; + PRBool prevNumCouldBeMin = PR_FALSE; + PRBool numCouldBeMin = PR_FALSE; + PRBool numCouldBeSec = PR_FALSE; + PRBool isIndefinite = PR_FALSE; + + char* spec; + char* str = spec = ToNewCString(aStringSpec); + + if (aIsMedia) + *aIsMedia = PR_FALSE; + + while (*str) { + if (IsSpace(*str)) { + if (started) { + ++str; + break; + } + // else, we haven't started yet, ignore initial whitespace + } else if (aAllowSign && (*str == '+' || *str == '-')) { + if (sign != 0) { + // sign has already been set + isValid = PR_FALSE; + break; + } + + if (started) { + // sign appears in the middle of the string + isValid = PR_FALSE; + break; + } + + sign = (*str == '+') ? 1 : -1; + // The NS_IS_DIGIT etc. macros are not locale-specific + } else if (NS_IS_DIGIT(*str)) { + char *end; + + prevNumCouldBeMin = numCouldBeMin; + + if (!GetClockComponent(str, &end, component, numIsReal, numCouldBeMin, + numCouldBeSec)) { + isValid = PR_FALSE; + break; + } + + started = PR_TRUE; + str = end - 1; + } else if (*str == ':') { + ++colonCount; + + // Neither minutes nor hours can be reals + if (numIsReal) { + isValid = PR_FALSE; + break; + } + + // Clock value can't start with a ':' + if (!started) { + isValid = PR_FALSE; + break; + } + + // Can't have more than two colons + if (colonCount > 2) { + isValid = PR_FALSE; + break; + } + + // Multiply the offset by 60 and add the last accumulated component + PRInt64 component64; + LL_D2L(component64, component); + LL_MUL(offset, offset, LL_INIT(0,60)); + LL_ADD(offset, offset, component64); + + component = 0.0l; + } else if (NS_IS_ALPHA(*str)) { + if (colonCount > 0) { + isValid = PR_FALSE; + break; + } + + char* end; + if (PL_strstr(str, "indefinite") == str && aAllowIndefinite) { + // We set a separate flag because we don't know what the state of the + // passed in time value is and we shouldn't change it in the case of a + // bad input string (so we can't initialise it to 0ms for example). + isIndefinite = PR_TRUE; + if (aResult) + aResult->SetIndefinite(); + end = str + PL_strlen("indefinite"); + } else if (PL_strstr(str, "media") == str && aAllowMedia) { + if (aIsMedia) + *aIsMedia = PR_TRUE; + end = str + PL_strlen("media"); + } else if (!GetMetricMultiplicand(str, &end, metricMultiplicand)) { + isValid = PR_FALSE; + break; + } + + str = end; + + // Nothing must come after the string except whitespace + break; + } else { + isValid = PR_FALSE; + break; + } + + ++str; + } + + if (!started) isValid = PR_FALSE; + + // Process remainder of string (if any) to ensure it is only trailing + // whitespace (embedded whitespace is not allowed) + while (*str && isValid) { + if (!IsSpace(*str)) isValid = PR_FALSE; + ++str; + } + + nsMemory::Free(spec); + + // No more processing required if the value was "indefinite" or "media". + if (isIndefinite || (aIsMedia && *aIsMedia)) + return NS_OK; + + // If there is more than one colon then the previous component must be a + // correctly formatted minute (i.e. two digits between 00 and 59) and the + // latest component must be a correctly formatted second (i.e. two digits + // before the .) + if (colonCount > 0 && (!prevNumCouldBeMin || !numCouldBeSec)) + isValid = PR_FALSE; + + if (isValid) { + // Tack on the last component + if (colonCount > 0) { + LL_MUL(offset, offset, LL_INIT(0,60)); + LL_MUL(offset, offset, LL_INIT(0,1000)); + component *= 1000; + // rounding + component = (component >= 0) ? component + 0.5l : component - 0.5l; + PRInt64 component64; + LL_D2L(component64, component); + LL_ADD(offset, offset, component64); + } else { + component *= metricMultiplicand; + // rounding + component = (component >= 0) ? component + 0.5l : component - 0.5l; + LL_D2L(offset, component); + } + + if (aResult) { + PRInt64 millis = offset; + + if (sign == -1) + LL_NEG(millis, offset); + + aResult->SetMillis(millis); + } + } + + return (isValid) ? NS_OK : NS_ERROR_FAILURE; +} + +// NS_IS_SPACE relies on isspace which may return true for \xB and \xC but +// SMILANIM does not consider these characters to be whitespace. +inline PRBool +nsSMILTimeValueSpec::IsSpace(const char c) +{ + return (c == 0x9 || c == 0xA || c == 0xD || c == 0x20); +} + +PRBool +nsSMILTimeValueSpec::GetClockComponent(const char* aSrc, + char** aEnd, + PRFloat64& aResult, + PRBool& aIsReal, + PRBool& aCouldBeMin, + PRBool& aCouldBeSec) +{ + char *rest; + PRFloat64 value = PR_strtod(aSrc, &rest); + + // Check a number was found + if (rest == aSrc) + return PR_FALSE; + + // Check it's not expressed in exponential form + PRBool isExp = (PL_strnpbrk(aSrc, "eE", rest - aSrc) != nsnull); + if (isExp) + return PR_FALSE; + + // Don't allow real numbers of the form "23." + if (*(rest - 1) == '.') + return PR_FALSE; + + // Number looks good + aResult = value; + *aEnd = rest; + + // Set some flags so we can check this number is valid once we know + // whether it's an hour, minute string etc. + aIsReal = (PL_strnchr(aSrc, '.', rest - aSrc) != nsnull); + aCouldBeMin = (value < 60.0l && ((rest - aSrc) == 2)); + aCouldBeSec = (value < 60.0l || + (value == 60.0l && aSrc[0] == '5')); // Take care of rounding error + aCouldBeSec &= (PL_strlen(aSrc) >= 2 && + (aSrc[2] == '\0' || aSrc[2] == '.' || IsSpace(aSrc[2]))); + + return PR_TRUE; +} + +inline PRBool +nsSMILTimeValueSpec::GetMetricMultiplicand(char* aSrc, + char** aEnd, + PRInt32& multiplicand) +{ + nsresult result = PR_TRUE; + + switch (*aSrc) + { + case 'h': + *aEnd = aSrc + 1; + multiplicand = MSEC_PER_HOUR; + break; + case 'm': + if (aSrc[1] == 'i' && aSrc[2] == 'n') { + *aEnd = aSrc + 3; + multiplicand = MSEC_PER_MIN; + } else if (aSrc[1] == 's') { + *aEnd = aSrc + 2; + multiplicand = 1; + } else { + result = PR_FALSE; + } + break; + case 's': + *aEnd = aSrc + 1; + multiplicand = MSEC_PER_SEC; + break; + default: + result = PR_FALSE; + break; + } + + return result; +} + Index: /cvsroot/mozilla/content/smil/src/nsSMILTimeValueSpec.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILTimeValueSpec.h diff -N content/smil/src/nsSMILTimeValueSpec.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILTimeValueSpec.h 9 Oct 2005 01:12:43 -0000 @@ -0,0 +1,106 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_SMILTIMEVALUESPEC_H__ +#define __NS_SMILTIMEVALUESPEC_H__ + +#include "nsISupports.h" +#include "nsString.h" +#include "nsWeakReference.h" +#include "nsISMILTimedElement.h" + +class nsSMILTimeValue; + +//////////////////////////////////////////////////////////////////////// +// nsSMILTimeValueSpec class + +// {39d2f376-6bda-42c0-8510-a93b24828a80} +#define NS_SMILTIMEVALUESPEC_IID \ +{ 0x39d2f376, 0x6bda, 0x42c0, { 0x85, 0x10, 0xa9, 0x3b, 0x24, 0x82, 0x8a, 0x80 } } + +class nsSMILTimeValueSpec : public nsSupportsWeakReference +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_SMILTIMEVALUESPEC_IID) + NS_DECL_ISUPPORTS + + // Common parsing methods + static nsresult ParseClockValue(const nsAString& aStringSpec, + nsSMILTimeValue* aResult, + PRBool aAllowSign = false, + PRBool aAllowIndefinite = false, + PRBool aAllowMedia = false, + PRBool* aIsMedia = nsnull); + +protected: + nsSMILTimeValueSpec(nsISMILTimedElement* aOwner, PRBool aIsBegin); + + friend already_AddRefed + NS_NewSMILTimeValueSpec(nsISMILTimedElement* aOwner, + PRBool aIsBegin, + const nsAString& aStringSpec); + + nsresult SetSpec(const nsAString& aStringSpec); + + static PRBool IsSpace(const char c); + + static PRBool GetClockComponent(const char* aSrc, + char** aEnd, + PRFloat64& aResult, + PRBool& aIsReal, + PRBool& aCouldBeMin, + PRBool& aCouldBeSec); + + static PRBool GetMetricMultiplicand(char* aSrc, + char** aEnd, + PRInt32& multiplicand); + + + static const PRUint32 MSEC_PER_SEC; + static const PRUint32 MSEC_PER_MIN; + static const PRUint32 MSEC_PER_HOUR; + + nsWeakPtr mOwner; + PRBool mIsBegin; + PRInt64 mOffset; +}; + +//////////////////////////////////////////////////////////////////////// +// Factory methods + +already_AddRefed +NS_NewSMILTimeValueSpec(nsISMILTimedElement* aOwner, + PRBool aIsBegin, + const nsAString& aStringSpec); + +#endif // __NS_SMILTIMEVALUESPEC_H__ Index: /cvsroot/mozilla/content/smil/src/nsSMILTimedDocumentRoot.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILTimedDocumentRoot.cpp diff -N content/smil/src/nsSMILTimedDocumentRoot.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILTimedDocumentRoot.cpp 9 Oct 2005 01:12:44 -0000 @@ -0,0 +1,221 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsSMILTimedDocumentRoot.h" +#include "nsSMILTimeValue.h" + +// XXXbb Remove +#include "nsITimelineService.h" + +//////////////////////////////////////////////////////////////////////// +// nsSMILTimedDocumentRoot implementation + +nsSMILTimedDocumentRoot::nsSMILTimedDocumentRoot( + nsSMILAnimationRegistry* registry) +: + mStartTime(), + mAccumulatedOffset(), + mAnimationRegistry(registry) +{ +} + +//---------------------------------------------------------------------- +// nsISupports methods: + +NS_IMPL_ISUPPORTS2(nsSMILTimedDocumentRoot, + nsISMILTimeContainer, + nsISupportsWeakReference); + +//---------------------------------------------------------------------- +// nsSMILTimedDocumentRoot methods + +nsSMILTimeValue +nsSMILTimedDocumentRoot::WallclockToDocumentTime(nsISMILTimeValueSpec* + aWallclockSpec) +{ + // XXXbb + (void)aWallclockSpec; + NS_NOTYETIMPLEMENTED("nsSMILTimedDocumentRoot::SeekToTime"); + return nsSMILTimeValue(); +} + +nsresult +nsSMILTimedDocumentRoot::SeekToTime(PRInt64 aSeekTo) +{ + // XXXbb + (void)aSeekTo; + NS_NOTYETIMPLEMENTED("nsSMILTimedDocumentRoot::SeekToTime"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +//---------------------------------------------------------------------- +// nsISMILTimeContainer methods + +nsresult +nsSMILTimedDocumentRoot::Pause() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILTimedDocumentRoot::Pause"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +nsresult +nsSMILTimedDocumentRoot::Resume() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILTimedDocumentRoot::Resume"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +void +nsSMILTimedDocumentRoot::Sample() +{ + NS_TIMELINE_START_TIMER("nsSMILTimedDocumentRoot::Sample"); + // + // It's probably more correct to use PRIntervalNow but I'm not sure if it + // will have sufficient range and it's unsigned. + // + PRInt64 now; + LL_DIV(now, PR_Now(), PR_USEC_PER_MSEC); + + // + // If this is the first time, record the document begin time + // + if (LL_IS_ZERO(mStartTime)) + mStartTime = now; + + PRInt64 instant; + LL_SUB(instant, now, mStartTime); + + if (mAnimationRegistry) + mAnimationRegistry->StartSample(); + + NS_TIMELINE_START_TIMER("nsSMILTimedDocumentRoot::SampleChildren"); + SampleChildren(instant); + NS_TIMELINE_STOP_TIMER("nsSMILTimedDocumentRoot::SampleChildren"); + + if (mAnimationRegistry) + mAnimationRegistry->EndSample(); + NS_TIMELINE_STOP_TIMER("nsSMILTimedDocumentRoot::Sample"); +} + +// XXXbb Remove -- only needed for timing +nsSMILTimedDocumentRoot::~nsSMILTimedDocumentRoot() +{ + NS_TIMELINE_MARK_TIMER("nsSMILTimedDocumentRoot::Sample"); + NS_TIMELINE_RESET_TIMER("nsSMILTimedDocumentRoot::Sample"); + NS_TIMELINE_INDENT(); + NS_TIMELINE_MARK_TIMER("nsSMILTimedDocumentRoot::SampleChildren"); + NS_TIMELINE_RESET_TIMER("nsSMILTimedDocumentRoot::SampleChildren"); + NS_TIMELINE_INDENT(); + NS_TIMELINE_MARK_TIMER("nsSMILTimedElement::SampleAt"); + NS_TIMELINE_RESET_TIMER("nsSMILTimedElement::SampleAt"); + NS_TIMELINE_OUTDENT(); + NS_TIMELINE_MARK_TIMER("nsSMILAnimationRegistry::EndSample"); + NS_TIMELINE_RESET_TIMER("nsSMILAnimationRegistry::EndSample"); + NS_TIMELINE_INDENT(); + NS_TIMELINE_MARK_TIMER("nsSMILCompositor::ComposeSample"); + NS_TIMELINE_RESET_TIMER("nsSMILCompositor::ComposeSample"); + NS_TIMELINE_INDENT(); + NS_TIMELINE_MARK_TIMER("nsSMILCompositor::Initialisation"); + NS_TIMELINE_RESET_TIMER("nsSMILCompositor::Initialisation"); + NS_TIMELINE_MARK_TIMER("nsSMILCompositor::SortCompositors"); + NS_TIMELINE_RESET_TIMER("nsSMILCompositor::SortCompositors"); + NS_TIMELINE_MARK_TIMER("nsSMILCompositor::Getting the enumerator"); + NS_TIMELINE_RESET_TIMER("nsSMILCompositor::Getting the enumerator"); + NS_TIMELINE_MARK_TIMER("nsSMILCompositor::Composing loop"); + NS_TIMELINE_RESET_TIMER("nsSMILCompositor::Composing loop"); + NS_TIMELINE_INDENT(); + NS_TIMELINE_MARK_TIMER("nsSMILAnimationFunction::ComposeResult"); + NS_TIMELINE_RESET_TIMER("nsSMILAnimationFunction::ComposeResult"); + NS_TIMELINE_OUTDENT(); + NS_TIMELINE_MARK_TIMER("nsSMILCompositor::Set value"); + NS_TIMELINE_RESET_TIMER("nsSMILCompositor::Set value"); + NS_TIMELINE_OUTDENT(); + NS_TIMELINE_MARK_TIMER("nsSVGSVGElement::EndCompositing"); + NS_TIMELINE_RESET_TIMER("nsSVGSVGElement::EndCompositing"); + NS_TIMELINE_OUTDENT(); + NS_TIMELINE_OUTDENT(); +} + +nsresult +nsSMILTimedDocumentRoot::AddTimedElement(nsISMILTimedElement* aElement) +{ + NS_ENSURE_ARG_POINTER(aElement); + + nsresult rv; + nsCOMPtr weakRef( + getter_AddRefs(do_GetWeakReference(aElement, &rv)) ); + NS_ENSURE_SUCCESS(rv,rv); + + rv = (mTimedElements.AppendObject(weakRef)) ? NS_OK : NS_ERROR_FAILURE; + + return rv; +} + +nsresult +nsSMILTimedDocumentRoot::RemoveTimedElement(nsISMILTimedElement* aElement) +{ + NS_ENSURE_ARG_POINTER(aElement); + + nsresult rv; + nsCOMPtr weakRef( + getter_AddRefs(do_GetWeakReference(aElement, &rv)) ); + NS_ENSURE_SUCCESS(rv,rv); + + rv = (mTimedElements.RemoveObject(weakRef)) ? NS_OK : NS_ERROR_FAILURE; + + return rv; +} + +//---------------------------------------------------------------------- +// Implementation helpers: + +void +nsSMILTimedDocumentRoot::SampleChildren(PRInt64 aDocumentTime) +{ + // XXXbb [threadsafety] + + PRUint32 i = mTimedElements.Count(); + while (i > 0) { + --i; + nsCOMPtr + element( do_QueryReferent(mTimedElements[i]) ); + + if (element) + element->SampleAt(aDocumentTime); + else + mTimedElements.RemoveObjectAt(i); + } +} + Index: /cvsroot/mozilla/content/smil/src/nsSMILTimedDocumentRoot.h =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILTimedDocumentRoot.h diff -N content/smil/src/nsSMILTimedDocumentRoot.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILTimedDocumentRoot.h 9 Oct 2005 01:12:44 -0000 @@ -0,0 +1,81 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_SMILTIMEDDOCUMENTROOT_H__ +#define __NS_SMILTIMEDDOCUMENTROOT_H__ + +#include "nsISupports.h" +#include "nsISMILTimeContainer.h" +#include "nsSMILAnimationRegistry.h" +#include "nsWeakReference.h" +#include "nsCOMArray.h" + +class nsISMILTimeValueSpec; +class nsISMILTimedElement; +class nsSMILTimeValue; + +//////////////////////////////////////////////////////////////////////// +// nsSMILTimedDocumentRoot: Timed document root + +class nsSMILTimedDocumentRoot : public nsISMILTimeContainer, + public nsSupportsWeakReference +{ +public: + nsSMILTimedDocumentRoot(nsSMILAnimationRegistry* registry); + // XXXbb Remove -- only used for timeline printing + ~nsSMILTimedDocumentRoot(); + + NS_DECL_ISUPPORTS + + nsSMILTimeValue WallclockToDocumentTime(nsISMILTimeValueSpec* + aWallclockSpec); + nsresult SeekToTime(PRInt64 aSeekTo); + + // nsISMILTimeContainer + virtual nsresult Pause(); + virtual nsresult Resume(); + virtual void Sample(); + virtual nsresult AddTimedElement(nsISMILTimedElement* aElement); + virtual nsresult RemoveTimedElement(nsISMILTimedElement* aElement); + +protected: + void SampleChildren(PRInt64 aDocumentTime); + + PRInt64 mStartTime; + PRInt64 mAccumulatedOffset; + nsCOMArray mTimedElements; + nsSMILAnimationRegistry* mAnimationRegistry; +}; + +#endif // __NS_SMILTIMEDDOCUMENTROOT_H__ + Index: /cvsroot/mozilla/content/smil/src/nsSMILTimedElement.cpp =================================================================== RCS file: /cvsroot/mozilla/content/smil/src/nsSMILTimedElement.cpp diff -N content/smil/src/nsSMILTimedElement.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/smil/src/nsSMILTimedElement.cpp 9 Oct 2005 01:12:46 -0000 @@ -0,0 +1,915 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsISMILTimedElement.h" +#include "nsSMILTimeValue.h" +#include "nsSMILTimeValueSpec.h" +#include "nsSMILInstanceTime.h" +#include "nsSMILInterval.h" +#include "nsISMILTimeClient.h" +#include "nsSMILEnum.h" +#include "nsSMILAtoms.h" +#include "nsCOMArray.h" +#include "nsReadableUtils.h" +#include "nsAutoPtr.h" +#include "prdtoa.h" +#include "plstr.h" + +// XXXbb remove +#include "nsITimelineService.h" + +//---------------------------------------------------------------------- +// Class declaration + +class nsSMILTimedElement : public nsISMILTimedElement +{ +public: + NS_DECL_ISUPPORTS + + // nsISMILTimedElement + virtual void AddInstanceTime(nsSMILInstanceTime* aInstanceTime, + PRBool aIsBegin); + virtual void SetTimeClient(nsISMILTimeClient* aClient); + virtual void SampleAt(const PRInt64& aDocumentTime); + + virtual nsresult SetBeginSpec(const nsAString& aBeginSpec); + virtual nsresult SetEndSpec(const nsAString& aEndSpec); + virtual nsresult SetSimpleDuration(const nsAString& aDurSpec); + virtual nsresult SetMin(const nsAString& aMinSpec); + virtual nsresult SetMax(const nsAString& aMaxSpec); + virtual nsresult SetRestart(const nsAString& aRestartSpec); + virtual nsresult SetRepeatCount(const nsAString& aRepeatCountSpec); + virtual nsresult SetRepeatDur(const nsAString& aRepeatDurSpec); + virtual nsresult SetFillMode(const nsAString& aFillModeSpec); + + virtual void UnsetBeginSpec(); + virtual void UnsetEndSpec(); + virtual void UnsetSimpleDuration(); + virtual void UnsetMin(); + virtual void UnsetMax(); + virtual void UnsetRestart(); + virtual void UnsetRepeatCount(); + virtual void UnsetRepeatDur(); + virtual void UnsetFillMode(); + +protected: + nsSMILTimedElement(); + ~nsSMILTimedElement(); + + friend nsISMILTimedElement* NS_NewSMILTimedElement(); + + // + // Implementation helpers + // + + // + // This may eventually be pushed to the public interface in order to support + // repeating time containers. For now we just use it when we need to + // re-initialise internally, such as when a new begin specification is set. + // + void Reset(); + + nsresult SetBeginOrEndSpec(const nsAString& aSpec, PRBool aIsBegin); + + /** + * Calculates the first acceptable interval for this element. + * + * @see SMILANIM 3.6.8 + */ + nsresult GetNextInterval(const nsSMILTimeValue& aBeginAfter, + PRBool aFirstInstance, + nsSMILInterval& aResult); + + PRBool GetNextGreater(const nsVoidArray& aList, + const nsSMILTimeValue& aBase, + PRInt32& aPosition, + nsSMILTimeValue& aResult); + nsSMILTimeValue CalcActiveEnd(const nsSMILTimeValue& aBegin, + const nsSMILTimeValue& aEnd); + PRInt64 ActiveTimeToSimpleTime(const PRInt64& aActiveTime, + PRUint32& aRepeatIteration); + void SampleSimpleTime(PRInt64 aActiveTime); + void SampleFillValue(); + PRInt64 MinLL(const PRInt64& a, const PRInt64& b); + + // + // Members + // + nsCOMArray mBeginSpecs; + nsCOMArray mEndSpecs; + + // + // We need to distinguish between attempting to set the begin spec and failing + // (in which case the mBeginSpecs array will be empty) and not attempting to + // set the begin spec at all. In the first case, we should act as if the begin + // was indefinite, and in the second, we should act as if begin was 0s. + // + PRBool mBeginSpecSet; + + nsSMILTimeValue mSimpleDur; + + /** + * The number of iterations of the animation function. We use an + * nsSMILTimeValue type where: + * + * milliseconds = the number of iterations * 1000, + * indefinite = repeating indefinitely, until the document ends, and + * unresolved = the attribute is not set, therefore no repeating. + */ + nsSMILTimeValue mRepeatCount; + nsSMILTimeValue mRepeatDur; + + nsSMILTimeValue mMin; + nsSMILTimeValue mMax; + + enum nsSMILFillMode + { + fill_remove, + fill_freeze + }; + static nsSMILEnumMapping sFillModeMap[]; + nsSMILEnum mFillMode; + + enum nsSMILRestartMode + { + restart_always, + restart_never, + restart_whennotactive + }; + nsSMILRestartMode mRestartMode; + + PRBool mEndHasEventConditions; + + // nsRefArray would be really nice here + nsVoidArray mBeginInstances; + nsVoidArray mEndInstances; + + nsCOMPtr mClient; + nsSMILInterval mCurrentInterval; + + /** + * The state of the element in its life-cycle. These states are based on the + * element life-cycle described in SMILANIM 3.6.8 + */ + enum nsSMILElementState + { + state_startup, + state_waiting, + state_active, + state_postactive + }; + + nsSMILElementState mElementState; +}; + +//---------------------------------------------------------------------- +// Static members + +nsSMILEnumMapping nsSMILTimedElement::sFillModeMap[] = { + {&nsSMILAtoms::remove, fill_remove}, + {&nsSMILAtoms::freeze, fill_freeze}, + {nsnull, 0} +}; + +//---------------------------------------------------------------------- +// Factory method + +nsISMILTimedElement* NS_NewSMILTimedElement() +{ + return new nsSMILTimedElement(); +} + +//---------------------------------------------------------------------- +// Ctor, dtor + +nsSMILTimedElement::nsSMILTimedElement() +: + mBeginSpecs(), + mEndSpecs(), + mBeginSpecSet(PR_FALSE), + mRestartMode(restart_always), + mFillMode(fill_remove, sFillModeMap), + mEndHasEventConditions(PR_FALSE), + mElementState(state_startup) +{ + mSimpleDur.SetIndefinite(); +} + +nsSMILTimedElement::~nsSMILTimedElement() +{ + PRInt32 count = mBeginInstances.Count(); + + for (int i = 0; i < count; ++i) + NS_STATIC_CAST(nsSMILInstanceTime*, mBeginInstances[i])->Release(); + + count = mEndInstances.Count(); + + for (int j = 0; j < count; ++j) + NS_STATIC_CAST(nsSMILInstanceTime*, mEndInstances[j])->Release(); +} + +//---------------------------------------------------------------------- +// nsISupports + +NS_IMPL_ISUPPORTS2(nsSMILTimedElement, + nsISMILTimedElement, + nsISupportsWeakReference) + +//---------------------------------------------------------------------- +// nsISMILTimedElement + +void +nsSMILTimedElement::AddInstanceTime(nsSMILInstanceTime* aInstanceTime, + PRBool aIsBegin) +{ + NS_ASSERTION(aInstanceTime, "NULL instance time"); + + if (aIsBegin) { + NS_ADDREF(aInstanceTime); + mBeginInstances.AppendElement(aInstanceTime); + } else { + NS_ADDREF(aInstanceTime); + mEndInstances.AppendElement(aInstanceTime); + } +} + +void +nsSMILTimedElement::SetTimeClient(nsISMILTimeClient* aClient) +{ + // + // No need to check for NULL. A NULL parameter simply means to remove the + // previous client which we do by setting to NULL anyway. + // + mClient = aClient; +} + +void +nsSMILTimedElement::SampleAt(const PRInt64& aDocumentTime) +{ + NS_TIMELINE_START_TIMER("nsSMILTimedElement::SampleAt"); + PRBool stateChanged; + nsSMILTimeValue docTime; + docTime.SetMillis(aDocumentTime); + + do { + stateChanged = false; + + switch (mElementState) + { + case state_startup: + { + nsSMILTimeValue beginAfter; + beginAfter.SetMillis(LL_MININT); + + mElementState = + (NS_SUCCEEDED(GetNextInterval(beginAfter, true, mCurrentInterval))) + ? state_waiting + : state_postactive; + stateChanged = true; + } + break; + + case state_waiting: + { + if (mCurrentInterval.Begin().CompareTo(docTime) < 1) { + mElementState = state_active; + if (mClient) + mClient->ToActive(mCurrentInterval.Begin().GetMillis()); + stateChanged = true; + } + } + break; + + case state_active: + { + if (mCurrentInterval.End().CompareTo(docTime) < 1) { + mElementState = + (NS_SUCCEEDED(GetNextInterval(mCurrentInterval.End(), + false, + mCurrentInterval))) + ? state_waiting + : state_postactive; + if (mClient) + mClient->ToInactive(mFillMode.GetIntegerValue() == fill_freeze); + SampleFillValue(); + stateChanged = true; + } else { + PRInt64 beginTime = mCurrentInterval.Begin().GetMillis(); + + PRInt64 activeTime; + LL_SUB(activeTime, aDocumentTime, beginTime); + + SampleSimpleTime(activeTime); + } + } + break; + + case state_postactive: + break; + } + } while (stateChanged); + NS_TIMELINE_STOP_TIMER("nsSMILTimedElement::SampleAt"); +} + +void +nsSMILTimedElement::SampleSimpleTime(PRInt64 aActiveTime) +{ + if (mClient) { + PRUint32 repeatIteration; + PRInt64 simpleTime = + ActiveTimeToSimpleTime(aActiveTime, repeatIteration); + mClient->SampleAt(simpleTime, mSimpleDur, repeatIteration); + } +} + +void +nsSMILTimedElement::SampleFillValue() +{ + if (mFillMode.GetIntegerValue() != fill_freeze) + return; + + if (!mClient) + return; + + PRUint32 repeatIteration; + PRInt64 activeTime; + LL_SUB(activeTime, + mCurrentInterval.End().GetMillis(), + mCurrentInterval.Begin().GetMillis()); + + PRInt64 simpleTime = + ActiveTimeToSimpleTime(activeTime, repeatIteration); + + if (LL_IS_ZERO(simpleTime)) + mClient->SampleLastValue(--repeatIteration); + else + mClient->SampleAt(simpleTime, mSimpleDur, repeatIteration); +} + +nsresult +nsSMILTimedElement::SetBeginSpec(const nsAString& aBeginSpec) +{ + mBeginSpecSet = PR_TRUE; + return SetBeginOrEndSpec(aBeginSpec, PR_TRUE); +} + +void +nsSMILTimedElement::UnsetBeginSpec() +{ + mBeginSpecs.Clear(); + mBeginInstances.Clear(); + mBeginSpecSet = PR_FALSE; + if (mElementState != state_startup) + Reset(); +} + +nsresult +nsSMILTimedElement::SetEndSpec(const nsAString& aEndSpec) +{ + // + // When implementing events etc., don't forget to ensure + // mEndEventHasEndConditions is set if the specification contains conditions + // that describe event-values, repeat-values or accessKey-values. + // + return SetBeginOrEndSpec(aEndSpec, PR_FALSE); +} + +void +nsSMILTimedElement::UnsetEndSpec() +{ + mEndSpecs.Clear(); + mEndInstances.Clear(); + if (mElementState != state_startup) + Reset(); +} + +nsresult +nsSMILTimedElement::SetSimpleDuration(const nsAString& aDurSpec) +{ + nsSMILTimeValue duration; + PRBool isMedia; + nsresult rv; + + rv = nsSMILTimeValueSpec::ParseClockValue(aDurSpec, + &duration, + false, // don't allow + or - + true, // allow indefinite + true, // allow media + &isMedia); + + if (NS_FAILED(rv) || (!duration.IsResolved() && !duration.IsIndefinite())) + return NS_ERROR_FAILURE; + + if (duration.IsResolved() && LL_EQ(duration.GetMillis(), LL_Zero())) + return NS_ERROR_FAILURE; + + // + // SVG-specific: "For SVG's animation elements, if "media" is specified, the + // attribute will be ignored." (SVG 1.1, section 19.2.6) + // + if (isMedia) + duration.SetIndefinite(); + + mSimpleDur = duration; + + return NS_OK; +} + +void +nsSMILTimedElement::UnsetSimpleDuration() +{ + mSimpleDur.SetIndefinite(); + if (mElementState != state_startup) + Reset(); +} + +nsresult +nsSMILTimedElement::SetMin(const nsAString& aMinSpec) +{ + // XXXbb + (void)aMinSpec; + NS_NOTYETIMPLEMENTED("nsSMILTimedElement::SetMin"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +void +nsSMILTimedElement::UnsetMin() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILTimedElement::UnsetMin"); +} + +nsresult +nsSMILTimedElement::SetMax(const nsAString& aMaxSpec) +{ + // XXXbb + (void)aMaxSpec; + NS_NOTYETIMPLEMENTED("nsSMILTimedElement::SetMax"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +void +nsSMILTimedElement::UnsetMax() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILTimedElement::UnsetMax"); +} + +nsresult +nsSMILTimedElement::SetRestart(const nsAString& aRestartSpec) +{ + // XXXbb + (void)aRestartSpec; + NS_NOTYETIMPLEMENTED("nsSMILTimedElement::SetRestart"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +void +nsSMILTimedElement::UnsetRestart() +{ + // XXXbb + NS_NOTYETIMPLEMENTED("nsSMILTimedElement::UnsetRestart"); +} + +nsresult +nsSMILTimedElement::SetRepeatCount(const nsAString& aRepeatCountSpec) +{ + nsresult rv = NS_OK; + char* str = ToNewCString(aRepeatCountSpec); + char* number = str; + + nsSMILTimeValue newRepeatCount; + + if (mElementState != state_startup) + Reset(); + + while (*number && isspace(*number)) + ++number; + + if (*number) { + if (PL_strstr(number, "indefinite") == number) { + newRepeatCount.SetIndefinite(); + number += PL_strlen("indefinite"); + } else { + char *rest; + PRFloat64 value = PR_strtod(number, &rest); + + if (rest != number) { + PRInt64 count; + value *= 1000; + + LL_D2L(count, value); + + newRepeatCount.SetMillis(count); + + if (!LL_GE_ZERO(count) || LL_IS_ZERO(count)) + rv = NS_ERROR_FAILURE; + + number = rest; + } else { + rv = NS_ERROR_FAILURE; + } + } + + /* Check the remainder is whitespace */ + while (*number && isspace(*number)) + number++; + + if (*number != 0) + rv = NS_ERROR_FAILURE; + } else { + /* Empty spec */ + rv = NS_ERROR_FAILURE; + } + + if (NS_SUCCEEDED(rv)) + mRepeatCount = newRepeatCount; + else + mRepeatCount.SetUnresolved(); + + nsMemory::Free(str); + + return rv; +} + +void +nsSMILTimedElement::UnsetRepeatCount() +{ + mRepeatCount.SetUnresolved(); + if (mElementState != state_startup) + Reset(); +} + +nsresult +nsSMILTimedElement::SetRepeatDur(const nsAString& aRepeatDurSpec) +{ + nsresult rv; + nsSMILTimeValue duration; + + if (mElementState != state_startup) + Reset(); + + rv = nsSMILTimeValueSpec::ParseClockValue(aRepeatDurSpec, + &duration, + false, // don't allow + or - + true); // allow indefinite + + if (NS_FAILED(rv) || (!duration.IsResolved() && !duration.IsIndefinite())) + return NS_ERROR_FAILURE; + + mRepeatDur = duration; + + return NS_OK; +} + +void +nsSMILTimedElement::UnsetRepeatDur() +{ + mRepeatDur.SetUnresolved(); + if (mElementState != state_startup) + Reset(); +} + +nsresult +nsSMILTimedElement::SetFillMode(const nsAString& aFillModeSpec) +{ + nsresult rv = mFillMode.SetStringValue(aFillModeSpec); + if (mElementState == state_waiting || mElementState == state_postactive) + Reset(); + return rv; +} + +void +nsSMILTimedElement::UnsetFillMode() +{ + mFillMode.SetIntegerValue(fill_remove); + if (mElementState == state_waiting || mElementState == state_postactive) + Reset(); +} + +//---------------------------------------------------------------------- +// Implementation helpers + +void +nsSMILTimedElement::Reset() +{ + nsSMILInstanceTime* instance; + PRInt32 count = mBeginInstances.Count(); + + for (PRInt32 i = 0; i < count; ++i) { + instance = NS_STATIC_CAST(nsSMILInstanceTime*, mBeginInstances[i]); + if (instance->ClearOnReset()) + mBeginInstances.RemoveElementAt(i); + } + + count = mEndInstances.Count(); + + for (PRInt32 j = 0; j < count; ++j) { + instance = NS_STATIC_CAST(nsSMILInstanceTime*, mEndInstances[j]); + if (instance->ClearOnReset()) + mEndInstances.RemoveElementAt(j); + } + + nsSMILTimeValue unresolved; + mCurrentInterval = nsSMILInterval(unresolved, unresolved); + mElementState = state_startup; + + // XXX Clear old intervals once we start accumulating them +} + +nsresult +nsSMILTimedElement::SetBeginOrEndSpec(const nsAString& aSpec, + PRBool aIsBegin) +{ + nsRefPtr spec; + nsCOMArray& timeSpecsList = (aIsBegin) + ? mBeginSpecs + : mEndSpecs; + nsVoidArray& instancesList = (aIsBegin) + ? mBeginInstances + : mEndInstances; + + timeSpecsList.Clear(); + instancesList.Clear(); + + if (mElementState != state_startup) + Reset(); + + PRInt32 start; + PRInt32 end = -1; + PRInt32 length; + + do { + start = end + 1; + end = aSpec.FindChar(';', start); + length = (end == -1) ? -1 : end - start; + + spec = NS_NewSMILTimeValueSpec(this, aIsBegin, + Substring(aSpec, start, length)); + + if (spec) + timeSpecsList.AppendObject(spec); + } while (end != -1 && spec); + + if (!spec) { + timeSpecsList.Clear(); + instancesList.Clear(); + Reset(); + return NS_ERROR_FAILURE; + } + + return NS_OK; +} + +// +// This method is based on the pseudocode given in the SMILANIM spec. +// +// See: +// http://www.w3.org/TR/2001/REC-smil-animation-20010904/#Timing-BeginEnd-LC-Start +// +nsresult +nsSMILTimedElement::GetNextInterval(const nsSMILTimeValue& aBeginAfter, + PRBool aFirstInterval, + nsSMILInterval& aResult) +{ + static nsSMILTimeValue zeroTime; + zeroTime.SetMillis(LL_Zero()); + + nsSMILTimeValue beginAfter = aBeginAfter; + nsSMILTimeValue tempBegin; + nsSMILTimeValue tempEnd; + PRInt32 beginPos = 0; + PRInt32 endPos = 0; + + // + // This is to handle the special case when a we are calculating the first + // interval and we have a non-0-duration interval immediately after + // a 0-duration in which case but we have to be careful not to re-use an end + // that has already been used in another interval. See the pseudocode in + // SMILANIM 3.6.8 for getFirstInterval. + // + PRInt32 endMaxPos = 0; + + mBeginInstances.Sort(nsSMILTimeValue::ComparisonCallback, nsnull); + mEndInstances.Sort(nsSMILTimeValue::ComparisonCallback, nsnull); + + while (true) { + if (!mBeginSpecSet && beginAfter.CompareTo(zeroTime) < 1) { + tempBegin.SetMillis(0); + } else { + PRBool beginFound = GetNextGreater(mBeginInstances, beginAfter, + beginPos, tempBegin); + if (!beginFound) + return NS_ERROR_FAILURE; + } + + if (mEndSpecs.Count() == 0) { + nsSMILTimeValue indefiniteEnd; + indefiniteEnd.SetIndefinite(); + + tempEnd = CalcActiveEnd(tempBegin, indefiniteEnd); + } else { + // + // Start searching from the beginning again. + // + endPos = 0; + + PRBool endFound = GetNextGreater(mEndInstances, tempBegin, + endPos, tempEnd); + + if (!aFirstInterval && tempEnd.CompareTo(aBeginAfter)==0 || + (aFirstInterval && tempEnd.CompareTo(tempBegin)==0 && endPos<=endMaxPos)) + endFound = GetNextGreater(mEndInstances, tempBegin, endPos, tempEnd); + + endMaxPos = endPos; + + if (!endFound) { + if (mEndHasEventConditions || mEndInstances.Count() == 0) + tempEnd.SetUnresolved(); + else + /* + * This is a little counter-intuitive but according to SMILANIM, if + * all the end's are after the begin, we _don't_ just assume an + * infinite end, it's actually a bad interval. ASV however will just + * use an infinite end. + */ + return NS_ERROR_FAILURE; + } + + tempEnd = CalcActiveEnd(tempBegin, tempEnd); + } + + if (tempEnd.CompareTo(zeroTime) == 1) { + aResult = nsSMILInterval(tempBegin, tempEnd); + return NS_OK; + } + /* + XXXbb fill in + else if (restart == never) + { + return NS_ERROR_FAILURE; + } + */ + else + { + beginAfter = tempEnd; + } + } + NS_NOTREACHED("Hmm... we really shouldn't be here"); + + return NS_ERROR_FAILURE; +} + +PRBool +nsSMILTimedElement::GetNextGreater(const nsVoidArray& aList, + const nsSMILTimeValue& aBase, + PRInt32 &aPosition, + nsSMILTimeValue& aResult) +{ + PRBool found = PR_FALSE; + nsSMILInstanceTime* val; + PRInt32 count = aList.Count(); + + for (; aPosition < count && !found; ++aPosition) { + val = NS_STATIC_CAST(nsSMILInstanceTime*, aList[aPosition]); + if (val->Time().CompareTo(aBase) > -1) { + aResult = val->Time(); + found = PR_TRUE; + } + } + + return found; +} + +inline PRInt64 +nsSMILTimedElement::MinLL(const PRInt64& a, const PRInt64& b) +{ + return (LL_CMP(a, <, b)) ? a : b; +} + +/** + * @see SMILANIM 3.3.4 + */ +nsSMILTimeValue +nsSMILTimedElement::CalcActiveEnd(const nsSMILTimeValue& aBegin, + const nsSMILTimeValue& aEnd) +{ + nsSMILTimeValue result; + + if (!aEnd.IsIndefinite() && !aEnd.IsResolved()) { + NS_ERROR("Unresolved end time passed to CalcActiveEnd."); + result.SetIndefinite(); + return result; + } + + if (!mSimpleDur.IsIndefinite() && !mSimpleDur.IsResolved()) { + NS_ERROR("Unresolved simple duration in CalcActiveEnd."); + result.SetIndefinite(); + return result; + } + + if (!aBegin.IsResolved() && !aBegin.IsIndefinite()) { + NS_ERROR("Unresolved begin time passed to CalcActiveEnd."); + result.SetIndefinite(); + return result; + } + + if (mRepeatDur.IsIndefinite() || aBegin.IsIndefinite()) { + result.SetIndefinite(); + } else { + if (mRepeatCount.IsResolved() && mRepeatDur.IsResolved()) { + if (mSimpleDur.IsResolved()) { + PRInt64 activeDur; + LL_MUL(activeDur, mRepeatCount.GetMillis(), mSimpleDur.GetMillis()); + LL_DIV(activeDur, activeDur, 1000); + result.SetMillis(MinLL(activeDur, mRepeatDur.GetMillis())); + } else { + result = mRepeatDur; + } + } else if (mRepeatCount.IsResolved() && mSimpleDur.IsResolved()) { + PRInt64 activeDur; + LL_MUL(activeDur, mRepeatCount.GetMillis(), mSimpleDur.GetMillis()); + LL_DIV(activeDur, activeDur, 1000); + result.SetMillis(activeDur); + } else if (mRepeatDur.IsResolved()) { + result = mRepeatDur; + } else { + if (mRepeatCount.IsIndefinite()) + result.SetIndefinite(); + else + result = mSimpleDur; + } + } + + if (aEnd.IsResolved() && aBegin.IsResolved()) { + PRInt64 activeDur; + LL_SUB(activeDur, aEnd.GetMillis(), aBegin.GetMillis()); + + if (result.IsResolved()) + result.SetMillis(MinLL(result.GetMillis(), activeDur)); + else + result.SetMillis(activeDur); + } + + if (result.IsResolved()) { + PRInt64 activeEnd; + LL_ADD(activeEnd, result.GetMillis(), aBegin.GetMillis()); + result.SetMillis(activeEnd); + } + + return result; +} + +PRInt64 +nsSMILTimedElement::ActiveTimeToSimpleTime(const PRInt64& aActiveTime, + PRUint32& aRepeatIteration) +{ + PRInt64 result; + + NS_ASSERTION(mSimpleDur.IsResolved() || mSimpleDur.IsIndefinite(), + "Trying to calculate active time with unresolved duration"); + + if (mSimpleDur.IsIndefinite() || LL_IS_ZERO(mSimpleDur.GetMillis())) { + aRepeatIteration = 0; + result = aActiveTime; + } else { + PRInt64 repeatResult; + LL_MOD(result, aActiveTime, mSimpleDur.GetMillis()); + LL_DIV(repeatResult, aActiveTime, mSimpleDur.GetMillis()); + + LL_L2UI(aRepeatIteration, repeatResult); + } + + return result; +} + Index: /cvsroot/mozilla/content/svg/content/src/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/Makefile.in,v retrieving revision 1.40 diff -u -r1.40 Makefile.in --- /cvsroot/mozilla/content/svg/content/src/Makefile.in 13 Sep 2005 22:38:26 -0000 1.40 +++ /cvsroot/mozilla/content/svg/content/src/Makefile.in 9 Oct 2005 01:12:50 -0000 @@ -140,6 +140,10 @@ CPPSRCS += nsSVGForeignObjectElement.cpp endif +ifdef MOZ_SMIL +CPPSRCS += nsSVGAnimateElement.cpp +endif + include $(topsrcdir)/config/config.mk # we don't want the shared lib, but we want to force the creation of a static lib. @@ -183,3 +187,10 @@ $(NULL) DEFINES += -D_IMPL_NS_LAYOUT + +#CXXFLAGS += -P +# XXXbb remove +# 4127 = conditional expression is constant +# 4512 = assignment operator could not be generated +# CXXFLAGS += -W4 -wd4127 -wd4512 + Index: /cvsroot/mozilla/content/svg/content/src/nsISVGAnimationElement.h =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsISVGAnimationElement.h diff -N content/svg/content/src/nsISVGAnimationElement.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/svg/content/src/nsISVGAnimationElement.h 9 Oct 2005 01:12:50 -0000 @@ -0,0 +1,57 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_ISVGANIMATIONELEMENT__ +#define __NS_ISVGANIMATIONELEMENT__ + +#include "nsISupports.h" + +////////////////////////////////////////////////////////////////////////////// +// nsISVGAnimationElement: private interface implemented by animation elements + +#define NS_ISVGANIMATIONELEMENT_IID \ +{ 0x70ac6eed, 0x0dba, 0x4c11, { 0xa6, 0xc5, 0x15, 0x73, 0xbc, 0x2f, 0x1a, 0xd8 } } + +class nsISVGAnimationElement : public nsISupports +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISVGANIMATIONELEMENT_IID) + + /** + * For setting the ordinal position of this animation within the document. + */ + virtual void SetDocumentPosition(PRUint16 aDocPosition)=0; +}; + +#endif // __NS_ISVGANIMATIONELEMENT__ + Index: /cvsroot/mozilla/content/svg/content/src/nsISVGLength.h =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsISVGLength.h,v retrieving revision 1.4 diff -u -r1.4 nsISVGLength.h --- /cvsroot/mozilla/content/svg/content/src/nsISVGLength.h 5 Aug 2004 09:01:09 -0000 1.4 +++ /cvsroot/mozilla/content/svg/content/src/nsISVGLength.h 9 Oct 2005 01:12:50 -0000 @@ -42,6 +42,9 @@ #include "nsIDOMSVGLength.h" class nsSVGCoordCtx; +#ifdef MOZ_SMIL +class nsISMILAnimVal; +#endif // MOZ_SMIL //////////////////////////////////////////////////////////////////////// // nsISVGLength: private interface for svg lengths @@ -56,6 +59,13 @@ NS_DEFINE_STATIC_IID_ACCESSOR(NS_ISVGLENGTH_IID) NS_IMETHOD SetContext(nsSVGCoordCtx* ctx)=0; +#ifdef MOZ_SMIL + // This could possibly be done via a tear-off that creates the required object + virtual nsISMILAnimVal* GetNewSMILValue()=0; + virtual nsISMILAnimVal* GetNewSMILValue(const nsAString& aSpec)=0; + virtual nsresult GetAnimValue(nsISMILAnimVal& aValue)=0; + virtual nsresult SetAnimValue(const nsISMILAnimVal& aNewValue)=0; +#endif // MOZ_SMIL }; Index: /cvsroot/mozilla/content/svg/content/src/nsISVGSVGElement.h =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsISVGSVGElement.h,v retrieving revision 1.6 diff -u -r1.6 nsISVGSVGElement.h --- /cvsroot/mozilla/content/svg/content/src/nsISVGSVGElement.h 25 Aug 2005 21:31:07 -0000 1.6 +++ /cvsroot/mozilla/content/svg/content/src/nsISVGSVGElement.h 9 Oct 2005 01:12:50 -0000 @@ -46,6 +46,9 @@ class nsSVGCoordCtxProvider; class nsIDOMSVGNumber; class nsISVGEnum; +#ifdef MOZ_SMIL +class nsISMILAnimationRegistry; +#endif //////////////////////////////////////////////////////////////////////// // nsISVGSVGElement: private interface implemented by -elements @@ -89,6 +92,18 @@ NS_IMETHOD_(float) GetPreviousScale()=0; NS_IMETHOD_(float) GetPreviousTranslate_x()=0; NS_IMETHOD_(float) GetPreviousTranslate_y()=0; + +#ifdef MOZ_SMIL + /** + * Get the animation registry object for the outermost svg element. + */ + NS_IMETHOD_(nsISMILAnimationRegistry*) GetAnimationRegistry()=0; + + /** + * Walk the tree and give each animation node an ordinal position value. + */ + NS_IMETHOD EnumerateAnimationNodes()=0; +#endif }; #endif // __NS_ISVGSVGELEMENT__ Index: /cvsroot/mozilla/content/svg/content/src/nsSVGAnimateElement.cpp =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGAnimateElement.cpp diff -N content/svg/content/src/nsSVGAnimateElement.cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/content/svg/content/src/nsSVGAnimateElement.cpp 9 Oct 2005 01:12:52 -0000 @@ -0,0 +1,528 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsSVGElement.h" +#include "nsIDOMSVGAnimateElement.h" +#include "nsISVGAnimationElement.h" +#include "nsSVGAtoms.h" +#include "nsISVGSVGElement.h" +#include "nsIBindingManager.h" +#include "nsIDocument.h" +#include "nsISMILTimedElement.h" +#include "nsISMILAnimationFunction.h" +#include "nsISMILAnimElement.h" +#include "nsISMILAnimationRegistry.h" +#include "nsISMILTimeClient.h" +#include "nsISMILComposable.h" + +typedef nsSVGElement nsSVGAnimateElementBase; + +class nsSVGAnimateElement : public nsSVGAnimateElementBase, + public nsIDOMSVGAnimateElement, + // : nsIDOMSVGAnimationElement + public nsISVGAnimationElement +{ +protected: + friend nsresult NS_NewSVGAnimateElement(nsIContent **aResult, + nsINodeInfo *aNodeInfo); + nsSVGAnimateElement(nsINodeInfo* aNodeInfo); + nsresult Init(); + +public: + // interfaces: + NS_DECL_ISUPPORTS_INHERITED + NS_DECL_NSIDOMSVGANIMATEELEMENT + NS_DECL_NSIDOMSVGANIMATIONELEMENT + + NS_FORWARD_NSIDOMNODE_NO_CLONENODE(nsSVGAnimateElementBase::) + NS_FORWARD_NSIDOMELEMENT(nsSVGAnimateElementBase::) + NS_FORWARD_NSIDOMSVGELEMENT(nsSVGAnimateElementBase::) + + // nsISVGAnimationElement + virtual void SetDocumentPosition(PRUint16 aDocPosition); + + // nsISVGContent specializations + virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent, + nsIContent* aBindingParent, + PRBool aCompileEventHandlers); + virtual void UnbindFromTree(PRBool aDeep = PR_TRUE, + PRBool aNullParent = PR_TRUE); + + // nsIContent specializations + virtual nsresult SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, + nsIAtom* aPrefix, const nsAString& aValue, + PRBool aNotify); + virtual nsresult UnsetAttr(PRInt32 aNameSpaceID, nsIAtom* aAttribute, + PRBool aNotify); + +protected: + // Implementation helpers + nsISMILAnimationRegistry* GetAnimationRegistry(); + nsIContent* GetParentElement(); + void UpdateTargetElement(); + nsISMILAnimAttr* GetTargetAttribute(); + void UpdateTargetAttribute(); + void SetAnimationProperties(); + + nsWeakPtr mTargetElement; + nsRefPtr mAnimation; + nsCOMPtr mTimedElement; +}; + +NS_IMPL_NS_NEW_SVG_ELEMENT(Animate) + + +//---------------------------------------------------------------------- +// nsISupports methods + +NS_IMPL_ADDREF_INHERITED(nsSVGAnimateElement,nsSVGAnimateElementBase) +NS_IMPL_RELEASE_INHERITED(nsSVGAnimateElement,nsSVGAnimateElementBase) + +NS_INTERFACE_MAP_BEGIN(nsSVGAnimateElement) + NS_INTERFACE_MAP_ENTRY(nsIDOMNode) + NS_INTERFACE_MAP_ENTRY(nsIDOMElement) + NS_INTERFACE_MAP_ENTRY(nsIDOMSVGElement) + NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimationElement) + NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimateElement) + NS_INTERFACE_MAP_ENTRY(nsISVGAnimationElement) + NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimateElement) +NS_INTERFACE_MAP_END_INHERITING(nsSVGAnimateElementBase) + +//---------------------------------------------------------------------- +// Implementation + +nsSVGAnimateElement::nsSVGAnimateElement(nsINodeInfo *aNodeInfo) + : nsSVGAnimateElementBase(aNodeInfo) +{ +} + +nsresult +nsSVGAnimateElement::Init() +{ + mTimedElement = NS_NewSMILTimedElement(); + mAnimation = NS_NewSMILAnimationFunction(); + + return (mTimedElement && mAnimation) ? NS_OK : NS_ERROR_FAILURE; +} + +//---------------------------------------------------------------------- +// nsIDOMSVGAnimationElement methods + +/* readonly attribute SVGElement targetElement; */ +NS_IMETHODIMP nsSVGAnimateElement::GetTargetElement(nsIDOMSVGElement * *aTarget) +{ + if (mTargetElement) { + nsCOMPtr target = do_QueryReferent(mTargetElement); + NS_IF_RELEASE(*aTarget); + NS_IF_ADDREF(*aTarget = target); + } else { + *aTarget = nsnull; + } + + return NS_OK; +} + +NS_IMETHODIMP nsSVGAnimateElement::GetStartTime(float* retval) +{ + // XXXbb + (void)retval; + NS_NOTYETIMPLEMENTED("nsSVGAnimateElement::GetStartTime"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP nsSVGAnimateElement::GetCurrentTime(float* retval) +{ + // XXXbb + (void)retval; + NS_NOTYETIMPLEMENTED("nsSVGAnimateElement::GetStartTime"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +NS_IMETHODIMP nsSVGAnimateElement::GetSimpleDuration(float* retval) +{ + // XXXbb + (void)retval; + NS_NOTYETIMPLEMENTED("nsSVGAnimateElement::GetStartTime"); + return NS_ERROR_NOT_IMPLEMENTED; +} + + +//---------------------------------------------------------------------- +// nsIDOMNode methods + +NS_IMPL_DOM_CLONENODE_WITH_INIT(nsSVGAnimateElement) + +//---------------------------------------------------------------------- +// nsISVGAnimationElement methods + +void +nsSVGAnimateElement::SetDocumentPosition(PRUint16 aDocPosition) +{ + if (mAnimation->GetTargetAttribute()) + mAnimation->SetDocumentPosition(aDocPosition); +} + +//---------------------------------------------------------------------- +// nsISVGContent methods + +nsresult +nsSVGAnimateElement::BindToTree(nsIDocument* aDocument, + nsIContent* aParent, + nsIContent* aBindingParent, + PRBool aCompileEventHandlers) +{ + nsresult rv = nsSVGAnimateElementBase::BindToTree(aDocument, aParent, + aBindingParent, + aCompileEventHandlers); + NS_ENSURE_SUCCESS(rv,rv); + + nsCOMPtr ownerDOMSVG; + rv = GetOwnerSVGElement(getter_AddRefs(ownerDOMSVG)); + + if (NS_FAILED(rv) || !ownerDOMSVG) + // No use proceeding. We don't have an SVG parent (yet) so we won't be able + // to register ourselves etc. Maybe next time we'll have more luck. + // (This sort of situation will arise a lot when trees are being constructed + // piece by piece via script) + return NS_OK; + + nsCOMPtr registry = GetAnimationRegistry(); + if (!registry) + // Registry hasn't been created yet. This will be created when the SVG + // parent is bound. + return NS_OK; + + UpdateTargetElement(); + + nsCOMPtr ownerSVG(do_QueryInterface(ownerDOMSVG, &rv)); + ownerSVG->EnumerateAnimationNodes(); + + rv = registry->RegisterTimedElement(mTimedElement); + NS_ENSURE_SUCCESS(rv,rv); + + return rv; +} + +void +nsSVGAnimateElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent) +{ + nsCOMPtr registry = GetAnimationRegistry(); + + if (mAnimation->GetTargetAttribute()) { + if (registry) { + nsCOMPtr composable(do_QueryInterface(mAnimation)); + registry->UnregisterComposable(composable); + } + mAnimation->SetTargetAttribute(nsnull); + } + + if (registry) + registry->UnregisterTimedElement(mTimedElement); + + nsSVGAnimateElementBase::UnbindFromTree(aDeep, aNullParent); +} + +//---------------------------------------------------------------------- +// nsIContent methods + +nsresult +nsSVGAnimateElement::SetAttr(PRInt32 aNameSpaceID, nsIAtom* aName, + nsIAtom* aPrefix, const nsAString& aValue, + PRBool aNotify) +{ + nsresult rv = nsSVGAnimateElementBase::SetAttr(aNameSpaceID, aName, aPrefix, + aValue, aNotify); + NS_ENSURE_SUCCESS(rv,rv); + + if (aNameSpaceID != kNameSpaceID_None) + return NS_OK; + + if (aName == nsSVGAtoms::attributeName) { + UpdateTargetAttribute(); + return NS_OK; + } + + /* + * Animation properties + */ + if (mAnimation->GetTargetAttribute()) { + if (aName == nsSVGAtoms::by) + return mAnimation->SetBy(aValue); + if (aName == nsSVGAtoms::from) + return mAnimation->SetFrom(aValue); + if (aName == nsSVGAtoms::to) + return mAnimation->SetTo(aValue); + if (aName == nsSVGAtoms::values) + return mAnimation->SetValues(aValue); + } + if (aName == nsSVGAtoms::accumulate) + return mAnimation->SetAccumulate(aValue); + if (aName == nsSVGAtoms::additive) + return mAnimation->SetAdditive(aValue); + if (aName == nsSVGAtoms::calcMode) + return mAnimation->SetCalcMode(aValue); + if (aName == nsSVGAtoms::keyTimes) + return mAnimation->SetKeyTimes(aValue); + if (aName == nsSVGAtoms::keySplines) + return mAnimation->SetKeySplines(aValue); + + /* + * Timing properties + */ + if (aName == nsSVGAtoms::begin) + return mTimedElement->SetBeginSpec(aValue); + if (aName == nsSVGAtoms::dur) + return mTimedElement->SetSimpleDuration(aValue); + if (aName == nsSVGAtoms::end) + return mTimedElement->SetEndSpec(aValue); + if (aName == nsSVGAtoms::fill) + return mTimedElement->SetFillMode(aValue); + if (aName == nsSVGAtoms::max) + return mTimedElement->SetMax(aValue); + if (aName == nsSVGAtoms::min) + return mTimedElement->SetMin(aValue); + if (aName == nsSVGAtoms::repeatCount) + return mTimedElement->SetRepeatCount(aValue); + if (aName == nsSVGAtoms::repeatDur) + return mTimedElement->SetRepeatDur(aValue); + if (aName == nsSVGAtoms::restart) + return mTimedElement->SetRestart(aValue); + + return rv; +} + +nsresult +nsSVGAnimateElement::UnsetAttr(PRInt32 aNameSpaceID, + nsIAtom* aAttribute, PRBool aNotify) +{ + nsresult rv = nsSVGAnimateElementBase::UnsetAttr(aNameSpaceID, aAttribute, + aNotify); + NS_ENSURE_SUCCESS(rv,rv); + + if (aNameSpaceID != kNameSpaceID_None) + return NS_OK; + + if (aAttribute == nsSVGAtoms::attributeName) { + UpdateTargetAttribute(); + return NS_OK; + } + + // + // Animation properties + // + if (aAttribute == nsSVGAtoms::accumulate) + mAnimation->UnsetAccumulate(); + else if (aAttribute == nsSVGAtoms::additive) + mAnimation->UnsetAdditive(); + else if (aAttribute == nsSVGAtoms::by) + mAnimation->UnsetBy(); + else if (aAttribute == nsSVGAtoms::calcMode) + mAnimation->UnsetCalcMode(); + else if (aAttribute == nsSVGAtoms::from) + mAnimation->UnsetFrom(); + else if (aAttribute == nsSVGAtoms::keyTimes) + mAnimation->UnsetKeyTimes(); + else if (aAttribute == nsSVGAtoms::keySplines) + mAnimation->UnsetKeySplines(); + else if (aAttribute == nsSVGAtoms::to) + mAnimation->UnsetTo(); + else if (aAttribute == nsSVGAtoms::values) + mAnimation->UnsetValues(); + + // + // Timing properties + // + if (aAttribute == nsSVGAtoms::begin) + mTimedElement->UnsetBeginSpec(); + else if (aAttribute == nsSVGAtoms::dur) + mTimedElement->UnsetSimpleDuration(); + else if (aAttribute == nsSVGAtoms::end) + mTimedElement->UnsetEndSpec(); + else if (aAttribute == nsSVGAtoms::fill) + mTimedElement->UnsetFillMode(); + else if (aAttribute == nsSVGAtoms::max) + mTimedElement->UnsetMax(); + else if (aAttribute == nsSVGAtoms::min) + mTimedElement->UnsetMin(); + else if (aAttribute == nsSVGAtoms::repeatCount) + mTimedElement->UnsetRepeatCount(); + else if (aAttribute == nsSVGAtoms::repeatDur) + mTimedElement->UnsetRepeatDur(); + else if (aAttribute == nsSVGAtoms::restart) + mTimedElement->UnsetRestart(); + + return NS_OK; +} + +//---------------------------------------------------------------------- +// Implementation helpers + +nsISMILAnimationRegistry* +nsSVGAnimateElement::GetAnimationRegistry() +{ + nsISMILAnimationRegistry* result = nsnull; + nsCOMPtr ownerDOMSVG; + + nsresult rv = GetOwnerSVGElement(getter_AddRefs(ownerDOMSVG)); + + if (NS_SUCCEEDED(rv) && ownerDOMSVG) { + nsCOMPtr ownerSVG( do_QueryInterface(ownerDOMSVG, &rv) ); + + if (ownerSVG) + result = ownerSVG->GetAnimationRegistry(); + } + + return result; +} + +nsIContent* +nsSVGAnimateElement::GetParentElement() +{ + nsIContent* result = nsnull; + nsIBindingManager* bindingManager = nsnull; + nsIDocument* ownerDoc = GetOwnerDoc(); + + if (ownerDoc) + bindingManager = ownerDoc->BindingManager(); + + if (bindingManager) + // we have a binding manager -- do we have an anonymous parent? + bindingManager->GetInsertionParent(this, &result); + + if (!result) + // if we didn't find an anonymous parent, use the explicit one, + // whether it's null or not... + result = GetParent(); + + return result; +} + +void +nsSVGAnimateElement::UpdateTargetElement() +{ + // XXX Follow xlink:href attributes when provided + + nsCOMPtr target = GetParentElement(); + if (!target) + return; + + nsWeakPtr targetElement = do_GetWeakReference(target); + if (mTargetElement != targetElement || !mAnimation->GetTargetAttribute()) { + mTargetElement = targetElement; + UpdateTargetAttribute(); + } +} + +nsISMILAnimAttr* +nsSVGAnimateElement::GetTargetAttribute() +{ + nsISMILAnimAttr* result = nsnull; + + if (mTargetElement) { + nsAutoString attributeName; + + GetAttr(kNameSpaceID_None, nsSVGAtoms::attributeName, attributeName); + + nsCOMPtr attributeAtom( do_GetAtom(attributeName) ); + nsCOMPtr + targetElement(do_QueryReferent(mTargetElement)); + + if (targetElement && attributeAtom) { + result = + targetElement->GetAnimAttribute(kNameSpaceID_None, attributeAtom); + } + } + + return result; +} + +void +nsSVGAnimateElement::UpdateTargetAttribute() +{ + // XXX Implement XML vs CSS vs auto attribute types + nsresult rv; + + if (mTargetElement) { + nsCOMPtr targetAttribute = GetTargetAttribute(); + + if (targetAttribute) { + rv = mAnimation->SetTargetAttribute(targetAttribute); + NS_ENSURE_SUCCESS(rv,); + + SetAnimationProperties(); + + nsCOMPtr timeClient( do_QueryInterface(mAnimation) ); + NS_ENSURE_TRUE(timeClient,); + mTimedElement->SetTimeClient(timeClient); + + nsCOMPtr registry = GetAnimationRegistry(); + NS_ENSURE_TRUE(registry,); + + nsCOMPtr composable( do_QueryInterface(mAnimation) ); + NS_ENSURE_TRUE(composable,); + + registry->RegisterComposable(targetAttribute, composable); + } else { + mAnimation->SetTargetAttribute(nsnull); + // XXX Attribute doesn't exist or it isn't animatable, mark document + // in error + } + } +} + +void +nsSVGAnimateElement::SetAnimationProperties() +{ + nsAutoString result; + + NS_ENSURE_TRUE(mAnimation,); + NS_ENSURE_TRUE(mAnimation->GetTargetAttribute(),); + + if (HasAttr(kNameSpaceID_None, nsSVGAtoms::by)) { + if (NS_SUCCEEDED(GetAttr(kNameSpaceID_None, nsSVGAtoms::by, result))) + mAnimation->SetBy(result); + } + if (HasAttr(kNameSpaceID_None, nsSVGAtoms::from)) { + if (NS_SUCCEEDED(GetAttr(kNameSpaceID_None, nsSVGAtoms::from, result))) + mAnimation->SetFrom(result); + } + if (HasAttr(kNameSpaceID_None, nsSVGAtoms::to)) { + if (NS_SUCCEEDED(GetAttr(kNameSpaceID_None, nsSVGAtoms::to, result))) + mAnimation->SetTo(result); + } + if (HasAttr(kNameSpaceID_None, nsSVGAtoms::values)) { + if (NS_SUCCEEDED(GetAttr(kNameSpaceID_None, nsSVGAtoms::values, result))) + mAnimation->SetValues(result); + } +} + Index: /cvsroot/mozilla/content/svg/content/src/nsSVGAnimatedLength.cpp =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGAnimatedLength.cpp,v retrieving revision 1.8 diff -u -r1.8 nsSVGAnimatedLength.cpp --- /cvsroot/mozilla/content/svg/content/src/nsSVGAnimatedLength.cpp 31 Jan 2005 19:45:10 -0000 1.8 +++ /cvsroot/mozilla/content/svg/content/src/nsSVGAnimatedLength.cpp 9 Oct 2005 01:12:52 -0000 @@ -41,6 +41,10 @@ #include "nsSVGAnimatedLength.h" #include "nsSVGLength.h" #include "nsContentUtils.h" +#ifdef MOZ_SMIL +#include "nsISMILAnimVal.h" +#include "nsISMILAnimAttr.h" +#endif // MOZ_SMIL //////////////////////////////////////////////////////////////////////// @@ -49,6 +53,9 @@ class nsSVGAnimatedLength : public nsIDOMSVGAnimatedLength, public nsSVGValue, public nsISVGValueObserver, +#ifdef MOZ_SMIL + public nsISMILAnimAttr, +#endif // MOZ_SMIL public nsSupportsWeakReference { protected: @@ -74,12 +81,23 @@ modificationType aModType); NS_IMETHOD DidModifySVGObservable (nsISVGValue* observable, modificationType aModType); + +#ifdef MOZ_SMIL + // nsISMILAnimAttr + virtual nsresult GetBaseValue(nsISMILAnimVal& aValue); + virtual nsresult SetAnimValue(const nsISMILAnimVal& aValue); + virtual nsISMILAnimVal* Create() const; + virtual nsISMILAnimVal* CreateFromSpec(const nsAString& aSpec) const; +#endif // MOZ_SMIL // nsISupportsWeakReference // implementation inherited from nsSupportsWeakReference protected: nsCOMPtr mBaseVal; +#ifdef MOZ_SMIL + nsCOMPtr mAnimVal; +#endif // MOZ_SMIL }; @@ -108,6 +126,12 @@ NS_ASSERTION(val, "baseval needs to implement nsISVGValue interface"); if (!val) return; val->AddObserver(this); +#ifdef MOZ_SMIL + nsCOMPtr length = do_QueryInterface(mBaseVal); + NS_ENSURE_TRUE(length,); + nsresult rv = NS_NewSVGLength(getter_AddRefs(mAnimVal), *length); + NS_ENSURE_SUCCESS(rv,); +#endif } //---------------------------------------------------------------------- @@ -122,6 +146,9 @@ NS_INTERFACE_MAP_ENTRY(nsIDOMSVGAnimatedLength) NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) +#ifdef MOZ_SMIL + NS_INTERFACE_MAP_ENTRY(nsISMILAnimAttr) +#endif // MOZ_SMIL NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGAnimatedLength) NS_INTERFACE_MAP_ENTRY_AMBIGUOUS(nsISupports, nsISVGValue) NS_INTERFACE_MAP_END @@ -159,7 +186,11 @@ NS_IMETHODIMP nsSVGAnimatedLength::GetAnimVal(nsIDOMSVGLength * *aAnimVal) { +#ifndef MOZ_SMIL *aAnimVal = mBaseVal; +#else + *aAnimVal = mAnimVal; +#endif NS_ADDREF(*aAnimVal); return NS_OK; } @@ -183,6 +214,46 @@ return NS_OK; } +#ifdef MOZ_SMIL +//---------------------------------------------------------------------- +// nsISMILAnimAttr methods + +nsresult +nsSVGAnimatedLength::GetBaseValue(nsISMILAnimVal& aValue) +{ + nsCOMPtr length( do_QueryInterface(mBaseVal) ); + NS_ENSURE_TRUE(length, NS_ERROR_FAILURE); + length->GetAnimValue(aValue); + return NS_OK; +} + +nsresult +nsSVGAnimatedLength::SetAnimValue(const nsISMILAnimVal& aValue) +{ + WillModify(mod_other); + mAnimVal->SetAnimValue(aValue); + DidModify(mod_other); + return NS_OK; +} + +// XXXbb! make sure we re-use the objects passed in +nsISMILAnimVal* +nsSVGAnimatedLength::Create() const +{ + nsCOMPtr length( do_QueryInterface(mBaseVal) ); + NS_ENSURE_TRUE(length, nsnull); + return length->GetNewSMILValue(); +} + +nsISMILAnimVal* +nsSVGAnimatedLength::CreateFromSpec(const nsAString& aSpec) const +{ + nsCOMPtr length( do_QueryInterface(mBaseVal) ); + NS_ENSURE_TRUE(length, nsnull); + return length->GetNewSMILValue(aSpec); +} +#endif // MOZ_SMIL + //////////////////////////////////////////////////////////////////////// // Exported creation functions @@ -205,3 +276,4 @@ return NS_OK; } + Index: /cvsroot/mozilla/content/svg/content/src/nsSVGAtomList.h =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGAtomList.h,v retrieving revision 1.26 diff -u -r1.26 nsSVGAtomList.h --- /cvsroot/mozilla/content/svg/content/src/nsSVGAtomList.h 13 Sep 2005 22:38:26 -0000 1.26 +++ /cvsroot/mozilla/content/svg/content/src/nsSVGAtomList.h 9 Oct 2005 01:12:53 -0000 @@ -55,6 +55,9 @@ ******/ // tags +#ifdef MOZ_SMIL +SVG_ATOM(animate, "animate") +#endif SVG_ATOM(circle, "circle") SVG_ATOM(clipPath, "clipPath") SVG_ATOM(defs, "defs") @@ -248,6 +251,29 @@ SVG_ATOM(y1, "y1") SVG_ATOM(y2, "y2") SVG_ATOM(zoomAndPan, "zoomAndPan") + +// SMIL properties (to be integrated with the others later) +#ifdef MOZ_SMIL +SVG_ATOM(accumulate, "accumulate") +SVG_ATOM(additive, "additive") +SVG_ATOM(attributeName, "attributeName") +SVG_ATOM(attributeType, "attributeType") +SVG_ATOM(begin, "begin") +SVG_ATOM(by, "by") +SVG_ATOM(calcMode, "calcMode") +SVG_ATOM(dur, "dur") +SVG_ATOM(end, "end") +SVG_ATOM(from, "from") +SVG_ATOM(keySplines, "keySplines") +SVG_ATOM(keyTimes, "keyTimes") +SVG_ATOM(max, "max") +SVG_ATOM(min, "min") +SVG_ATOM(repeatCount, "repeatCount") +SVG_ATOM(repeatDur, "repeatDur") +SVG_ATOM(restart, "restart") +SVG_ATOM(to, "to") +SVG_ATOM(values, "values") +#endif // transformation keywords SVG_ATOM(matrix, "matrix") Index: /cvsroot/mozilla/content/svg/content/src/nsSVGElement.cpp =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGElement.cpp,v retrieving revision 1.80 diff -u -r1.80 nsSVGElement.cpp --- /cvsroot/mozilla/content/svg/content/src/nsSVGElement.cpp 25 Aug 2005 21:31:07 -0000 1.80 +++ /cvsroot/mozilla/content/svg/content/src/nsSVGElement.cpp 9 Oct 2005 01:12:55 -0000 @@ -92,6 +92,9 @@ NS_INTERFACE_MAP_ENTRY(nsISupportsWeakReference) NS_INTERFACE_MAP_ENTRY(nsISVGValueObserver) NS_INTERFACE_MAP_ENTRY(nsISVGContent) +#ifdef MOZ_SMIL + NS_INTERFACE_MAP_ENTRY(nsISMILAnimElement) +#endif // MOZ_SMIL // provided by nsGenericElement: // NS_INTERFACE_MAP_ENTRY(nsIStyledContent) // NS_INTERFACE_MAP_ENTRY(nsIContent) @@ -213,7 +216,10 @@ attrValue.SetTo(proxy); } else { - attrValue.SetTo(svg_value); + // We don't want to continue on and call SetAttrAndNotify, as + // the SVGValue has already done that for us. Returning early + // is safe as no event attributes are also SVGValues. + return NS_OK; } } else if (aName == nsSVGAtoms::style && aNamespaceID == kNameSpaceID_None) { @@ -872,3 +878,26 @@ return aAttr; } + +#ifdef MOZ_SMIL +//---------------------------------------------------------------------- +// nsISMILAnimElement methods + +// This should be overridden as necessary, e.g. to ensure some attributes are +// not animatable + +nsISMILAnimAttr* +nsSVGElement::GetAnimAttribute(PRInt32 aNamespaceID, nsIAtom* aName) +{ + NS_ENSURE_TRUE(aName, nsnull); + + nsCOMPtr result; + nsCOMPtr attr = GetMappedAttribute(aNamespaceID, aName); + + if (attr) + result = do_QueryInterface(attr); + + return result; +} +#endif // MOZ_SMIL + Index: /cvsroot/mozilla/content/svg/content/src/nsSVGElement.h =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGElement.h,v retrieving revision 1.47 diff -u -r1.47 nsSVGElement.h --- /cvsroot/mozilla/content/svg/content/src/nsSVGElement.h 25 Aug 2005 21:57:31 -0000 1.47 +++ /cvsroot/mozilla/content/svg/content/src/nsSVGElement.h 9 Oct 2005 01:12:55 -0000 @@ -53,10 +53,16 @@ #include "nsWeakReference.h" #include "nsISVGContent.h" #include "nsICSSStyleRule.h" +#ifdef MOZ_SMIL +#include "nsISMILAnimElement.h" +#endif // MOZ_SMIL class nsSVGElement : public nsGenericElement, // :nsIXMLContent:nsIStyledContent:nsIContent public nsISVGValueObserver, public nsSupportsWeakReference, // :nsISupportsWeakReference +#ifdef MOZ_SMIL + public nsISMILAnimElement, +#endif // MOZ_SMIL public nsISVGContent { protected: @@ -122,6 +128,12 @@ // nsISVGContent virtual void ParentChainChanged(); + +#ifdef MOZ_SMIL + // nsISVGAnimationTarget + virtual nsISMILAnimAttr* + GetAnimAttribute(PRInt32 aNamespaceID, nsIAtom* aName); +#endif // MOZ_SMIL protected: // Hooks for subclasses Index: /cvsroot/mozilla/content/svg/content/src/nsSVGElementFactory.cpp =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGElementFactory.cpp,v retrieving revision 1.30 diff -u -r1.30 nsSVGElementFactory.cpp --- /cvsroot/mozilla/content/svg/content/src/nsSVGElementFactory.cpp 24 Sep 2005 18:43:10 -0000 1.30 +++ /cvsroot/mozilla/content/svg/content/src/nsSVGElementFactory.cpp 9 Oct 2005 01:12:56 -0000 @@ -126,6 +126,10 @@ NS_NewSVGFEUnimplementedMOZElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); nsresult NS_NewSVGPatternElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +#ifdef MOZ_SMIL +nsresult +NS_NewSVGAnimateElement(nsIContent **aResult, nsINodeInfo *aNodeInfo); +#endif // MOZ_SMIL nsresult NS_NewSVGElement(nsIContent** aResult, nsINodeInfo *aNodeInfo) @@ -233,6 +237,10 @@ return NS_NewSVGFEUnimplementedMOZElement(aResult, aNodeInfo); if (name == nsSVGAtoms::pattern) return NS_NewSVGPatternElement(aResult, aNodeInfo); +#ifdef MOZ_SMIL + if (name == nsSVGAtoms::animate) + return NS_NewSVGAnimateElement(aResult, aNodeInfo); +#endif // MOZ_SMIL // if we don't know what to create, just create a standard xml element: return NS_NewXMLElement(aResult, aNodeInfo); Index: /cvsroot/mozilla/content/svg/content/src/nsSVGLength.cpp =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGLength.cpp,v retrieving revision 1.21 diff -u -r1.21 nsSVGLength.cpp --- /cvsroot/mozilla/content/svg/content/src/nsSVGLength.cpp 9 Aug 2005 13:53:00 -0000 1.21 +++ /cvsroot/mozilla/content/svg/content/src/nsSVGLength.cpp 9 Oct 2005 01:12:58 -0000 @@ -49,6 +49,106 @@ #include "nsISVGValueUtils.h" #include "nsWeakReference.h" #include "nsContentUtils.h" +#ifdef MOZ_SMIL +#include "nsISMILAnimVal.h" +#include "nsDOMError.h" + +class nsSVGLengthAnimVal : public nsISMILAnimVal +{ +public: + nsSVGLengthAnimVal() : mCanonicalValue(0.0f) {} + + NS_DECL_ISUPPORTS + + virtual nsresult ComputeDistance(const nsISMILAnimVal& aTo, + PRFloat64& aDistance) const; + virtual nsresult Interpolate(const nsISMILAnimVal& aEndVal, + float aUnitDistance, + nsISMILAnimVal& aResult); + virtual nsresult Add(const nsISMILAnimVal& aAddedVal); + virtual nsresult Set(const nsISMILAnimVal& aNewVal); + virtual nsresult Repeat(PRUint32 aCount, + const nsISMILAnimVal* aRepeatValue /*= nsnull*/); + + // nsWeakPtr mBase; + float mCanonicalValue; +}; + +NS_IMPL_ISUPPORTS1(nsSVGLengthAnimVal, + nsISMILAnimVal) + +nsresult +nsSVGLengthAnimVal::ComputeDistance(const nsISMILAnimVal& aTo, + PRFloat64& aDistance) const +{ + (void)aTo; + aDistance = 0.0; + NS_NOTYETIMPLEMENTED("nsSVGLengthAnimVal::ComputeDistance"); + return NS_ERROR_NOT_IMPLEMENTED; +} + +nsresult +nsSVGLengthAnimVal::Interpolate(const nsISMILAnimVal& aEndValue, + float aUnitDistance, + nsISMILAnimVal& aResult) +{ + // We wouldn't have to cast away const-ness if GetValue was a const member. + nsSVGLengthAnimVal* end = (nsSVGLengthAnimVal*)&aEndValue; + NS_ENSURE_TRUE(end, NS_ERROR_FAILURE); + + nsSVGLengthAnimVal* length = NS_STATIC_CAST(nsSVGLengthAnimVal*, &aResult); + NS_ENSURE_TRUE(length, NS_ERROR_FAILURE); + + nsresult rv = NS_OK; + + const float &startVal = mCanonicalValue; + const float &endVal = end->mCanonicalValue; + + length->mCanonicalValue = (startVal + (endVal - startVal) * aUnitDistance); + + return NS_OK; +} + +nsresult +nsSVGLengthAnimVal::Add(const nsISMILAnimVal& aAddedValue) +{ + // We wouldn't have to cast away const-ness if GetValue was a const member. + nsSVGLengthAnimVal* add = (nsSVGLengthAnimVal*)&aAddedValue; + NS_ENSURE_TRUE(add, NS_ERROR_FAILURE); + + mCanonicalValue += add->mCanonicalValue; + + return NS_OK; +} + +nsresult +nsSVGLengthAnimVal::Repeat(PRUint32 aCount, + const nsISMILAnimVal* aRepeatValue) +{ + float value = mCanonicalValue; + + if (aRepeatValue) { + // We wouldn't have to cast away const-ness if GetValue was a const member. + nsSVGLengthAnimVal* repeat = (nsSVGLengthAnimVal*)aRepeatValue; + NS_ENSURE_TRUE(repeat, NS_ERROR_FAILURE); + value = repeat->mCanonicalValue; + } + + mCanonicalValue = value * aCount; + + return NS_OK; +} + +nsresult +nsSVGLengthAnimVal::Set(const nsISMILAnimVal& aNewValue) +{ + nsSVGLengthAnimVal* length = (nsSVGLengthAnimVal*)&aNewValue; + NS_ENSURE_TRUE(length, NS_ERROR_FAILURE); + + mCanonicalValue = length->mCanonicalValue; + return NS_OK; +} +#endif // MOZ_SMIL //////////////////////////////////////////////////////////////////////// // nsSVGLength class @@ -65,6 +165,11 @@ friend nsresult NS_NewSVGLength(nsISVGLength** result, const nsAString &value); + +#ifdef MOZ_SMIL + friend nsresult NS_NewSVGLength(nsISVGLength** result, + const nsISVGLength& base); +#endif // MOZ_SMIL nsSVGLength(float value, PRUint16 unit); nsSVGLength(); @@ -79,6 +184,12 @@ // nsISVGLength interface: NS_IMETHOD SetContext(nsSVGCoordCtx* context); +#ifdef MOZ_SMIL + virtual nsISMILAnimVal* GetNewSMILValue(); + virtual nsISMILAnimVal* GetNewSMILValue(const nsAString& aSpec); + virtual nsresult GetAnimValue(nsISMILAnimVal& aValue); + virtual nsresult SetAnimValue(const nsISMILAnimVal& aNewValue); +#endif // MOZ_SMIL // nsISVGValue interface: NS_IMETHOD SetValueString(const nsAString& aValue); @@ -95,6 +206,9 @@ protected: // implementation helpers: + nsresult ParseStringValue(const nsAString &aValueAsString, + float &aValue, + PRUint16 &aUnits); float mmPerPixel(); float AxisLength(); PRBool IsValidUnitType(PRUint16 unit); @@ -104,6 +218,10 @@ float mValueInSpecifiedUnits; PRUint16 mSpecifiedUnitType; nsRefPtr mContext; +#ifdef MOZ_SMIL + nsRefPtr mRefLength; + PRPackedBool mIsAnimated:1; +#endif // MOZ_SMIL }; @@ -140,16 +258,42 @@ return NS_OK; } +#ifdef MOZ_SMIL +nsresult +NS_NewSVGLength(nsISVGLength** result, + const nsISVGLength &ref) +{ + *result = nsnull; + nsSVGLength *pl = new nsSVGLength(); + if (!pl) + return NS_ERROR_OUT_OF_MEMORY; + NS_ADDREF(pl); + const nsSVGLength* refLength = NS_STATIC_CAST(const nsSVGLength*, &ref); + if (!refLength) { + NS_RELEASE(pl); + return NS_ERROR_FAILURE; + } + pl->mRefLength = NS_CONST_CAST(nsSVGLength*, refLength); + *result = pl; + return NS_OK; +} +#endif // MOZ_SMIL nsSVGLength::nsSVGLength(float value, PRUint16 unit) : mValueInSpecifiedUnits(value), +#ifdef MOZ_SMIL + mIsAnimated(PR_FALSE), +#endif // MOZ_SMIL mSpecifiedUnitType(unit) { // we don't have a context yet, so we don't call MaybeAddAsObserver() } nsSVGLength::nsSVGLength() +#ifdef MOZ_SMIL + : mIsAnimated(PR_FALSE) +#endif // MOZ_SMIL { } @@ -215,6 +359,11 @@ NS_IMETHODIMP nsSVGLength::GetUnitType(PRUint16 *aUnitType) { +#ifdef MOZ_SMIL + if (mRefLength) + return mRefLength->GetUnitType(aUnitType); +#endif // MOZ_SMIL + *aUnitType = mSpecifiedUnitType; return NS_OK; } @@ -223,6 +372,13 @@ NS_IMETHODIMP nsSVGLength::GetValue(float *aValue) { +#ifdef MOZ_SMIL + if (mRefLength && !mIsAnimated) + return mRefLength->GetValue(aValue); + if (mIsAnimated) + mSpecifiedUnitType = mRefLength->mSpecifiedUnitType; +#endif // MOZ_SMIL + switch (mSpecifiedUnitType) { case SVG_LENGTHTYPE_NUMBER: case SVG_LENGTHTYPE_PX: @@ -266,6 +422,17 @@ WillModify(); +#ifdef MOZ_SMIL + if (mRefLength && !mIsAnimated) + mIsAnimated = PR_TRUE; + if (mIsAnimated) + mSpecifiedUnitType = mRefLength->mSpecifiedUnitType; + + // XXX This should really throw a modification not allowed error for animated + // values but we currently re-use this method to actually set the animated + // value +#endif // MOZ_SMIL + switch (mSpecifiedUnitType) { case SVG_LENGTHTYPE_NUMBER: case SVG_LENGTHTYPE_PX: @@ -310,13 +477,25 @@ NS_IMETHODIMP nsSVGLength::GetValueInSpecifiedUnits(float *aValueInSpecifiedUnits) { +#ifdef MOZ_SMIL + if (mIsAnimated && mSpecifiedUnitType != mRefLength->mSpecifiedUnitType) + ConvertToSpecifiedUnits(mRefLength->mSpecifiedUnitType); +#endif // MOZ_SMIL + *aValueInSpecifiedUnits = mValueInSpecifiedUnits; return NS_OK; } + NS_IMETHODIMP nsSVGLength::SetValueInSpecifiedUnits(float aValueInSpecifiedUnits) { WillModify(); +#ifdef MOZ_SMIL + if (mRefLength && mIsAnimated) + return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; + if (mRefLength) + return mRefLength->SetValueInSpecifiedUnits(aValueInSpecifiedUnits); +#endif // MOZ_SMIL mValueInSpecifiedUnits = aValueInSpecifiedUnits; DidModify(); return NS_OK; @@ -326,6 +505,13 @@ NS_IMETHODIMP nsSVGLength::GetValueAsString(nsAString & aValueAsString) { +#ifdef MOZ_SMIL + if (mRefLength && !mIsAnimated) + mRefLength->GetValueAsString(aValueAsString); + if (mIsAnimated) + mSpecifiedUnitType = mRefLength->mSpecifiedUnitType; +#endif // MOZ_SMIL + PRUnichar buf[24]; nsTextFormatter::snprintf(buf, sizeof(buf)/sizeof(PRUnichar), NS_LITERAL_STRING("%g").get(), @@ -379,65 +565,25 @@ NS_IMETHODIMP nsSVGLength::SetValueAsString(const nsAString & aValueAsString) { - nsresult rv = NS_OK; - - char *str = ToNewCString(aValueAsString); + float value; + PRUint16 unitType; - char* number = str; - while (*number && isspace(*number)) - ++number; - - if (*number) { - char *rest; - double value = PR_strtod(number, &rest); - if (rest!=number) { - const char* unitStr = nsCRT::strtok(rest, "\x20\x9\xD\xA", &rest); - PRUint16 unitType = SVG_LENGTHTYPE_UNKNOWN; - if (!unitStr || *unitStr=='\0') { - unitType = SVG_LENGTHTYPE_NUMBER; - } - else { - nsCOMPtr unitAtom = do_GetAtom(unitStr); - if (unitAtom == nsSVGAtoms::px) - unitType = SVG_LENGTHTYPE_PX; - else if (unitAtom == nsSVGAtoms::mm) - unitType = SVG_LENGTHTYPE_MM; - else if (unitAtom == nsSVGAtoms::cm) - unitType = SVG_LENGTHTYPE_CM; - else if (unitAtom == nsSVGAtoms::in) - unitType = SVG_LENGTHTYPE_IN; - else if (unitAtom == nsSVGAtoms::pt) - unitType = SVG_LENGTHTYPE_PT; - else if (unitAtom == nsSVGAtoms::pc) - unitType = SVG_LENGTHTYPE_PC; - else if (unitAtom == nsSVGAtoms::ems) - unitType = SVG_LENGTHTYPE_EMS; - else if (unitAtom == nsSVGAtoms::exs) - unitType = SVG_LENGTHTYPE_EXS; - else if (unitAtom == nsSVGAtoms::percentage) - unitType = SVG_LENGTHTYPE_PERCENTAGE; - } - if (IsValidUnitType(unitType)){ - WillModify(); - mValueInSpecifiedUnits = (float)value; - mSpecifiedUnitType = unitType; - DidModify(); - } - else { // parse error - // not a valid unit type - rv = NS_ERROR_FAILURE; - NS_ERROR("invalid length type"); - } - } - else { // parse error - // no number - rv = NS_ERROR_FAILURE; - } - } + nsresult rv = ParseStringValue(aValueAsString, value, unitType); + if (NS_FAILED(rv)) + return rv; - nsMemory::Free(str); - - return rv; + WillModify(); +#ifdef MOZ_SMIL + if (mRefLength && mIsAnimated) + return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; + if (mRefLength) + return mRefLength->SetValueAsString(aValueAsString); +#endif // MOZ_SMIL + mValueInSpecifiedUnits = value; + mSpecifiedUnitType = unitType; + DidModify(); + + return NS_OK; } /* void newValueSpecifiedUnits (in unsigned short unitType, in float valueInSpecifiedUnits); */ @@ -450,6 +596,12 @@ PRBool observer_change = (unitType != mSpecifiedUnitType); WillModify(); +#ifdef MOZ_SMIL + if (mRefLength && mIsAnimated) + return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; + if (mRefLength) + return mRefLength->NewValueSpecifiedUnits(unitType, valueInSpecifiedUnits); +#endif // MOZ_SMIL if (observer_change) MaybeRemoveAsObserver(); mValueInSpecifiedUnits = valueInSpecifiedUnits; @@ -471,6 +623,12 @@ PRBool observer_change = (unitType != mSpecifiedUnitType); WillModify(); +#ifdef MOZ_SMIL + if (mRefLength && mIsAnimated) + return NS_ERROR_DOM_NO_MODIFICATION_ALLOWED_ERR; + if (mRefLength) + return mRefLength->ConvertToSpecifiedUnits(unitType); +#endif // MOZ_SMIL if (observer_change) MaybeRemoveAsObserver(); float valueInUserUnits; @@ -529,10 +687,142 @@ return NS_OK; } +#ifdef MOZ_SMIL +nsISMILAnimVal* +nsSVGLength::GetNewSMILValue() +{ + nsSVGLengthAnimVal* val = new nsSVGLengthAnimVal(); + if (!val) + return nsnull; + GetValue(&(val->mCanonicalValue)); + return val; +} + +nsISMILAnimVal* +nsSVGLength::GetNewSMILValue(const nsAString& aSpec) +{ + nsSVGLengthAnimVal* val = new nsSVGLengthAnimVal(); + + // Look away... + float oldValue = mValueInSpecifiedUnits; + PRUint16 oldUnits = mSpecifiedUnitType; + + float value; + PRUint16 units; + nsresult rv = ParseStringValue(aSpec, value, units); + if (NS_FAILED(rv)) + { + delete val; + return nsnull; + } + + mValueInSpecifiedUnits = value; + mSpecifiedUnitType = units; + GetValue(&(val->mCanonicalValue)); + mValueInSpecifiedUnits = oldValue; + mSpecifiedUnitType = oldUnits; + // I warned you! + // (This is all temporary code--it's not worth refactoring nsSVGLength to make + // this neater until we decide how to support animated values) + + return val; +} + +nsresult +nsSVGLength::GetAnimValue(nsISMILAnimVal& aValue) +{ + nsSVGLengthAnimVal* length = + NS_STATIC_CAST(nsSVGLengthAnimVal*, &aValue); + NS_ENSURE_TRUE(length,NS_ERROR_FAILURE); + GetValue(&(length->mCanonicalValue)); + + return NS_OK; +} + +nsresult +nsSVGLength::SetAnimValue(const nsISMILAnimVal& aNewValue) +{ + const nsSVGLengthAnimVal* length = + NS_STATIC_CAST(const nsSVGLengthAnimVal*, &aNewValue); + NS_ENSURE_TRUE(length,NS_ERROR_FAILURE); + + WillModify(); + mIsAnimated = PR_TRUE; + SetValue(length->mCanonicalValue); + DidModify(); + + return NS_OK; +} +#endif // MOZ_SMIL //---------------------------------------------------------------------- // Implementation helpers: +nsresult +nsSVGLength::ParseStringValue(const nsAString & aValueAsString, + float &aValue, + PRUint16 &aUnits) +{ + nsresult rv = NS_OK; + + char *str = ToNewCString(aValueAsString); + + char* number = str; + while (*number && isspace(*number)) + ++number; + + if (*number) { + char *rest; + double value = PR_strtod(number, &rest); + if (rest!=number) { + const char* unitStr = nsCRT::strtok(rest, "\x20\x9\xD\xA", &rest); + PRUint16 unitType = SVG_LENGTHTYPE_UNKNOWN; + if (!unitStr || *unitStr=='\0') { + unitType = SVG_LENGTHTYPE_NUMBER; + } + else { + nsCOMPtr unitAtom = do_GetAtom(unitStr); + if (unitAtom == nsSVGAtoms::px) + unitType = SVG_LENGTHTYPE_PX; + else if (unitAtom == nsSVGAtoms::mm) + unitType = SVG_LENGTHTYPE_MM; + else if (unitAtom == nsSVGAtoms::cm) + unitType = SVG_LENGTHTYPE_CM; + else if (unitAtom == nsSVGAtoms::in) + unitType = SVG_LENGTHTYPE_IN; + else if (unitAtom == nsSVGAtoms::pt) + unitType = SVG_LENGTHTYPE_PT; + else if (unitAtom == nsSVGAtoms::pc) + unitType = SVG_LENGTHTYPE_PC; + else if (unitAtom == nsSVGAtoms::ems) + unitType = SVG_LENGTHTYPE_EMS; + else if (unitAtom == nsSVGAtoms::exs) + unitType = SVG_LENGTHTYPE_EXS; + else if (unitAtom == nsSVGAtoms::percentage) + unitType = SVG_LENGTHTYPE_PERCENTAGE; + } + if (IsValidUnitType(unitType)){ + aValue = (float)value; + aUnits = unitType; + } + else { // parse error + // not a valid unit type + rv = NS_ERROR_FAILURE; + NS_ERROR("invalid length type"); + } + } + else { // parse error + // no number + rv = NS_ERROR_FAILURE; + } + } + + nsMemory::Free(str); + + return rv; +} + + float nsSVGLength::mmPerPixel() { if (!mContext) { Index: /cvsroot/mozilla/content/svg/content/src/nsSVGLength.h =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGLength.h,v retrieving revision 1.4 diff -u -r1.4 nsSVGLength.h --- /cvsroot/mozilla/content/svg/content/src/nsSVGLength.h 17 Apr 2004 21:52:20 -0000 1.4 +++ /cvsroot/mozilla/content/svg/content/src/nsSVGLength.h 9 Oct 2005 01:12:58 -0000 @@ -51,6 +51,12 @@ NS_NewSVGLength(nsISVGLength** result, const nsAString &value); +#ifdef MOZ_SMIL +nsresult +NS_NewSVGLength(nsISVGLength** result, + const nsISVGLength &base); +#endif // MOZ_SMIL + // XXX we'll need this prototype-based stuff to support unsetting: //nsresult NS_NewSVGLength(nsIDOMSVGLength** result, // nsIDOMSVGLength* prototype); Index: /cvsroot/mozilla/content/svg/content/src/nsSVGSVGElement.cpp =================================================================== RCS file: /cvsroot/mozilla/content/svg/content/src/nsSVGSVGElement.cpp,v retrieving revision 1.57 diff -u -r1.57 nsSVGSVGElement.cpp --- /cvsroot/mozilla/content/svg/content/src/nsSVGSVGElement.cpp 2 Oct 2005 23:59:20 -0000 1.57 +++ /cvsroot/mozilla/content/svg/content/src/nsSVGSVGElement.cpp 9 Oct 2005 01:13:02 -0000 @@ -71,6 +71,16 @@ #include "nsISVGChildFrame.h" #include "nsGUIEvent.h" +#ifdef MOZ_SMIL +#include "nsISMILAnimationController.h" +#include "nsISMILAnimationRegistry.h" +#include "nsISMILAnimationObserver.h" +#include "nsISVGAnimationElement.h" +#include "nsIContentIterator.h" + +nsresult NS_NewContentIterator(nsIContentIterator** aInstancePtrResult); +#endif // MOZ_SMIL + typedef nsSVGStylableElement nsSVGSVGElementBase; class nsSVGSVGElement : public nsSVGSVGElementBase, @@ -78,6 +88,9 @@ public nsIDOMSVGFitToViewBox, public nsIDOMSVGLocatable, public nsIDOMSVGZoomAndPan, +#ifdef MOZ_SMIL + public nsISMILAnimationObserver, +#endif public nsSVGCoordCtxProvider { protected: @@ -111,6 +124,10 @@ NS_IMETHOD_(float) GetPreviousTranslate_x(); NS_IMETHOD_(float) GetPreviousTranslate_y(); NS_IMETHOD_(float) GetPreviousScale(); +#ifdef MOZ_SMIL + NS_IMETHOD_(nsISMILAnimationRegistry*) GetAnimationRegistry(); + NS_IMETHOD EnumerateAnimationNodes(); +#endif // MOZ_SMIL // nsIStyledContent interface NS_IMETHOD_(PRBool) IsAttributeMapped(const nsIAtom* aAttribute) const; @@ -121,12 +138,32 @@ NS_IMETHOD DidModifySVGObservable (nsISVGValue* observable, nsISVGValue::modificationType aModType); +#ifdef MOZ_SMIL + // nsISMILAnimationObserver interface + virtual void StartSample() {} + virtual void StartCompositing(); + virtual void EndCompositing(); + virtual void EndSample() {} +#endif // MOZ_SMIL + protected: // nsSVGElement overrides PRBool IsEventName(nsIAtom* aName); +#ifdef MOZ_SMIL + virtual nsresult BindToTree(nsIDocument* aDocument, nsIContent* aParent, + nsIContent* aBindingParent, + PRBool aCompileEventHandlers); + virtual void UnbindFromTree(PRBool aDeep = PR_TRUE, + PRBool aNullParent = PR_TRUE); +#endif // MOZ_SMIL // implementation helpers: void GetOffsetToAncestor(nsIContent* ancestor, float &x, float &y); +#ifdef MOZ_SMIL + nsISMILAnimationController* + GetAnimationController(nsIDocument* aDocument, PRBool aCreate = PR_FALSE); + void DoEnumerateAnimationNodes(); +#endif // MOZ_SMIL nsCOMPtr mWidth; nsCOMPtr mHeight; @@ -147,6 +184,12 @@ float mPreviousScale; PRBool mDispatchEvent; +#ifdef MOZ_SMIL + // animation + nsCOMPtr mAnimationRegistry; + PRBool mAnimationEnumerationRequired; +#endif // MOZ_SMIL + PRInt32 mRedrawSuspendCount; }; @@ -170,6 +213,9 @@ NS_INTERFACE_MAP_ENTRY(nsIDOMSVGZoomAndPan) NS_INTERFACE_MAP_ENTRY(nsISVGSVGElement) NS_INTERFACE_MAP_ENTRY(nsSVGCoordCtxProvider) +#ifdef MOZ_SMIL + NS_INTERFACE_MAP_ENTRY(nsISMILAnimationObserver) +#endif NS_INTERFACE_MAP_ENTRY_CONTENT_CLASSINFO(SVGSVGElement) NS_INTERFACE_MAP_END_INHERITING(nsSVGSVGElementBase) @@ -177,7 +223,11 @@ // Implementation nsSVGSVGElement::nsSVGSVGElement(nsINodeInfo* aNodeInfo) - : nsSVGSVGElementBase(aNodeInfo), mRedrawSuspendCount(0) + : nsSVGSVGElementBase(aNodeInfo), +#ifdef MOZ_SMIL + mAnimationEnumerationRequired(PR_FALSE), +#endif + mRedrawSuspendCount(0) { } @@ -1427,6 +1477,50 @@ return mPreviousScale; } +#ifdef MOZ_SMIL +nsISMILAnimationRegistry* +nsSVGSVGElement::GetAnimationRegistry() +{ + nsISMILAnimationRegistry* result = nsnull; + + if (mAnimationRegistry) { + result = mAnimationRegistry; + } else { + // We must not be the outermost SVG element, try to find it + nsCOMPtr outerSVGDOM; + + nsresult rv = GetOwnerSVGElement(getter_AddRefs(outerSVGDOM)); + + if (NS_SUCCEEDED(rv) && outerSVGDOM) { + nsCOMPtr outerSVG( do_QueryInterface(outerSVGDOM) ); + result = outerSVG->GetAnimationRegistry(); + } + } + + return result; +} + +NS_IMETHODIMP +nsSVGSVGElement::EnumerateAnimationNodes() +{ + nsresult rv = NS_OK; + + // This operation should be performed from the outermost SVG element + nsCOMPtr outerSVGDOM; + rv = GetOwnerSVGElement(getter_AddRefs(outerSVGDOM)); + + if (NS_SUCCEEDED(rv) && outerSVGDOM) { + nsCOMPtr outerSVG( do_QueryInterface(outerSVGDOM) ); + rv = outerSVG->EnumerateAnimationNodes(); + } else { + // We must be the outermost SVG element -- use lazy enumeration + mAnimationEnumerationRequired = PR_TRUE; + } + + return rv; +} +#endif // MOZ_SMIL + //---------------------------------------------------------------------- // nsIStyledContent methods @@ -1563,6 +1657,83 @@ aName == nsSVGAtoms::onzoom; } +#ifdef MOZ_SMIL +nsresult +nsSVGSVGElement::BindToTree(nsIDocument* aDocument, + nsIContent* aParent, + nsIContent* aBindingParent, + PRBool aCompileEventHandlers) +{ + nsCOMPtr outerSVG; + + GetOwnerSVGElement(getter_AddRefs(outerSVG)); + + PRBool outermost = (outerSVG == nsnull); + + nsCOMPtr smilController = + GetAnimationController(aDocument, PR_TRUE); + NS_ASSERTION(smilController, "Couldn't get animation controller"); + + if (!mAnimationRegistry && outermost) { + // We are now the outermost SVG element + mAnimationRegistry = NS_NewSMILAnimationRegistry(); + NS_ENSURE_TRUE(mAnimationRegistry, NS_ERROR_FAILURE); + mAnimationRegistry->SetObserver(this); + } else if (mAnimationRegistry && !outermost) { + mAnimationRegistry = nsnull; + } + + nsresult rv = nsSVGSVGElementBase::BindToTree(aDocument, aParent, + aBindingParent, + aCompileEventHandlers); + NS_ENSURE_SUCCESS(rv,rv); + + // XXXbb When implementing pausing, make the time container initially paused + // and then do something like mAnimationRegistry->Unpause(). This would make + // a lot more sense than the following where setting the controller + // effectively starts the animation + + // Eventually this will be done at the same time as the SVGLoad event but + // given that we don't currently support externalResourcesRequired, + // starting up the animation at this time is roughly the same + if (mAnimationRegistry && smilController) + rv = mAnimationRegistry->SetController(smilController); + + return rv; +} + +void +nsSVGSVGElement::UnbindFromTree(PRBool aDeep, PRBool aNullParent) +{ + if (mAnimationRegistry) + mAnimationRegistry->SetController(nsnull); + + nsSVGSVGElementBase::UnbindFromTree(aDeep, aNullParent); +} + +//---------------------------------------------------------------------- +// nsISMILAnimationObserver + +void +nsSVGSVGElement::StartCompositing() +{ + PRUint32 retval; + SuspendRedraw(0, &retval); + + if (mAnimationEnumerationRequired) { + DoEnumerateAnimationNodes(); + mAnimationEnumerationRequired = PR_FALSE; + } +} + +void +nsSVGSVGElement::EndCompositing() +{ + UnsuspendRedraw(0); +} + +#endif // MOZ_SMIL + //---------------------------------------------------------------------- // implementation helpers @@ -1602,3 +1773,53 @@ y = point.y * context->TwipsToPixels(); } } + +#ifdef MOZ_SMIL +nsISMILAnimationController* +nsSVGSVGElement::GetAnimationController(nsIDocument* aDocument, + PRBool aCreate /* = PR_FALSE */) +{ + nsISMILAnimationController* result = nsnull; + + NS_ENSURE_TRUE(aDocument, nsnull); + + nsIPresShell* presShell = aDocument->GetShellAt(0); + NS_ENSURE_TRUE(presShell, nsnull); + + nsPresContext* context = presShell->GetPresContext(); + NS_ENSURE_TRUE(context, nsnull); + + nsIAnimationController* controller = context->GetAnimationController(); + + if (controller) { + nsresult rv = CallQueryInterface(controller, &result); + NS_ENSURE_SUCCESS(rv, nsnull); + } else if (aCreate) { + result = NS_NewSMILAnimationController(); + context->SetAnimationController(result); + } + + return result; +} + +void +nsSVGSVGElement::DoEnumerateAnimationNodes() +{ + PRUint16 position = 0; + nsCOMPtr iter; + NS_NewContentIterator(getter_AddRefs(iter)); + iter->Init(NS_STATIC_CAST(nsIContent*, this)); + + while (!iter->IsDone()) { + nsIContent* content = iter->GetCurrentNode(); + nsIAtom* tag = content->Tag(); + if (tag == nsSVGAtoms::animate) { + nsCOMPtr element( do_QueryInterface(content) ); + if (element) + element->SetDocumentPosition(++position); + } + iter->Next(); + } +} +#endif // MOZ_SMIL + Index: /cvsroot/mozilla/content/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/content/Makefile.in,v retrieving revision 1.10 diff -u -r1.10 Makefile.in --- /cvsroot/mozilla/content/Makefile.in 18 Apr 2005 06:33:19 -0000 1.10 +++ /cvsroot/mozilla/content/Makefile.in 9 Oct 2005 01:13:11 -0000 @@ -53,6 +53,10 @@ DIRS += xtf endif +ifdef MOZ_SMIL +DIRS += smil +endif + DIRS += events include $(topsrcdir)/config/rules.mk Index: /cvsroot/mozilla/dom/public/nsIDOMClassInfo.h =================================================================== RCS file: /cvsroot/mozilla/dom/public/nsIDOMClassInfo.h,v retrieving revision 1.72 diff -u -r1.72 nsIDOMClassInfo.h --- /cvsroot/mozilla/dom/public/nsIDOMClassInfo.h 13 Sep 2005 22:38:34 -0000 1.72 +++ /cvsroot/mozilla/dom/public/nsIDOMClassInfo.h 9 Oct 2005 01:13:14 -0000 @@ -248,6 +248,10 @@ eDOMClassInfo_SVGDocument_id, // SVG element classes +#ifdef MOZ_SMIL + eDOMClassInfo_SVGAnimateElement_id, + eDOMClassInfo_SVGAnimationElement_id, +#endif // MOZ_SMIL eDOMClassInfo_SVGCircleElement_id, eDOMClassInfo_SVGClipPathElement_id, eDOMClassInfo_SVGDefsElement_id, Index: /cvsroot/mozilla/dom/public/idl/svg/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/dom/public/idl/svg/Makefile.in,v retrieving revision 1.22 diff -u -r1.22 Makefile.in --- /cvsroot/mozilla/dom/public/idl/svg/Makefile.in 13 Sep 2005 22:38:34 -0000 1.22 +++ /cvsroot/mozilla/dom/public/idl/svg/Makefile.in 9 Oct 2005 01:13:16 -0000 @@ -121,4 +121,10 @@ nsIDOMSVGZoomEvent.idl \ $(NULL) +ifdef MOZ_SMIL +XPIDLSRCS += nsIDOMSVGAnimateElement.idl \ + nsIDOMSVGAnimationElement.idl \ + $(NULL) +endif + include $(topsrcdir)/config/rules.mk Index: /cvsroot/mozilla/dom/public/idl/svg/nsIDOMSVGAnimateElement.idl =================================================================== RCS file: /cvsroot/mozilla/dom/public/idl/svg/nsIDOMSVGAnimateElement.idl diff -N dom/public/idl/svg/nsIDOMSVGAnimateElement.idl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/dom/public/idl/svg/nsIDOMSVGAnimateElement.idl 9 Oct 2005 01:13:16 -0000 @@ -0,0 +1,43 @@ +/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * The Initial Developer of the Original Code is + * Crocodile Clips Ltd.. + * Portions created by the Initial Developer are Copyright (C) 2001 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsIDOMSVGAnimationElement.idl" + +[scriptable, uuid(0c4297e8-68d0-471d-a933-64132ccc5b97)] +interface nsIDOMSVGAnimateElement : nsIDOMSVGAnimationElement {}; + Index: /cvsroot/mozilla/dom/public/idl/svg/nsIDOMSVGAnimationElement.idl =================================================================== RCS file: /cvsroot/mozilla/dom/public/idl/svg/nsIDOMSVGAnimationElement.idl diff -N dom/public/idl/svg/nsIDOMSVGAnimationElement.idl --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/dom/public/idl/svg/nsIDOMSVGAnimationElement.idl 9 Oct 2005 01:13:16 -0000 @@ -0,0 +1,63 @@ +/* -*- Mode: IDL; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * The Initial Developer of the Original Code is + * Crocodile Clips Ltd.. + * Portions created by the Initial Developer are Copyright (C) 2001 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#include "nsIDOMSVGElement.idl" + +[scriptable, uuid(8f2ccf31-5544-4a9d-8927-ef35d242039e)] +interface nsIDOMSVGAnimationElement + : nsIDOMSVGElement +/* + The SVG DOM makes use of multiple interface inheritance. + Since XPCOM only supports single interface inheritance, + the best thing that we can do is to promise that whenever + an object implements _this_ interface it will also + implement the following interfaces. (We then have to QI to + hop between them.) + + nsIDOMSVGTests, + nsIDOMSVGExternalResourcesRequired, + smil::ElementTimeControl, + events::nsIDOMEventTarget +*/ +{ + readonly attribute nsIDOMSVGElement targetElement; + float getStartTime ( ); + float getCurrentTime ( ); + float getSimpleDuration ( ); + // raises (nsIDOMDOMException) +}; Index: /cvsroot/mozilla/dom/src/base/nsDOMClassInfo.cpp =================================================================== RCS file: /cvsroot/mozilla/dom/src/base/nsDOMClassInfo.cpp,v retrieving revision 1.322 diff -u -r1.322 nsDOMClassInfo.cpp --- /cvsroot/mozilla/dom/src/base/nsDOMClassInfo.cpp 4 Oct 2005 20:38:58 -0000 1.322 +++ /cvsroot/mozilla/dom/src/base/nsDOMClassInfo.cpp 9 Oct 2005 01:13:40 -0000 @@ -328,6 +328,10 @@ #include "nsIDOMSVGAnimPresAspRatio.h" #include "nsIDOMSVGAnimatedRect.h" #include "nsIDOMSVGAnimatedString.h" +#ifdef MOZ_SMIL +#include "nsIDOMSVGAnimateElement.h" +#include "nsIDOMSVGAnimationElement.h" +#endif // MOZ_SMIL #include "nsIDOMSVGAnimTransformList.h" #include "nsIDOMSVGCircleElement.h" #include "nsIDOMSVGClipPathElement.h" @@ -861,6 +865,12 @@ DOCUMENT_SCRIPTABLE_FLAGS) // SVG element classes +#ifdef MOZ_SMIL + NS_DEFINE_CLASSINFO_DATA(SVGAnimateElement, nsElementSH, + ELEMENT_SCRIPTABLE_FLAGS) + NS_DEFINE_CLASSINFO_DATA(SVGAnimationElement, nsElementSH, + ELEMENT_SCRIPTABLE_FLAGS) +#endif // MOZ_SMIL NS_DEFINE_CLASSINFO_DATA(SVGCircleElement, nsElementSH, ELEMENT_SCRIPTABLE_FLAGS) NS_DEFINE_CLASSINFO_DATA(SVGClipPathElement, nsElementSH, @@ -2431,6 +2441,19 @@ // SVG element classes +#ifdef MOZ_SMIL + DOM_CLASSINFO_MAP_BEGIN(SVGAnimateElement, nsIDOMSVGAnimateElement) + DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimationElement) + DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimateElement) + DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES + DOM_CLASSINFO_MAP_END + + DOM_CLASSINFO_MAP_BEGIN(SVGAnimationElement, nsIDOMSVGAnimationElement) + DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGAnimationElement) + DOM_CLASSINFO_SVG_ELEMENT_MAP_ENTRIES + DOM_CLASSINFO_MAP_END +#endif // MOZ_SMIL + DOM_CLASSINFO_MAP_BEGIN(SVGCircleElement, nsIDOMSVGCircleElement) DOM_CLASSINFO_MAP_ENTRY(nsIDOMSVGCircleElement) DOM_CLASSINFO_SVG_GRAPHIC_ELEMENT_MAP_ENTRIES Index: /cvsroot/mozilla/layout/base/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/layout/base/Makefile.in,v retrieving revision 1.22 diff -u -r1.22 Makefile.in --- /cvsroot/mozilla/layout/base/Makefile.in 21 Sep 2005 19:14:29 -0000 1.22 +++ /cvsroot/mozilla/layout/base/Makefile.in 9 Oct 2005 01:13:43 -0000 @@ -112,6 +112,10 @@ nsStyleConsts.h \ $(NULL) +ifdef MOZ_SMIL +EXPORTS += nsIAnimationController.h +endif + CPPSRCS = \ nsBidiUtils.cpp \ nsCSSColorUtils.cpp \ Index: /cvsroot/mozilla/layout/base/nsIAnimationController.h =================================================================== RCS file: /cvsroot/mozilla/layout/base/nsIAnimationController.h diff -N layout/base/nsIAnimationController.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ /cvsroot/mozilla/layout/base/nsIAnimationController.h 9 Oct 2005 01:13:43 -0000 @@ -0,0 +1,56 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is the Mozilla SVG project. + * + * Contributor(s): + * Brian Birtles + * + * Alternatively, the contents of this file may be used under the terms of + * either of the GNU General Public License Version 2 or later (the "GPL"), + * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the MPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ + +#ifndef __NS_IANIMATIONCONTROLLER_H__ +#define __NS_IANIMATIONCONTROLLER_H__ + +#include "nsISupports.h" + +//////////////////////////////////////////////////////////////////////// +// nsIAnimationController: Animation controller + +// {7aa203ea-e6e1-4cca-84af-a29f0eaedef5} +#define NS_IANIMATIONCONTROLLER_IID \ +{ 0x7aa203ea, 0xe6e1, 0x4cca, { 0x84, 0xaf, 0xa2, 0x9f, 0x0e, 0xae, 0xde, 0xf5 } } + +class nsIAnimationController : public nsISupports +{ +public: + NS_DEFINE_STATIC_IID_ACCESSOR(NS_IANIMATIONCONTROLLER_IID) + + virtual nsresult Pause()=0; + virtual nsresult Resume()=0; +}; + +#endif // __NS_IANIMATIONCONTROLLER_H__ + Index: /cvsroot/mozilla/layout/base/nsPresContext.cpp =================================================================== RCS file: /cvsroot/mozilla/layout/base/nsPresContext.cpp,v retrieving revision 3.290 diff -u -r3.290 nsPresContext.cpp --- /cvsroot/mozilla/layout/base/nsPresContext.cpp 23 Aug 2005 23:52:16 -0000 3.290 +++ /cvsroot/mozilla/layout/base/nsPresContext.cpp 9 Oct 2005 01:13:45 -0000 @@ -267,6 +267,10 @@ NS_IF_RELEASE(mDeviceContext); NS_IF_RELEASE(mLookAndFeel); NS_IF_RELEASE(mLangGroup); + +#ifdef MOZ_SMIL + NS_IF_RELEASE(mAnimationController); +#endif } NS_IMPL_ISUPPORTS2(nsPresContext, nsPresContext, nsIObserver) Index: /cvsroot/mozilla/layout/base/nsPresContext.h =================================================================== RCS file: /cvsroot/mozilla/layout/base/nsPresContext.h,v retrieving revision 3.152 diff -u -r3.152 nsPresContext.h --- /cvsroot/mozilla/layout/base/nsPresContext.h 23 Aug 2005 23:52:16 -0000 3.152 +++ /cvsroot/mozilla/layout/base/nsPresContext.h 9 Oct 2005 01:13:46 -0000 @@ -56,6 +56,8 @@ #include "nsCRT.h" #include "nsIPrintSettings.h" #include "nsPropertyTable.h" +#include "nsIAnimationController.h" + #ifdef IBMBIDI class nsBidiPresUtils; #endif // IBMBIDI @@ -626,6 +628,21 @@ */ const nscoord* GetBorderWidthTable() { return mBorderWidthTable; } +#ifdef MOZ_SMIL + nsIAnimationController* GetAnimationController() + { + return mAnimationController; + } + + void SetAnimationController(nsIAnimationController* aController) + { + NS_IF_ADDREF(aController); + nsIAnimationController* temp = mAnimationController; + mAnimationController = aController; + NS_IF_RELEASE(temp); + } +#endif + protected: NS_HIDDEN_(void) SetImgAnimations(nsIContent *aParent, PRUint16 aMode); NS_HIDDEN_(void) GetDocumentColorPreferences(); @@ -669,6 +686,10 @@ nsBidiPresUtils* mBidiUtils; #endif +#ifdef MOZ_SMIL + nsIAnimationController* mAnimationController; // [STRONG] +#endif + nsCOMPtr mTheme; nsCOMPtr mLangService; nsCOMPtr mPrintSettings; Index: /cvsroot/mozilla/layout/build/Makefile.in =================================================================== RCS file: /cvsroot/mozilla/layout/build/Makefile.in,v retrieving revision 1.129 diff -u -r1.129 Makefile.in --- /cvsroot/mozilla/layout/build/Makefile.in 16 Sep 2005 02:25:36 -0000 1.129 +++ /cvsroot/mozilla/layout/build/Makefile.in 9 Oct 2005 01:13:48 -0000 @@ -193,6 +193,12 @@ endif endif +ifdef MOZ_SMIL +SHARED_LIBRARY_LIBS += \ + $(DIST)/lib/$(LIB_PREFIX)gkconsmil_s.$(LIB_SUFFIX) \ + $(NULL) +endif + EXTRA_DSO_LDOPTS = \ $(LIBS_DIR) \ $(EXTRA_DSO_LIBS) \ Index: /cvsroot/mozilla/config/autoconf.mk.in =================================================================== RCS file: /cvsroot/mozilla/config/autoconf.mk.in,v retrieving revision 3.367 diff -u -r3.367 autoconf.mk.in --- /cvsroot/mozilla/config/autoconf.mk.in 16 Sep 2005 02:25:34 -0000 3.367 +++ /cvsroot/mozilla/config/autoconf.mk.in 9 Oct 2005 01:13:55 -0000 @@ -198,6 +198,7 @@ MOZ_LIBART_CFLAGS = @MOZ_LIBART_CFLAGS@ MOZ_ENABLE_CANVAS = @MOZ_ENABLE_CANVAS@ MOZ_CAIRO_CFLAGS = @MOZ_CAIRO_CFLAGS@ +MOZ_SMIL = @MOZ_SMIL@ TX_EXE = @TX_EXE@ # Mac's don't like / in a #include, so we include the libart Index: /cvsroot/mozilla/allmakefiles.sh =================================================================== RCS file: /cvsroot/mozilla/allmakefiles.sh,v retrieving revision 1.585 diff -u -r1.585 allmakefiles.sh --- /cvsroot/mozilla/allmakefiles.sh 31 Aug 2005 22:15:27 -0000 1.585 +++ /cvsroot/mozilla/allmakefiles.sh 9 Oct 2005 01:14:28 -0000 @@ -1340,6 +1340,15 @@ " fi +# smil +if [ "$MOZ_SMIL" ]; then + MAKEFILES_content="$MAKEFILES_content + content/smil/Makefile + content/smil/public/Makefile + content/smil/src/Makefile +" +fi + # xtf if [ "$MOZ_XTF" ]; then MAKEFILES_content="$MAKEFILES_content Index: /cvsroot/mozilla/configure.in =================================================================== RCS file: /cvsroot/mozilla/configure.in,v retrieving revision 1.1530 diff -u -r1.1530 configure.in --- /cvsroot/mozilla/configure.in 16 Sep 2005 02:25:34 -0000 1.1530 +++ /cvsroot/mozilla/configure.in 9 Oct 2005 01:14:46 -0000 @@ -5040,6 +5040,17 @@ dnl fi dnl ======================================================== +dnl SMIL +dnl ======================================================== +MOZ_ARG_ENABLE_BOOL(smil, +[ --enable-smil Enable SMIL animation support], + MOZ_SMIL=1, + MOZ_SMIL= ) +if test -n "$MOZ_SMIL"; then + AC_DEFINE(MOZ_SMIL) +fi + +dnl ======================================================== dnl Transformiix dnl ======================================================== @@ -6649,6 +6660,7 @@ AC_SUBST(MOZ_SVG_RENDERER_GDIPLUS) AC_SUBST(MOZ_SVG_RENDERER_LIBART) AC_SUBST(MOZ_SVG_RENDERER_CAIRO) +AC_SUBST(MOZ_SMIL) AC_SUBST(TX_EXE) AC_SUBST(MOZ_JS_LIBS) AC_SUBST(MOZ_PSM) Index: /cvsroot/mozilla/configure =================================================================== RCS file: /cvsroot/mozilla/configure,v retrieving revision 1.1521 diff -u -r1.1521 configure --- /cvsroot/mozilla/configure 16 Sep 2005 02:32:38 -0000 1.1521 +++ /cvsroot/mozilla/configure 9 Oct 2005 01:15:31 -0000 @@ -184,6 +184,8 @@ ac_help="$ac_help --enable-svg-renderer={gdiplus,libart,cairo}" ac_help="$ac_help + --enable-smil Enable SMIL animation support" +ac_help="$ac_help --disable-installer Disable building of installer" ac_help="$ac_help --disable-updater Disable building of updater" @@ -938,7 +940,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 -echo "configure:942: checking host system type" >&5 +echo "configure:944: checking host system type" >&5 host_alias=$host case "$host_alias" in @@ -959,7 +961,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 -echo "configure:963: checking target system type" >&5 +echo "configure:965: checking target system type" >&5 target_alias=$target case "$target_alias" in @@ -977,7 +979,7 @@ echo "$ac_t""$target" 1>&6 echo $ac_n "checking build system type""... $ac_c" 1>&6 -echo "configure:981: checking build system type" >&5 +echo "configure:983: checking build system type" >&5 build_alias=$build case "$build_alias" in @@ -1047,12 +1049,12 @@ LIBGNOME_VERSION=2.0 MISSING_X= -for ac_prog in gawk mawk nawk awk +for ac_prog in mawk gawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1056: checking for $ac_word" >&5 +echo "configure:1058: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AWK'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1150,7 +1152,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1154: checking for $ac_word" >&5 +echo "configure:1156: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NSINSTALL_BIN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1223,13 +1225,13 @@ _SAVE_LDFLAGS="$LDFLAGS" echo $ac_n "checking for host c compiler""... $ac_c" 1>&6 -echo "configure:1227: checking for host c compiler" >&5 +echo "configure:1229: checking for host c compiler" >&5 for ac_prog in $HOST_CC gcc cc /usr/ucb/cc cl icc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1233: checking for $ac_word" >&5 +echo "configure:1235: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1264,13 +1266,13 @@ fi echo "$ac_t""$HOST_CC" 1>&6 echo $ac_n "checking for host c++ compiler""... $ac_c" 1>&6 -echo "configure:1268: checking for host c++ compiler" >&5 +echo "configure:1270: checking for host c++ compiler" >&5 for ac_prog in $HOST_CXX $CCC c++ g++ gcc CC cxx cc++ cl icc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1274: checking for $ac_word" >&5 +echo "configure:1276: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1319,7 +1321,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1323: checking for $ac_word" >&5 +echo "configure:1325: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1354,7 +1356,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1358: checking for $ac_word" >&5 +echo "configure:1360: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1389,16 +1391,16 @@ LDFLAGS="$HOST_LDFLAGS" echo $ac_n "checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1393: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1395: checking whether the host c compiler ($HOST_CC $HOST_CFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1404: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_hostcc_works=1 echo "$ac_t""yes" 1>&6 else @@ -1413,16 +1415,16 @@ CFLAGS="$HOST_CXXFLAGS" echo $ac_n "checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1417: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 +echo "configure:1419: checking whether the host c++ compiler ($HOST_CXX $HOST_CXXFLAGS $HOST_LDFLAGS) works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:1428: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_prog_hostcxx_works=1 echo "$ac_t""yes" 1>&6 else @@ -1442,7 +1444,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1446: checking for $ac_word" >&5 +echo "configure:1448: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1476,7 +1478,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1480: checking for $ac_word" >&5 +echo "configure:1482: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1506,7 +1508,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1510: checking for $ac_word" >&5 +echo "configure:1512: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1557,7 +1559,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1561: checking for $ac_word" >&5 +echo "configure:1563: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1589,7 +1591,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1593: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:1595: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1600,12 +1602,12 @@ cat > conftest.$ac_ext << EOF -#line 1604 "configure" +#line 1606 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:1609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1631,12 +1633,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1635: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1637: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:1640: checking whether we are using GNU C" >&5 +echo "configure:1642: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1645,7 +1647,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1649: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:1651: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -1664,7 +1666,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:1668: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:1670: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1700,7 +1702,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1704: checking for $ac_word" >&5 +echo "configure:1706: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1736,7 +1738,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1740: checking for $ac_word" >&5 +echo "configure:1742: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1768,7 +1770,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:1772: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:1774: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -1779,12 +1781,12 @@ cat > conftest.$ac_ext << EOF -#line 1783 "configure" +#line 1785 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:1788: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:1790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -1810,12 +1812,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:1814: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:1816: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:1819: checking whether we are using GNU C++" >&5 +echo "configure:1821: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1824,7 +1826,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:1830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -1843,7 +1845,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:1847: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:1849: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1874,63 +1876,12 @@ fi fi -for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat > conftest.$ac_ext < -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF -if { (eval echo configure:1896: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue -fi -rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - - for ac_prog in $RANLIB "${target_alias}-ranlib" "${target}-ranlib" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1934: checking for $ac_word" >&5 +echo "configure:1885: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -1965,7 +1916,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:1969: checking for $ac_word" >&5 +echo "configure:1920: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2000,7 +1951,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2004: checking for $ac_word" >&5 +echo "configure:1955: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2041,7 +1992,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2045: checking for $ac_word" >&5 +echo "configure:1996: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2076,7 +2027,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2080: checking for $ac_word" >&5 +echo "configure:2031: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2111,7 +2062,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2115: checking for $ac_word" >&5 +echo "configure:2066: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2149,7 +2100,7 @@ # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2153: checking for $ac_word" >&5 +echo "configure:2104: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2179,7 +2130,7 @@ # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2183: checking for $ac_word" >&5 +echo "configure:2134: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2230,7 +2181,7 @@ # Extract the first word of "cl", so it can be a program name with args. set dummy cl; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2234: checking for $ac_word" >&5 +echo "configure:2185: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2262,7 +2213,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2266: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:2217: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2273,12 +2224,12 @@ cat > conftest.$ac_ext << EOF -#line 2277 "configure" +#line 2228 "configure" #include "confdefs.h" main(){return(0);} EOF -if { (eval echo configure:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2304,12 +2255,12 @@ { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2308: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2259: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:2313: checking whether we are using GNU C" >&5 +echo "configure:2264: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2318,7 +2269,7 @@ yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2273: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -2337,7 +2288,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:2341: checking whether ${CC-cc} accepts -g" >&5 +echo "configure:2292: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2373,7 +2324,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2377: checking for $ac_word" >&5 +echo "configure:2328: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2405,7 +2356,7 @@ echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:2409: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 +echo "configure:2360: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -2416,12 +2367,12 @@ cat > conftest.$ac_ext << EOF -#line 2420 "configure" +#line 2371 "configure" #include "confdefs.h" int main(){return(0);} EOF -if { (eval echo configure:2425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:2376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cxx_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -2447,12 +2398,12 @@ { echo "configure: error: installation or configuration problem: C++ compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:2451: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:2402: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cxx_cross" 1>&6 cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking whether we are using GNU C++""... $ac_c" 1>&6 -echo "configure:2456: checking whether we are using GNU C++" >&5 +echo "configure:2407: checking whether we are using GNU C++" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gxx'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2461,7 +2412,7 @@ yes; #endif EOF -if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2465: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:2416: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gxx=yes else ac_cv_prog_gxx=no @@ -2480,7 +2431,7 @@ ac_save_CXXFLAGS="$CXXFLAGS" CXXFLAGS= echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 -echo "configure:2484: checking whether ${CXX-g++} accepts -g" >&5 +echo "configure:2435: checking whether ${CXX-g++} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cxx_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2511,61 +2462,10 @@ fi fi -for ac_declaration in \ - ''\ - '#include ' \ - 'extern "C" void std::exit (int) throw (); using std::exit;' \ - 'extern "C" void std::exit (int); using std::exit;' \ - 'extern "C" void exit (int) throw ();' \ - 'extern "C" void exit (int);' \ - 'void exit (int);' -do - cat > conftest.$ac_ext < -$ac_declaration -int main() { -exit (42); -; return 0; } -EOF -if { (eval echo configure:2533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - : -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* - continue -fi -rm -f conftest* - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - break -else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -fi -rm -f conftest* -done -if test -n "$ac_declaration"; then - echo '#ifdef __cplusplus' >>confdefs.h - echo $ac_declaration >>confdefs.h - echo '#endif' >>confdefs.h -fi - - # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2569: checking for $ac_word" >&5 +echo "configure:2469: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2597,7 +2497,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2601: checking for $ac_word" >&5 +echo "configure:2501: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2638,7 +2538,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2642: checking for $ac_word" >&5 +echo "configure:2542: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2673,7 +2573,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2677: checking for $ac_word" >&5 +echo "configure:2577: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2708,7 +2608,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2712: checking for $ac_word" >&5 +echo "configure:2612: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2743,7 +2643,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2747: checking for $ac_word" >&5 +echo "configure:2647: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2832,7 +2732,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:2836: checking for $ac_word" >&5 +echo "configure:2736: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_MIDL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -2874,14 +2774,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:2885: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2899,14 +2799,14 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < int main() { unsigned *test = new unsigned(42); ; return 0; } EOF -if { (eval echo configure:2910: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2810: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -2962,7 +2862,7 @@ _MIDL_REV_VERSION=`echo ${_MIDL_FULL_VERSION} | $AWK -F\. '{ print $3 }'` # Add flags if necessary echo $ac_n "checking for midl flags""... $ac_c" 1>&6 -echo "configure:2966: checking for midl flags" >&5 +echo "configure:2866: checking for midl flags" >&5 if test \( "$_MIDL_MAJOR_VERSION" -gt "6" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" -gt "0" \) -o \( "$_MIDL_MAJOR_VERSION" = "6" -a "$_MIDL_MINOR_VERSION" = "00" -a "$_MIDL_REV_VERSION" -gt "359" \); then # Starting with MIDL version 6.0.359, the MIDL compiler # generates /Oicf /robust stubs by default, which is not @@ -2984,9 +2884,9 @@ _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $1 }'` _W32API_MINOR_VERSION=`echo $W32API_VERSION | $AWK -F\. '{ print $2 }'` echo $ac_n "checking for w32api version >= $W32API_VERSION""... $ac_c" 1>&6 -echo "configure:2988: checking for w32api version >= $W32API_VERSION" >&5 +echo "configure:2888: checking for w32api version >= $W32API_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -2998,7 +2898,7 @@ ; return 0; } EOF -if { (eval echo configure:3002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:2902: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* res=yes else @@ -3014,7 +2914,7 @@ fi # Check windres version echo $ac_n "checking for windres version >= $WINDRES_VERSION""... $ac_c" 1>&6 -echo "configure:3018: checking for windres version >= $WINDRES_VERSION" >&5 +echo "configure:2918: checking for windres version >= $WINDRES_VERSION" >&5 _WINDRES_VERSION=`${WINDRES} --version 2>&1 | grep -i windres 2>/dev/null | $AWK '{ print $3 }'` echo "$ac_t""$_WINDRES_VERSION" 1>&6 _WINDRES_MAJOR_VERSION=`echo $_WINDRES_VERSION | $AWK -F\. '{ print $1 }'` @@ -3041,7 +2941,7 @@ SKIP_COMPILER_CHECKS=1 SKIP_LIBRARY_CHECKS=1 echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3045: checking how to run the C preprocessor" >&5 +echo "configure:2945: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3056,13 +2956,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3066: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2966: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3073,13 +2973,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3083: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:2983: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3090,13 +2990,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3100: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3000: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3124,17 +3024,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:3128: checking for $ac_hdr" >&5 +echo "configure:3028: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3138: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -3165,10 +3065,10 @@ if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then if test "x$CC" != xcc; then echo $ac_n "checking whether $CC and cc understand -c and -o together""... $ac_c" 1>&6 -echo "configure:3169: checking whether $CC and cc understand -c and -o together" >&5 +echo "configure:3069: checking whether $CC and cc understand -c and -o together" >&5 else echo $ac_n "checking whether cc understands -c and -o together""... $ac_c" 1>&6 -echo "configure:3172: checking whether cc understands -c and -o together" >&5 +echo "configure:3072: checking whether cc understands -c and -o together" >&5 fi set dummy $CC; ac_cc="`echo $2 | sed -e 's/[^a-zA-Z0-9_]/_/g' -e 's/^[0-9]/_/'`" @@ -3180,16 +3080,16 @@ # We do the test twice because some compilers refuse to overwrite an # existing .o file with -o, though they will create one. ac_try='${CC-cc} -c conftest.c -o conftest.o 1>&5' -if { (eval echo configure:3184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:3185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +if { (eval echo configure:3084: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:3085: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then eval ac_cv_prog_cc_${ac_cc}_c_o=yes if test "x$CC" != xcc; then # Test first that cc exists at all. - if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3190: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then + if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:3090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ac_try='cc -c conftest.c -o conftest.o 1>&5' - if { (eval echo configure:3192: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && - test -f conftest.o && { (eval echo configure:3193: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; + if { (eval echo configure:3092: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && + test -f conftest.o && { (eval echo configure:3093: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : @@ -3225,7 +3125,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:3229: checking how to run the C preprocessor" >&5 +echo "configure:3129: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -3240,13 +3140,13 @@ # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3250: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3150: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3257,13 +3157,13 @@ rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3267: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3167: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3274,13 +3174,13 @@ rm -rf conftest* CPP="${CC-cc} -nologo -E" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3284: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3184: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3305,7 +3205,7 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 -echo "configure:3309: checking how to run the C++ preprocessor" >&5 +echo "configure:3209: checking how to run the C++ preprocessor" >&5 if test -z "$CXXCPP"; then if eval "test \"`echo '$''{'ac_cv_prog_CXXCPP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3318,12 +3218,12 @@ cross_compiling=$ac_cv_prog_cxx_cross CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:3327: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:3227: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : @@ -3370,7 +3270,7 @@ # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:3374: checking for a BSD compatible install" >&5 +echo "configure:3274: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -3423,7 +3323,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6 -echo "configure:3427: checking whether ln -s works" >&5 +echo "configure:3327: checking whether ln -s works" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3448,7 +3348,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3452: checking for $ac_word" >&5 +echo "configure:3352: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PERL'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3488,7 +3388,7 @@ fi echo $ac_n "checking for minimum required perl version >= $PERL_VERSION""... $ac_c" 1>&6 -echo "configure:3492: checking for minimum required perl version >= $PERL_VERSION" >&5 +echo "configure:3392: checking for minimum required perl version >= $PERL_VERSION" >&5 _perl_version=`PERL_VERSION=$PERL_VERSION $PERL -e 'print "$]"; if ($] >= $ENV{PERL_VERSION}) { exit(0); } else { exit(1); }' 2>&5` _perl_res=$? echo "$ac_t""$_perl_version" 1>&6 @@ -3498,7 +3398,7 @@ fi echo $ac_n "checking for full perl installation""... $ac_c" 1>&6 -echo "configure:3502: checking for full perl installation" >&5 +echo "configure:3402: checking for full perl installation" >&5 _perl_archlib=`$PERL -e 'use Config; if ( -d $Config{archlib} ) { exit(0); } else { exit(1); }' 2>&5` _perl_res=$? if test "$_perl_res" != 0; then @@ -3511,7 +3411,7 @@ # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3515: checking for $ac_word" >&5 +echo "configure:3415: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_DOXYGEN'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3547,7 +3447,7 @@ # Extract the first word of "whoami", so it can be a program name with args. set dummy whoami; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3551: checking for $ac_word" >&5 +echo "configure:3451: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_WHOAMI'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3583,7 +3483,7 @@ # Extract the first word of "autoconf", so it can be a program name with args. set dummy autoconf; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3587: checking for $ac_word" >&5 +echo "configure:3487: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_AUTOCONF'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3619,7 +3519,7 @@ # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3623: checking for $ac_word" >&5 +echo "configure:3523: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_UNZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3657,7 +3557,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3661: checking for $ac_word" >&5 +echo "configure:3561: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ZIP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3698,7 +3598,7 @@ # Extract the first word of "makedepend", so it can be a program name with args. set dummy makedepend; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3702: checking for $ac_word" >&5 +echo "configure:3602: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SYSTEM_MAKEDEPEND'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3733,7 +3633,7 @@ # Extract the first word of "xargs", so it can be a program name with args. set dummy xargs; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3737: checking for $ac_word" >&5 +echo "configure:3637: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XARGS'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3796,7 +3696,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3800: checking for $ac_word" >&5 +echo "configure:3700: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PBBUILD'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3846,7 +3746,7 @@ # Extract the first word of "sdp", so it can be a program name with args. set dummy sdp; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3850: checking for $ac_word" >&5 +echo "configure:3750: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_SDP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3952,7 +3852,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3956: checking for $ac_word" >&5 +echo "configure:3856: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3995,7 +3895,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3999: checking for $ac_word" >&5 +echo "configure:3899: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_MAKE'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -4063,7 +3963,7 @@ # Uses ac_ vars as temps to allow command line to override cache and checks. # --without-x overrides everything else, but does not touch the cache. echo $ac_n "checking for X""... $ac_c" 1>&6 -echo "configure:4067: checking for X" >&5 +echo "configure:3967: checking for X" >&5 # Check whether --with-x or --without-x was given. if test "${with_x+set}" = set; then @@ -4125,12 +4025,12 @@ # First, try using that file with no special directory specified. cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:4134: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:4034: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -4199,14 +4099,14 @@ ac_save_LIBS="$LIBS" LIBS="-l$x_direct_test_library $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* LIBS="$ac_save_LIBS" # We can link X programs with no special library path. @@ -4312,17 +4212,17 @@ case "`(uname -sr) 2>/dev/null`" in "SunOS 5"*) echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6 -echo "configure:4316: checking whether -R must be followed by a space" >&5 +echo "configure:4216: checking whether -R must be followed by a space" >&5 ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4226: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_nospace=yes else @@ -4338,14 +4238,14 @@ else LIBS="$ac_xsave_LIBS -R $x_libraries" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_R_space=yes else @@ -4377,7 +4277,7 @@ # libraries were built with DECnet support. And karl@cs.umb.edu says # the Alpha needs dnet_stub (dnet does not exist). echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6 -echo "configure:4381: checking for dnet_ntoa in -ldnet" >&5 +echo "configure:4281: checking for dnet_ntoa in -ldnet" >&5 ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4385,7 +4285,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4418,7 +4318,7 @@ if test $ac_cv_lib_dnet_dnet_ntoa = no; then echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6 -echo "configure:4422: checking for dnet_ntoa in -ldnet_stub" >&5 +echo "configure:4322: checking for dnet_ntoa in -ldnet_stub" >&5 ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4426,7 +4326,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldnet_stub $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4341: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4466,12 +4366,12 @@ # The nsl library prevents programs from opening the X display # on Irix 5.2, according to dickey@clark.net. echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6 -echo "configure:4470: checking for gethostbyname" >&5 +echo "configure:4370: checking for gethostbyname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyname=yes" else @@ -4515,7 +4415,7 @@ if test $ac_cv_func_gethostbyname = no; then echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6 -echo "configure:4519: checking for gethostbyname in -lnsl" >&5 +echo "configure:4419: checking for gethostbyname in -lnsl" >&5 ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4523,7 +4423,7 @@ ac_save_LIBS="$LIBS" LIBS="-lnsl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4564,12 +4464,12 @@ # -lsocket must be given before -lnsl if both are needed. # We assume that if connect needs -lnsl, so does gethostbyname. echo $ac_n "checking for connect""... $ac_c" 1>&6 -echo "configure:4568: checking for connect" >&5 +echo "configure:4468: checking for connect" >&5 if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4496: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_connect=yes" else @@ -4613,7 +4513,7 @@ if test $ac_cv_func_connect = no; then echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6 -echo "configure:4617: checking for connect in -lsocket" >&5 +echo "configure:4517: checking for connect in -lsocket" >&5 ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4621,7 +4521,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4536: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4656,12 +4556,12 @@ # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX. echo $ac_n "checking for remove""... $ac_c" 1>&6 -echo "configure:4660: checking for remove" >&5 +echo "configure:4560: checking for remove" >&5 if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_remove=yes" else @@ -4705,7 +4605,7 @@ if test $ac_cv_func_remove = no; then echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6 -echo "configure:4709: checking for remove in -lposix" >&5 +echo "configure:4609: checking for remove in -lposix" >&5 ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4713,7 +4613,7 @@ ac_save_LIBS="$LIBS" LIBS="-lposix $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4748,12 +4648,12 @@ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. echo $ac_n "checking for shmat""... $ac_c" 1>&6 -echo "configure:4752: checking for shmat" >&5 +echo "configure:4652: checking for shmat" >&5 if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_shmat=yes" else @@ -4797,7 +4697,7 @@ if test $ac_cv_func_shmat = no; then echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6 -echo "configure:4801: checking for shmat in -lipc" >&5 +echo "configure:4701: checking for shmat in -lipc" >&5 ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4805,7 +4705,7 @@ ac_save_LIBS="$LIBS" LIBS="-lipc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4720: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -4849,7 +4749,7 @@ # libraries we check for below, so use a different variable. # --interran@uluru.Stanford.EDU, kb@cs.umb.edu. echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6 -echo "configure:4853: checking for IceConnectionNumber in -lICE" >&5 +echo "configure:4753: checking for IceConnectionNumber in -lICE" >&5 ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -4857,7 +4757,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $X_EXTRA_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:4772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5278,7 +5178,7 @@ if test "$COMPILE_ENVIRONMENT"; then if test "$GNU_CC"; then echo $ac_n "checking whether ld has archive extraction flags""... $ac_c" 1>&6 -echo "configure:5282: checking whether ld has archive extraction flags" >&5 +echo "configure:5182: checking whether ld has archive extraction flags" >&5 if eval "test \"`echo '$''{'ac_cv_mkshlib_force_and_unforce'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -5295,14 +5195,14 @@ LDFLAGS=$force LIBS=$unforce cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_mkshlib_force_and_unforce=$line; break else @@ -5337,17 +5237,17 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for 64-bit OS""... $ac_c" 1>&6 -echo "configure:5341: checking for 64-bit OS" >&5 +echo "configure:5241: checking for 64-bit OS" >&5 if test "$cross_compiling" = yes; then result="maybe" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:5251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -5506,9 +5406,9 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for VisualAge C++ compiler version >= 5.0.2.0""... $ac_c" 1>&6 -echo "configure:5510: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 +echo "configure:5410: checking for VisualAge C++ compiler version >= 5.0.2.0" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:5421: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -5554,17 +5454,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:5558: checking for $ac_hdr" >&5 +echo "configure:5458: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:5568: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:5468: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -5606,7 +5506,7 @@ LIBS="$LIBS -lbe" if test "$COMPILE_ENVIRONMENT"; then echo $ac_n "checking for main in -lbind""... $ac_c" 1>&6 -echo "configure:5610: checking for main in -lbind" >&5 +echo "configure:5510: checking for main in -lbind" >&5 ac_lib_var=`echo bind'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5614,14 +5514,14 @@ ac_save_LIBS="$LIBS" LIBS="-lbind $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -5642,7 +5542,7 @@ fi echo $ac_n "checking for main in -lzeta""... $ac_c" 1>&6 -echo "configure:5646: checking for main in -lzeta" >&5 +echo "configure:5546: checking for main in -lzeta" >&5 ac_lib_var=`echo zeta'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -5650,14 +5550,14 @@ ac_save_LIBS="$LIBS" LIBS="-lzeta $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:5561: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -6554,9 +6454,9 @@ CC_VERSION=`$CC -V 2>&1 | grep '^cc:' 2>/dev/null | $AWK -F\: '{ print $2 }'` CXX_VERSION=`$CXX -V 2>&1 | grep '^CC:' 2>/dev/null | $AWK -F\: '{ print $2 }'` echo $ac_n "checking for Forte compiler version >= WS6U2""... $ac_c" 1>&6 -echo "configure:6558: checking for Forte compiler version >= WS6U2" >&5 +echo "configure:6458: checking for Forte compiler version >= WS6U2" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6469: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _BAD_COMPILER= else @@ -6687,7 +6587,7 @@ ;; *-darwin*) echo $ac_n "checking for -exported_symbols_list option to ld""... $ac_c" 1>&6 -echo "configure:6691: checking for -exported_symbols_list option to ld" >&5 +echo "configure:6591: checking for -exported_symbols_list option to ld" >&5 if eval "test \"`echo '$''{'ac_cv_exported_symbols_list'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -6727,12 +6627,12 @@ cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -echo "configure:6731: checking for ANSI C header files" >&5 +echo "configure:6631: checking for ANSI C header files" >&5 if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -6740,7 +6640,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:6744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:6644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -6757,7 +6657,7 @@ if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -6775,7 +6675,7 @@ if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. cat > conftest.$ac_ext < EOF @@ -6796,7 +6696,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') @@ -6807,7 +6707,7 @@ exit (0); } EOF -if { (eval echo configure:6811: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:6711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -6831,12 +6731,12 @@ fi echo $ac_n "checking for working const""... $ac_c" 1>&6 -echo "configure:6835: checking for working const" >&5 +echo "configure:6735: checking for working const" >&5 if eval "test \"`echo '$''{'ac_cv_c_const'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6789: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_c_const=yes else @@ -6906,12 +6806,12 @@ fi echo $ac_n "checking for mode_t""... $ac_c" 1>&6 -echo "configure:6910: checking for mode_t" >&5 +echo "configure:6810: checking for mode_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_mode_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6939,12 +6839,12 @@ fi echo $ac_n "checking for off_t""... $ac_c" 1>&6 -echo "configure:6943: checking for off_t" >&5 +echo "configure:6843: checking for off_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_off_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -6972,12 +6872,12 @@ fi echo $ac_n "checking for pid_t""... $ac_c" 1>&6 -echo "configure:6976: checking for pid_t" >&5 +echo "configure:6876: checking for pid_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_pid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -7005,12 +6905,12 @@ fi echo $ac_n "checking for size_t""... $ac_c" 1>&6 -echo "configure:7009: checking for size_t" >&5 +echo "configure:6909: checking for size_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS @@ -7038,12 +6938,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -echo "configure:7042: checking for uid_t in sys/types.h" >&5 +echo "configure:6942: checking for uid_t in sys/types.h" >&5 if eval "test \"`echo '$''{'ac_cv_type_uid_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF @@ -7072,12 +6972,12 @@ fi echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 -echo "configure:7076: checking for st_blksize in struct stat" >&5 +echo "configure:6976: checking for st_blksize in struct stat" >&5 if eval "test \"`echo '$''{'ac_cv_struct_st_blksize'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7085,7 +6985,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF -if { (eval echo configure:7089: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:6989: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else @@ -7106,12 +7006,12 @@ fi echo $ac_n "checking for siginfo_t""... $ac_c" 1>&6 -echo "configure:7110: checking for siginfo_t" >&5 +echo "configure:7010: checking for siginfo_t" >&5 if eval "test \"`echo '$''{'ac_cv_siginfo_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -7119,7 +7019,7 @@ siginfo_t* info; ; return 0; } EOF -if { (eval echo configure:7123: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_siginfo_t=true else @@ -7153,12 +7053,12 @@ fi echo $ac_n "checking for int16_t""... $ac_c" 1>&6 -echo "configure:7157: checking for int16_t" >&5 +echo "configure:7057: checking for int16_t" >&5 if eval "test \"`echo '$''{'ac_cv_int16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7166,7 +7066,7 @@ int16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7170: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7070: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int16_t=true else @@ -7188,12 +7088,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int32_t""... $ac_c" 1>&6 -echo "configure:7192: checking for int32_t" >&5 +echo "configure:7092: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_int32_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7201,7 +7101,7 @@ int32_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7105: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int32_t=true else @@ -7223,12 +7123,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64_t""... $ac_c" 1>&6 -echo "configure:7227: checking for int64_t" >&5 +echo "configure:7127: checking for int64_t" >&5 if eval "test \"`echo '$''{'ac_cv_int64_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7236,7 +7136,7 @@ int64_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7240: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7140: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64_t=true else @@ -7258,12 +7158,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for int64""... $ac_c" 1>&6 -echo "configure:7262: checking for int64" >&5 +echo "configure:7162: checking for int64" >&5 if eval "test \"`echo '$''{'ac_cv_int64'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7271,7 +7171,7 @@ int64 foo = 0; ; return 0; } EOF -if { (eval echo configure:7275: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7175: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int64=true else @@ -7293,12 +7193,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint""... $ac_c" 1>&6 -echo "configure:7297: checking for uint" >&5 +echo "configure:7197: checking for uint" >&5 if eval "test \"`echo '$''{'ac_cv_uint'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7306,7 +7206,7 @@ uint foo = 0; ; return 0; } EOF -if { (eval echo configure:7310: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7210: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint=true else @@ -7328,12 +7228,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint_t""... $ac_c" 1>&6 -echo "configure:7332: checking for uint_t" >&5 +echo "configure:7232: checking for uint_t" >&5 if eval "test \"`echo '$''{'ac_cv_uint_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7341,7 +7241,7 @@ uint_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7345: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7245: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint_t=true else @@ -7363,12 +7263,12 @@ echo "$ac_t""no" 1>&6 fi echo $ac_n "checking for uint16_t""... $ac_c" 1>&6 -echo "configure:7367: checking for uint16_t" >&5 +echo "configure:7267: checking for uint16_t" >&5 if eval "test \"`echo '$''{'ac_cv_uint16_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include @@ -7376,7 +7276,7 @@ uint16_t foo = 0; ; return 0; } EOF -if { (eval echo configure:7380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_uint16_t=true else @@ -7407,12 +7307,12 @@ echo $ac_n "checking for uname.domainname""... $ac_c" 1>&6 -echo "configure:7411: checking for uname.domainname" >&5 +echo "configure:7311: checking for uname.domainname" >&5 if eval "test \"`echo '$''{'ac_cv_have_uname_domainname_field'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -7420,7 +7320,7 @@ (void)uname(res); if (res != 0) { domain = res->domainname; } ; return 0; } EOF -if { (eval echo configure:7424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7324: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_domainname_field=true else @@ -7444,12 +7344,12 @@ fi echo $ac_n "checking for uname.__domainname""... $ac_c" 1>&6 -echo "configure:7448: checking for uname.__domainname" >&5 +echo "configure:7348: checking for uname.__domainname" >&5 if eval "test \"`echo '$''{'ac_cv_have_uname_us_domainname_field'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { @@ -7457,7 +7357,7 @@ (void)uname(res); if (res != 0) { domain = res->__domainname; } ; return 0; } EOF -if { (eval echo configure:7461: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7361: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_have_uname_us_domainname_field=true else @@ -7490,7 +7390,7 @@ echo $ac_n "checking for usable wchar_t (2 bytes, unsigned)""... $ac_c" 1>&6 -echo "configure:7494: checking for usable wchar_t (2 bytes, unsigned)" >&5 +echo "configure:7394: checking for usable wchar_t (2 bytes, unsigned)" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7498,14 +7398,14 @@ ac_cv_have_usable_wchar="maybe" else cat > conftest.$ac_ext < int main () { return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ; } EOF -if { (eval echo configure:7509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_have_usable_wchar="yes" else @@ -7540,7 +7440,7 @@ CXXFLAGS="$CXXFLAGS -fshort-wchar" echo $ac_n "checking for compiler -fshort-wchar option""... $ac_c" 1>&6 -echo "configure:7544: checking for compiler -fshort-wchar option" >&5 +echo "configure:7444: checking for compiler -fshort-wchar option" >&5 if eval "test \"`echo '$''{'ac_cv_have_usable_wchar_option'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7548,14 +7448,17 @@ ac_cv_have_usable_wchar_option="maybe" else cat > conftest.$ac_ext < int main () { return (sizeof(wchar_t) != 2) || (wchar_t)-1 < (wchar_t) 0 ; } EOF -if { (eval echo configure:7559: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:7462: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_have_usable_wchar_option="yes" else @@ -7591,7 +7494,7 @@ if test "$GNU_CC"; then echo $ac_n "checking for visibility(hidden) attribute""... $ac_c" 1>&6 -echo "configure:7595: checking for visibility(hidden) attribute" >&5 +echo "configure:7498: checking for visibility(hidden) attribute" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_hidden'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7615,7 +7518,7 @@ EOF echo $ac_n "checking for visibility pragma support""... $ac_c" 1>&6 -echo "configure:7619: checking for visibility pragma support" >&5 +echo "configure:7522: checking for visibility pragma support" >&5 if eval "test \"`echo '$''{'ac_cv_visibility_pragma'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -7657,12 +7560,12 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr that defines DIR""... $ac_c" 1>&6 -echo "configure:7661: checking for $ac_hdr that defines DIR" >&5 +echo "configure:7564: checking for $ac_hdr that defines DIR" >&5 if eval "test \"`echo '$''{'ac_cv_header_dirent_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include <$ac_hdr> @@ -7670,7 +7573,7 @@ DIR *dirp = 0; ; return 0; } EOF -if { (eval echo configure:7674: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:7577: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else @@ -7695,7 +7598,7 @@ # Two versions of opendir et al. are in -ldir and -lx on SCO Xenix. if test $ac_header_dirent = dirent.h; then echo $ac_n "checking for opendir in -ldir""... $ac_c" 1>&6 -echo "configure:7699: checking for opendir in -ldir" >&5 +echo "configure:7602: checking for opendir in -ldir" >&5 ac_lib_var=`echo dir'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7703,7 +7606,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldir $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7621: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7736,7 +7639,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 -echo "configure:7740: checking for opendir in -lx" >&5 +echo "configure:7643: checking for opendir in -lx" >&5 ac_lib_var=`echo x'_'opendir | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -7744,7 +7647,7 @@ ac_save_LIBS="$LIBS" LIBS="-lx $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:7662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -7787,17 +7690,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7791: checking for $ac_hdr" >&5 +echo "configure:7694: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7801: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7704: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7827,17 +7730,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7831: checking for $ac_hdr" >&5 +echo "configure:7734: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7841: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7744: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7867,17 +7770,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7871: checking for $ac_hdr" >&5 +echo "configure:7774: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7784: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7907,17 +7810,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7911: checking for $ac_hdr" >&5 +echo "configure:7814: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7921: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7824: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7947,17 +7850,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7951: checking for $ac_hdr" >&5 +echo "configure:7854: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:7961: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7864: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -7988,17 +7891,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:7992: checking for $ac_hdr" >&5 +echo "configure:7895: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7905: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8029,17 +7932,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8033: checking for $ac_hdr" >&5 +echo "configure:7936: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8043: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7946: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8076,17 +7979,17 @@ NEW_H=new.h ac_safe=`echo "new" | sed 'y%./+-%__p_%'` echo $ac_n "checking for new""... $ac_c" 1>&6 -echo "configure:8080: checking for new" >&5 +echo "configure:7983: checking for new" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8090: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:7993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8127,17 +8030,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:8131: checking for $ac_hdr" >&5 +echo "configure:8034: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8141: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8044: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8171,7 +8074,7 @@ ;; *) echo $ac_n "checking for gethostbyname_r in -lc_r""... $ac_c" 1>&6 -echo "configure:8175: checking for gethostbyname_r in -lc_r" >&5 +echo "configure:8078: checking for gethostbyname_r in -lc_r" >&5 ac_lib_var=`echo c_r'_'gethostbyname_r | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8179,7 +8082,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8097: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8225,7 +8128,7 @@ ;; *) echo $ac_n "checking for atan in -lm""... $ac_c" 1>&6 -echo "configure:8229: checking for atan in -lm" >&5 +echo "configure:8132: checking for atan in -lm" >&5 ac_lib_var=`echo m'_'atan | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8233,7 +8136,7 @@ ac_save_LIBS="$LIBS" LIBS="-lm $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8151: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8272,7 +8175,7 @@ fi echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 -echo "configure:8276: checking for dlopen in -ldl" >&5 +echo "configure:8179: checking for dlopen in -ldl" >&5 ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8280,7 +8183,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8308,17 +8211,17 @@ echo "$ac_t""yes" 1>&6 ac_safe=`echo "dlfcn.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for dlfcn.h""... $ac_c" 1>&6 -echo "configure:8312: checking for dlfcn.h" >&5 +echo "configure:8215: checking for dlfcn.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8322: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8225: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8354,7 +8257,7 @@ case $target in *-aix*) echo $ac_n "checking for demangle in -lC_r""... $ac_c" 1>&6 -echo "configure:8358: checking for demangle in -lC_r" >&5 +echo "configure:8261: checking for demangle in -lC_r" >&5 ac_lib_var=`echo C_r'_'demangle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8362,7 +8265,7 @@ ac_save_LIBS="$LIBS" LIBS="-lC_r $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8403,7 +8306,7 @@ ;; *) echo $ac_n "checking for demangle in -lC""... $ac_c" 1>&6 -echo "configure:8407: checking for demangle in -lC" >&5 +echo "configure:8310: checking for demangle in -lC" >&5 ac_lib_var=`echo C'_'demangle | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8411,7 +8314,7 @@ ac_save_LIBS="$LIBS" LIBS="-lC $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8453,7 +8356,7 @@ esac fi echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 -echo "configure:8457: checking for socket in -lsocket" >&5 +echo "configure:8360: checking for socket in -lsocket" >&5 ac_lib_var=`echo socket'_'socket | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8461,7 +8364,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsocket $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8379: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8517,7 +8420,7 @@ _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XDrawLines in -lX11""... $ac_c" 1>&6 -echo "configure:8521: checking for XDrawLines in -lX11" >&5 +echo "configure:8424: checking for XDrawLines in -lX11" >&5 ac_lib_var=`echo X11'_'XDrawLines | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8525,7 +8428,7 @@ ac_save_LIBS="$LIBS" LIBS="-lX11 $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8558,7 +8461,7 @@ fi echo $ac_n "checking for XextAddDisplay in -lXext""... $ac_c" 1>&6 -echo "configure:8562: checking for XextAddDisplay in -lXext" >&5 +echo "configure:8465: checking for XextAddDisplay in -lXext" >&5 ac_lib_var=`echo Xext'_'XextAddDisplay | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8566,7 +8469,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8484: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8601,7 +8504,7 @@ echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:8605: checking for XtFree in -lXt" >&5 +echo "configure:8508: checking for XtFree in -lXt" >&5 ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8609,7 +8512,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8641,7 +8544,7 @@ unset ac_cv_lib_Xt_XtFree echo $ac_n "checking for IceFlush in -lICE""... $ac_c" 1>&6 -echo "configure:8645: checking for IceFlush in -lICE" >&5 +echo "configure:8548: checking for IceFlush in -lICE" >&5 ac_lib_var=`echo ICE'_'IceFlush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8649,7 +8552,7 @@ ac_save_LIBS="$LIBS" LIBS="-lICE $XT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8681,7 +8584,7 @@ fi echo $ac_n "checking for SmcCloseConnection in -lSM""... $ac_c" 1>&6 -echo "configure:8685: checking for SmcCloseConnection in -lSM" >&5 +echo "configure:8588: checking for SmcCloseConnection in -lSM" >&5 ac_lib_var=`echo SM'_'SmcCloseConnection | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8689,7 +8592,7 @@ ac_save_LIBS="$LIBS" LIBS="-lSM $XT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8607: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8721,7 +8624,7 @@ fi echo $ac_n "checking for XtFree in -lXt""... $ac_c" 1>&6 -echo "configure:8725: checking for XtFree in -lXt" >&5 +echo "configure:8628: checking for XtFree in -lXt" >&5 ac_lib_var=`echo Xt'_'XtFree | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8729,7 +8632,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXt $X_PRE_LIBS $XT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8774,7 +8677,7 @@ esac echo $ac_n "checking for XineramaIsActive in -lXinerama""... $ac_c" 1>&6 -echo "configure:8778: checking for XineramaIsActive in -lXinerama" >&5 +echo "configure:8681: checking for XineramaIsActive in -lXinerama" >&5 ac_lib_var=`echo Xinerama'_'XineramaIsActive | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8782,7 +8685,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXinerama $XLIBS $XEXT_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8815,17 +8718,17 @@ ac_safe=`echo "X11/extensions/Xinerama.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/Xinerama.h""... $ac_c" 1>&6 -echo "configure:8819: checking for X11/extensions/Xinerama.h" >&5 +echo "configure:8722: checking for X11/extensions/Xinerama.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8732: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8848,7 +8751,7 @@ echo $ac_n "checking for XShmCreateImage in -lXext""... $ac_c" 1>&6 -echo "configure:8852: checking for XShmCreateImage in -lXext" >&5 +echo "configure:8755: checking for XShmCreateImage in -lXext" >&5 ac_lib_var=`echo Xext'_'XShmCreateImage | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8856,7 +8759,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXext $XLIBS $XEXT_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8774: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8889,17 +8792,17 @@ ac_safe=`echo "X11/extensions/XShm.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/XShm.h""... $ac_c" 1>&6 -echo "configure:8893: checking for X11/extensions/XShm.h" >&5 +echo "configure:8796: checking for X11/extensions/XShm.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8806: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -8929,7 +8832,7 @@ fi echo $ac_n "checking for XieFloGeometry in -lXIE""... $ac_c" 1>&6 -echo "configure:8933: checking for XieFloGeometry in -lXIE" >&5 +echo "configure:8836: checking for XieFloGeometry in -lXIE" >&5 ac_lib_var=`echo XIE'_'XieFloGeometry | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -8937,7 +8840,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXIE $XLIBS $XEXT_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:8855: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -8970,17 +8873,17 @@ ac_safe=`echo "X11/extensions/XIElib.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for X11/extensions/XIElib.h""... $ac_c" 1>&6 -echo "configure:8974: checking for X11/extensions/XIElib.h" >&5 +echo "configure:8877: checking for X11/extensions/XIElib.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:8984: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:8887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -9054,7 +8957,7 @@ # Extract the first word of "freetype-config", so it can be a program name with args. set dummy freetype-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:9058: checking for $ac_word" >&5 +echo "configure:8961: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_FT2_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9090,7 +8993,7 @@ min_ft_version=6.1.0 echo $ac_n "checking for FreeType - version >= $min_ft_version""... $ac_c" 1>&6 -echo "configure:9094: checking for FreeType - version >= $min_ft_version" >&5 +echo "configure:8997: checking for FreeType - version >= $min_ft_version" >&5 no_ft="" if test "$FT2_CONFIG" = "no" ; then no_ft=yes @@ -9138,7 +9041,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -9164,7 +9067,7 @@ } EOF -if { (eval echo configure:9168: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9071: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -9221,7 +9124,7 @@ *) echo $ac_n "checking for pthread_create in -lpthreads""... $ac_c" 1>&6 -echo "configure:9225: checking for pthread_create in -lpthreads" >&5 +echo "configure:9128: checking for pthread_create in -lpthreads" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -9243,7 +9146,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lpthread""... $ac_c" 1>&6 -echo "configure:9247: checking for pthread_create in -lpthread" >&5 +echo "configure:9150: checking for pthread_create in -lpthread" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -9265,7 +9168,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc_r""... $ac_c" 1>&6 -echo "configure:9269: checking for pthread_create in -lc_r" >&5 +echo "configure:9172: checking for pthread_create in -lc_r" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -9287,7 +9190,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for pthread_create in -lc""... $ac_c" 1>&6 -echo "configure:9291: checking for pthread_create in -lc" >&5 +echo "configure:9194: checking for pthread_create in -lc" >&5 echo " #include void *foo(void *v) { int a = 1; } @@ -9345,7 +9248,7 @@ rm -f conftest* ac_cv_have_dash_pthread=no echo $ac_n "checking whether ${CC-cc} accepts -pthread""... $ac_c" 1>&6 -echo "configure:9349: checking whether ${CC-cc} accepts -pthread" >&5 +echo "configure:9252: checking whether ${CC-cc} accepts -pthread" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthread -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -9368,7 +9271,7 @@ ac_cv_have_dash_pthreads=no if test "$ac_cv_have_dash_pthread" = "no"; then echo $ac_n "checking whether ${CC-cc} accepts -pthreads""... $ac_c" 1>&6 -echo "configure:9372: checking whether ${CC-cc} accepts -pthreads" >&5 +echo "configure:9275: checking whether ${CC-cc} accepts -pthreads" >&5 echo 'int main() { return 0; }' | cat > conftest.c ${CC-cc} -pthreads -o conftest conftest.c > conftest.out 2>&1 if test $? -eq 0; then @@ -9490,7 +9393,7 @@ echo $ac_n "checking whether mmap() sees write()s""... $ac_c" 1>&6 -echo "configure:9494: checking whether mmap() sees write()s" >&5 +echo "configure:9397: checking whether mmap() sees write()s" >&5 mmap_test_prog=' @@ -9529,11 +9432,11 @@ result="yes" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -9558,13 +9461,13 @@ if test $ac_cv_prog_gcc = yes; then echo $ac_n "checking whether ${CC-cc} needs -traditional""... $ac_c" 1>&6 -echo "configure:9562: checking whether ${CC-cc} needs -traditional" >&5 +echo "configure:9465: checking whether ${CC-cc} needs -traditional" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc_traditional'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_pattern="Autoconf.*'x'" cat > conftest.$ac_ext < Autoconf TIOCGETP @@ -9582,7 +9485,7 @@ if test $ac_cv_prog_gcc_traditional = no; then cat > conftest.$ac_ext < Autoconf TCGETA @@ -9604,7 +9507,7 @@ fi echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 -echo "configure:9608: checking for 8-bit clean memcmp" >&5 +echo "configure:9511: checking for 8-bit clean memcmp" >&5 if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -9612,7 +9515,7 @@ ac_cv_func_memcmp_clean=no else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:9529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_memcmp_clean=yes else @@ -9642,12 +9545,12 @@ for ac_func in random strerror lchown fchmod snprintf statvfs memmove rint stat64 lstat64 do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9646: checking for $ac_func" >&5 +echo "configure:9549: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9697,12 +9600,12 @@ for ac_func in flockfile getpagesize do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9701: checking for $ac_func" >&5 +echo "configure:9604: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9632: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9754,12 +9657,12 @@ for ac_func in localtime_r strtok_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:9758: checking for $ac_func" >&5 +echo "configure:9661: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -9818,19 +9721,19 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for wcrtomb""... $ac_c" 1>&6 -echo "configure:9822: checking for wcrtomb" >&5 +echo "configure:9725: checking for wcrtomb" >&5 if eval "test \"`echo '$''{'ac_cv_have_wcrtomb'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { mbstate_t ps={0};wcrtomb(0,'f',&ps); ; return 0; } EOF -if { (eval echo configure:9834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9737: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_wcrtomb="yes" else @@ -9850,19 +9753,19 @@ fi echo $ac_n "checking for mbrtowc""... $ac_c" 1>&6 -echo "configure:9854: checking for mbrtowc" >&5 +echo "configure:9757: checking for mbrtowc" >&5 if eval "test \"`echo '$''{'ac_cv_have_mbrtowc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { mbstate_t ps={0};mbrtowc(0,0,0,&ps); ; return 0; } EOF -if { (eval echo configure:9866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_have_mbrtowc="yes" else @@ -9891,12 +9794,12 @@ fi echo $ac_n "checking for res_ninit()""... $ac_c" 1>&6 -echo "configure:9895: checking for res_ninit()" >&5 +echo "configure:9798: checking for res_ninit()" >&5 if eval "test \"`echo '$''{'ac_cv_func_res_ninit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_res_ninit=yes else @@ -9938,12 +9841,12 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for gnu_get_libc_version()""... $ac_c" 1>&6 -echo "configure:9942: checking for gnu_get_libc_version()" >&5 +echo "configure:9845: checking for gnu_get_libc_version()" >&5 if eval "test \"`echo '$''{'ac_cv_func_gnu_get_libc_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9861: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_gnu_get_libc_version=yes else @@ -9983,7 +9886,7 @@ *) echo $ac_n "checking for iconv in -lc""... $ac_c" 1>&6 -echo "configure:9987: checking for iconv in -lc" >&5 +echo "configure:9890: checking for iconv in -lc" >&5 ac_lib_var=`echo c'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -9991,7 +9894,7 @@ ac_save_LIBS="$LIBS" LIBS="-lc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10024,7 +9927,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for iconv in -liconv""... $ac_c" 1>&6 -echo "configure:10028: checking for iconv in -liconv" >&5 +echo "configure:9931: checking for iconv in -liconv" >&5 ac_lib_var=`echo iconv'_'iconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10032,7 +9935,7 @@ ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10065,7 +9968,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for libiconv in -liconv""... $ac_c" 1>&6 -echo "configure:10069: checking for libiconv in -liconv" >&5 +echo "configure:9972: checking for libiconv in -liconv" >&5 ac_lib_var=`echo iconv'_'libiconv | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10073,7 +9976,7 @@ ac_save_LIBS="$LIBS" LIBS="-liconv $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:9994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -10114,12 +10017,12 @@ _SAVE_LIBS=$LIBS LIBS="$LIBS $_ICONV_LIBS" echo $ac_n "checking for iconv()""... $ac_c" 1>&6 -echo "configure:10118: checking for iconv()" >&5 +echo "configure:10021: checking for iconv()" >&5 if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10133,7 +10036,7 @@ ; return 0; } EOF -if { (eval echo configure:10137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_iconv=yes else @@ -10157,12 +10060,12 @@ LIBXUL_LIBS="$LIBXUL_LIBS $_ICONV_LIBS" LIBICONV="$_ICONV_LIBS" echo $ac_n "checking for iconv() with const input""... $ac_c" 1>&6 -echo "configure:10161: checking for iconv() with const input" >&5 +echo "configure:10064: checking for iconv() with const input" >&5 if eval "test \"`echo '$''{'ac_cv_func_const_iconv'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -10177,7 +10080,7 @@ ; return 0; } EOF -if { (eval echo configure:10181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_func_const_iconv=yes else @@ -10206,19 +10109,19 @@ echo $ac_n "checking for nl_langinfo and CODESET""... $ac_c" 1>&6 -echo "configure:10210: checking for nl_langinfo and CODESET" >&5 +echo "configure:10113: checking for nl_langinfo and CODESET" >&5 if eval "test \"`echo '$''{'am_cv_langinfo_codeset'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char* cs = nl_langinfo(CODESET); ; return 0; } EOF -if { (eval echo configure:10222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10125: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* am_cv_langinfo_codeset=yes else @@ -10250,7 +10153,7 @@ echo $ac_n "checking for an implementation of va_copy()""... $ac_c" 1>&6 -echo "configure:10254: checking for an implementation of va_copy()" >&5 +echo "configure:10157: checking for an implementation of va_copy()" >&5 if eval "test \"`echo '$''{'ac_cv_va_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10260,7 +10163,7 @@ else cat > conftest.$ac_ext < @@ -10274,7 +10177,7 @@ } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_va_copy=yes else @@ -10291,7 +10194,7 @@ echo "$ac_t""$ac_cv_va_copy" 1>&6 echo $ac_n "checking for an implementation of __va_copy()""... $ac_c" 1>&6 -echo "configure:10295: checking for an implementation of __va_copy()" >&5 +echo "configure:10198: checking for an implementation of __va_copy()" >&5 if eval "test \"`echo '$''{'ac_cv___va_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10301,7 +10204,7 @@ else cat > conftest.$ac_ext < @@ -10315,7 +10218,7 @@ } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10319: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10222: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv___va_copy=yes else @@ -10332,7 +10235,7 @@ echo "$ac_t""$ac_cv___va_copy" 1>&6 echo $ac_n "checking whether va_lists can be copied by value""... $ac_c" 1>&6 -echo "configure:10336: checking whether va_lists can be copied by value" >&5 +echo "configure:10239: checking whether va_lists can be copied by value" >&5 if eval "test \"`echo '$''{'ac_cv_va_val_copy'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -10342,7 +10245,7 @@ else cat > conftest.$ac_ext < @@ -10356,7 +10259,7 @@ } int main() { f (0, 42); return 0; } EOF -if { (eval echo configure:10360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_va_val_copy=yes else @@ -10455,7 +10358,7 @@ if test "$GNU_CXX"; then echo $ac_n "checking for C++ exceptions flag""... $ac_c" 1>&6 -echo "configure:10459: checking for C++ exceptions flag" >&5 +echo "configure:10362: checking for C++ exceptions flag" >&5 if eval "test \"`echo '$''{'ac_cv_cxx_exceptions_flags'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -10490,12 +10393,12 @@ HAVE_GCC3_ABI= if test "$GNU_CC"; then echo $ac_n "checking for gcc 3.0 ABI""... $ac_c" 1>&6 -echo "configure:10494: checking for gcc 3.0 ABI" >&5 +echo "configure:10397: checking for gcc 3.0 ABI" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_three_abi'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10415: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_gcc_three_abi="yes" else @@ -10532,12 +10435,12 @@ echo $ac_n "checking for C++ \"explicit\" keyword""... $ac_c" 1>&6 -echo "configure:10536: checking for C++ \"explicit\" keyword" >&5 +echo "configure:10439: checking for C++ \"explicit\" keyword" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_explicit'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10454: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_explicit=yes else @@ -10568,12 +10471,12 @@ fi echo $ac_n "checking for C++ \"typename\" keyword""... $ac_c" 1>&6 -echo "configure:10572: checking for C++ \"typename\" keyword" >&5 +echo "configure:10475: checking for C++ \"typename\" keyword" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_typename'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10499: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_typename=yes else @@ -10613,12 +10516,12 @@ fi echo $ac_n "checking for modern C++ template specialization syntax support""... $ac_c" 1>&6 -echo "configure:10617: checking for modern C++ template specialization syntax support" >&5 +echo "configure:10520: checking for modern C++ template specialization syntax support" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_modern_specialize_template_syntax'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct X { int a; }; class Y {}; @@ -10628,7 +10531,7 @@ X y_x; ; return 0; } EOF -if { (eval echo configure:10632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10535: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_modern_specialize_template_syntax=yes else @@ -10650,12 +10553,12 @@ echo $ac_n "checking whether partial template specialization works""... $ac_c" 1>&6 -echo "configure:10654: checking whether partial template specialization works" >&5 +echo "configure:10557: checking whether partial template specialization works" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_partial_specialization'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class Foo {}; template class Foo {}; @@ -10663,7 +10566,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:10667: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10570: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_partial_specialization=yes else @@ -10684,12 +10587,12 @@ fi echo $ac_n "checking whether operators must be re-defined for templates derived from templates""... $ac_c" 1>&6 -echo "configure:10688: checking whether operators must be re-defined for templates derived from templates" >&5 +echo "configure:10591: checking whether operators must be re-defined for templates derived from templates" >&5 if eval "test \"`echo '$''{'ac_cv_need_derived_template_operators'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class Base { }; template @@ -10701,7 +10604,7 @@ return 0; ; return 0; } EOF -if { (eval echo configure:10705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10608: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_derived_template_operators=no else @@ -10723,12 +10626,12 @@ echo $ac_n "checking whether we need to cast a derived template to pass as its base class""... $ac_c" 1>&6 -echo "configure:10727: checking whether we need to cast a derived template to pass as its base class" >&5 +echo "configure:10630: checking whether we need to cast a derived template to pass as its base class" >&5 if eval "test \"`echo '$''{'ac_cv_need_cpp_template_cast_to_base'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class Base { }; template class Derived : public Base { }; @@ -10737,7 +10640,7 @@ Derived bar; return foo(bar); ; return 0; } EOF -if { (eval echo configure:10741: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10644: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_need_cpp_template_cast_to_base=no else @@ -10758,12 +10661,12 @@ fi echo $ac_n "checking whether the compiler can resolve const ambiguities for templates""... $ac_c" 1>&6 -echo "configure:10762: checking whether the compiler can resolve const ambiguities for templates" >&5 +echo "configure:10665: checking whether the compiler can resolve const ambiguities for templates" >&5 if eval "test \"`echo '$''{'ac_cv_can_resolve_const_ambiguity'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < class ptrClass { @@ -10784,7 +10687,7 @@ a(&i); ; return 0; } EOF -if { (eval echo configure:10788: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10691: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_can_resolve_const_ambiguity=yes else @@ -10806,12 +10709,12 @@ echo $ac_n "checking whether the C++ \"using\" keyword can change access""... $ac_c" 1>&6 -echo "configure:10810: checking whether the C++ \"using\" keyword can change access" >&5 +echo "configure:10713: checking whether the C++ \"using\" keyword can change access" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_access_changing_using2'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10726: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10737: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_access_changing_using2=no else @@ -10858,12 +10761,12 @@ fi echo $ac_n "checking whether the C++ \"using\" keyword resolves ambiguity""... $ac_c" 1>&6 -echo "configure:10862: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 +echo "configure:10765: checking whether the C++ \"using\" keyword resolves ambiguity" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_ambiguity_resolving_using'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10786: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_ambiguity_resolving_using=yes else @@ -10900,19 +10803,19 @@ fi echo $ac_n "checking for \"std::\" namespace""... $ac_c" 1>&6 -echo "configure:10904: checking for \"std::\" namespace" >&5 +echo "configure:10807: checking for \"std::\" namespace" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_namespace_std'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { return std::min(0, 1); ; return 0; } EOF -if { (eval echo configure:10916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_namespace_std=yes else @@ -10933,12 +10836,12 @@ fi echo $ac_n "checking whether standard template operator!=() is ambiguous""... $ac_c" 1>&6 -echo "configure:10937: checking whether standard template operator!=() is ambiguous" >&5 +echo "configure:10840: checking whether standard template operator!=() is ambiguous" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_unambiguous_std_notequal'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < struct T1 {}; @@ -10948,7 +10851,7 @@ T1 a,b; return a != b; ; return 0; } EOF -if { (eval echo configure:10952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10855: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_unambiguous_std_notequal=unambiguous else @@ -10970,12 +10873,12 @@ echo $ac_n "checking for C++ reinterpret_cast""... $ac_c" 1>&6 -echo "configure:10974: checking for C++ reinterpret_cast" >&5 +echo "configure:10877: checking for C++ reinterpret_cast" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_reinterpret_cast'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <(z); ; return 0; } EOF -if { (eval echo configure:10987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:10890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cpp_reinterpret_cast=yes else @@ -11004,7 +10907,7 @@ fi echo $ac_n "checking for C++ dynamic_cast to void*""... $ac_c" 1>&6 -echo "configure:11008: checking for C++ dynamic_cast to void*" >&5 +echo "configure:10911: checking for C++ dynamic_cast to void*" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_dynamic_cast_void_ptr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11012,8 +10915,11 @@ ac_cv_cpp_dynamic_cast_void_ptr=no else cat > conftest.$ac_ext <(suby)))); } EOF -if { (eval echo configure:11032: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:10938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_cpp_dynamic_cast_void_ptr=yes else @@ -11052,19 +10958,19 @@ echo $ac_n "checking whether C++ requires implementation of unused virtual methods""... $ac_c" 1>&6 -echo "configure:11056: checking whether C++ requires implementation of unused virtual methods" >&5 +echo "configure:10962: checking whether C++ requires implementation of unused virtual methods" >&5 if eval "test \"`echo '$''{'ac_cv_cpp_unused_required'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:10974: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_cpp_unused_required=no else @@ -11087,12 +10993,12 @@ echo $ac_n "checking for trouble comparing to zero near std::operator!=()""... $ac_c" 1>&6 -echo "configure:11091: checking for trouble comparing to zero near std::operator!=()" >&5 +echo "configure:10997: checking for trouble comparing to zero near std::operator!=()" >&5 if eval "test \"`echo '$''{'ac_cv_trouble_comparing_to_zero'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < template class Foo {}; @@ -11103,7 +11009,7 @@ Foo f; return (0 != f); ; return 0; } EOF -if { (eval echo configure:11107: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11013: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_trouble_comparing_to_zero=no else @@ -11135,19 +11041,19 @@ echo $ac_n "checking for LC_MESSAGES""... $ac_c" 1>&6 -echo "configure:11139: checking for LC_MESSAGES" >&5 +echo "configure:11045: checking for LC_MESSAGES" >&5 if eval "test \"`echo '$''{'ac_cv_i18n_lc_messages'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { int category = LC_MESSAGES; ; return 0; } EOF -if { (eval echo configure:11151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:11057: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_i18n_lc_messages=yes else @@ -11228,7 +11134,7 @@ # Extract the first word of "nspr-config", so it can be a program name with args. set dummy nspr-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11232: checking for $ac_word" >&5 +echo "configure:11138: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_NSPR_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11263,7 +11169,7 @@ min_nspr_version=4.0.0 echo $ac_n "checking for NSPR - version >= $min_nspr_version (skipping)""... $ac_c" 1>&6 -echo "configure:11267: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 +echo "configure:11173: checking for NSPR - version >= $min_nspr_version (skipping)" >&5 no_nspr="" if test "$NSPR_CONFIG" = "no"; then @@ -11333,7 +11239,7 @@ SYSTEM_JPEG= else echo $ac_n "checking for jpeg_destroy_compress in -ljpeg""... $ac_c" 1>&6 -echo "configure:11337: checking for jpeg_destroy_compress in -ljpeg" >&5 +echo "configure:11243: checking for jpeg_destroy_compress in -ljpeg" >&5 ac_lib_var=`echo jpeg'_'jpeg_destroy_compress | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11341,7 +11247,7 @@ ac_save_LIBS="$LIBS" LIBS="-ljpeg $JPEG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11381,7 +11287,7 @@ SYSTEM_JPEG= else cat > conftest.$ac_ext < #include @@ -11395,7 +11301,7 @@ } EOF -if { (eval echo configure:11399: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_JPEG=1 else @@ -11436,7 +11342,7 @@ SYSTEM_ZLIB= else echo $ac_n "checking for gzread in -lz""... $ac_c" 1>&6 -echo "configure:11440: checking for gzread in -lz" >&5 +echo "configure:11346: checking for gzread in -lz" >&5 ac_lib_var=`echo z'_'gzread | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11444,7 +11350,7 @@ ac_save_LIBS="$LIBS" LIBS="-lz $ZLIB_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11483,7 +11389,7 @@ SYSTEM_ZLIB= else cat > conftest.$ac_ext < @@ -11504,7 +11410,7 @@ } EOF -if { (eval echo configure:11508: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11414: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_ZLIB=1 else @@ -11547,7 +11453,7 @@ SYSTEM_PNG= else echo $ac_n "checking for png_get_valid in -lpng""... $ac_c" 1>&6 -echo "configure:11551: checking for png_get_valid in -lpng" >&5 +echo "configure:11457: checking for png_get_valid in -lpng" >&5 ac_lib_var=`echo png'_'png_get_valid | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -11555,7 +11461,7 @@ ac_save_LIBS="$LIBS" LIBS="-lpng $PNG_LIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -11594,7 +11500,7 @@ SYSTEM_PNG= else cat > conftest.$ac_ext < #include @@ -11608,7 +11514,7 @@ } EOF -if { (eval echo configure:11612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then SYSTEM_PNG=1 else @@ -11903,7 +11809,7 @@ # Extract the first word of "gtk-config", so it can be a program name with args. set dummy gtk-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:11907: checking for $ac_word" >&5 +echo "configure:11813: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GTK_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -11938,7 +11844,7 @@ min_gtk_version=$GTK_VERSION echo $ac_n "checking for GTK - version >= $min_gtk_version""... $ac_c" 1>&6 -echo "configure:11942: checking for GTK - version >= $min_gtk_version" >&5 +echo "configure:11848: checking for GTK - version >= $min_gtk_version" >&5 no_gtk="" if test "$GTK_CONFIG" = "no" ; then no_gtk=yes @@ -11961,7 +11867,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -12039,7 +11945,7 @@ } EOF -if { (eval echo configure:12043: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:11949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -12074,7 +11980,7 @@ CFLAGS="$CFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" cat > conftest.$ac_ext < @@ -12084,7 +11990,7 @@ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ; return 0; } EOF -if { (eval echo configure:12088: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:11994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GTK or finding the wrong" @@ -12135,7 +12041,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12139: checking for $ac_word" >&5 +echo "configure:12045: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12179,19 +12085,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gtk+-2.0 >= 1.3.7""... $ac_c" 1>&6 -echo "configure:12183: checking for gtk+-2.0 >= 1.3.7" >&5 +echo "configure:12089: checking for gtk+-2.0 >= 1.3.7" >&5 if $PKG_CONFIG --exists "gtk+-2.0 >= 1.3.7" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GTK2_CFLAGS""... $ac_c" 1>&6 -echo "configure:12190: checking MOZ_GTK2_CFLAGS" >&5 +echo "configure:12096: checking MOZ_GTK2_CFLAGS" >&5 MOZ_GTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 1.3.7"` echo "$ac_t""$MOZ_GTK2_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GTK2_LIBS""... $ac_c" 1>&6 -echo "configure:12195: checking MOZ_GTK2_LIBS" >&5 +echo "configure:12101: checking MOZ_GTK2_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GTK2_LIBS="`$PKG_CONFIG --libs \"gtk+-2.0 >= 1.3.7\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GTK2_LIBS" 1>&6 @@ -12255,7 +12161,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12259: checking for $ac_word" >&5 +echo "configure:12165: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_MOC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12307,7 +12213,7 @@ cross_compiling=$ac_cv_prog_cxx_cross echo $ac_n "checking for main in -lqt""... $ac_c" 1>&6 -echo "configure:12311: checking for main in -lqt" >&5 +echo "configure:12217: checking for main in -lqt" >&5 ac_lib_var=`echo qt'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12315,14 +12221,14 @@ ac_save_LIBS="$LIBS" LIBS="-lqt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12341,7 +12247,7 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for main in -lqt-mt""... $ac_c" 1>&6 -echo "configure:12345: checking for main in -lqt-mt" >&5 +echo "configure:12251: checking for main in -lqt-mt" >&5 ac_lib_var=`echo qt-mt'_'main | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -12349,14 +12255,14 @@ ac_save_LIBS="$LIBS" LIBS="-lqt-mt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:12266: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -12392,9 +12298,9 @@ LIBS="$LIBS $QT_LIBS" echo $ac_n "checking Qt - version >= $QT_VERSION""... $ac_c" 1>&6 -echo "configure:12396: checking Qt - version >= $QT_VERSION" >&5 +echo "configure:12302: checking Qt - version >= $QT_VERSION" >&5 cat > conftest.$ac_ext < int main() { @@ -12405,7 +12311,7 @@ ; return 0; } EOF -if { (eval echo configure:12409: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:12315: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* result="yes" else @@ -12939,7 +12845,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:12943: checking for $ac_word" >&5 +echo "configure:12849: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -12983,19 +12889,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for xft""... $ac_c" 1>&6 -echo "configure:12987: checking for xft" >&5 +echo "configure:12893: checking for xft" >&5 if $PKG_CONFIG --exists "xft" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_XFT_CFLAGS""... $ac_c" 1>&6 -echo "configure:12994: checking MOZ_XFT_CFLAGS" >&5 +echo "configure:12900: checking MOZ_XFT_CFLAGS" >&5 MOZ_XFT_CFLAGS=`$PKG_CONFIG --cflags "xft"` echo "$ac_t""$MOZ_XFT_CFLAGS" 1>&6 echo $ac_n "checking MOZ_XFT_LIBS""... $ac_c" 1>&6 -echo "configure:12999: checking MOZ_XFT_LIBS" >&5 +echo "configure:12905: checking MOZ_XFT_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_XFT_LIBS="`$PKG_CONFIG --libs \"xft\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_XFT_LIBS" 1>&6 @@ -13028,7 +12934,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13032: checking for $ac_word" >&5 +echo "configure:12938: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13072,19 +12978,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pango >= 1.1.0""... $ac_c" 1>&6 -echo "configure:13076: checking for pango >= 1.1.0" >&5 +echo "configure:12982: checking for pango >= 1.1.0" >&5 if $PKG_CONFIG --exists "pango >= 1.1.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking _PANGOCHK_CFLAGS""... $ac_c" 1>&6 -echo "configure:13083: checking _PANGOCHK_CFLAGS" >&5 +echo "configure:12989: checking _PANGOCHK_CFLAGS" >&5 _PANGOCHK_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.1.0"` echo "$ac_t""$_PANGOCHK_CFLAGS" 1>&6 echo $ac_n "checking _PANGOCHK_LIBS""... $ac_c" 1>&6 -echo "configure:13088: checking _PANGOCHK_LIBS" >&5 +echo "configure:12994: checking _PANGOCHK_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic _PANGOCHK_LIBS="`$PKG_CONFIG --libs \"pango >= 1.1.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$_PANGOCHK_LIBS" 1>&6 @@ -13142,7 +13048,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13146: checking for $ac_word" >&5 +echo "configure:13052: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13186,19 +13092,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for pango >= 1.6.0 pangoft2 >= 1.6.0""... $ac_c" 1>&6 -echo "configure:13190: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 +echo "configure:13096: checking for pango >= 1.6.0 pangoft2 >= 1.6.0" >&5 if $PKG_CONFIG --exists "pango >= 1.6.0 pangoft2 >= 1.6.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_PANGO_CFLAGS""... $ac_c" 1>&6 -echo "configure:13197: checking MOZ_PANGO_CFLAGS" >&5 +echo "configure:13103: checking MOZ_PANGO_CFLAGS" >&5 MOZ_PANGO_CFLAGS=`$PKG_CONFIG --cflags "pango >= 1.6.0 pangoft2 >= 1.6.0"` echo "$ac_t""$MOZ_PANGO_CFLAGS" 1>&6 echo $ac_n "checking MOZ_PANGO_LIBS""... $ac_c" 1>&6 -echo "configure:13202: checking MOZ_PANGO_LIBS" >&5 +echo "configure:13108: checking MOZ_PANGO_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_PANGO_LIBS="`$PKG_CONFIG --libs \"pango >= 1.6.0 pangoft2 >= 1.6.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_PANGO_LIBS" 1>&6 @@ -13265,7 +13171,7 @@ _SAVE_LDFLAGS="$LDFLAGS" LDFLAGS="$XLDFLAGS $LDFLAGS" echo $ac_n "checking for XpGetPrinterList in -lXp""... $ac_c" 1>&6 -echo "configure:13269: checking for XpGetPrinterList in -lXp" >&5 +echo "configure:13175: checking for XpGetPrinterList in -lXp" >&5 ac_lib_var=`echo Xp'_'XpGetPrinterList | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -13273,7 +13179,7 @@ ac_save_LIBS="$LIBS" LIBS="-lXp $XEXT_LIBS $XLIBS $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:13194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -13356,7 +13262,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13360: checking for $ac_word" >&5 +echo "configure:13266: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13400,19 +13306,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION""... $ac_c" 1>&6 -echo "configure:13404: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 +echo "configure:13310: checking for gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" >&5 if $PKG_CONFIG --exists "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GNOMEVFS_CFLAGS""... $ac_c" 1>&6 -echo "configure:13411: checking MOZ_GNOMEVFS_CFLAGS" >&5 +echo "configure:13317: checking MOZ_GNOMEVFS_CFLAGS" >&5 MOZ_GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION"` echo "$ac_t""$MOZ_GNOMEVFS_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GNOMEVFS_LIBS""... $ac_c" 1>&6 -echo "configure:13416: checking MOZ_GNOMEVFS_LIBS" >&5 +echo "configure:13322: checking MOZ_GNOMEVFS_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GNOMEVFS_LIBS="`$PKG_CONFIG --libs \"gnome-vfs-2.0 >= $GNOMEVFS_VERSION gnome-vfs-module-2.0 >= $GNOMEVFS_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GNOMEVFS_LIBS" 1>&6 @@ -13460,7 +13366,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13464: checking for $ac_word" >&5 +echo "configure:13370: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13504,19 +13410,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for gconf-2.0 >= $GCONF_VERSION""... $ac_c" 1>&6 -echo "configure:13508: checking for gconf-2.0 >= $GCONF_VERSION" >&5 +echo "configure:13414: checking for gconf-2.0 >= $GCONF_VERSION" >&5 if $PKG_CONFIG --exists "gconf-2.0 >= $GCONF_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GCONF_CFLAGS""... $ac_c" 1>&6 -echo "configure:13515: checking MOZ_GCONF_CFLAGS" >&5 +echo "configure:13421: checking MOZ_GCONF_CFLAGS" >&5 MOZ_GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 >= $GCONF_VERSION"` echo "$ac_t""$MOZ_GCONF_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GCONF_LIBS""... $ac_c" 1>&6 -echo "configure:13520: checking MOZ_GCONF_LIBS" >&5 +echo "configure:13426: checking MOZ_GCONF_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GCONF_LIBS="`$PKG_CONFIG --libs \"gconf-2.0 >= $GCONF_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GCONF_LIBS" 1>&6 @@ -13560,7 +13466,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13564: checking for $ac_word" >&5 +echo "configure:13470: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13604,19 +13510,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libgnome-2.0 >= $LIBGNOME_VERSION""... $ac_c" 1>&6 -echo "configure:13608: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 +echo "configure:13514: checking for libgnome-2.0 >= $LIBGNOME_VERSION" >&5 if $PKG_CONFIG --exists "libgnome-2.0 >= $LIBGNOME_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_LIBGNOME_CFLAGS""... $ac_c" 1>&6 -echo "configure:13615: checking MOZ_LIBGNOME_CFLAGS" >&5 +echo "configure:13521: checking MOZ_LIBGNOME_CFLAGS" >&5 MOZ_LIBGNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnome-2.0 >= $LIBGNOME_VERSION"` echo "$ac_t""$MOZ_LIBGNOME_CFLAGS" 1>&6 echo $ac_n "checking MOZ_LIBGNOME_LIBS""... $ac_c" 1>&6 -echo "configure:13620: checking MOZ_LIBGNOME_LIBS" >&5 +echo "configure:13526: checking MOZ_LIBGNOME_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_LIBGNOME_LIBS="`$PKG_CONFIG --libs \"libgnome-2.0 >= $LIBGNOME_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_LIBGNOME_LIBS" 1>&6 @@ -13691,7 +13597,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:13695: checking for $ac_word" >&5 +echo "configure:13601: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -13735,19 +13641,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libgnomeui-2.0 >= $GNOMEUI_VERSION""... $ac_c" 1>&6 -echo "configure:13739: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 +echo "configure:13645: checking for libgnomeui-2.0 >= $GNOMEUI_VERSION" >&5 if $PKG_CONFIG --exists "libgnomeui-2.0 >= $GNOMEUI_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking MOZ_GNOMEUI_CFLAGS""... $ac_c" 1>&6 -echo "configure:13746: checking MOZ_GNOMEUI_CFLAGS" >&5 +echo "configure:13652: checking MOZ_GNOMEUI_CFLAGS" >&5 MOZ_GNOMEUI_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= $GNOMEUI_VERSION"` echo "$ac_t""$MOZ_GNOMEUI_CFLAGS" 1>&6 echo $ac_n "checking MOZ_GNOMEUI_LIBS""... $ac_c" 1>&6 -echo "configure:13751: checking MOZ_GNOMEUI_LIBS" >&5 +echo "configure:13657: checking MOZ_GNOMEUI_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic MOZ_GNOMEUI_LIBS="`$PKG_CONFIG --libs \"libgnomeui-2.0 >= $GNOMEUI_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$MOZ_GNOMEUI_LIBS" 1>&6 @@ -14250,7 +14156,7 @@ # Extract the first word of "javac", so it can be a program name with args. set dummy javac; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14254: checking for $ac_word" >&5 +echo "configure:14160: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAVAC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14286,7 +14192,7 @@ # Extract the first word of "jar", so it can be a program name with args. set dummy jar; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14290: checking for $ac_word" >&5 +echo "configure:14196: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_JAR'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14465,7 +14371,7 @@ gdiplus) MOZ_SVG_RENDERER_GDIPLUS=1 echo $ac_n "checking for Gdiplus.h""... $ac_c" 1>&6 -echo "configure:14469: checking for Gdiplus.h" >&5 +echo "configure:14375: checking for Gdiplus.h" >&5 ac_ext=C # CXXFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. @@ -14475,7 +14381,7 @@ cross_compiling=$ac_cv_prog_cxx_cross cat > conftest.$ac_ext < #include @@ -14484,7 +14390,7 @@ ; return 0; } EOF -if { (eval echo configure:14488: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* echo "$ac_t""yes" 1>&6 else @@ -14530,6 +14436,25 @@ fi +# Check whether --enable-smil or --disable-smil was given. +if test "${enable_smil+set}" = set; then + enableval="$enable_smil" + if test "$enableval" = "yes"; then + MOZ_SMIL=1 + elif test "$enableval" = "no"; then + MOZ_SMIL= + else + { echo "configure: error: Option, smil, does not take an argument ($enableval)." 1>&2; exit 1; } + fi +fi + +if test -n "$MOZ_SMIL"; then + cat >> confdefs.h <<\EOF +#define MOZ_SMIL 1 +EOF + +fi + if test "$TX_EXE"; then cat >> confdefs.h <<\EOF @@ -14581,13 +14506,13 @@ msvc*|mks*|cygwin*|mingw*|wince*) if test -n "$MOZ_UPDATER"; then echo $ac_n "checking for iconv""... $ac_c" 1>&6 -echo "configure:14585: checking for iconv" >&5 +echo "configure:14510: checking for iconv" >&5 for ac_prog in $HOST_ICONV "iconv" do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:14591: checking for $ac_word" >&5 +echo "configure:14516: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_HOST_ICONV'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -14853,18 +14778,18 @@ if test -n "$MOZ_DEBUG"; then echo $ac_n "checking for valid debug flags""... $ac_c" 1>&6 -echo "configure:14857: checking for valid debug flags" >&5 +echo "configure:14782: checking for valid debug flags" >&5 _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MOZ_DEBUG_FLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:14868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14793: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -14905,18 +14830,18 @@ if test "$COMPILE_ENVIRONMENT"; then if test -n "$MOZ_OPTIMIZE"; then echo $ac_n "checking for valid optimization flags""... $ac_c" 1>&6 -echo "configure:14909: checking for valid optimization flags" >&5 +echo "configure:14834: checking for valid optimization flags" >&5 _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $MOZ_OPTIMIZE_FLAGS" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:14920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:14845: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _results=yes else @@ -15133,7 +15058,7 @@ if test -n "$_ENABLE_EFENCE"; then echo $ac_n "checking for malloc in -lefence""... $ac_c" 1>&6 -echo "configure:15137: checking for malloc in -lefence" >&5 +echo "configure:15062: checking for malloc in -lefence" >&5 ac_lib_var=`echo efence'_'malloc | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 @@ -15141,7 +15066,7 @@ ac_save_LIBS="$LIBS" LIBS="-lefence $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15081: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_lib_$ac_lib_var=yes" else @@ -15253,12 +15178,12 @@ for ac_func in __builtin_vec_new __builtin_vec_delete __builtin_new __builtin_delete __pure_virtual do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15257: checking for $ac_func" >&5 +echo "configure:15182: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15527,12 +15452,12 @@ for ac_func in __cxa_demangle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:15531: checking for $ac_func" >&5 +echo "configure:15456: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:15487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -15696,7 +15621,7 @@ # Compiler Options echo $ac_n "checking for gcc -pipe support""... $ac_c" 1>&6 -echo "configure:15700: checking for gcc -pipe support" >&5 +echo "configure:15625: checking for gcc -pipe support" >&5 if test -n "$GNU_CC" && test -n "$GNU_CXX" && test -n "$GNU_AS"; then echo '#include ' > dummy-hello.c echo 'int main() { printf("Hello World\n"); exit(0); }' >> dummy-hello.c @@ -15711,14 +15636,14 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pipe" cat > conftest.$ac_ext < int main() { printf("Hello World\n"); ; return 0; } EOF -if { (eval echo configure:15722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15647: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _res_gcc_pipe="yes" else @@ -15760,16 +15685,16 @@ _SAVE_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS ${_COMPILER_PREFIX}-Wno-long-long" echo $ac_n "checking whether compiler supports -Wno-long-long""... $ac_c" 1>&6 -echo "configure:15764: checking whether compiler supports -Wno-long-long" >&5 +echo "configure:15689: checking whether compiler supports -Wno-long-long" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15698: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _WARNINGS_CFLAGS="${_WARNINGS_CFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" _WARNINGS_CXXFLAGS="${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-Wno-long-long" @@ -15790,16 +15715,16 @@ CFLAGS="$CFLAGS -fprofile-generate" echo $ac_n "checking whether C compiler supports -fprofile-generate""... $ac_c" 1>&6 -echo "configure:15794: checking whether C compiler supports -fprofile-generate" >&5 +echo "configure:15719: checking whether C compiler supports -fprofile-generate" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-generate" result="yes" @@ -15817,16 +15742,16 @@ else CFLAGS="$_SAVE_CFLAGS -fprofile-arcs" echo $ac_n "checking whether C compiler supports -fprofile-arcs""... $ac_c" 1>&6 -echo "configure:15821: checking whether C compiler supports -fprofile-arcs" >&5 +echo "configure:15746: checking whether C compiler supports -fprofile-arcs" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* PROFILE_GEN_CFLAGS="-fprofile-arcs" result="yes" @@ -15872,18 +15797,21 @@ _SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS} ${_COMPILER_PREFIX}-pedantic" echo $ac_n "checking whether C++ compiler has -pedantic long long bug""... $ac_c" 1>&6 -echo "configure:15876: checking whether C++ compiler has -pedantic long long bug" >&5 +echo "configure:15801: checking whether C++ compiler has -pedantic long long bug" >&5 if test "$cross_compiling" = yes; then result="maybe" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="no" else @@ -15913,13 +15841,16 @@ fi echo $ac_n "checking for correct temporary object destruction order""... $ac_c" 1>&6 -echo "configure:15917: checking for correct temporary object destruction order" >&5 +echo "configure:15845: checking for correct temporary object destruction order" >&5 if test "$cross_compiling" = yes; then result="maybe" else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:15873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then result="yes" else @@ -15959,12 +15890,12 @@ _SAVE_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS ${_WARNINGS_CXXFLAGS}" echo $ac_n "checking for correct overload resolution with const and templates""... $ac_c" 1>&6 -echo "configure:15963: checking for correct overload resolution with const and templates" >&5 +echo "configure:15894: checking for correct overload resolution with const and templates" >&5 if eval "test \"`echo '$''{'ac_nscap_nonconst_opeq_bug'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < @@ -15994,7 +15925,7 @@ ; return 0; } EOF -if { (eval echo configure:15998: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:15929: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_nscap_nonconst_opeq_bug="no" else @@ -16256,7 +16187,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16260: checking for $ac_word" >&5 +echo "configure:16191: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16300,19 +16231,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 -echo "configure:16304: checking for libIDL-2.0 >= 0.8.0" >&5 +echo "configure:16235: checking for libIDL-2.0 >= 0.8.0" >&5 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 -echo "configure:16311: checking LIBIDL_CFLAGS" >&5 +echo "configure:16242: checking LIBIDL_CFLAGS" >&5 LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 -echo "configure:16316: checking LIBIDL_LIBS" >&5 +echo "configure:16247: checking LIBIDL_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBIDL_LIBS" 1>&6 @@ -16434,7 +16365,7 @@ # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16438: checking for $ac_word" >&5 +echo "configure:16369: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16469,7 +16400,7 @@ min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:16473: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:16404: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -16492,7 +16423,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -16568,7 +16499,7 @@ } EOF -if { (eval echo configure:16572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -16602,7 +16533,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -16612,7 +16543,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:16616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -16656,7 +16587,7 @@ # Extract the first word of "libIDL-config", so it can be a program name with args. set dummy libIDL-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16660: checking for $ac_word" >&5 +echo "configure:16591: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -16691,7 +16622,7 @@ min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:16695: checking for libIDL - version >= $min_libIDL_version" >&5 +echo "configure:16626: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes @@ -16718,7 +16649,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -16804,7 +16735,7 @@ } EOF -if { (eval echo configure:16808: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:16739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -16838,7 +16769,7 @@ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < @@ -16849,7 +16780,7 @@ return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:16853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:16784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding libIDL or finding the wrong" @@ -16977,7 +16908,7 @@ # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:16981: checking for $ac_word" >&5 +echo "configure:16912: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17012,7 +16943,7 @@ min_glib_version=1.2.0 echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:17016: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:16947: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -17035,7 +16966,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -17111,7 +17042,7 @@ } EOF -if { (eval echo configure:17115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -17145,7 +17076,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -17155,7 +17086,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:17159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -17199,7 +17130,7 @@ # Extract the first word of "libIDL-config", so it can be a program name with args. set dummy libIDL-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17203: checking for $ac_word" >&5 +echo "configure:17134: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_LIBIDL_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17234,7 +17165,7 @@ min_libIDL_version=$LIBIDL_VERSION echo $ac_n "checking for libIDL - version >= $min_libIDL_version""... $ac_c" 1>&6 -echo "configure:17238: checking for libIDL - version >= $min_libIDL_version" >&5 +echo "configure:17169: checking for libIDL - version >= $min_libIDL_version" >&5 no_libIDL="" if test "$LIBIDL_CONFIG" = "no" ; then no_libIDL=yes @@ -17261,7 +17192,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -17347,7 +17278,7 @@ } EOF -if { (eval echo configure:17351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -17381,7 +17312,7 @@ CFLAGS="$CFLAGS $LIBIDL_CFLAGS" LIBS="$LIBS $LIBIDL_LIBS" cat > conftest.$ac_ext < @@ -17392,7 +17323,7 @@ return IDL_get_libver_string ? 1 : 0; ; return 0; } EOF -if { (eval echo configure:17396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding libIDL or finding the wrong" @@ -17432,7 +17363,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17436: checking for $ac_word" >&5 +echo "configure:17367: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17476,19 +17407,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for libIDL-2.0 >= 0.8.0""... $ac_c" 1>&6 -echo "configure:17480: checking for libIDL-2.0 >= 0.8.0" >&5 +echo "configure:17411: checking for libIDL-2.0 >= 0.8.0" >&5 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking LIBIDL_CFLAGS""... $ac_c" 1>&6 -echo "configure:17487: checking LIBIDL_CFLAGS" >&5 +echo "configure:17418: checking LIBIDL_CFLAGS" >&5 LIBIDL_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` echo "$ac_t""$LIBIDL_CFLAGS" 1>&6 echo $ac_n "checking LIBIDL_LIBS""... $ac_c" 1>&6 -echo "configure:17492: checking LIBIDL_LIBS" >&5 +echo "configure:17423: checking LIBIDL_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic LIBIDL_LIBS="`$PKG_CONFIG --libs \"libIDL-2.0 >= 0.8.0\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$LIBIDL_LIBS" 1>&6 @@ -17523,7 +17454,7 @@ # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17527: checking for $ac_word" >&5 +echo "configure:17458: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_ORBIT_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17560,7 +17491,7 @@ if test -n "$ORBIT_CONFIG"; then echo $ac_n "checking for ORBit libIDL usability""... $ac_c" 1>&6 -echo "configure:17564: checking for ORBit libIDL usability" >&5 +echo "configure:17495: checking for ORBit libIDL usability" >&5 _ORBIT_CFLAGS=`${ORBIT_CONFIG} client --cflags` _ORBIT_LIBS=`${ORBIT_CONFIG} client --libs` _ORBIT_INC_PATH=`${PERL} -e '{ for $f (@ARGV) { print "$f " if ($f =~ m/^-I/); } }' -- ${_ORBIT_CFLAGS}` @@ -17577,7 +17508,7 @@ result="maybe" else cat > conftest.$ac_ext < @@ -17592,7 +17523,7 @@ } EOF -if { (eval echo configure:17596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17527: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then _LIBIDL_FOUND=1 result="yes" @@ -17645,7 +17576,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17649: checking for $ac_word" >&5 +echo "configure:17580: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17689,19 +17620,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for glib-2.0 >= 1.3.7""... $ac_c" 1>&6 -echo "configure:17693: checking for glib-2.0 >= 1.3.7" >&5 +echo "configure:17624: checking for glib-2.0 >= 1.3.7" >&5 if $PKG_CONFIG --exists "glib-2.0 >= 1.3.7" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking GLIB_CFLAGS""... $ac_c" 1>&6 -echo "configure:17700: checking GLIB_CFLAGS" >&5 +echo "configure:17631: checking GLIB_CFLAGS" >&5 GLIB_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 1.3.7"` echo "$ac_t""$GLIB_CFLAGS" 1>&6 echo $ac_n "checking GLIB_LIBS""... $ac_c" 1>&6 -echo "configure:17705: checking GLIB_LIBS" >&5 +echo "configure:17636: checking GLIB_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic GLIB_LIBS="`$PKG_CONFIG --libs \"glib-2.0 >= 1.3.7\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$GLIB_LIBS" 1>&6 @@ -17784,7 +17715,7 @@ # Extract the first word of "glib-config", so it can be a program name with args. set dummy glib-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:17788: checking for $ac_word" >&5 +echo "configure:17719: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_GLIB_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -17819,7 +17750,7 @@ min_glib_version=${GLIB_VERSION} echo $ac_n "checking for GLIB - version >= $min_glib_version""... $ac_c" 1>&6 -echo "configure:17823: checking for GLIB - version >= $min_glib_version" >&5 +echo "configure:17754: checking for GLIB - version >= $min_glib_version" >&5 no_glib="" if test "$GLIB_CONFIG" = "no" ; then no_glib=yes @@ -17842,7 +17773,7 @@ echo $ac_n "cross compiling; assumed OK... $ac_c" else cat > conftest.$ac_ext < @@ -17918,7 +17849,7 @@ } EOF -if { (eval echo configure:17922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:17853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else @@ -17952,7 +17883,7 @@ CFLAGS="$CFLAGS $GLIB_CFLAGS" LIBS="$LIBS $GLIB_LIBS" cat > conftest.$ac_ext < @@ -17962,7 +17893,7 @@ return ((glib_major_version) || (glib_minor_version) || (glib_micro_version)); ; return 0; } EOF -if { (eval echo configure:17966: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "*** The test program compiled, but did not run. This usually means" echo "*** that the run-time linker is not finding GLIB or finding the wrong" @@ -18041,19 +17972,19 @@ # The Ultrix 4.2 mips builtin alloca declared by alloca.h only works # for constant arguments. Useless! echo $ac_n "checking for working alloca.h""... $ac_c" 1>&6 -echo "configure:18045: checking for working alloca.h" >&5 +echo "configure:17976: checking for working alloca.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_alloca_h'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < int main() { char *p = alloca(2 * sizeof(int)); ; return 0; } EOF -if { (eval echo configure:18057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:17988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_header_alloca_h=yes else @@ -18074,12 +18005,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 -echo "configure:18078: checking for alloca" >&5 +echo "configure:18009: checking for alloca" >&5 if eval "test \"`echo '$''{'ac_cv_func_alloca_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18042: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_func_alloca_works=yes else @@ -18139,12 +18070,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -echo "configure:18143: checking whether alloca needs Cray hooks" >&5 +echo "configure:18074: checking whether alloca needs Cray hooks" >&5 if eval "test \"`echo '$''{'ac_cv_os_cray'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&6 -echo "configure:18173: checking for $ac_func" >&5 +echo "configure:18104: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +if { (eval echo configure:18132: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -18224,7 +18155,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -echo "configure:18228: checking stack direction for C alloca" >&5 +echo "configure:18159: checking stack direction for C alloca" >&5 if eval "test \"`echo '$''{'ac_cv_c_stack_direction'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18232,7 +18163,7 @@ ac_cv_c_stack_direction=0 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +if { (eval echo configure:18186: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_stack_direction=1 else @@ -18300,17 +18231,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:18304: checking for $ac_hdr" >&5 +echo "configure:18235: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:18314: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +{ (eval echo configure:18245: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* @@ -18414,7 +18345,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18418: checking for $ac_word" >&5 +echo "configure:18349: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18458,19 +18389,19 @@ PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then echo $ac_n "checking for cairo >= $CAIRO_VERSION""... $ac_c" 1>&6 -echo "configure:18462: checking for cairo >= $CAIRO_VERSION" >&5 +echo "configure:18393: checking for cairo >= $CAIRO_VERSION" >&5 if $PKG_CONFIG --exists "cairo >= $CAIRO_VERSION" ; then echo "$ac_t""yes" 1>&6 succeeded=yes echo $ac_n "checking CAIRO_CFLAGS""... $ac_c" 1>&6 -echo "configure:18469: checking CAIRO_CFLAGS" >&5 +echo "configure:18400: checking CAIRO_CFLAGS" >&5 CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= $CAIRO_VERSION"` echo "$ac_t""$CAIRO_CFLAGS" 1>&6 echo $ac_n "checking CAIRO_LIBS""... $ac_c" 1>&6 -echo "configure:18474: checking CAIRO_LIBS" >&5 +echo "configure:18405: checking CAIRO_LIBS" >&5 ## Remove evil flags like -Wl,--export-dynamic CAIRO_LIBS="`$PKG_CONFIG --libs \"cairo >= $CAIRO_VERSION\" |sed s/-Wl,--export-dynamic//g`" echo "$ac_t""$CAIRO_LIBS" 1>&6 @@ -18534,7 +18465,7 @@ # Extract the first word of "python", so it can be a program name with args. set dummy python; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:18538: checking for $ac_word" >&5 +echo "configure:18469: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -18794,14 +18725,14 @@ cross_compiling=$ac_cv_prog_cc_cross cat > conftest.$ac_ext < int main() { int x = 1; x++; ; return 0; } EOF -if { (eval echo configure:18805: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:18736: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -18978,6 +18909,7 @@ + CFLAGS=`echo \ $_WARNINGS_CFLAGS \ $CFLAGS` @@ -19096,7 +19028,7 @@ _SAVE_CFLAGS=$CFLAGS CFLAGS="$CFLAGS $XCFLAGS" cat > conftest.$ac_ext < @@ -19112,7 +19044,7 @@ ; return 0; } EOF -if { (eval echo configure:19116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +if { (eval echo configure:19048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then : else echo "configure: failed program was:" >&5 @@ -19321,34 +19253,15 @@ # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. -# -# If the first sed substitution is executed (which looks for macros that -# take arguments), then we branch to the quote section. Otherwise, -# look for a macro that doesn't take arguments. -cat >confdef2opt.sed <<\_ACEOF -t clear -: clear -s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g -t quote -s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g -t quote -d -: quote -s,[ `~#$^&*(){}\\|;'"<>?],\\&,g -s,\[,\\&,g -s,\],\\&,g -s,\$,$$,g -p -_ACEOF -# We use echo to avoid assuming a particular line-breaking character. -# The extra dot is to prevent the shell from consuming trailing -# line-breaks from the sub-command output. A line-break within -# single-quotes doesn't work because, if this script is created in a -# platform that uses two characters for line-breaks (e.g., DOS), tr -# would break. -ac_LF_and_DOT=`echo; echo .` -DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` -rm -f confdef2opt.sed +cat > conftest.defs <<\EOF +s%#define \([A-Za-z_][A-Za-z0-9_]*\) *\(.*\)%-D\1=\2%g +s%[ `~#$^&*(){}\\|;'"<>?]%\\&%g +s%\[%\\&%g +s%\]%\\&%g +s%\$%$$%g +EOF +DEFS=`sed -f conftest.defs confdefs.h | tr '\012' ' '` +rm -f conftest.defs MOZ_DEFINES=$DEFS @@ -19746,6 +19659,7 @@ s%@MOZ_SVG_RENDERER_GDIPLUS@%$MOZ_SVG_RENDERER_GDIPLUS%g s%@MOZ_SVG_RENDERER_LIBART@%$MOZ_SVG_RENDERER_LIBART%g s%@MOZ_SVG_RENDERER_CAIRO@%$MOZ_SVG_RENDERER_CAIRO%g +s%@MOZ_SMIL@%$MOZ_SMIL%g s%@TX_EXE@%$TX_EXE%g s%@MOZ_JS_LIBS@%$MOZ_JS_LIBS%g s%@MOZ_PSM@%$MOZ_PSM%g