Packman Build Service PMBS

synfig.spec Changed

_service Changed

@@ -3,6 +3,8 @@
 		<param name="exclude">*.bat</param>
 		<param name="exclude">*.md</param>
 		<param name="exclude">*.yml</param>
+		<param name="exclude">.github</param>
+		<param name="exclude">.gitignore</param>
 		<param name="exclude">1-setup-linux-native.sh</param>
 		<param name="exclude">1-setup-nix.sh</param>
 		<param name="exclude">1-setup-osx-brew.sh</param>
@@ -12,6 +14,7 @@
 		<param name="exclude">2-build-production.sh</param>
 		<param name="exclude">3-package-osx-dmg.sh</param>
 		<param name="exclude">CMakeLists.txt</param>
+		<param name="exclude">ChangeLog-development.md</param>
 		<param name="exclude">ChangeLog-generate.sh</param>
 		<param name="exclude">ChangeLog-split.sh</param>
 		<param name="exclude">ChangeLog.last_id</param>
@@ -206,7 +209,7 @@
 		<param name="exclude">version-bump.sh</param>
 		<param name="exclude">version-release.sh</param>
 		<param name="filename">synfig</param>
-		<param name="revision">3b7c539bcca37c0bad9dd16843289f2111858a79</param>
+		<param name="revision">d8951f9c2a61308d5a54951d01c63102472d5ef1</param>
 		<param name="scm">git</param>
 		<param name="submodules">disable</param>
 		<param name="url">https://github.com/synfig/synfig.git</param>

_service:obs_scm:synfig-1.5.3.obscpio/.github Deleted

_service:obs_scm:synfig-1.5.3.obscpio/.github/ISSUE_TEMPLATE Deleted

_service:obs_scm:synfig-1.5.3.obscpio/.github/workflows Deleted

_service:obs_scm:synfig-1.5.3.obscpio/.gitignore Deleted

@@ -1,270 +0,0 @@
-*.deps
-*.pyc
-*.exe
-*.h1
-*.keys
-*.la
-*.libs
-*.lo
-*.mime
-*.nsi
-*.o
-*.orig
-*.pc
-*.rej
-*.spec
-*.xml
-*~
-_debug/
-_production/
-_packages/
-
-.cache
-.kdev4/
-
-# ---- MacOS thumbnails ------------
-.DS_Store
-
-# ------------------------------------------------------------------------
-
-# generated in ETL, core and studio
-# TODO: clean this up when autotools->cmake switch is complete
-*-config
-ABOUT-NLS
-Makefile.in.in
-Makevars.template
-POTFILES
-Rules-quot
-aclocal.m4
-autom4te.cache
-boldquot.sed
-config.*
-!config.h.cmake.in
-configure
-depcomp
-en@boldquot.header
-en@quot.header
-insert-header.sin
-install-sh
-libtool
-ltmain.sh
-missing
-quot.sed
-remove-potcdate.sed
-remove-potcdate.sin
-stamp-h1
-stamp-po
-test-driver
-compile
-.dirstamp
-
-/_debug/
-/_production/
-/_release/
-/build-cmake/
-/build.conf
-
-# ------------------------------------------------------------------------
-
-cmake-build
-
-ETL/ETL.pc.in
-ETL/ETL/etl_profile.h
-ETL/ETL/etl_profile_.h
-ETL/ETL/etl_profile_.h.in
-
-synfig-core/libltdl
-synfig-core/pkg-info/macosx/synfig-core.info
-synfig-core/po/*.gmo
-synfig-core/po/stamp-it
-synfig-core/po/synfig.pot
-synfig-core/src/modules/synfig_modules.cfg
-synfig-core/src/synfig/proto/nodebase.h
-synfig-core/src/tool/synfig
-synfig-core/synfig.pc.in
-
-synfig-core/autorevision.h
-synfig-core/m4/codeset.m4
-synfig-core/m4/gettext.m4
-synfig-core/m4/glibc2.m4
-synfig-core/m4/glibc21.m4
-synfig-core/m4/iconv.m4
-synfig-core/m4/intdiv0.m4
-synfig-core/m4/inttypes.m4
-synfig-core/m4/inttypes-h.m4
-synfig-core/m4/inttypes_h.m4
-synfig-core/m4/inttypes-pri.m4
-synfig-core/m4/intmax.m4
-synfig-core/m4/isc-posix.m4
-synfig-core/m4/lcmessage.m4
-synfig-core/m4/lib-ld.m4
-synfig-core/m4/lib-link.m4
-synfig-core/m4/lib-prefix.m4
-synfig-core/m4/lock.m4
-synfig-core/m4/longdouble.m4
-synfig-core/m4/longlong.m4
-synfig-core/m4/po.m4
-synfig-core/m4/progtest.m4
-synfig-core/m4/nls.m4
-synfig-core/m4/printf-posix.m4
-synfig-core/m4/uintmax_t.m4
-synfig-core/m4/ulonglong.m4
-synfig-core/m4/signed.m4
-synfig-core/m4/size_max.m4
-synfig-core/m4/stdint_h.m4
-synfig-core/m4/visibility.m4
-synfig-core/m4/wchar_t.m4
-synfig-core/m4/wint_t.m4
-synfig-core/m4/xsize.m4
-synfig-core/m4/argz.m4
-synfig-core/m4/libtool.m4
-synfig-core/m4/ltargz.m4
-synfig-core/m4/ltdl.m4
-synfig-core/m4/ltoptions.m4
-synfig-core/m4/ltsugar.m4
-synfig-core/m4/ltversion.m4
-synfig-core/m4/lt~obsolete.m4
-
-synfig-studio/autorevision.h
-synfig-studio/images/128x128
-synfig-studio/images/16x16
-synfig-studio/images/22x22
-synfig-studio/images/24x24
-synfig-studio/images/32x32
-synfig-studio/images/48x48
-synfig-studio/images/64x64
-synfig-studio/images/*.png
-synfig-studio/images/*.bmp
-synfig-studio/images/*.ico
-synfig-studio/images/images.nsh
-synfig-studio/images/unimages.nsh
-synfig-studio/images/icons.nsh
-synfig-studio/images/unicons.nsh
-synfig-studio/m4/codeset.m4
-synfig-studio/m4/gettext.m4
-synfig-studio/m4/glibc21.m4
-synfig-studio/m4/glibc2.m4
-synfig-studio/m4/iconv.m4
-synfig-studio/m4/intdiv0.m4
-synfig-studio/m4/intmax.m4
-synfig-studio/m4/inttypes-h.m4
-synfig-studio/m4/inttypes_h.m4
-synfig-studio/m4/inttypes.m4
-synfig-studio/m4/inttypes-pri.m4
-synfig-studio/m4/isc-posix.m4
-synfig-studio/m4/lcmessage.m4
-synfig-studio/m4/lib-ld.m4
-synfig-studio/m4/lib-link.m4
-synfig-studio/m4/lib-prefix.m4
-synfig-studio/m4/lock.m4
-synfig-studio/m4/longdouble.m4
-synfig-studio/m4/longlong.m4
-synfig-studio/m4/nls.m4
-synfig-studio/m4/po.m4
-synfig-studio/m4/printf-posix.m4
-synfig-studio/m4/progtest.m4
-synfig-studio/m4/signed.m4
-synfig-studio/m4/size_max.m4
-synfig-studio/m4/stdint_h.m4
-synfig-studio/m4/uintmax_t.m4
-synfig-studio/m4/ulonglong.m4
-synfig-studio/m4/visibility.m4
-synfig-studio/m4/wchar_t.m4
-synfig-studio/m4/wint_t.m4
-synfig-studio/m4/xsize.m4
-synfig-studio/m4/libtool.m4
-synfig-studio/m4/ltdl.m4
-synfig-studio/m4/ltoptions.m4
-synfig-studio/m4/ltsugar.m4
-synfig-studio/m4/ltversion.m4
-synfig-studio/m4/lt~obsolete.m4
-synfig-studio/pkg-info/macosx/synfig-studio.info
-synfig-studio/po/*.gmo
-synfig-studio/po/.intltool-merge-cache
-synfig-studio/po/synfigstudio.pot
-synfig-studio/po/stamp-it
-synfig-studio/src/gui/synfigstudio
-synfig-studio/synfigstudio-thumbnailer.schemas
-synfig-studio/tmpwrk*
-synfig-studio/org.synfig.SynfigStudio.desktop
-
-# ------------------------------------------------------------------------
-
-# files we used to check in, but don't any more
-COPYING
-ChangeLog
-doxygen.cfg
-INSTALL
-Makefile.in
-Makefile
-
-# ------------------------------------------------------------------------
-
-
-# don't track .sif and .sifz files:
-*.sif
-*.sifz
-
-# except for the ones we know about - core examples, core examples/walk and studio images:
-
-!synfig-core/examples/*.sif
-!synfig-core/examples/walk/*.sif
-
-!synfig-studio/images/*.sif
-
-synfig-studio/images/splash_screen_development.sif
-
-# ------------------------------------------------------------------------
-# These are executables produced by 'make check' in ETL/trunk
-# ------------------------------------------------------------------------
-
-ETL/test/angle
-ETL/test/benchmark
-ETL/test/clock
-ETL/test/fixed
-ETL/test/handle
-ETL/test/hermite
-ETL/test/pen
-ETL/test/smach
-ETL/test/stringf
-ETL/test/surface
-
-# doxygen-generated docs
-ETL/doc
-synfig-core/doc
-synfig-studio/doc
-/.project
-/.cproject
-/.settings/
-
-# ------------------------------------------------------------------------
-# Netbeans projects
-# ------------------------------------------------------------------------
-/nbproject/
-/ETL/nbproject/
-/synfig-core/nbproject/
-/synfig-studio/nbproject/
-
-# ------------------------------------------------------------------------
-# CLion projects
-# ------------------------------------------------------------------------
-/.idea
-cmake-build-*
-
-# ------------------------------------------------------------------------
-# snapcraft artifacts
-# ------------------------------------------------------------------------
-*.snap
-
-# ------------------------------------------------------------------------ 
-# Visual Studio 2019 projects 
-# ------------------------------------------------------------------------ 
-/.vs 
-/out 
-CMakeSettings.json
-
-# ------------------------------------------------------------------------ 
-# QtCreator IDE
-# ------------------------------------------------------------------------ 
-build-synfig-*
-CMakeLists.txt.user

_service:obs_scm:synfig-1.5.3.obscpio/ETL/config/pkg-support Deleted

_service:obs_scm:synfig-1.5.3.obscpio/ETL/config/pkg-support/ETL-devel.info Deleted

_service:obs_scm:synfig-1.5.3.obscpio/ETL/config/pkg-support/devel-resources Deleted

_service:obs_scm:synfig-1.5.3.obscpio/ETL/config/pkg-support/devel-resources/License.rtf Deleted

_service:obs_scm:synfig-1.5.3.obscpio/ETL/config/pkg-support/devel-resources/ReadMe.rtf Deleted

_service:obs_scm:synfig-1.5.3.obscpio/ETL/config/pkg-support/devel-resources/Welcome.rtf Deleted

_service:obs_scm:synfig-1.5.3.obscpio/ETL/config/pkg-support/devel-resources/install.sh Deleted

@@ -1,48 +0,0 @@
-#!/bin/sh
-# finish up the installation
-# this script should be executed using the sudo command
-# this file is copied to ETL-devel.post_install and ETL-devel.post_upgrade
-# inside the .pkg bundle
-echo "Running post-install script"
-umask 022
-sleep 1
-
-RESOURCE_DIR=`dirname $0`
-
-cd RESOURCE_DIR
-
-echo "Creating ETL-config script"
-sleep 1
- -d /usr/local || mkdir /usr/local
- -d /usr/local/bin || mkdir /usr/local/bin
- -d /usr/local/include || mkdir /usr/local/include
- -d /usr/local/lib || mkdir /usr/local/lib
- -d /usr/local/sbin || mkdir /usr/local/sbin
-
-# If we already have a directory called ETL in our include directory, nuke it
- -d /usr/local/include/ETL && rm -fr /usr/local/include/ETL
-
-ln -s /usr/local/include/ETL /Library/Frameworks/ETL.framework/Headers
-sed '
-s:@exec_prefix@:/usr/local:g;
-s:@prefix@:/usr/local:g;
-s:@bindir@:$exec_prefix/bin:g;
-s:@libdir@:$exec_prefix/lib:g;
-s:@includedir@:$prefix/include/ETL:g;
-s:@VERSION@:@_VERSION_@:g;
-s:@PACKAGE@:@_PACKAGE_@:g;
-s:@LIBS@::g;
-' < $RESOURCE_DIR/ETL-config.in > /usr/local/bin/ETL-config
-chmod 775 /usr/local/bin/ETL-config
-
-echo "Done with shell script"
-sleep 1
-
-exit 0
-
-
-#echo "Precompiling Headers"
-#/usr/bin/cc -precomp ~/Library/Frameworks/SDL.framework/Headers/SDL.h -o ~/Library/Frameworks/SDL.framework/Headers/SDL.p
-
-# open up the README file
-#open ~/"Readme SDL Developer.txt"

_service:obs_scm:synfig-1.5.3.obscpio/ETL/configure.ac Deleted

@@ -1,106 +0,0 @@
-# -- I N I T --------------------------------------------------
-AC_PREREQ(2.60)
-AC_INIT(Extended Template Library,1.5.3,https://github.com/synfig/synfig/issues,ETL)
-AC_REVISION
-
-AM_SILENT_RULES(yes)
-
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_HEADERS(ETL/etl_profile_.h)
-AC_CANONICAL_HOST
-AC_CANONICAL_TARGET
-
-AM_INIT_AUTOMAKE( no-define )
-AM_MAINTAINER_MODE
-
-# -- V A R I A B L E S ----------------------------------------
-
-debug="no"
-
-# -- A R G U M E N T S ----------------------------------------
-
-
-# -- P R O G R A M S ------------------------------------------
-AC_LANG(C++)
-AC_REQUIRE_CPP
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CXXCPP
-AC_PROG_INSTALL
-AC_PROG_RANLIB
-AX_CXX_COMPILE_STDCXX(11, noext)
-CXXFLAGS="$CXXFLAGS -std=gnu++11"
-
-# that is not working, btw
-test "x$CXX" == "x" && AC_MSG_ERROR(Required program 'c++' not found.)
-
-
-AC_ARG_WARNINGS
-AC_ARG_OPTIMIZATION
-AC_ARG_DEBUG
-AC_ARG_PROFILING
-
-AC_WIN32_QUIRKS
-
-# -- L I B R A R I E S ----------------------------------------
-
-# -- H E A D E R S --------------------------------------------
-
-AH_TOP(
-// We want to be autoconf/autoheader friendly, so
-// if the developer has already included an
-// autoheader-generated configuration script,
-// we can assume that the user knew what they
-// were doing and let them use their own config.h.
-//#ifndef PACKAGE_TARNAME
-)
-
-AH_BOTTOM(
-//#endif // ifndef PACKAGE_TARNAME
-)
-
-
-# -- T Y P E S & S T R U C T S --------------------------------
-
-# -- F U N C T I O N S ----------------------------------------
-
-ETL_DEPS
-
-# -- O U T P U T ----------------------------------------------
-
-PKG_CHECK_MODULES(GLIBMM, glibmm-2.4 >= 2.24.2,
-	CONFIG_DEPS="$CONFIG_DEPS glibmm-2.4"
-,
-	AC_MSG_ERROR( ** You need to install glibmm-2.4 version 2.24.2 or higher.)
-)
-
-etlincludedir=$includedir/ETL
-AC_SUBST(etlincludedir)
-
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-
-AC_CONFIG_FILES(ETL-config
-Makefile
-ETL/Makefile
-ETL.pc
-doxygen.cfg
-)
-AC_OUTPUT
-
-# -- S U M M A R Y --------------------------------------------
-
-echo "
-$PACKAGE_NAME v.$VERSION
-Configuration Summary
-- - - - - - - - - - - - - - - - - - - - - - - - -
-
-Install Prefix -------------------> $prefix
-Target Platform ------------------> $host
-Debug Mode -----------------------> $debug
-
-"'$'"CXX ------------------------------> '$CXX'
-"'$'"CXXFLAGS -------------------------> '$CXXFLAGS'
-"

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/Makefile Deleted

@@ -1,92 +0,0 @@
-
-VERSION=0.61.03
-
-COREDIR=synfig-core
-STUDIODIR=synfig-studio
-ETLDIR=etl
-
-OUTPUTDIR=output
-
-SRCPKG=Synfig.mpkg
-OUTPKG=$(OUTPUTDIR)/Synfig-$(VERSION).mpkg
-PKGDIR=$(OUTPKG)/Contents/Packages
-
-SSH_USER=darco@www.bridgetone.com
-SSH_DIR=~/voria/files
-
-all: src osx package
-
-publish:
-	cd $(OUTPUTDIR) && tar c *.gz *.zip *.exe *.bz2 | ssh $(SSH_USER) "cd $(SSH_DIR) && tar xv" 
-
-osx-pkg:
-	rm -fr $(OUTPKG)
-	rm -fr $(OUTPKG).zip
-	cp -R $(SRCPKG) $(OUTPKG)
-	cp -r $(OUTPUTDIR)/*.pkg $(PKGDIR)
-	cd $(OUTPUTDIR) && zip -r Synfig-$(VERSION).mpkg.zip *.mpkg
-	
-core-osx:
-	 -d $(OUTPUTDIR)  || mkdir $(OUTPUTDIR)
-	rm -fr $(COREDIR)
-	svn export https://svn.voria.com/code/synfig-core/trunk $(COREDIR) || exit 2
-	cd $(COREDIR) && ./macosxbuild.sh
-	cp -r $(COREDIR)/macosxbuild/*.pkg $(OUTPUTDIR)
-
-studio-osx:
-	 -d $(OUTPUTDIR)  || mkdir $(OUTPUTDIR)
-	rm -fr $(STUDIODIR)
-	svn export https://svn.voria.com/code/synfig-studio/trunk $(STUDIODIR) || exit 2
-	cd $(STUDIODIR) && ./macosxbuild.sh
-	cp -r $(STUDIODIR)/macosxbuild/*.pkg $(OUTPUTDIR)
-
-core-w32:
-	 -d $(OUTPUTDIR)  || mkdir $(OUTPUTDIR)
-	rm -fr $(COREDIR)
-	svn export https://svn.voria.com/code/synfig-core/trunk $(COREDIR) || exit 2
-	cd $(COREDIR) && ./win32build.sh
-	cp -r $(COREDIR)/win32build/*.exe $(OUTPUTDIR)
-
-studio-w32:
-	 -d $(OUTPUTDIR)  || mkdir $(OUTPUTDIR)
-	rm -fr $(STUDIODIR)
-	svn export https://svn.voria.com/code/synfig-studio/trunk $(STUDIODIR) || exit 2
-	cd $(STUDIODIR) && ./win32build.sh
-	cp -r $(STUDIODIR)/win32build/*.exe $(OUTPUTDIR)
-
-core-src:
-	 -d $(OUTPUTDIR)  || mkdir $(OUTPUTDIR)
-	rm -fr $(COREDIR)
-	svn export https://svn.voria.com/code/synfig-core/trunk $(COREDIR) || exit 2
-	cd $(COREDIR) && libtoolize --ltdl --copy --force && autoreconf --force --install && ./configure
-	make -C $(COREDIR) dist
-	cp -r $(COREDIR)/*.gz $(OUTPUTDIR)
-
-studio-src:
-	 -d $(OUTPUTDIR)  || mkdir $(OUTPUTDIR)
-	rm -fr $(STUDIODIR)
-	svn export https://svn.voria.com/code/synfig-studio/trunk $(STUDIODIR) || exit 2
-	cd $(STUDIODIR) && autoreconf --force --install && ./configure
-	make -C $(STUDIODIR) dist
-	cp -r $(STUDIODIR)/*.gz $(OUTPUTDIR)
-
-etl-src:
-	 -d $(OUTPUTDIR)  || mkdir $(OUTPUTDIR)
-	rm -fr $(ETLDIR)
-	svn export https://svn.voria.com/code/ETL/trunk $(ETLDIR) || exit 2
-	cd $(ETLDIR) && autoreconf --force --install && ./configure
-	make -C $(ETLDIR) dist
-	cp -r $(ETLDIR)/*.gz $(OUTPUTDIR)
-
-src: etl-src core-src studio-src
-
-osx: core-osx studio-osx
-
-w32: core-w32 studio-w32
-
-clean:
-	rm -fr $(COREDIR)
-	rm -fr $(STUDIODIR)
-	rm -fr $(ETLDIR)
-	rm -fr $(OUTPUTDIR)
-

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/api.sh Deleted

@@ -1,88 +0,0 @@
-#!/bin/sh
-#
-# Script to generate API documentation and send it to sf.net
-#
-# Copyright 2009-2010 Konstantin Dmitriev
-# Copyright 2010, 2013 Carlos López
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This script has been redesigned to be used in a cron work.
-# Adapt the following macros to the proper directories values.
-
-export HTMLDIR=$HOME/synfig/synfig-repository/api
-#export SOURCEDIR=$HOME/synfig/synfig-repository/code/synfig
-export SOURCEDIR=$HOME/synfig/synfig-repository/api/tmp/synfig
-
-set -e
-
-#check for git and doxygen
-if ! which git > /dev/null 2>&1; then
-	echo "Please install git."
-	exit
-fi
-if ! which doxygen > /dev/null 2>&1; then
-	echo "Please install doxygen."
-	exit
-fi
-
-#fetching sources
-if ! -d $SOURCEDIR ; then
-	mkdir -p `dirname $SOURCEDIR`
-	cd `dirname $SOURCEDIR`
-	git clone --depth 1 git://github.com/synfig/synfig.git `basename $SOURCEDIR`
-fi
-
-mkdir -p $HTMLDIR
-
-cd $SOURCEDIR
-git fetch
-git reset --hard
-git checkout remotes/origin/master
-
-#generating api to htmldir
-for module in ETL synfig-core synfig-studio; do
-cd $module
-echo "Generating API for $module..."
-case $module in
-	ETL)
-		MODULETITLE='Extended Template Library'
-		;;
-	synfig-core)
-		MODULETITLE='Synfig Core'
-		;;
-	synfig-studio)
-		MODULETITLE='Synfig Studio'
-		;;
-esac
-	VERSION=`cat configure.ac |egrep "AC_INIT\(\$MODULETITLE\,"| sed "s|.*$MODULETITLE\,\||" | sed "s|\,\.*||"`
-	VERSION=${VERSION#*\'}
-	VERSION=${VERSION%\'}
-cp -f doxygen.cfg.in doxygen.cfg
-sed -i "s/@VERSION@/$VERSION/" doxygen.cfg
-sed -i "s/@PACKAGE@/$module/" doxygen.cfg
-doxygen doxygen.cfg
-rm -rf $HTMLDIR/$module
-mv doc/html $HTMLDIR/$module
-cp $SOURCEDIR/$module/doxygen.cfg $HTMLDIR/$module
-cd ..
-done
-
-#index.html
-DATE=`date -R`
-cat > $HTMLDIR/index.html <<EOF
-<html><head><title>ETL, synfig, synfigstudio API docs</title></head>
-<body>
-<h1>ETL, synfig, synfigstudio API docs</h1>
-<ul>
-<li><a href="ETL/annotated.html">ETL</a></li>
-<li><a href="synfig-core/annotated.html">synfig-core</a></li>
-<li><a href="synfig-studio/annotated.html">synfig-studio</a></li>
-</ul>
-Generated on: $DATE.
-</body></html>
-EOF
-

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/build.sh Deleted

@@ -1,428 +0,0 @@
-#!/usr/bin/env bash
-#
-# SynfigStudio build script
-# Copyright (c) 2008-2018 Konstantin Dmitriev
-#
-# This file is part of Synfig.
-#
-# Synfig is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# Synfig is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Synfig. If not, see <https://www.gnu.org/licenses/>.
-
-# = Usage: =
-# ./build.sh package mode
-#
-# where:
-# - package is all|etl|core|studio
-# - mode is full|clean|configure|make
-# 
-#
-# = Examples: =
-#
-# == Standard mode ==
-# Configure and (re)build:
-# ./build.sh
-# Configure and make clean build:
-# ./build.sh all full
-# Quick rebuild (without configure):
-# ./build.sh all make
-# Quick rebuild of synfig-core (without configure):
-# ./build.sh core make
-
-set -e
-
-REPO_DIR=`dirname "$0"`
-pushd "${REPO_DIR}/.." > /dev/null
-REPO_DIR=`pwd`
-popd > /dev/null
-
-RELEASE=8
-if -z "$PREFIX" ; then
-#PREFIX=$HOME/synfig
-PREFIX=`pwd`/build
-fi
-
-# detect number of threads for make (this can be overridden by build.conf)
-MAKE_THREADS="$(which nproc >/dev/null && nproc || sysctl -n hw.ncpu || getconf _NPROCESSORS_ONLN || echo 2 2>/dev/null)"
-
-# Allow overriding PREFIX and other settings
-if -f "./build.conf" ; then
-	. "./build.conf"
-fi
-
-if -z $DEBUG ; then
-	export DEBUG=0
-fi
-
-if $DEBUG == 1 ; then
-	DEBUG='--enable-debug --enable-optimization=0'
-else
-	DEBUG=''
-fi
-
-mkdir -p ETL
-mkdir -p synfig-core
-mkdir -p synfig-studio
-mkdir -p "${PREFIX}/bin"
-
-#========================== VARIABLES ==================================
-
-if `uname` == "Linux" ; then
-	export PKG_CONFIG_PATH="${PREFIX}/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/lib/`uname -i`-linux-gnu/pkgconfig/:${PKG_CONFIG_PATH}"
-fi
-
-if `uname` == "MSYS"* ; then
-	echo "You need to switch to MSYS2 MINGW shell, you are currently using pure MSYS"
-	exit 1
-fi
-
-if `uname` == "MINGW"* ; then # MacOS doesn't support `uname -o` flag
-	PATH="${PREFIX}/lib/ccache/bin:${PATH}"
-	# copy MLT
-	MLT_REV=1 # Change this when something is changed inside of if block below
-	if ! -f "${PREFIX}/mlt-${VERSION_MLT}-${MLT_REV}.done" ; then
-		VERSION_MLT="7.2.0"
-		cp -rf /opt/mlt-${VERSION_MLT}/*.dll "${PREFIX}/bin/"
-		cp -rf /opt/mlt-${VERSION_MLT}/*.exe "${PREFIX}/bin/"
-		cp -rf /opt/mlt-${VERSION_MLT}/share "${PREFIX}/bin/"
-		mkdir -p "${PREFIX}/bin/lib/"
-		cp -rf /opt/mlt-${VERSION_MLT}/lib/mlt "${PREFIX}/bin/lib/"
-		touch "${PREFIX}/mlt-${VERSION_MLT}-${MLT_REV}.done"
-	fi
-	export PKG_CONFIG_PATH="/opt/mlt-${VERSION_MLT}/lib/pkgconfig:${PKG_CONFIG_PATH}"
-fi
-if `uname` == "Darwin" ; then
-	# autopoint is not in PATH after install via brew (conflicting with system gettext https://github.com/Homebrew/legacy-homebrew/issues/24070)
-	# so we can do `brew link --force gettext` or just add it to PATH before configuring which is preferable because we need it only for compiling
-	export PATH="$(brew --prefix ccache)/libexec:$(brew --prefix gettext)/bin:${PATH}"
-	# `lib` is required to correctly detect libmng/libjpeg in autotools. Current `configure.ac` script doesn't use
-	# `pkg-config` to get library flags (libmng provides pkg-config (.pc) file from 2.0.3, but Debian still using 1.0.1).
-	export LDFLAGS="-L$(brew --prefix)/lib ${LDFLAGS}"
-
-	#export LDFLAGS="-L$(brew --prefix gettext)/lib ${LDFLAGS}"
-	#export LDFLAGS="-L$(brew --prefix libomp)/lib ${LDFLAGS}"
-	#export LDFLAGS="-L$(brew --prefix libtool)/lib ${LDFLAGS}"
-	#export CPPFLAGS="-I$(brew --prefix gettext)/include ${CPPFLAGS}"
-	#export PKG_CONFIG_PATH="$(brew --prefix libffi)/lib/pkgconfig:${PKG_CONFIG_PATH}"
-
-	# Force use system perl, see https://github.com/synfig/synfig/issues/794
-	cat > "${PREFIX}/bin/perl" <<EOF
-#!/bin/sh
-
-/usr/bin/perl "\$@"
-EOF
-	chmod +x "${PREFIX}/bin/perl"
-
-fi
-export PKG_CONFIG_PATH="${PREFIX}/lib/pkgconfig:${PKG_CONFIG_PATH}"
-export PATH="${PREFIX}/bin:$PATH"
-export LD_LIBRARY_PATH="${PREFIX}/lib:${PREFIX}/lib64:/usr/local/lib:$LD_LIBRARY_PATH"
-export LDFLAGS="-Wl,-rpath -Wl,\\\$\$ORIGIN/lib ${LDFLAGS}"
-export CFLAGS="-fdiagnostics-color=always $CFLAGS"
-export CXXFLAGS="-fdiagnostics-color=always $CXXFLAGS"
-
-#========================== FUNCTIONS ==================================
-
-travis_fold_start()
-{
-	if -n "$TRAVIS" ; then
-		echo -e "travis_fold:start:$1\03333;1m$2\0330m"
-	fi
-}
-
-travis_fold_end()
-{
-	if -n "$TRAVIS" ; then
-		echo -e "\ntravis_fold:end:$1\r"
-	fi
-}
-
-ccache_show_stats()
-{
-	if ( which ccache > /dev/null ); then
-	ccache -s
-	fi
-}
-
-#============================== ETL ====================================
-
-etl_clean() {
-cd ETL
-echo "Cleaning source tree..."
-make clean || true
-cd ..
-}
-
-etl_configure()
-{
-cd ETL
-echo "Going to configure..."
-pushd "${REPO_DIR}/ETL/" >/dev/null
-/bin/bash "${REPO_DIR}/ETL/bootstrap.sh"
-popd
-/bin/bash "${REPO_DIR}/ETL/configure" --prefix="${PREFIX}" --includedir="${PREFIX}/include" $DEBUG
-cd ..
-}
-
-etl_make()
-{
-cd ETL
-make -j$MAKE_THREADS
-sed -i.bak "s|^Cflags: -I\\\${includedir}|Cflags: -I$REPO_DIR\/ETL -I\\\${includedir}|" ETL.pc
-make install
-cd ..
-
-ccache_show_stats
-
-}
-
-etl_build()
-{
-etl_configure
-etl_make
-}
-
-etl_full()
-{
-etl_clean
-etl_configure
-etl_make
-}
-
-#======================== Synfig-Core ==================================
-
-core_clean()
-{
-cd synfig-core
-echo "Cleaning source tree..."
-make clean || true
-cd ..
-}
-
-core_configure()
-{
-cd synfig-core
-pushd "${REPO_DIR}/synfig-core/" >/dev/null
-/bin/bash "${REPO_DIR}/synfig-core/bootstrap.sh"
-popd >/dev/null
-if `uname -o` == "Msys" ; then
-	# Currently there is an error when building with Magick++ on MSYS2
-	export CONFIGURE_OPTIONS="--without-magickpp"
-else
-	export CONFIGURE_OPTIONS="--with-magickpp"
-fi
-if `uname` == "Darwin" ; then
-	base_version=10.13 # High Sierra
-	version=$(sw_vers -productVersion)
-	if $(echo -e $base_version"\n"$version | sort -V | tail -1) == "$base_version" ; then
-		# this version supports imagemagick
-		echo ""
-	else
-		# Currently there is an error when building with imagemack on OSX >= High Sierra
-		export CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --without-imagemagick --without-magickpp"
-	fi
-fi
-/bin/bash "${REPO_DIR}/synfig-core/configure" --prefix="${PREFIX}" \
-	--includedir="${PREFIX}/include" \
-	--disable-static --enable-shared \
-	--without-libavcodec \
-	--without-included-ltdl \
-	$CONFIGURE_OPTIONS \
-	$DEBUG
-cd ..
-}
-
-core_make()
-{
-cd synfig-core
-make -j$MAKE_THREADS
-sed -i.bak "s|^includedir=.*$|includedir=$REPO_DIR\/synfig-core\/src|" synfig.pc
-make install
-make check
-cd ..
-
-ccache_show_stats
-
-}
-
-core_check()
-{
-cd synfig-core
-make check
-cd ..
-}
-
-core_build()
-{
-core_configure
-core_make
-}
-
-core_full()
-{
-core_clean
-core_configure
-core_make
-}
-
-#======================== Synfig-Studio ==================================
-
-studio_clean()
-{
-cd synfig-studio
-echo "Cleaning source tree..."
-make clean || true
-cd ..
-}
-
-studio_configure()
-{
-cd synfig-studio
-pushd "${REPO_DIR}/synfig-studio/" >/dev/null
-/bin/bash "${REPO_DIR}/synfig-studio/bootstrap.sh"
-popd >/dev/null
-if `uname` == "Linux" ; then
-	export CONFIGURE_OPTIONS="--enable-jack"
-else
-	export CONFIGURE_OPTIONS=""
-fi
-
-/bin/bash "${REPO_DIR}/synfig-studio/configure" --prefix="${PREFIX}" \
-	--includedir="${PREFIX}/include" \
-	--disable-static \
-	--enable-shared \
-	${CONFIGURE_OPTIONS} \
-	--enable-warnings=max $DEBUG
-cd ..
-}
-
-studio_make()
-{
-cd synfig-studio
-
-make -j$MAKE_THREADS
-make install
-make check
-
-ccache_show_stats
-
-for n in AUTHORS COPYING NEWS README
-do
- 	cp -f "${REPO_DIR}/synfig-studio/$n" "${PREFIX}"
-done
-
-if ! -z "$NIX_BUILD_CORES" ; then
-	source "`head -n 1 ${MAKE_WRAPPER_PATH}/nix-support/propagated-build-inputs | sed -e 's/:space:*$//'`/nix-support/setup-hook"
-	source "${MAKE_WRAPPER_PATH}/nix-support/setup-hook"
-	wrapProgram "${PREFIX}/bin/synfigstudio" \
-		 --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
-		 --prefix XCURSOR_PATH : "$ADWAITA_PATH/share/icons" \
-		 --set XCURSOR_THEME "Adwaita"
-fi
-
-cd ..
-msg_done
-}
-
-studio_check()
-{
-cd synfig-studio
-make check
-cd ..
-}
-
-studio_build()
-{
-studio_configure
-studio_make
-}
-
-studio_full()
-{
-studio_clean
-studio_configure
-studio_make
-}
-
-#=============================== ALL ===================================
-
-all_clean()
-{
-etl_clean
-core_clean
-studio_clean
-}
-
-all_configure()
-{
-etl_configure
-core_configure
-studio_configure
-}
-
-all_make()
-{
-etl_make
-core_make
-studio_make
-}
-
-all_build()
-{
-travis_fold_start ETL "Building ETL"
-etl_build
-travis_fold_end ETL
-
-travis_fold_start synfig-core "Building Synfig Core"
-core_build
-travis_fold_end synfig-core
-
-travis_fold_start synfig-studio "Building Synfig Studio"
-studio_build
-travis_fold_end synfig-studio
-}
-
-all_full()
-{
-etl_full
-core_full
-studio_full
-}
-
-msg_done()
-{
-echo
-echo
-echo "Done. Please check your Synfig installation in"
-echo " ${PREFIX}"
-echo
-echo "You can start Synfig by executing"
-echo " ${PREFIX}/bin/synfigstudio"
-echo
-}
-
-#============================== MAIN ===================================
-
-if -z $1 ; then
-	ARG1='all'
-else
-	ARG1=$1
-fi
-
-if -z $2 ; then
-	ARG2='build'
-else
-	ARG2=$2
-fi
-
-# executing command
-${ARG1}_${ARG2}

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/cygwin Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/cygwin/rpm-4.10.3.1-python-fixes.patch Deleted

@@ -1,219 +0,0 @@
-diff --git a/python/header-py.c b/python/header-py.c
-index d194fdc..48a88ef 100644
---- a/python/header-py.c
-+++ b/python/header-py.c
-@@ -683,7 +683,7 @@ static char hdr_doc =
- "";
- 
- PyTypeObject hdr_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.hdr",			/* tp_name */
- 	sizeof(hdrObject),		/* tp_size */
- 	0,				/* tp_itemsize */
-diff --git a/python/rpmbmodule.c b/python/rpmbmodule.c
-index f6e1491..f5c94f0 100644
---- a/python/rpmbmodule.c
-+++ b/python/rpmbmodule.c
-@@ -10,18 +10,22 @@ static char rpmb__doc__ =
- */
- static int prepareInitModule(void)
- {
-+#if !defined(__CYGWIN__)
- if (PyType_Ready(&spec_Type) < 0) return 0;
- if (PyType_Ready(&specPkg_Type) < 0) return 0;
-+#endif
- 
- return 1;
- }
- 
- static int initModule(PyObject *m)
- {
-+#if !defined(__CYGWIN__)
- Py_INCREF(&spec_Type);
- PyModule_AddObject(m, "spec", (PyObject *) &spec_Type);
- Py_INCREF(&specPkg_Type);
- PyModule_AddObject(m, "specPkg", (PyObject *) &specPkg_Type);
-+#endif
- 
- #define REGISTER_ENUM(val) PyModule_AddIntConstant(m, #val, val)
- REGISTER_ENUM(RPMBUILD_ISSOURCE);
-diff --git a/python/rpmds-py.c b/python/rpmds-py.c
-index 30fb908..ed97690 100644
---- a/python/rpmds-py.c
-+++ b/python/rpmds-py.c
-@@ -340,7 +340,7 @@ static char rpmds_doc =
- "";
- 
- PyTypeObject rpmds_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.ds",			/* tp_name */
- 	sizeof(rpmdsObject),		/* tp_basicsize */
- 	0,				/* tp_itemsize */
-diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c
-index a266ad6..029487b 100644
---- a/python/rpmfd-py.c
-+++ b/python/rpmfd-py.c
-@@ -309,7 +309,7 @@ static PyGetSetDef rpmfd_getseters = {
- };
- 
- PyTypeObject rpmfd_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.fd",			/* tp_name */
- 	sizeof(rpmfdObject),		/* tp_size */
- 	0,				/* tp_itemsize */
-diff --git a/python/rpmfi-py.c b/python/rpmfi-py.c
-index 458e721..66222f5 100644
---- a/python/rpmfi-py.c
-+++ b/python/rpmfi-py.c
-@@ -319,7 +319,7 @@ static char rpmfi_doc =
- "";
- 
- PyTypeObject rpmfi_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.fi",			/* tp_name */
- 	sizeof(rpmfiObject),		/* tp_basicsize */
- 	0,				/* tp_itemsize */
-diff --git a/python/rpmii-py.c b/python/rpmii-py.c
-index d7713af..d323768 100644
---- a/python/rpmii-py.c
-+++ b/python/rpmii-py.c
-@@ -102,7 +102,7 @@ static char rpmii_doc =
- "";
- 
- PyTypeObject rpmii_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.ii",			/* tp_name */
- 	sizeof(rpmiiObject),		/* tp_size */
- 	0,				/* tp_itemsize */
-diff --git a/python/rpmkeyring-py.c b/python/rpmkeyring-py.c
-index d5f131e..45ace97 100644
---- a/python/rpmkeyring-py.c
-+++ b/python/rpmkeyring-py.c
-@@ -51,7 +51,7 @@ static struct PyMethodDef rpmPubkey_methods = {
- static char rpmPubkey_doc = "";
- 
- PyTypeObject rpmPubkey_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.pubkey",			/* tp_name */
- 	sizeof(rpmPubkeyObject),	/* tp_size */
- 	0,				/* tp_itemsize */
-@@ -132,7 +132,7 @@ static char rpmKeyring_doc =
- "";
- 
- PyTypeObject rpmKeyring_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.keyring",			/* tp_name */
- 	sizeof(rpmKeyringObject),	/* tp_size */
- 	0,				/* tp_itemsize */
-diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c
-index 8e670ce..ad3d85b 100644
---- a/python/rpmmi-py.c
-+++ b/python/rpmmi-py.c
-@@ -163,7 +163,7 @@ static char rpmmi_doc =
- "";
- 
- PyTypeObject rpmmi_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.mi",			/* tp_name */
- 	sizeof(rpmmiObject),		/* tp_size */
- 	0,				/* tp_itemsize */
-diff --git a/python/rpmps-py.c b/python/rpmps-py.c
-index bdc899a..04b01f9 100644
---- a/python/rpmps-py.c
-+++ b/python/rpmps-py.c
-@@ -71,7 +71,7 @@ static void rpmprob_dealloc(rpmProblemObject *s)
- }
- 
- PyTypeObject rpmProblem_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.prob",			/* tp_name */
- 	sizeof(rpmProblemObject),		/* tp_basicsize */
- 	0,				/* tp_itemsize */
-diff --git a/python/rpmte-py.c b/python/rpmte-py.c
-index 2204a52..8884c03 100644
---- a/python/rpmte-py.c
-+++ b/python/rpmte-py.c
-@@ -249,7 +249,7 @@ static char rpmte_doc =
- "";
- 
- PyTypeObject rpmte_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.te",			/* tp_name */
- 	sizeof(rpmteObject),		/* tp_size */
- 	0,				/* tp_itemsize */
-diff --git a/python/rpmts-py.c b/python/rpmts-py.c
-index 5c6e9ba..2ffeeac 100644
---- a/python/rpmts-py.c
-+++ b/python/rpmts-py.c
-@@ -871,7 +871,7 @@ static PyGetSetDef rpmts_getseters = {
- };
- 
- PyTypeObject rpmts_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.ts",			/* tp_name */
- 	sizeof(rpmtsObject),		/* tp_size */
- 	0,				/* tp_itemsize */
-diff --git a/python/setup.py.in b/python/setup.py.in
-index 619b0ac..55a4f24 100644
---- a/python/setup.py.in
-+++ b/python/setup.py.in
-@@ -27,14 +27,14 @@ rpmmod = Extension('rpm._rpm',
- 'rpmtd', 'rpmte', 'rpmts', 'rpmmodule',
- ),
- include_dirs = pkgconfig('--cflags'),
-- libraries = pkgconfig('--libs'),
-+ libraries = pkgconfig('--libs') + 'ssp' + 'intl',
- extra_compile_args = cflags
- )
- 
- rpmbuild_mod = Extension('rpm._rpmb',
- sources = mksources('rpmbmodule', 'spec'),
- include_dirs = pkgconfig('--cflags'),
-- libraries = pkgconfig('--libs') + 'rpmbuild',
-+ libraries = 'rpmbuild' + 'magic' + 'ssp' + pkgconfig('--libs') + 'intl',
- extra_compile_args = cflags
- )
- 
-diff --git a/python/spec-py.c b/python/spec-py.c
-index 1850a50..5923421 100644
---- a/python/spec-py.c
-+++ b/python/spec-py.c
-@@ -61,7 +61,7 @@ static PyGetSetDef specpkg_getseters = {
- };
- 
- PyTypeObject specPkg_Type = {
--	PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+	PyVarObject_HEAD_INIT(NULL, 0)
- 	"rpm.specpkg",			/* tp_name */
- 	sizeof(specPkgObject),		/* tp_size */
- 	0,				/* tp_itemsize */
-@@ -262,7 +262,7 @@ static struct PyMethodDef spec_methods = {
- };
- 
- PyTypeObject spec_Type = {
-- PyVarObject_HEAD_INIT(&PyType_Type, 0)
-+ PyVarObject_HEAD_INIT(NULL, 0)
- "rpm.spec", /*tp_name*/
- sizeof(specObject), /*tp_basicsize*/
- 0, /*tp_itemsize*/
-diff --git a/rpm.pc.in b/rpm.pc.in
-index 9426920..86e63dc 100644
---- a/rpm.pc.in
-+++ b/rpm.pc.in
-@@ -12,4 +12,4 @@ URL: http://rpm.org
- # Conflicts:
- Cflags: -I${includedir}
- Libs: -L${libdir} -lrpm -lrpmio
--Libs.private: -lpopt -lrt -lpthread @WITH_SELINUX_LIB@ @WITH_LZMA_LIB@ @WITH_DB_LIB@ @WITH_BZ2_LIB@ @WITH_ZLIB_LIB@ @WITH_NSS_LIB@ @WITH_LUA_LIB@
-+Libs.private: -lpopt -lrt -lpthread @WITH_SELINUX_LIB@ @WITH_LZMA_LIB@ @WITH_DB_LIB@ @WITH_BZ2_LIB@ @WITH_ZLIB_LIB@ @WITH_NSS_LIB@

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/cygwin/rpm-4.10.3.1.patch Deleted

@@ -1,102 +0,0 @@
-diff --git a/misc/fts.c b/misc/fts.c
-index 9fbefe3..27e9c42 100644
---- a/misc/fts.c
-+++ b/misc/fts.c
-@@ -61,6 +61,12 @@ static char sccsid = "@(#)fts.c	8.6 (Berkeley) 8/14/94";
- # define _STAT_VER		0
- # define __fxstat64(_stat_ver, _fd, _sbp) fstat64((_fd), (_sbp))
- #endif
-+#if defined(__CYGWIN__)
-+# define __errno_location() 	(&errno)
-+# define stat64		stat
-+# define _STAT_VER		0
-+# define __fxstat64(_stat_ver, _fd, _sbp)	fstat((_fd), (_sbp))
-+#endif
- #include "system.h"
- #include <stdlib.h>
- #include <string.h>
-diff --git a/misc/fts.h b/misc/fts.h
-index 47c650e..a1ed262 100644
---- a/misc/fts.h
-+++ b/misc/fts.h
-@@ -53,6 +53,10 @@
- # define	_LARGEFILE64_SOURCE
- #endif
- 
-+#if defined(__CYGWIN__)
-+# define _D_EXACT_NAMLEN(d) (strlen ((d)->d_name))
-+#endif
-+
- #if defined(sun)
- # define _D_EXACT_NAMLEN(d) ((d)->d_reclen)
- #endif
-diff --git a/rpmdb.c b/rpmdb.c
-index 7223fdf..53e95f5 100644
---- a/rpmdb.c
-+++ b/rpmdb.c
-@@ -5,7 +5,7 @@
- #include "cliutils.h"
- #include "debug.h"
- 
--#if !defined(__GLIBC__) && !defined(__APPLE__)
-+#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__CYGWIN__)
- char ** environ = NULL;
- #endif
- 
-diff --git a/rpmkeys.c b/rpmkeys.c
-index fa4e4d8..42416d7 100644
---- a/rpmkeys.c
-+++ b/rpmkeys.c
-@@ -5,7 +5,7 @@
- #include "cliutils.h"
- #include "debug.h"
- 
--#if !defined(__GLIBC__) && !defined(__APPLE__)
-+#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__CYGWIN__)
- char ** environ = NULL;
- #endif
- 
-diff --git a/rpmsign.c b/rpmsign.c
-index e29864e..868cd78 100644
---- a/rpmsign.c
-+++ b/rpmsign.c
-@@ -8,7 +8,7 @@
- #include "cliutils.h"
- #include "debug.h"
- 
--#if !defined(__GLIBC__) && !defined(__APPLE__)
-+#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__CYGWIN__)
- char ** environ = NULL;
- #endif
- 
-diff --git a/sign/rpmgensig.c b/sign/rpmgensig.c
-index 7695ffa..13d7fd9 100644
---- a/sign/rpmgensig.c
-+++ b/sign/rpmgensig.c
-@@ -22,7 +22,7 @@
- 
- #include "debug.h"
- 
--#if !defined(__GLIBC__) && !defined(__APPLE__)
-+#if !defined(__GLIBC__) && !defined(__APPLE__) && !defined(__CYGWIN__)
- char ** environ = NULL;
- #endif
- 
-diff --git a/system.h b/system.h
-index 0037244..5f69d75 100644
---- a/system.h
-+++ b/system.h
-@@ -119,11 +119,13 @@ typedef	char * security_context_t;
- #define	setprogname(pn)
- #else
- #define	__progname	program_name
-+#if !defined(__CYGWIN__)
- #define	setprogname(pn)	\
- { if ((__progname = strrchr(pn, '/')) != NULL) __progname++; \
- else __progname = pn;		\
- }
- #endif
-+#endif
- extern const char *__progname;
- 
- /* Take care of NLS matters. */

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/default-nixpkgs.nix Deleted

@@ -1,88 +0,0 @@
-/*
-This is a nix expression to build Synfig from source on any distro
-where nix is installed. This will install all the dependencies from
-the nixpkgs repo and build Synfig without interfering with the host
-distro.
-
-http://nixos.org/nix/
-
-To quickly install nix, you can run the following command:
-
-$ curl -L http://git.io/nix-install.sh | bash
-
-To initialise it:
-
-$ source ~/.nix-profile/etc/profile.d/nix.sh
-
-To build synfig, from the current directory:
-
-$ nix-build
-
-To run the newly compiled synfigstudio:
-
-$ ./result/bin/synfigstudio
-*/
-
-with import <nixpkgs> {};
-
-let
- version = "git";
-
- ETL = stdenv.mkDerivation rec {
- name = "ETL-${version}";
-
- src = ../ETL;
-
- nativeBuildInputs = autoreconfHook ;
- };
-
- synfig = stdenv.mkDerivation rec {
- name = "synfig-${version}";
-
- src = ../synfig-core;
-
- configureFlags = 
- ;
-
- nativeBuildInputs = pkgconfig autoreconfHook gettext ;
-
- buildInputs = 
- ETL cairo fftw glibmm intltool libjpeg libsigcxx libxmlxx
- mlt imagemagick pango which
- ;
-
- preConfigure = "./bootstrap.sh";
-
- };
-in
-stdenv.mkDerivation rec {
- name = "synfigstudio-${version}";
-
- src = ../synfig-studio;
-
- preConfigure = "./bootstrap.sh";
-
- nativeBuildInputs = pkgconfig autoreconfHook gettext ;
- buildInputs = 
- ETL cairo fftw glibmm gnome3.defaultIconTheme gtk3 gtkmm3
- imagemagick intltool libjack2 libsigcxx libxmlxx makeWrapper mlt
- synfig which
- ;
-
- postInstall = ''
- wrapProgram "$out/bin/synfigstudio" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
- --prefix XCURSOR_PATH : "${gnome3.adwaita-icon-theme.out}/share/icons" \
- --set XCURSOR_THEME "Adwaita"
- '';
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- description = "A 2D animation program";
- homepage = http://www.synfig.org;
- license = licenses.gpl2Plus;
- maintainers = maintainers.goibhniu ;
- platforms = platforms.linux;
- };
-}

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/default.nix Deleted

@@ -1,72 +0,0 @@
-/*
-This is a nix expression to build Synfig from source on any distro
-where nix is installed. This will install all the dependencies from
-the nixpkgs repo and build Synfig without interfering with the host
-distro.
-
-http://nixos.org/nix/
-
-To quickly install nix, you can run the following command:
-
-$ curl -L http://git.io/nix-install.sh | bash
-
-To initialise it:
-
-$ source ~/.nix-profile/etc/profile.d/nix.sh
-
-*/
-
-with import <nixpkgs> {};
-
-let
- version = "git";
-in
-stdenv.mkDerivation rec {
- name = "synfigstudio-${version}";
-
- src = ../autobuild ../ETL ../synfig-core ../synfig-studio ;
-
- nativeBuildInputs = pkgconfig autoreconfHook gettext gnumake makeWrapper ;
- buildInputs = 
- cairo ffmpeg fftw intltool glibmm gnome3.defaultIconTheme gtk3 gtkmm3
- imagemagick intltool libjpeg libjack2 libsigcxx libxmlxx mlt
- pango which
- ;
-
- preConfigure = "";
- configureScript = "";
-
- ADWAITA_PATH = "${gnome3.adwaita-icon-theme.out}";
- MAKE_WRAPPER_PATH = "${makeWrapper.out}";
-
- sourceRoot = ".";
-
- postUnpack = ''
- touch configure.ac
- '';
-
- buildPhase = ''
- PREFIX=$out ./autobuild/build.sh
- '';
-
- installPhase = ''
- echo
- '';
-
- postInstall = ''
- wrapProgram "./_production/build/bin/synfigstudio" \
- --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
- --prefix XCURSOR_PATH : "${gnome3.adwaita-icon-theme.out}/share/icons" \
- --set XCURSOR_THEME "Adwaita"
- '';
-
- enableParallelBuilding = true;
-
- meta = with stdenv.lib; {
- description = "A 2D animation program";
- homepage = http://www.synfig.org;
- license = licenses.gpl2Plus;
- maintainers = maintainers.goibhniu ;
- platforms = platforms.linux;
- };
-}

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/fedora-crosscompile-linux.sh Deleted

@@ -1,2356 +0,0 @@
-#!/bin/bash
-
-# TODO: Bundle ALL dependent lib (libpng issue)
-# TODO: FFmpeg/libx264 - stick to particular version
-# TODO: FFmpeg/libx264/mlt - cache sources
-# TODO: Debug builds for dependent libraries
-# TODO: Use BUILDROOT_LIBRARY_SET_ID
-
-set -e
-
-export SCRIPTPATH=$(cd `dirname "$0"`; pwd)
-
-RELEASE=10
-
-BUILDROOT_VERSION=5
-BUILDROOT_LIBRARY_SET_ID=2
-
-if -z $ARCH ; then
-	if `uname -i` == "x86_64" ; then
-		export ARCH="64"
-	else
-		export ARCH="32"
-	fi
-fi
-
-if -z $THREADS ; then
-	export THREADS=2
-fi
-
-if -z $DEBUG ; then
-	export DEBUG=0
-fi
-
-if $DEBUG == 1 ; then
-	echo
-	echo "Debug mode: enabled"
-	echo
-	DEBUG_OPT='--enable-debug --enable-optimization=0'
-	DEBUG_OPT2='--enable-debug=yes'
-	export SUFFIX="-debug"
-else
-	DEBUG_OPT='--enable-optimization=3'
-fi
-
-if ! -z $SUBSET ; then
-	export SUFFIX="-$SUBSET"
-fi
-
-export WORKSPACE=$HOME/synfig-buildroot
-export SYSPREFIX=$WORKSPACE/linux$ARCH$SUFFIX/sys
-export PREFIX=$WORKSPACE/linux$ARCH$SUFFIX/build
-#export DEPSPREFIX=$WORKSPACE/linux$ARCH$SUFFIX/build
-export DEPSPREFIX=$WORKSPACE/linux$ARCH$SUFFIX/sys-deps
-export TOOLSPREFIX=$WORKSPACE/linux$ARCH$SUFFIX/tools
-export SRCPREFIX=$WORKSPACE/linux$ARCH$SUFFIX/source
-export DISTPREFIX=$WORKSPACE/linux$ARCH$SUFFIX/dist
-export CACHEDIR=$WORKSPACE/cache
-
- -e ${SRCPREFIX} || mkdir -p ${SRCPREFIX}
- -e ${WORKSPACE}/cache || mkdir -p ${WORKSPACE}/cache
-
-export EMAIL='root@synfig.org'
-SOURCES_URL="rsync://download.tuxfamily.org/pub/synfig/packages/sources/base"
-
-# Bundled libraries
-LIBJPEG_VERSION=1.3.1
-LIBSIGCPP_VERSION=2.2.10
-GLEW_VERSION=1.5.1
-CAIROMM_VERSION=1.10.0
-PANGOMM_VERSION=2.34.0
-GTKMM_VERSION=3.14.0
-FTGL_VERSION=2.1.2
-FREEGLUT_VERSION=2.4.0
-GTKGLEXT_VERSION=1.2.0
-GTKGLEXTMM_VERSION=1.2.0
-LIBXMLPP_VERSION=2.22.0
-GLIBMM_VERSION=2.42.0
-CAIRO_VERSION=1.12.18
-ATK_VERSION=2.14.0
-AT_SPI2_VERSION=2.10.2
-AT_SPI2_ATK_VERSION=2.10.2
-GLIB_VERSION=2.42.1
-GDK_PIXBUF_VERSION=2.31.3
-GTK_VERSION=3.14.14
-PIXMAN_VERSION=0.30.0		# required by CAIRO 1.12.0
-HARFBUZZ_VERSION=0.9.24
-PANGO_VERSION=1.36.8
-ATKMM_VERSION=2.22.7
-IMAGEMAGICK_VERSION=6.9.1
-
-# System libraries
-FONTCONFIG_VERSION=2.11.0
-JACK_VERSION=0.124.1
-
-if $ARCH == "32" ; then
-	export SYS_ARCH=i386
-	export RPM_ARCH=i386
-	export GCC_ARCH=i486
-	export LIBDIR="lib"
-	export HOST=i686-pc-linux-gnu
-	if ( cat /etc/issue | egrep "Ubuntu" ); then
-		export UBUNTU_LIBDIR="/lib/i386-linux-gnu/"
-	fi
-else
-	export SYS_ARCH=amd64
-	export RPM_ARCH=x86_64
-	export GCC_ARCH=x86_64
-	export LIBDIR="lib64"
-	export HOST=x86_64-pc-linux-gnu
-	if ( cat /etc/issue | egrep "Ubuntu" ); then
-		export UBUNTU_LIBDIR="/lib/x86_64-linux-gnu/"
-	fi
-fi
-
-#if `uname -i` == "x86_64" ; then
-#export NATIVE_LIBDIR="lib64"
-
-
-pushd "${SCRIPTPATH}" > /dev/null
-export VERSION=`cat ${SCRIPTPATH}/../synfig-core/configure.ac |egrep "AC_INIT$\Synfig Core\,"| sed "s|.*Core\,\||" | sed "s|\,\.*||"`
-export REVISION=`git show --pretty=format:%ci HEAD | head -c 10 | tr -d '-'`
-if -z $BREED ; then
-	BREED="`git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/\(no\ branch$// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//`"
-	if ( echo $BREED | egrep origin/master > /dev/null ); then
-		#give a priority to master branch
-		BREED='master'
-	else
-		BREED=`echo $BREED | cut -d ' ' -f 1`
-		BREED=${BREED##*/}
-	fi
-	BREED=${BREED%_master}
-fi
-if ${VERSION##*-RC} != ${VERSION} ; then
-	#if $BREED == 'master' ; then
-		BREED=rc${VERSION##*-RC}
-	#else
-	#	BREED=rc${VERSION##*-RC}.$BREED
-	#fi
-	VERSION=${VERSION%%-*}
-fi
- $DEBUG == 1 && BREED=${BREED}.dbg
-BREED=`echo $BREED | tr _ . | tr - .`	# No "-" or "_" characters, because RPM and DEB complain
-
-popd > /dev/null
-
-set_environment()
-{
-	#export LD_LIBRARY_PATH=${DEPSPREFIX}/lib:/${LIBDIR}:${SYSPREFIX}/${LIBDIR}:${SYSPREFIX}/usr/${LIBDIR}
-	#export LD_LIBRARY_PATH=${SYSPREFIX}/lib-native:${PREFIX}/lib:${DEPSPREFIX}/lib:${SYSPREFIX}/${LIBDIR}:${SYSPREFIX}/usr/${LIBDIR}
-	if ( cat /etc/issue | egrep "Ubuntu" ); then
-		export LD_PRELOAD=${UBUNTU_LIBDIR}/libc.so.6:${UBUNTU_LIBDIR}/libpthread.so.0:${UBUNTU_LIBDIR}/libdl.so.2
-	else
-		export LD_PRELOAD=/${LIBDIR}/libc.so.6:/${LIBDIR}/libpthread.so.0:/${LIBDIR}/libdl.so.2
-	fi
-	export LD_LIBRARY_PATH=${PREFIX}/lib:${DEPSPREFIX}/lib:${SYSPREFIX}/${LIBDIR}:${SYSPREFIX}/usr/lib:${SYSPREFIX}/lib/${RPM_ARCH}-linux-gnu:${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu
-	
-	export PATH=${DEPSPREFIX}/bin:${PREFIX}/bin:${SYSPREFIX}/bin:${SYSPREFIX}/usr/bin
-	export LDFLAGS="-Wl,-rpath -Wl,\\\$\$ORIGIN/lib -L${PREFIX}/lib -L${DEPSPREFIX}/lib -L${SYSPREFIX}/${LIBDIR} -L${SYSPREFIX}/usr/${LIBDIR} -L${SYSPREFIX}/lib/${RPM_ARCH}-linux-gnu/ -L${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/"
-	if $DEBUG == 1 ; then
-		export CFLAGS="-O0"
-		export CXXFLAGS="-O0"
-	else
-		export CFLAGS="-O3"
-		export CXXFLAGS="-O3"
-	fi
-	#export CFLAGS=" -nostdinc -I${SYSPREFIX}/usr/lib/gcc/${RPM_ARCH}-linux-gnu/4.3.2/include -I${SYSPREFIX}/usr/lib/gcc/${RPM_ARCH}-linux-gnu/4.3.2/include-fixed -I${PREFIX}/include -I${DEPSPREFIX}/include -I${SYSPREFIX}/usr/include"
-	GCC_VER=4.7
-	export CPPFLAGS="-I${SYSPREFIX}/usr/include -I${DEPSPREFIX}/include -I${PREFIX}/include -I${SYSPREFIX}/usr/include/${RPM_ARCH}-linux-gnu" 
-	#export CXXFLAGS="-I${SYSPREFIX}/usr/include/linux/ -I${SYSPREFIX}/usr/include/c++/${GCC_VER}/ -I${SYSPREFIX}/usr/include/c++/${GCC_VER}/${GCC_ARCH}-linux-gnu/ -I${SYSPREFIX}/usr/lib/gcc/${GCC_ARCH}-linux-gnu/${GCC_VER}/include/ -I${SYSPREFIX}/usr/lib/gcc/${GCC_ARCH}-linux-gnu/${GCC_VER}/include-fixed/ -I${SYSPREFIX}/usr/${GCC_ARCH}-linux-gnu/include"
-	#export CXXFLAGS="-I${SYSPREFIX}/usr/local/include/x86_64-linux-gnu -I${SYSPREFIX}/usr/lib/gcc/x86_64-linux-gnu/4.4.5/include -I${SYSPREFIX}/usr/lib/gcc/x86_64-linux-gnu/4.4.5/include-fixed -I${SYSPREFIX}/usr/lib/gcc/../../x86_64-linux-gnu/include -I${SYSPREFIX}/usr/include/x86_64-linux-gnu"
-	#export CXXFLAGS=" -nostdinc -I${SYSPREFIX}/usr/lib/gcc/../../include/c++/4.3 -I${SYSPREFIX}/usr/lib/gcc/../../include/c++/4.3/x86_64-linux-gnu -I${SYSPREFIX}/usr/lib/gcc/../../include/c++/4.3/backward -I${SYSPREFIX}/usr/lib/gcc/x86_64-linux-gnu/4.3.2/include -I${SYSPREFIX}/usr/lib/gcc/x86_64-linux-gnu/4.3.2/include-fixed -I${PREFIX}/include -I${DEPSPREFIX}/include -I${SYSPREFIX}/usr/include"
-	export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:${DEPSPREFIX}/lib/pkgconfig:${SYSPREFIX}/usr/lib/pkgconfig:${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/pkgconfig:${SYSPREFIX}/usr/share/pkgconfig
-	PERL_VERSION=`perl -v | grep "This is perl" | sed "s|This is perl .*(v||g" | sed "s|).*||"`
-	export NM=nm
-	export PERL5LIB="${SYSPREFIX}/etc/perl:${SYSPREFIX}/usr/share/automake-1.11:${DEPSPREFIX}/lib/perl/${PERL_VERSION}:${DEPSPREFIX}/share/perl/${PERL_VERSION}:${SYSPREFIX}/usr/lib/perl5:${SYSPREFIX}/usr/share/perl5:${SYSPREFIX}/usr/lib/perl/${PERL_VERSION}:${SYSPREFIX}/usr/share/perl/${PERL_VERSION}:${DEPSPREFIX}/lib/site_perl"
-	if $ARCH == "32" ; then
-		export CFLAGS="$CFLAGS -m32"
-		export CXXFLAGS="$CXXFLAGS -m32"
-		export LDFLAGS="$LDFLAGS -m32"
-	fi
-}
-
-run_native()
-{
-	LD_PRELOAD=""
-	LD_LIBRARY_PATH=""
-	PATH="/usr/local/bin/:/usr/sbin:/usr/bin:/bin"
-	LDFLAGS=""
-	CFLAGS=""
-	CXXFLAGS=""
-	PKG_CONFIG_PATH=""
-	PERL5LIB=""
-	if $ARCH == "32" ; then
-		export CFLAGS="$CFLAGS -m32"
-		export CXXFLAGS="$CXXFLAGS -m32"
-		export LDFLAGS="$LDFLAGS -m32"
-	fi
-	"$@"
-	set_environment
-}
-
-mkprefix_()
-{
-	 ! -e ${SYSPREFIX}/dev || rm -rf ${SYSPREFIX}/dev
-	 ! -e ${SYSPREFIX}/proc || rm -rf ${SYSPREFIX}/proc
-	
-	#deb http://debootstrap.invalid/ lenny main
-	
-	LD_LIBRARY_PATH=${UBUNTU_LIBDIR}:/${LIBDIR}:${SYSPREFIX}/usr/${LIBDIR} \
-	PATH=/usr/local/sbin:/usr/sbin:/sbin:/sbin:/bin:/usr/bin:${SYSPREFIX}/usr/sbin:${SYSPREFIX}/sbin:${SYSPREFIX}/usr/bin:${SYSPREFIX}/bin:$PATH HOME=/ LOGNAME=root \
-		fakeroot \
-		${SYSPREFIX}/usr/bin/apt-get \
-		-o Dir::Etc::SourceList="${SYSPREFIX}/etc/apt/sources.list" \
-		-o Dir::Etc::Parts="${SYSPREFIX}/etc/apt/apt.conf.d/" \
-		-o Dir::State::Lists="${SYSPREFIX}/var/lib/apt/lists/" \
-		-o Dir::Cache::Archives="${SYSPREFIX}/var/cache/apt/archives/" \
-		-o Dir::Etc::Preferences="${SYSPREFIX}/etc/apt/preferences" \
-		 --print-uris --yes install m4
-}
-
-mkprefix()
-{
-	# -e $WORKSPACE/linux$ARCH$SUFFIX/tools/bin/fakeroot || mkfakeroot
-	# -e $WORKSPACE/linux$ARCH$SUFFIX/tools/bin/fakechroot || mkfakechroot
-	
-	DEB_LIST_MINIMAL="\
-			build-essential \
-			libpng12-dev \
-			libfreetype6-dev \
-			libxml2-dev \
-			libjasper-dev \
-			libffi-dev \
-			libasound2-dev \
-			x11proto-xext-dev libdirectfb-dev libxfixes-dev libxinerama-dev libxdamage-dev libxcomposite-dev libxcursor-dev libxft-dev libxrender-dev libxt-dev libxrandr-dev libxi-dev libxext-dev libx11-dev \
-			libxtst-dev \
-			libpthread-stubs0-dev \
-			libxml-parser-perl \
-			libdb-dev uuid-dev \
-			libdbus-1-dev \
-			wget mawk \
-			python-dev \
-			gettext autopoint \
-			libpciaccess-dev multiarch-support libx11-xcb-dev \
-			libudev-dev \
-			x11proto-gl-dev \
-			bzip2"
-			
-			#autoconf automake m4 \
-			#libtool intltool gettext \
-			# libgl1-mesa-dev \
-			#llvm-dev \
-	
-	INCLUDE_LIST=""
-	for deb in $DEB_LIST_MINIMAL; do
-		INCLUDE_LIST="$deb,$INCLUDE_LIST"
-	done
-	
-	 ! -e ${SYSPREFIX}/dev || rm -rf ${SYSPREFIX}/dev
-	 ! -e ${SYSPREFIX}/proc || rm -rf ${SYSPREFIX}/proc
-	# --foreign --variant=fakechroot
-	LD_LIBRARY_PATH=${UBUNTU_LIBDIR}:/${LIBDIR}:${SYSPREFIX}/usr/${LIBDIR} \
-	PATH=/usr/local/sbin:/usr/sbin:/sbin:/sbin:/bin:/usr/bin:${SYSPREFIX}/usr/sbin:${SYSPREFIX}/sbin:${SYSPREFIX}/usr/bin:${SYSPREFIX}/bin:$PATH HOME=/ LOGNAME=root \
-		fakeroot fakechroot \
-		debootstrap --variant=fakechroot --download-only --keep-debootstrap-dir --arch=$SYS_ARCH \
-		--include=$INCLUDE_LIST \
-		wheezy ${SYSPREFIX} http://ftp.ru.debian.org/debian #http://archive.debian.org/debian
-
-	#LD_LIBRARY_PATH=${UBUNTU_LIBDIR}:/${LIBDIR}:${SYSPREFIX}/usr/${LIBDIR} PATH=/usr/local/sbin:/usr/sbin:/sbin:/sbin:/bin:/usr/bin:${SYSPREFIX}/usr/sbin:${SYSPREFIX}/sbin:${SYSPREFIX}/usr/bin:${SYSPREFIX}/bin:$PATH HOME=/ LOGNAME=root fakeroot fakechroot debootstrap --variant=fakechroot --arch=$SYS_ARCH --foreign --keep-debootstrap-dir --include=sudo --include=apt lenny ${SYSPREFIX} http://archive.debian.org/debian
-	
-	#LD_LIBRARY_PATH=${UBUNTU_LIBDIR}:/${LIBDIR}:${SYSPREFIX}/usr/${LIBDIR} PATH=/usr/local/sbin:/usr/sbin:/sbin:/sbin:/bin:/usr/bin:${SYSPREFIX}/usr/sbin:${SYSPREFIX}/sbin:${SYSPREFIX}/usr/bin:${SYSPREFIX}/bin:$PATH fakeroot fakechroot linux32 chroot ${SYSPREFIX} #${SYSPREFIX}/debootstrap/debootstrap --second-stage
-	
-	#pushd ${SYSPREFIX}/var/cache/apt/archives/
-	
-	#wget -c https://mirror.hmc.edu/debian/pool/main/libx/libxshmfence/libxshmfence-dev_1.2-1_${SYS_ARCH}.deb --no-check-certificate
-
-	#wget -c https://mirror.hmc.edu/debian/pool/main/libx/libxshmfence/libxshmfence1_1.2-1_${SYS_ARCH}.deb --no-check-certificate
-	
-	#wget -c https://mirror.hmc.edu/debian/pool/main/x/x11proto-dri2/x11proto-dri2-dev_2.8-2_all.deb --no-check-certificate
-	
-	#wget -c https://mirror.hmc.edu/debian/pool/main/x/x11proto-dri3/x11proto-dri3-dev_1.0-1_all.deb --no-check-certificate
-	
-	#popd
-	
-	for file in `ls -1 ${SYSPREFIX}/var/cache/apt/archives/*.deb`; do
-		echo $file
-		dpkg -x $file ${SYSPREFIX}
-	done
-
-	#touch /home/zelgadis/synfig-buildroot/linux64/sys.off/var/lib/dpkg/status
-
-	#fakeroot dpkg --log=/home/zelgadis/synfig-buildroot/linux64/sys.off/var/log/dpkg.log --unpack --force-not-root --root=/home/zelgadis/synfig-buildroot/linux64/sys.off --ignore-depends=multiarch-support,libc6 ./libxshmfence-dev_1.2-1_amd64.deb ./libxshmfence1_1.2-1_amd64.deb 
-	
-	echo "Synfig Buildroot v${BUILDROOT_VERSION}" > ${SYSPREFIX}/etc/chroot.id
-}
-
-mkprep()
-{
-
-MISSING_PKGS=""
-for PKG in \
-		debootstrap \
-		dpkg \
-		automake autoconf \
-		which \
-		fakeroot \
-		fakechroot \
-		rpmbuild \
-		git \
-		flex \
-		bison; do
-	if ! ( which $PKG > /dev/null ) ; then
-		MISSING_PKGS="$MISSING_PKGS $PKG"
-	fi
-done
-
-if ! ( which dpkg-buildpackage > /dev/null ); then
-	MISSING_PKGS="$MISSING_PKGS dpkg-dev"
-fi
-
-if ! -z "$MISSING_PKGS" ; then
-	echo "ERROR: Please install following packages:"
-	echo " $MISSING_PKGS"
-	exit 1
-fi
-
-if ! -e ${SYSPREFIX}/etc/chroot.id ; then
-	mkprefix
-elif `cat ${SYSPREFIX}/etc/chroot.id` != "Synfig Buildroot v${BUILDROOT_VERSION}" ; then
-	#rm -rf ${SYSPREFIX} || true
-	mkprefix
-fi
-
-mkprepconf
-
-}
-
-mkprepconf()
-{
-
-# ! -e ${SYSPREFIX}/lib-native || rm -rf ${SYSPREFIX}/lib-native
-#mkdir -p ${SYSPREFIX}/lib-native
-#for file in libc.so.6 libpthread.so.0 ; do
-#	cp -L /${LIBDIR}/${file} ${SYSPREFIX}/lib-native
-#done
-
-ln -sf ${SYSPREFIX}/usr/bin/mawk ${SYSPREFIX}/usr/bin/awk
-ln -sf ${SYSPREFIX}/usr/bin/aclocal-1.11 ${SYSPREFIX}/usr/bin/aclocal
-	
-# Patching libraries ...
-for lib in libc libpthread; do
-	sed -i "s| /lib/| ${SYSPREFIX}/lib/|g" ${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/$lib.so
-	sed -i "s| /usr/lib/| ${SYSPREFIX}/usr/lib/|g" ${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/$lib.so
-done
-
-sed -i "s|prefix=\"/usr\"|prefix=\"${SYSPREFIX}/usr\"|g" ${SYSPREFIX}/usr/bin/autopoint
-
-#sed -i "s|@automake_includes = (\"/usr/share/aclocal|@automake_includes = (\"${SYSPREFIX}/usr/share/aclocal|g" ${SYSPREFIX}/usr/bin/aclocal-1.11
-#sed -i "s|p@system_includes = ('/usr/share/aclocal')|@system_includes = ('${SYSPREFIX}/usr/share/aclocal')|g" ${SYSPREFIX}/usr/bin/aclocal-1.11
-
-for file in `find ${SYSPREFIX}/usr/lib/pkgconfig/ -type f -name "*.pc"`; do
-	sed -i "s|=/usr|=${SYSPREFIX}/usr|g" ${file}
-done
-for file in `find ${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/pkgconfig/ -type f -name "*.pc"`; do
-	sed -i "s|=/usr|=${SYSPREFIX}/usr|g" ${file}
-done
-for file in `find ${SYSPREFIX}/usr/bin/ -type f -name "*-config"`; do
-	sed -i "s|=/usr|=${SYSPREFIX}/usr|g" ${file}
-done
-for file in `find ${SYSPREFIX}/usr/lib/ -type f -name "*.la"`; do
-	sed -i "s|libdir='/usr/lib|libdir='${SYSPREFIX}/usr/lib|g" ${file}
-	sed -i "s| /usr/lib| ${SYSPREFIX}/usr/lib|g" ${file}
-done
-for file in `find ${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/ -type f -name "*.la"`; do
-	sed -i "s|libdir='/usr/lib|libdir='${SYSPREFIX}/usr/lib|g" ${file}
-	sed -i "s| /usr/lib| ${SYSPREFIX}/usr/lib|g" ${file}
-done
-
-sed -i "s|#! /usr/bin/python2.7|#!${SYSPREFIX}/usr/bin/python2.7|g" ${SYSPREFIX}/usr/bin/python2.7-config
-
-# Fixing symlinks
-if $ARCH == 64off ; then
-	rm ${SYSPREFIX}/lib64
-	rm ${SYSPREFIX}/usr/lib64
-	ln -sf ${SYSPREFIX}/lib ${SYSPREFIX}/lib64
-	ln -sf ${SYSPREFIX}/usr/lib ${SYSPREFIX}/usr/lib64
-fi
-# For some reason we have to specify ${SYSPREFIX}/usr/lib explicitly
-for CHECKPATH in ${SYSPREFIX} ${SYSPREFIX}/usr/lib ${SYSPREFIX}/bin; do
-	for LINK in `find -L ${CHECKPATH} -xtype l`; do
-		LINK_TARGET=`readlink "$LINK"`
-		if ${LINK_TARGET::1} == "/" && ! ( echo $LINK |grep ssl ); then
-			if "${LINK_TARGET:0:${#SYSPREFIX}}" != "$SYSPREFIX" ; then
-				echo "Fixing link: $LINK ($LINK_TARGET)"
-				ln -sf "${SYSPREFIX}/${LINK_TARGET}" "${LINK}" || true
-			fi
-		fi			
-	done
-done
-
-ln -sf ${SYSPREFIX}/usr/bin/gcc ${SYSPREFIX}/usr/bin/cc
-
- -e "${PREFIX}/lib" || mkdir -p ${PREFIX}/lib
-#cp ${SYSPREFIX}/usr/lib/libltdl* ${PREFIX}/lib/
-cp ${SYSPREFIX}/lib/${RPM_ARCH}-linux-gnu/libpng12* ${PREFIX}/lib/
-cp ${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/libdb-5*.so ${PREFIX}/lib/
-cp ${SYSPREFIX}/lib/${RPM_ARCH}-linux-gnu/libpcre.so* ${PREFIX}/lib/
-cp ${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/libffi*.so* ${PREFIX}/lib
-# SDL deps
-cp ${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/libdirect-*.so* ${PREFIX}/lib/
-cp ${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/libdirectfb-*.so* ${PREFIX}/lib/
-cp ${SYSPREFIX}/usr/lib/${RPM_ARCH}-linux-gnu/libfusion*.so* ${PREFIX}/lib/
-
-#RANDOM_SYSPREFIX=`tr -cd ':alnum:' < /dev/urandom | fold -w8 | head -n1`
-#DATE=`date +%s`
-#LIB_PATH=${SYSPREFIX}/tmp/lib-\${DATE}-\${RANDOM_SYSPREFIX}
-#mkdir -p \${LIB_PATH} || true
-#for lib in libc.so.6 libpthread.so.0; do
-#	cp -L ${SYSPREFIX}/${LIBDIR}/\${lib} \${LIB_PATH}
-#done
-
- -e ${DEPSPREFIX}/bin || mkdir -p ${DEPSPREFIX}/bin
-
-cat > ${DEPSPREFIX}/bin/gcc <<EOF
-#!/bin/sh
-
-#${SYSPREFIX}/usr/bin/gcc -nostdinc -I${SYSPREFIX}/usr/lib/gcc/${GCC_ARCH}-linux-gnu/4.3.2/include -I${SYSPREFIX}/usr/lib/gcc/${GCC_ARCH}-linux-gnu/4.3.2/include-fixed -I${PREFIX}/include -I${DEPSPREFIX}/include -I${SYSPREFIX}/usr/include "\$@"
-
-${SYSPREFIX}/usr/bin/gcc --sysroot=${SYSPREFIX} "\$@"
-
-EOF
-chmod a+x ${DEPSPREFIX}/bin/gcc
-
-cat > ${DEPSPREFIX}/bin/g++ <<EOF
-#!/bin/sh
-
-#${SYSPREFIX}/usr/bin/g++ -nostdinc -I${SYSPREFIX}/usr/lib/gcc/../../include/c++/4.3 -I${SYSPREFIX}/usr/lib/gcc/../../include/c++/4.3/${GCC_ARCH}-linux-gnu -I${SYSPREFIX}/usr/lib/gcc/../../include/c++/4.3/backward -I${SYSPREFIX}/usr/lib/gcc/${GCC_ARCH}-linux-gnu/4.3.2/include -I${SYSPREFIX}/usr/lib/gcc/${GCC_ARCH}-linux-gnu/4.3.2/include-fixed -I${PREFIX}/include -I${DEPSPREFIX}/include -I${SYSPREFIX}/usr/include "\$@"
-
-${SYSPREFIX}/usr/bin/g++ --sysroot=${SYSPREFIX} "\$@"
-EOF
-chmod a+x ${DEPSPREFIX}/bin/g++ || true
-
-cat > ${DEPSPREFIX}/bin/synfig-- <<EOF
-#!/bin/sh
-
-#if -d ${DEPSPREFIX} ; then
-#mv ${DEPSPREFIX} ${DEPSPREFIX}.off
-#fi
-
-export LD_PRELOAD=""
-export LD_LIBRARY_PATH=""
-export PATH="/usr/local/bin/:/usr/sbin:/usr/bin:/bin"
-export LDFLAGS=""
-export CFLAGS=""
-export CXXFLAGS=""
-export PKG_CONFIG_PATH=""
-export PERL5LIB=""
-
-echo "-----------------!!!-------------"
-
-~/synfig/bin/synfig "\$@"
-EOF
-#chmod a+x ${DEPSPREFIX}/bin/synfig || true
-
-
-cat > ${DEPSPREFIX}/bin/rsync <<EOF
-#!/bin/sh
-
-/usr/bin/rsync "\$@"
-EOF
-chmod a+x ${DEPSPREFIX}/bin/rsync
-
-cat > ${DEPSPREFIX}/bin/flex <<EOF
-#!/bin/sh
-
-/usr/bin/flex "\$@"
-EOF
-chmod a+x ${DEPSPREFIX}/bin/flex
-
-cat > ${DEPSPREFIX}/bin/bison <<EOF
-#!/bin/sh
-
-/usr/bin/bison "\$@"
-EOF
-chmod a+x ${DEPSPREFIX}/bin/bison
-
-cat > ${DEPSPREFIX}/bin/git <<EOF
-#!/bin/sh
-
-/usr/bin/git "\$@"
-EOF
-chmod a+x ${DEPSPREFIX}/bin/git
-
-#for binary in bzip2; do
-#	ln -sf /usr/bin/$binary ${DEPSPREFIX}/bin/$binary
-#done
-
-}
-
-mkglib()
-{
-PKG_NAME=glib
-PKG_VERSION="${GLIB_VERSION}"
-TAREXT=xz
-if ! pkg-config ${PKG_NAME}-2.0 --exact-version=${PKG_VERSION} --print-errors; then
-	cd ${CACHEDIR}
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://ftp.gnome.org/pub/gnome/sources/glib/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --disable-static --enable-shared --prefix=${PREFIX}/
-	make -j${THREADS}
-	make install
-	cd ..
-fi
-}
-
-mkfontconfig()
-{
-PKG_NAME=fontconfig
-PKG_VERSION="${FONTCONFIG_VERSION}"
-TAREXT=bz2
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://www.freedesktop.org/software/fontconfig/release/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --disable-static --enable-shared --prefix=${DEPSPREFIX}/
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-sed -i "s?<cachedir>${DEPSPREFIX}.*</cachedir>??" ${DEPSPREFIX}/etc/fonts/fonts.conf
-}
-
-mkatk()
-{
-PKG_NAME=atk
-PKG_VERSION="${ATK_VERSION}"
-TAREXT=xz
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
-	cd ${CACHEDIR}
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://ftp.gnome.org/pub/gnome/sources/atk/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --disable-static --enable-shared --prefix=${PREFIX}/
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkatkmm()
-{
-PKG_NAME=atkmm
-PKG_VERSION="${ATKMM_VERSION}"
-TAREXT=xz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	cd ${CACHEDIR}
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --disable-static --enable-shared --prefix=${PREFIX}/
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mkatspi2()
-{
-PKG_NAME=at-spi2-core
-PKG_VERSION="${AT_SPI2_VERSION}"
-TAREXT=xz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	
-	./configure --build=${HOST} --prefix=${PREFIX}/ \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mkatspi2atk()
-{
-mkatspi2
-PKG_NAME=at-spi2-atk
-PKG_VERSION="${AT_SPI2_ATK_VERSION}"
-TAREXT=xz	
-if ! pkg-config atk-bridge-2.0 --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure --build=${HOST} --prefix=${PREFIX}/ \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-
-mkpixman()
-{
-PKG_NAME=pixman
-PKG_VERSION="${PIXMAN_VERSION}"
-TAREXT=gz
-if ! pkg-config ${PKG_NAME}-1 --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://cairographics.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --disable-static --enable-shared --prefix=${PREFIX}/
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkharfbuzz()
-{
-PKG_NAME=harfbuzz
-PKG_VERSION="${HARFBUZZ_VERSION}"
-TAREXT=bz2
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://www.freedesktop.org/software/harfbuzz/release/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${PREFIX}
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkcairo()
-{
-PKG_NAME=cairo
-PKG_VERSION="${CAIRO_VERSION}"
-TAREXT=xz
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://cairographics.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	
-	sed -i 's|if test "x$cairo_cc_stderr" != "x"; then|if test "x$cairo_cc_stderr___" != "x"; then|g' configure 
-	
-	./configure --host=${HOST} --prefix=${PREFIX} \
-		--disable-static 	\
-		--enable-warnings 	\
-		--enable-xlib 		\
-		--enable-freetype 	\
-		--enable-pdf		\
-	 --enable-gobject \
-		--disable-gtk-doc
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkgdkpixbuf()
-{
-	
-	mkgobjectintrospection
-	
-PKG_NAME=gdk-pixbuf
-PKG_VERSION="${GDK_PIXBUF_VERSION}"
-TAREXT=xz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	sed -i 's|^enable_relocations=no|enable_relocations=yes|g' configure
-	./configure --host=${HOST} --prefix=${PREFIX}/ \
-		--enable-introspection=yes \
-		${DEBUG_OPT2} \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-	
-fi
-}
-
-mkpango()
-{
-PKG_NAME=pango
-PKG_VERSION="${PANGO_VERSION}"
-TAREXT=xz
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/pango/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure --host=${HOST} --prefix=${PREFIX}/ \
-		--disable-static --enable-shared \
-		--with-included-modules=yes
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkgtk()
-{
-PKG_NAME=gtk\+
-PKG_VERSION="${GTK_VERSION}"
-TAREXT=xz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/gtk+/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	
-	# Special fix that prevents retrieving some options from XSettings daemon
-	#sed -i '/Net\/ThemeName/d' ./gdk/x11/gdksettings.c
-	#sed -i '/Gtk\/MenuImages/d' ./gdk/x11/gdksettings.c
-	
-	 ! -e config.cache || rm config.cache
-	./configure --build=${HOST} --prefix=${PREFIX}/ \
-		${DEBUG_OPT2} \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mklibcroco()
-{
-PKG_NAME=libcroco
-PKG_VERSION=0.6.8
-TAREXT=xz
-if ! pkg-config ${PKG_NAME}-0.6 --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure --build=${HOST} --prefix=${PREFIX}/ \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkgobjectintrospection()
-{
-PKG_NAME=gobject-introspection
-PKG_VERSION=1.42.0
-TAREXT=xz
-if ! pkg-config ${PKG_NAME}-1.0 --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure --build=${HOST} --prefix=${PREFIX}/ \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-
-mklibrsvg()
-{
-	
-	mkgobjectintrospection
-	mkgdkpixbuf
-	mklibcroco
-	
-PKG_NAME=librsvg
-PKG_VERSION=2.40.6
-TAREXT=xz
-if ! pkg-config ${PKG_NAME}-2.0 --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure --build=${HOST} --prefix=${PREFIX}/ \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-# Not used
-mkgnomethemes()
-{
-	
-mklibrsvg
-
-PKG_NAME=gnome-themes-standard
-PKG_VERSION=3.15.2
-TAREXT=xz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure --build=${HOST} --prefix=${PREFIX}/ \
-		--disable-gtk2-engine \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mkadwaitaicons()
-{
-	
-mklibrsvg
-
-PKG_NAME=adwaita-icon-theme
-PKG_VERSION=3.15.1
-TAREXT=xz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure --build=${HOST} --prefix=${PREFIX}/ \
-		--disable-gtk2-engine \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-	
-fi
-}
-
-mklibsigcpp()
-{
-PKG_NAME=libsigc++
-PKG_VERSION="${LIBSIGCPP_VERSION}"
-TAREXT=bz2
-if ! pkg-config sigc++-2.0 --exact-version=${PKG_VERSION} --print-errors; then
-	#rsync -av ${SOURCES_URL}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	#rsync -av ${SOURCES_URL}/libsigc++-2.0_2.0.18-2.diff ${WORKSPACE}/cache/libsigc++-2.0_2.0.18-2.diff
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/GNOME/sources/libsigc++/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xjf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} # && cd ${PKG_NAME}-${PKG_VERSION} && patch -p1 < ${WORKSPACE}/cache/libsigc++-2.0_2.0.18-2.diff && cd ..
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkglibmm()
-{
-PKG_NAME=glibmm
-PKG_VERSION="${GLIBMM_VERSION}"
-TAREXT=xz
-if ! pkg-config ${PKG_NAME}-2.4 --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/GNOME/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-fulldocs \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mklibtiff()
-{
-PKG_NAME=tiff
-PKG_VERSION=4.0.3
-TAREXT=gz
-
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://download.osgeo.org/lib${PKG_NAME}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure \
-		--host=${HOST} \
-		--prefix=${PREFIX} \
-		--includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-
- make -j$THREADS
- make install -j$THREADS
- 
- touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-
-fi
-}
-
-mklibjpeg()
-{
-
-mkyasm
-
-PKG_NAME=libjpeg-turbo
-PKG_VERSION=${LIBJPEG_VERSION}
-TAREXT=gz
-
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://sourceforge.net/projects/libjpeg-turbo/files/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure \
-		--host=${HOST} \
-		--prefix=${PREFIX} \
-		--includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-
- make -j$THREADS
- make install -j$THREADS
- 
- touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-
-fi
-}
-
-mklibxmlpp()
-{
-PKG_NAME=libxml++
-PKG_VERSION="${LIBXMLPP_VERSION}"
-TAREXT=bz2
-if ! pkg-config libxml++-2.6 --exact-version=${PKG_VERSION} --print-errors; then
-	rsync -av ${SOURCES_URL}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xjf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkimagemagick()
-{
-PKG_NAME=ImageMagick
-PKG_VERSION="${IMAGEMAGICK_VERSION}-10"
-TAREXT=xz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	( cd ${WORKSPACE}/cache/ && wget -c http://www.imagemagick.org/download/releases/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared \
-		--with-modules \
-		--without-perl \
-		--without-x \
-		--with-threads \
-		--with-magick_plus_plus
-	sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-	sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-	
-fi
-}
-
-mklibogg()
-{
-
-PKG_NAME=libogg
-PKG_VERSION=1.3.1
-TAREXT=gz
-
-if ! pkg-config ogg --exact-version=${PKG_VERSION} --print-errors; then
-	
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://downloads.xiph.org/releases/ogg/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared
- 
- make all -j$THREADS
- make install -j$THREADS
-
-fi
-}
-
-mklibvorbis()
-{
-mklibogg
-
-PKG_NAME=libvorbis
-PKG_VERSION=1.3.4
-TAREXT=gz
-
-if ! pkg-config vorbis --exact-version=${PKG_VERSION} --print-errors; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://downloads.xiph.org/releases/vorbis/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-
- make all -j$THREADS
- make install -j$THREADS
-
-fi
-}
-
-mklibsamplerate()
-{
-PKG_NAME=libsamplerate
-PKG_VERSION=0.1.8
-TAREXT=gz
-
-if ! pkg-config samplerate --exact-version=${PKG_VERSION} --print-errors; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://www.mega-nerd.com/SRC/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure \
- --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-
- make all -j$THREADS
- make install -j$THREADS
-
-fi
-}
-
-mksox()
-{
-PKG_NAME=sox
-PKG_VERSION=14.4.1
-TAREXT=gz
-
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://download.tuxfamily.org/synfig/packages/sources/base/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure \
- --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-
- make all -j$THREADS
- make install -j$THREADS
-
-fi
-}
-
-mklame()
-{
-PKG_NAME=lame
-PKG_VERSION=3.99.5
-TAREXT=gz
-
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://sourceforge.net/projects/lame/files/lame/3.99/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-
- make all -j$THREADS
- make install -j$THREADS
- 
- touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-
-fi
-}
-
-mklibtheora()
-{
-	
-mklibogg
-
-PKG_NAME=libtheora
-PKG_VERSION=1.1.1
-TAREXT=gz
-
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://downloads.xiph.org/releases/theora/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-
- make all -j$THREADS
- make install -j$THREADS
- 
- touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-
-fi
-}
-
-mkx264()
-{
-PKG_NAME=x264
-PKG_VERSION=3.99.5
-TAREXT=gz
-
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
- if -d x264 ; then
-	 cd x264
-	 /usr/bin/git pull -v
-	 cd ..
-	else
-	 /usr/bin/git clone git://git.videolan.org/x264.git
-	fi
- cd ${PKG_NAME}
- ! -e config.cache || rm config.cache
- ./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-
- make all -j$THREADS
- make install -j$THREADS
- 
- touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-
-fi
-}
-
-
-mkfaac()
-{
-PKG_NAME=faac
-PKG_VERSION=1.28
-TAREXT=bz2
-
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://downloads.sourceforge.net/faac/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xjf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-static --enable-shared
-		
-	if ! -f common/mp4v2/mpeg4ip.h.patch ; then
-		sed -i '126 s|^|//|' common/mp4v2/mpeg4ip.h
-		touch common/mp4v2/mpeg4ip.h.patch
-	fi
-
- make all -j$THREADS
- make install -j$THREADS
- 
- sed -i '53 s|^|//|' ${PREFIX}/include/faac.h
- 
- touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-
-fi
-}
-
-mkyasm()
-{
-PKG_NAME=yasm
-PKG_VERSION=1.2.0
-TAREXT=gz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://www.tortall.net/projects/yasm/releases/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- 
-	./configure --host=${HOST} --disable-static --enable-shared --prefix=${DEPSPREFIX}/
-	make -j${THREADS}
-	make install
-	cd ..
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mkfftw()
-{
-PKG_NAME=fftw
-PKG_VERSION=3.3.4
-TAREXT=gz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://www.fftw.org/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure --host=${HOST} --prefix=${PREFIX}/ \
-		${DEBUG_OPT2} \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-	
-fi
-}
-
-mkffmpeg()
-{
-
-#mkfaac
-mkyasm
-mklame
-mklibtheora
-mklibvorbis
-mkx264
-
-PKG_NAME=ffmpeg
-PKG_VERSION=2.4.x
-TAREXT=bz2
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	
-	pushd ${SRCPREFIX}
-	
-	if -d ffmpeg ; then
-	 cd ffmpeg
-	 /usr/bin/git fetch
-	 cd ..
-	else
-		/usr/bin/git clone git://source.ffmpeg.org/ffmpeg.git ffmpeg
-	fi
-
-	#rsync -av ${SOURCES_URL}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	
-	# ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xjf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	#cd ${PKG_NAME}-${PKG_VERSION}
-	
-	cd ${PKG_NAME}
-	git reset --hard
-	git checkout a194298954e98d9157
-	
-	./configure --prefix=${PREFIX} \
-		--arch=${SYS_ARCH} \
-		--enable-rpath \
-		--enable-gpl --enable-nonfree \
-		--enable-libx264 --enable-libmp3lame \
-		--enable-libtheora --enable-libvorbis \
-		--disable-static --enable-shared
-		#--enable-libfaac
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mksdl()
-{
-	
-PKG_NAME=SDL
-PKG_VERSION=1.2.15
-TAREXT=gz
-
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://www.libsdl.org/release/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- 
-	./configure --host=${HOST} --disable-static --enable-shared --prefix=${PREFIX}/
-	make -j${THREADS}
-	make install
-	cd ..
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mkmlt()
-{
-mksdl
-mkffmpeg
-mklibsamplerate
-mklibvorbis
-mksox
-	
-PKG_NAME=mlt
-PKG_VERSION=0.9.6
-TAREXT=gz
-
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-
- #export CPPFLAGS=" -I/usr/${TOOLCHAIN_HOST}/sys-root/mingw/include/SDL $CPPFLAGS"
- #export LDFLAGS=" $LDFLAGS -lmingw32 -lSDLmain -lSDL -mwindows"
-	
- cd $SRCPREFIX
- if ! -d ${PKG_NAME} ; then
- /usr/bin/git clone http://github.com/morevnaproject/mlt
- fi
- cd mlt
- /usr/bin/git reset --hard
- /usr/bin/git checkout master
- /usr/bin/git reset --hard
- /usr/bin/git pull
- /usr/bin/git clean -f -d
- ! -e config.cache || rm config.cache
-
- ./configure \
- --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
- --avformat-shared=${PREFIX}/ \
- --target-arch=${RPM_ARCH} \
- --enable-gpl --disable-decklink \
- $DEBUG
- 
- touch src/modules/disable-gtk2
-
- make all -j$THREADS
- make install -j$THREADS
- 
- if ! -f ${PREFIX}/lib/mlt/libmltsdl.so ; then
-		echo "ERROR: No SDL module compiled for MLT."
-		exit 1
- fi
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mklibdrm()
-{
-PKG_NAME=libdrm
-PKG_VERSION=2.4.65
-TAREXT=gz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://dri.freedesktop.org/libdrm/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${DEPSPREFIX} --includedir=${DEPSPREFIX}/include \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mkxcb-proto()
-{
-
-PKG_NAME=xcb-proto
-PKG_VERSION=1.11
-TAREXT=bz2
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://xcb.freedesktop.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${DEPSPREFIX} --includedir=${DEPSPREFIX}/include \
-		--disable-static --enable-shared
-
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mklibxcb()
-{
-
-mkxcb-proto
-
-PKG_NAME=libxcb
-PKG_VERSION=1.11.1
-TAREXT=bz2
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://xcb.freedesktop.org/dist/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${DEPSPREFIX} --includedir=${DEPSPREFIX}/include \
-		--disable-static --enable-shared
-
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mkmesa()
-{
-mklibxcb
-mklibdrm
-
-PKG_NAME=mesa
-PKG_VERSION=10.6.9
-TAREXT=gz
-if ! -f ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done ; then
-	#( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${DEPSPREFIX} --includedir=${DEPSPREFIX}/include \
-		--with-gallium-drivers="swrast" \
-		--with-dri-drivers="swrast" \
-		--disable-static --enable-shared
-		
-#		 \
-#		--disable-egl \
-
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-	
-	touch ${PREFIX}/../${PKG_NAME}-${PKG_VERSION}.done
-fi
-}
-
-mkcairomm()
-{
-PKG_NAME=cairomm
-PKG_VERSION="${CAIROMM_VERSION}"
-TAREXT=gz
-if ! pkg-config ${PKG_NAME}-1.0 --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://cairographics.org/releases/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--enable-docs=no \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkpangomm()
-{
-PKG_NAME=pangomm
-PKG_VERSION="${PANGOMM_VERSION}"
-TAREXT=xz
-if ! pkg-config ${PKG_NAME}-1.4 --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/GNOME/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-docs \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkgtkmm()
-{
-mkatkmm
-PKG_NAME=gtkmm
-PKG_VERSION="${GTKMM_VERSION}"
-TAREXT=xz
-if ! pkg-config ${PKG_NAME}-3.0 --exact-version=${PKG_VERSION} --print-errors; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate http://ftp.gnome.org/pub/GNOME/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	#rsync -av ${SOURCES_URL}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${PREFIX} --includedir=${PREFIX}/include \
-		--disable-examples --disable-demos --disable-docs \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkjack()
-{
-PKG_NAME=jack-audio-connection-kit
-PKG_VERSION="${JACK_VERSION}"
-TAREXT=gz
-if ! pkg-config jack --exact-version=${PKG_VERSION} --print-errors; then
-	rsync -av ${SOURCES_URL}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	
-	# Disable check for parallel jack installs
-	sed -i 's|if test $not_overwriting -gt 0 ; then|if test $not_overwriting -gt 500 ; then|g' configure 
-	
-	./configure --host=${HOST} --prefix=${DEPSPREFIX} --includedir=${DEPSPREFIX}/include \
-		--libdir=${DEPSPREFIX}/lib \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-
- -e "${PREFIX}/lib.extra" || mkdir -p ${PREFIX}/lib.extra
-if ${PREFIX} != ${DEPSPREFIX} ; then
-	cp ${DEPSPREFIX}/lib/libjack.so* ${PREFIX}/lib.extra/
-fi
-}
-
-mkm4()
-{
-PKG_NAME=m4
-PKG_VERSION="1.4.17"
-TAREXT=gz
-
-# TODO: DEPSPREFIX -> TOOLSPREFIX ?
-
-if ! -e ${DEPSPREFIX}/bin/m4 ; then
-	( cd ${WORKSPACE}/cache/ && wget -c http://ftp.gnu.org/gnu/m4/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${DEPSPREFIX}
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-
-}
-
-mkautoconf()
-{
-PKG_NAME=autoconf
-PKG_VERSION="2.69"
-TAREXT=gz
-
-# TODO: DEPSPREFIX -> TOOLSPREFIX ?
-
-if ! -e ${DEPSPREFIX}/bin/autoconf ; then
-	( cd ${WORKSPACE}/cache/ && wget -c http://ftp.gnu.org/gnu/autoconf/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${DEPSPREFIX}
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkautomake()
-{
-PKG_NAME=automake
-PKG_VERSION="1.14"
-TAREXT=gz
-
-# TODO: DEPSPREFIX -> TOOLSPREFIX ?
-
-if ! -e ${DEPSPREFIX}/bin/automake ; then
-	( cd ${WORKSPACE}/cache/ && wget -c http://ftp.gnu.org/gnu/automake/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${DEPSPREFIX}
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mklibtool()
-{
-PKG_NAME=libtool
-PKG_VERSION="2.4.2"
-TAREXT=gz
-
-mkdir -p $SYSPREFIX/tmp/${PKG_NAME}-bin || true
-cat > $SYSPREFIX/tmp/${PKG_NAME}-bin/gcc <<EOF
-#!/bin/sh
-
-${SYSPREFIX}/usr/bin/gcc "\$@"
-
-EOF
-chmod a+x $SYSPREFIX/tmp/${PKG_NAME}-bin/gcc
-
-
-
-PATH_BAK=$PATH
-PATH="$SYSPREFIX/tmp/${PKG_NAME}-bin/:$PATH"
-
-if ! -e ${DEPSPREFIX}/bin/libtoolize ; then
-	( cd ${WORKSPACE}/cache/ && wget -c http://ftpmirror.gnu.org/libtool/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	IFS=" " ./configure --host=${HOST} --prefix=${DEPSPREFIX} --enable-ltdl-install
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-
- -e ${PREFIX}/lib/ || mkdir -p ${PREFIX}/lib/
-if "${PREFIX}" != "${DEPSPREFIX}" ; then
-	#rm -rf ${PREFIX}/lib/libltdl* || true
-	cp ${DEPSPREFIX}/lib/libltdl.so* ${PREFIX}/lib/
-fi
-
-PATH="$PATH_BAK"
-}
-
-mkintltool()
-{
-PKG_NAME=intltool
-PKG_VERSION="0.50.2"
-TAREXT=gz
-
-
-if ! -e ${DEPSPREFIX}/bin/intltoolize ; then
-	( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate https://launchpad.net/intltool/trunk/0.50.2/+download/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${DEPSPREFIX}
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-
-}
-
-# TODO: remove?
-mkgettext()
-{
-
-PKG_NAME=gettext
-PKG_VERSION="0.19.6"
-TAREXT=gz
-
-mkdir -p $SYSPREFIX/tmp/gettext-bin || true
-cat > $SYSPREFIX/tmp/gettext-bin/gij <<EOF
-#!/bin/sh
-
-false
-EOF
-chmod a+x $SYSPREFIX/tmp/gettext-bin/gij
-
-cat > $SYSPREFIX/tmp/gettext-bin/gcc <<EOF
-#!/bin/sh
-
-${SYSPREFIX}/usr/bin/gcc "\$@"
-
-EOF
-chmod a+x $SYSPREFIX/tmp/gettext-bin/gcc
-
-#rm -rf $SYSPREFIX/tmp/gettext-bin
-
-PATH_BAK=$PATH
-PATH="$SYSPREFIX/tmp/gettext-bin/:$PATH"
-
-
-if ! -e ${DEPSPREFIX}/bin/gettext ; then
-	( cd ${WORKSPACE}/cache/ && wget -c http://ftp.gnu.org/pub/gnu/gettext/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	# cd ${PKG_NAME}-${PKG_VERSION} && patch -p1 < ${WORKSPACE}/cache/gettext-${PKG_VERSION}-4.patch && cd ..
-	cd ${PKG_NAME}-${PKG_VERSION}
-	./configure --host=${HOST} --prefix=${DEPSPREFIX} \
-		--disable-java --disable-native-java
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-
-PATH="$PATH_BAK"
-}
-
-#ETL
-mketl()
-{
-cd $SCRIPTPATH/../ETL
-make clean || true
-run_native autoreconf --install --force
-./configure --host=${HOST} --prefix=${PREFIX} \
-	--includedir=${PREFIX}/include --libdir=${PREFIX}/lib \
-	--bindir=${PREFIX}/bin \
-	$DEBUG_OPT
-make -j${THREADS}
-make install
-}
-
-#synfig-core
-mksynfig()
-{
-cd $SCRIPTPATH/../synfig-core/
-make clean || true
- ! -e config.cache || rm config.cache
-/bin/sh ./bootstrap.sh
-./configure --host=${HOST} --prefix=${PREFIX} \
-	--includedir=${PREFIX}/include \
-	--libdir=${PREFIX}/lib --bindir=${PREFIX}/bin \
-	--sysconfdir=${PREFIX}/etc \
-	--disable-static --enable-shared \
-	--with-magickpp --without-libavcodec \
-	--enable-warnings=minimum \
-	$DEBUG_OPT
-make -j${THREADS}
-make install
-}
-
-#synfig-studio
-mksynfigstudio()
-{
-cd $SCRIPTPATH/../synfig-studio/
-make clean || true
- ! -e config.cache || rm config.cache
-/bin/sh ./bootstrap.sh
-./configure --host=${HOST} --prefix=${PREFIX} \
-	--includedir=${SYSPREFIX}/include \
-	--libdir=${PREFIX}/lib --bindir=${PREFIX}/bin \
-	--sysconfdir=${PREFIX}/etc --datadir=${PREFIX}/share \
-	--disable-static --enable-shared \
-	$DEBUG_OPT
-
-make -j${THREADS} install
-
-#for DIR in build_tools src plugins po brushes; do
-#cd $DIR
-#make -j${THREADS}
-#make -j${THREADS} install
-#cd ..
-#done
-
-}
-
-mkconfig()
-{
-	
-#if ${PREFIX} == ${DEPSPREFIX} ; then
-	#if ! -e "${PREFIX}/etc/pango/pango.modules.in" ; then
-	#	sed "s?${PREFIX}/lib/pango/1.6.0/modules?@ROOTDIR@/modules?" < ${PREFIX}/etc/pango/pango.modules > ${PREFIX}/etc/pango/pango.modules.in
-	#fi
-
-
-	if ! -e "${PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache.in" ; then
-		sed "s?${PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders?@ROOTDIR@/loaders?" < ${PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache > ${PREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache.in
-	fi
-#fi
-
-cat > ${PREFIX}/synfig <<EOF
-#!/bin/sh
-
-SYSPREFIX=\$(cd \`dirname "\$0"\`; pwd)
-
-export LD_LIBRARY_PATH=\${SYSPREFIX}/lib:\$LD_LIBRARY_PATH
-export SYNFIG_ROOT=\${SYSPREFIX}/
-export SYNFIG_MODULE_LIST=\${SYSPREFIX}/etc/synfig_modules.cfg
-export MLT_DATA="\${SYSPREFIX}/share/mlt/"
-export MLT_REPOSITORY="\${SYSPREFIX}/lib/mlt/"
-export MAGICK_CODER_FILTER_PATH="\${SYSPREFIX}/lib/ImageMagick-${IMAGEMAGICK_VERSION}/config-Q16/"
-export MAGICK_CODER_MODULE_PATH="\${SYSPREFIX}/lib/ImageMagick-${IMAGEMAGICK_VERSION}/modules-Q16/coders/"
-export MAGICK_CONFIGURE_PATH="\${SYSPREFIX}/lib/ImageMagick-${IMAGEMAGICK_VERSION}/modules-Q16/filters/"
-
-
-\$SYSPREFIX/bin/synfig "\$@"
-EOF
-	chmod a+x $PREFIX/synfig
-
-cat > ${PREFIX}/synfigstudio <<EOF
-#!/bin/sh
-
-SYSPREFIX=\$(cd \`dirname "\$0"\`; pwd)
-
-# Check if this system have JACK installed
-if ( ! ldconfig -p | grep libjack.so >/dev/null ) || ( ! which jackd >/dev/null ) ; then
-	# No JACK, so disable this functionality.
-	# (The bundled libjack won't work correctly anyway).
-	export SYNFIG_DISABLE_JACK=1
-	export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:\${SYSPREFIX}/lib.extra
-fi
-
-USER_CONFIG_DIR=\$HOME/.config/synfig
-export ETC_DIR=\${SYSPREFIX}/etc
-export LD_LIBRARY_PATH=\${SYSPREFIX}/lib:\$LD_LIBRARY_PATH
-export SYNFIG_ROOT=\${SYSPREFIX}/
-export SYNFIG_GTK_THEME="Adwaita"
-export SYNFIG_MODULE_LIST=\${SYSPREFIX}/etc/synfig_modules.cfg
-export XDG_DATA_DIRS="\${SYSPREFIX}/share/:\$XDG_DATA_DIRS:/usr/local/share/:/usr/share/"
-export XDG_CONFIG_DIRS="\$HOME/.config/synfig:\$XDG_CONFIG_DIRS"
-#export GDK_PIXBUF_MODULEDIR="\${SYSPREFIX}/lib/gtk-2.0/2.10.0/loaders"
-export GSETTINGS_SCHEMA_DIR="\${SYSPREFIX}/share/glib-2.0/schemas/"
-export FONTCONFIG_PATH="\${SYSPREFIX}/etc/fonts"
-export MLT_DATA="\${SYSPREFIX}/share/mlt/"
-export MLT_REPOSITORY="\${SYSPREFIX}/lib/mlt/"
-export MAGICK_CONFIGURE_PATH="\${SYSPREFIX}/lib/ImageMagick-${IMAGEMAGICK_VERSION}/config-Q16/"
-export MAGICK_CODER_MODULE_PATH="\${SYSPREFIX}/lib/ImageMagick-${IMAGEMAGICK_VERSION}/modules-Q16/coders/"
-export MAGICK_CODER_FILTER_PATH="\${SYSPREFIX}/lib/ImageMagick-${IMAGEMAGICK_VERSION}/modules-Q16/filters/"
-
-# Create install-location-dependent config files for Pango and GDK image loaders
-# We have to do this every time because its possible that SYSPREFIX has changed
-
- -e "\$USER_CONFIG_DIR" || mkdir -p "\$USER_CONFIG_DIR"
-
-#sed "s?@ROOTDIR@/modules?\${SYSPREFIX}/lib/pango/1.6.0/modules?" < \$ETC_DIR/pango/pango.modules.in > \$USER_CONFIG_DIR/pango/pango.modules
-if -e \${SYSPREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache.in ; then
-	export GDK_PIXBUF_MODULE_FILE="\${USER_CONFIG_DIR}/gdk-pixbuf.loaders"
-	sed "s?@ROOTDIR@/loaders?\${SYSPREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders?" < \${SYSPREFIX}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache.in > \$GDK_PIXBUF_MODULE_FILE
-fi
-
-\${SYSPREFIX}/bin/synfigstudio "\$@"
-
-EOF
-
-chmod +x ${PREFIX}/synfigstudio
-
-}
-
-mkpackage()
-{
-	 ! -e ${DISTPREFIX} || rm -rf ${DISTPREFIX}
-	mkdir -p ${DISTPREFIX}
-	cp -r ${PREFIX}/etc ${DISTPREFIX}
-	cp -r ${PREFIX}/lib ${DISTPREFIX}
-	cp -r ${PREFIX}/lib.extra ${DISTPREFIX}
-	cp -r ${PREFIX}/share ${DISTPREFIX}
-	
-	cp -r ${PREFIX}/synfig ${DISTPREFIX}
-	cp -r ${PREFIX}/synfigstudio ${DISTPREFIX}
-	
-	mkdir -p ${DISTPREFIX}/bin
-	BINARIES="\
-		identify
-		synfig
-		synfigstudio"
-	for FILE in $BINARIES; do
-		cp -r ${PREFIX}/bin/${FILE} ${DISTPREFIX}/bin/
-	done
-	
-	#cleaning devel stuff
-	rm -f ${DISTPREFIX}/lib/*.la
-	rm -f ${DISTPREFIX}/lib/*.a
-	rm -f ${DISTPREFIX}/lib/cairo/*.la
-	rm -rf ${DISTPREFIX}/include
-	rm -rf ${DISTPREFIX}/lib/gdkmm-2.4
-	rm -rf ${DISTPREFIX}/lib/libxml++-2.6
-	rm -rf ${DISTPREFIX}/lib/giomm-2.4
-	rm -rf ${DISTPREFIX}/lib/glibmm-2.4
-	rm -rf ${DISTPREFIX}/lib/pangomm-1.4
-	rm -rf ${DISTPREFIX}/lib/gtkmm-2.4
-	rm -rf ${DISTPREFIX}/lib/pkgconfig
-	rm -rf ${DISTPREFIX}/lib/sigc++-2.0
-	rm -rf ${DISTPREFIX}/share/applications/gtk3-*
-	rm -rf ${DISTPREFIX}/share/doc
-	rm -rf ${DISTPREFIX}/share/devhelp
-	rm -rf ${DISTPREFIX}/share/gtk-doc
-	rm -rf ${DISTPREFIX}/share/gtkmm-2.4
-	rm -rf ${DISTPREFIX}/share/aclocal
-	rm -rf ${DISTPREFIX}/share/ImageMagick-6.4.0
-	rm -rf ${DISTPREFIX}/share/man
-	
-	mkpackage_tar
-	mkpackage_rpm
-	mkpackage_deb
-}
-	
-mkpackage_tar()
-{
-	#== tar.bz2 ==
-	rm -f ${WORKSPACE}/synfigstudio-${VERSION}-${REVISION}.$BREED.${RPM_ARCH}.tar.bz2 || true
-	pushd ${DISTPREFIX}/..
-	 ! -d synfigstudio-${VERSION}-${REVISION}.${RPM_ARCH} || rm -rf synfigstudio-${VERSION}-${REVISION}${RPM_ARCH}
-	cp -rf dist synfigstudio-${VERSION}-${REVISION}.${RPM_ARCH}
-	tar cjf ${WORKSPACE}/synfigstudio-${VERSION}-${REVISION}.${RPM_ARCH}.tar.bz2 synfigstudio-${VERSION}-${REVISION}.${RPM_ARCH}
-	rm -rf synfigstudio-${VERSION}-${REVISION}.${RPM_ARCH}
-	popd
-}
-
-mkpackage_rpm()
-{
-	#== rpm ==
- cat > ${WORKSPACE}/linux$ARCH$SUFFIX/synfigstudio.spec << EOF
-%define __spec_install_post /bin/true
-
-Name: synfigstudio
-Version: ${VERSION}
-Release: ${REVISION}
-Summary: Film-Quality 2D Vector Animation package
-Group: Applications/Graphics
-License: GPL
-URL: http://www.synfig.org/
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Obsoletes: synfig ETL
-AutoReqProv: no
-
-
-%description
-Synfig Animation Studio is a powerful, industrial-strength vector-based
-2D animation software, designed from the ground-up for producing
-feature-film quality animation with fewer people and resources.
-It eliminates the need for tweening, preventing the need to hand-draw
-each frame. Synfig features spatial and temporal resolution independence
-(sharp and smooth at any resolution or framerate), high dynamic range
-images, and a flexible plugin system.
-
-
-%prep
-
-
-%build
-
-%install
-rm -rf \$RPM_BUILD_ROOT
-mkdir -p \$RPM_BUILD_ROOT/opt/synfig
-cp -r ${DISTPREFIX}/* \$RPM_BUILD_ROOT/opt/synfig
-mkdir -p \$RPM_BUILD_ROOT/usr/share
-mkdir -p \$RPM_BUILD_ROOT/usr/share/icons
-mv \$RPM_BUILD_ROOT/opt/synfig/share/applications \$RPM_BUILD_ROOT/usr/share
-mv \$RPM_BUILD_ROOT/opt/synfig/share/appdata \$RPM_BUILD_ROOT/usr/share
-mv \$RPM_BUILD_ROOT/opt/synfig/share/icons/hicolor \$RPM_BUILD_ROOT/usr/share/icons
-mv \$RPM_BUILD_ROOT/opt/synfig/share/mime \$RPM_BUILD_ROOT/usr/share
-mv \$RPM_BUILD_ROOT/opt/synfig/share/mime-info \$RPM_BUILD_ROOT/usr/share
-mkdir -p \$RPM_BUILD_ROOT/usr/share/pixmaps
-ln -sf /opt/synfig/share/pixmaps/sif_icon.png \$RPM_BUILD_ROOT/usr/share/pixmaps/sif_icon.png
-ln -sf /opt/synfig/share/pixmaps/synfig_icon.png \$RPM_BUILD_ROOT/usr/share/pixmaps/synfig_icon.png
-mkdir -p \$RPM_BUILD_ROOT/usr/bin
-cp \$RPM_BUILD_ROOT/opt/synfig/synfig \$RPM_BUILD_ROOT/usr/bin/
-cp \$RPM_BUILD_ROOT/opt/synfig/synfigstudio \$RPM_BUILD_ROOT/usr/bin/
-sed -i 's|^SYSPREFIX=.*|SYSPREFIX=/opt/synfig|' \$RPM_BUILD_ROOT/usr/bin/synfig
-sed -i 's|^SYSPREFIX=.*|SYSPREFIX=/opt/synfig|' \$RPM_BUILD_ROOT/usr/bin/synfigstudio
-
-
-%clean
-rm -rf \$RPM_BUILD_ROOT
-
-%post
-if -x /usr/bin/update-mime-database ; then
- update-mime-database /usr/share/mime
-fi
-if -x /usr/bin/update-desktop-database ; then
- update-desktop-database
-fi
-
-%postun
-if -x /usr/bin/update-mime-database ; then
- update-mime-database /usr/share/mime
-fi
-if -x /usr/bin/update-desktop-database ; then
- update-desktop-database
-fi
-
-%files
-%defattr(-,root,root,-)
-/opt/synfig/
-/usr/share/*
-/usr/bin/*
-
-%changelog
-* Sat Mar 21 2009 Konstantin Dmitriev <ksee.zelgadis@gmail.com> - 0.61.09-2354.morevnapackage.1
-- Update to SVN2354
-- Include ImageMagick-c++
-
-* Wed Jan 14 2009 Konstantin Dmitriev <ksee.zelgadis@gmail.com> - 0.61.09-2316.morevnapackage.1
-- First release
-
-EOF
- run_native linux${ARCH} rpmbuild -bb --target ${RPM_ARCH} ${WORKSPACE}/linux$ARCH$SUFFIX/synfigstudio.spec
- 
- cp $HOME/rpmbuild/RPMS/${RPM_ARCH}/synfigstudio-${VERSION}-${REVISION}.${RPM_ARCH}.rpm ${WORKSPACE}
-}
-
-mkpackage_deb()
-{
- rm -rf ${WORKSPACE}/linux$ARCH$SUFFIX/dist-deb || true
- mkdir ${WORKSPACE}/linux$ARCH$SUFFIX/dist-deb
- cd ${WORKSPACE}/linux$ARCH$SUFFIX/dist-deb
- mkdir synfigstudio-${VERSION}
- DEB_DIST=${WORKSPACE}/linux$ARCH$SUFFIX/dist-deb/synfigstudio-${VERSION}
-	
-	
-	mkdir -p ${DEB_DIST}/opt/synfig
-	cp -r ${DISTPREFIX}/* ${DEB_DIST}/opt/synfig
-	mkdir -p ${DEB_DIST}/usr/share
-	mkdir -p ${DEB_DIST}/usr/share/icons
-	mv ${DEB_DIST}/opt/synfig/share/applications ${DEB_DIST}/usr/share
-	mv ${DEB_DIST}/opt/synfig/share/appdata ${DEB_DIST}/usr/share
-	mv ${DEB_DIST}/opt/synfig/share/icons/hicolor ${DEB_DIST}/usr/share/icons
-	mv ${DEB_DIST}/opt/synfig/share/mime ${DEB_DIST}/usr/share
-	mv ${DEB_DIST}/opt/synfig/share/mime-info ${DEB_DIST}/usr/share
-	mkdir -p ${DEB_DIST}/usr/share/pixmaps
-	ln -sf /opt/synfig/share/pixmaps/sif_icon.png ${DEB_DIST}/usr/share/pixmaps/sif_icon.png
-	ln -sf /opt/synfig/share/pixmaps/synfig_icon.png ${DEB_DIST}/usr/share/pixmaps/synfig_icon.png
-	mkdir -p ${DEB_DIST}/usr/bin
-	cp ${DEB_DIST}/opt/synfig/synfig ${DEB_DIST}/usr/bin/
-	cp ${DEB_DIST}/opt/synfig/synfigstudio ${DEB_DIST}/usr/bin/
-	sed -i 's|^SYSPREFIX=.*|SYSPREFIX=/opt/synfig|' ${DEB_DIST}/usr/bin/synfig
-	sed -i 's|^SYSPREFIX=.*|SYSPREFIX=/opt/synfig|' ${DEB_DIST}/usr/bin/synfigstudio
-	
-	mkdir -p ${DEB_DIST}/debian
-	echo "9" > ${DEB_DIST}/debian/compat
-	
-	cat > ${DEB_DIST}/debian/control << EOF
-Source: synfigstudio
-Section: graphics
-Priority: extra
-Maintainer: Konstantin Dmitiev <root@synfig.org>
-
-Package: synfigstudio
-Provides: synfig
-Recommends: synfig-examples
-Architecture: any
-Description: Film-Quality 2D Vector Animation package
- Synfig Animation Studio is a powerful, industrial-strength vector-based
- 2D animation software, designed from the ground-up for producing
- feature-film quality animation with fewer people and resources.
- It eliminates the need for tweening, preventing the need to hand-draw
- each frame. Synfig features spatial and temporal resolution independence
- (sharp and smooth at any resolution or framerate), high dynamic range
- images, and a flexible plugin system.
-EOF
-	
-	cat > ${DEB_DIST}/debian/copyright << EOF
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: synfig
-Source: http://sourceforge.net/projects/synfig/files/synfigstudio/
-
-Files: *
-Copyright: 2002-2005 Adrian Bentley
- 2009 Carlos A. Sosa Navarro
- 2008-2013 Carlos López
- 2010-2011 Carlos López González
- 2007-2008 Chris Moore
- 2008 David Roden
- 2008 Gerald Young
- 2008-2009 Gerco Ballintijn
- 2013 Ivan Mahonin
- 2009,2012-2013 Konstantin Dmitriev <ksee.zelgadis@gmail.com>
- 2009-2011 Nikita Kitaev
- 2007-2008 Paul Wise
- 2001-2014 Robert B. Quattlebaum Jr.
- 2006 Yue Shi Lai
-License: GPL-2+
-Comment: see list of all contributors in file README
-EOF
-	
-	cat > ${DEB_DIST}/debian/changelog << EOF
-synfigstudio (${VERSION}-${REVISION}) unstable; urgency=medium
-
- * Custom Debian package form synfig.org.
-
- -- Konstantin Dmitriev <ksee.zelgadis@gmail.com> Sun, 18 Jan 2015 16:22:23 +1100
-
-EOF
-	
-	cat > ${DEB_DIST}/debian/postinst << EOF
-#!/bin/bash
-if -x /usr/bin/update-mime-database ; then
- update-mime-database /usr/share/mime
-fi
-if -x /usr/bin/update-desktop-database ; then
- update-desktop-database
-fi
-#chmod a+rX -R /opt/synfig
-#chmod a+rX /opt
-EOF
-	chmod a+x ${DEB_DIST}/debian/postinst
-	
-	cat > ${DEB_DIST}/debian/postrm << EOF
-#!/bin/bash
-if -x /usr/bin/update-mime-database ; then
- update-mime-database /usr/share/mime
-fi
-if -x /usr/bin/update-desktop-database ; then
- update-desktop-database
-fi
-EOF
-	chmod a+x ${DEB_DIST}/debian/postrm
-
-	cat > ${DEB_DIST}/debian/rules << EOF
-#!/usr/bin/make -f
-# debian/rules for alien
-
-PACKAGE=\$(shell dh_listpackages)
-
-build:
-	dh_testdir
-
-clean:
-	dh_testdir
-	dh_testroot
-	dh_clean -d
-
-binary-indep: build
-
-binary-arch: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	dh_installdocs
-	dh_installchangelogs
-
-# Copy the packages's files.
-	find . -maxdepth 1 -mindepth 1 -not -name debian -print0 | \
-		xargs -0 -r -i cp -a {} debian/\$(PACKAGE)
-
-#
-# If you need to move files around in debian/\$(PACKAGE) or do some
-# binary patching, do it here
-#
-
-
-# This has been known to break on some wacky binaries.
-#	dh_strip
-	dh_compress
-#	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	-dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-#	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary
-EOF
-		
-		
-	#run_native fakeroot alien -g -k --scripts synfigstudio-${VERSION}-${REVISION}.${RPM_ARCH}.rpm
-		
-	cd synfigstudio-${VERSION}
-	
-	run_native dpkg-buildpackage -rfakeroot -a${SYS_ARCH} -d || true
-	# We have to use "dpkg-deb" command from chroot, 
-	# because recent dpkg-deb seems broken on Fedora
-	chmod -R a+rX debian/synfigstudio
-	run_native /usr/bin/fakeroot dpkg-deb -Zgzip -b debian/synfigstudio
-	#run_native fakeroot dpkg-deb --build synfigstudio
-	if ! -e debian/synfigstudio.deb ; then
-		echo "Failed to generate deb package"
-		exit 1
-	fi
-	mv debian/synfigstudio.deb ../synfigstudio_${VERSION}-${REVISION}_${SYS_ARCH}.deb
-	mv ../synfigstudio_${VERSION}-${REVISION}_${SYS_ARCH}.deb ${WORKSPACE}
-	rm -rf synfigstudio-${VERSION}.orig
-	rm -rf synfigstudio_${VERSION}.orig.tar.gz
-	rm -rf synfigstudio_${VERSION}-${REVISION}_${SYS_ARCH}.changes
-	rm -rf synfigstudio_${VERSION}-${REVISION}.diff.gz
-	rm -rf synfigstudio_${VERSION}-${REVISION}.dsc
-	rm -rf synfigstudio-${VERSION}
-	rm -rf ${WORKSPACE}/linux$ARCH$SUFFIX/dist-deb
-}
-
-mkall()
-{
-	mkprep
-	
-	set_environment
-	
-	# build tools
-	mkm4
-	mkautoconf
-	mkautomake
-	mklibtool
-	mkintltool
-	#mkgettext
-	
-	# system libraries
-	mklibjpeg
-	mklibtiff
-	mkglib
-	mkharfbuzz
-	mkfontconfig
-	mkgobjectintrospection
-	mkatk
-	mkatspi2atk
-	mkpixman
-	mkcairo # bundled library
-	mkpango
-	mkgdkpixbuf
-	mkgtk
-	mkadwaitaicons
-	mkgnomethemes
-	mkjack
-	
-	# synfig-core deps
-	#mkmesa
-	mklibsigcpp
-	mkglibmm
-	mklibxmlpp
-	#if $OPENGL == 1 ; then
-	#	mkglew
-	#fi
-	mkmlt
-	mkimagemagick
-	mkfftw
-	
-	# synfig-studio deps
-	mkcairomm
-	mkpangomm
-	mkgtkmm
-	#if $OPENGL == 1 ; then
-	#	mkfreeglut
-	#	mkftgl
-	#	mkgtkglext
-	#	mkgtkglextmm
-	#fi
-	
-	mketl
-	mksynfig
-	mksynfigstudio
-	mkconfig
-	mkpackage
-}
-
-do_cleanup()
-{
-	echo "Cleaning up..."
-	if ${PREFIX} != ${DEPSPREFIX} ; then
-		 ! -e ${DEPSPREFIX} || mv ${DEPSPREFIX} ${DEPSPREFIX}.off
-	fi
-	 ! -e ${SYSPREFIX} || mv ${SYSPREFIX} ${SYSPREFIX}.off
-
-	exit
-}
-
-trap do_cleanup INT SIGINT SIGTERM EXIT
-
- ! -e ${SYSPREFIX}.off || mv ${SYSPREFIX}.off ${SYSPREFIX}
- ! -e ${DEPSPREFIX}.off || mv ${DEPSPREFIX}.off ${DEPSPREFIX}
- -e ${DEPSPREFIX} || mkdir -p ${DEPSPREFIX}
-
-if -z $1 ; then
-	mkall
-else
-	echo "Executing custom user command..."
-	#mkprep
-	set_environment
-
-
-	$@
-fi
-
-do_cleanup

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/fedora-crosscompile-win.sh Deleted

@@ -1,745 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export SCRIPTPATH=$(cd `dirname "$0"`; pwd)
-
-if -z $ARCH ; then
-	export ARCH="64"
-fi
-
-if -z $THREADS ; then
-	export THREADS=4
-fi
-
-export TOOLCHAIN="mingw$ARCH" # mingw32 | mingw64
-
-if $TOOLCHAIN == "mingw32" ; then
- export TOOLCHAIN_HOST="i686-w64-mingw32"
- export EXT_ARCH=i386
-elif $TOOLCHAIN == "mingw64" ; then
- export TOOLCHAIN_HOST="x86_64-w64-mingw32"
- export EXT_ARCH=x86_64
-else
- echo "Error: Unknown toolchain"
- exit 1
-fi
-
-export WORKSPACE=${SCRIPTPATH}/../../../build
-export PREFIX=$WORKSPACE/win$ARCH/build
-export DISTPREFIX=$WORKSPACE/win$ARCH/dist
-export SRCPREFIX=$WORKSPACE/win$ARCH/source
-export CACHEDIR=$WORKSPACE/cache
-export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:/usr/${TOOLCHAIN_HOST}/sys-root/mingw/lib/pkgconfig/
-export PKG_CONFIG_LIBDIR=${PREFIX}/lib/pkgconfig
-export PATH=/usr/${TOOLCHAIN_HOST}/bin:/usr/${TOOLCHAIN_HOST}/sys-root/mingw/bin:${PREFIX}/bin:$PATH
-export LD_LIBRARY_PATH=${PREFIX}/lib:/usr/${TOOLCHAIN_HOST}/sys-root/mingw/lib
-
-export CC=/usr/bin/${TOOLCHAIN_HOST}-gcc
-export CXX=/usr/bin/${TOOLCHAIN_HOST}-g++
-export CPPFLAGS=" -I/usr/${TOOLCHAIN_HOST}/sys-root/mingw/include -I${PREFIX}/include"
-export LDFLAGS=" -L/usr/${TOOLCHAIN_HOST}/sys-root/mingw/lib -L${PREFIX}/lib "
-
-
-if -z $DEBUG ; then
-	export DEBUG=0
-fi
-
-if $DEBUG == 1 ; then
-	echo
-	echo "Debug mode: enabled"
-	echo
-	DEBUG='--enable-debug --enable-optimization=0'
-else
-	DEBUG=''
-fi
-
- -e $SRCPREFIX || mkdir -p $SRCPREFIX
- -e $CACHEDIR || mkdir -p $CACHEDIR
-
-export VERSION=`cat ${SCRIPTPATH}/../synfig-core/configure.ac |egrep "AC_INIT\(\Synfig Core\,"| sed "s|.*Core\,\||" | sed "s|\,\.*||"`
-pushd "${SCRIPTPATH}" > /dev/null
-export REVISION=`git show --pretty=format:%ci HEAD | head -c 10 | tr -d '-'`
-popd > /dev/null
-
-#mkdir -p ${WORKSPACE}/win$ARCH/bin || true
-#cat > ${WORKSPACE}/win$ARCH/bin/synfig <<EOF
-##!/bin/sh
-#
-#wine ${PREFIX}/bin/synfig.exe \$@
-#EOF
-#chmod +x ${WORKSPACE}/win$ARCH/bin/synfig
-#export PATH=${WORKSPACE}/win$ARCH/bin:$PATH
-
-mkprep()
-{
-
-if ! -z $DEPS ; then
-	DNF_BINARY=yum
-	if -f /usr/bin/dnf ; then
-		DNF_BINARY=dnf
-	fi
-	sudo $DNF_BINARY install -y \
-		wget xz make which unzip \
-		libXdmcp \
-		intltool \
-		gcc-c++ \
-		autoconf \
-		automake \
-		libtool \
-		libtool-ltdl-devel \
-		${TOOLCHAIN}-adwaita-icon-theme \
-		${TOOLCHAIN}-hicolor-icon-theme \
-		${TOOLCHAIN}-gcc-c++ \
-		${TOOLCHAIN}-cpp \
-		${TOOLCHAIN}-libxml++ \
-		${TOOLCHAIN}-cairo \
-		${TOOLCHAIN}-pango \
-		${TOOLCHAIN}-libjpeg-turbo \
-		${TOOLCHAIN}-gtkmm30 \
-		${TOOLCHAIN}-glibmm24 \
-		${TOOLCHAIN}-libltdl \
-		${TOOLCHAIN}-SDL \
-		${TOOLCHAIN}-fftw \
-		mingw32-nsis \
-		p7zip \
-		ImageMagick \
-		
-	#which synfig || sudo $DNF_BINARY install -y synfig
-		
-
-# Mesa deps (not used)
-#		scons \
-#		python-mako \
-
-fi
-
-# copy libs
- -d ${PREFIX}/bin || mkdir -p ${PREFIX}/bin
-for file in \
- av*.dll \
- ffmpeg.exe \
- iconv.dll \
- libatk-\*.dll \
- libatkmm-1.6-1.dll \
- libbz2\*.dll \
- libcairo\*.dll \
- libdl.dll \
- libepoxy\*.dll \
- libexpat\*.dll \
- libffi\*.dll \
- libfftw\*.dll \
- libfontconfig\*.dll \
- libfreetype\*.dll \
- libgcc_s_\*.dll \
- libgdk\*.dll \
- libgettext\*.dll \
- libgio\*.dll \
- libglib\*.dll \
- libgmodule\*.dll \
- libgobject\*.dll \
- libgomp*.dll \
- libgthread\*.dll \
- libgtk\*.dll \
- libharfbuzz\*.dll \
- libiconv\*.dll \
- libintl\*.dll \
- libjasper\*.dll \
- libjpeg\*.dll \
- libltdl*.dll \
- liblzma\*.dll \
- libMagick*.dll \
- libmlt*.dll \
- libogg*.dll \
- libpango\*.dll \
- libpcre\*.dll \
- libpixman\*.dll \
- libpng\*.dll \
- libsamplerate*.dll \
- libsigc\*.dll \
- libsox*.dll \
- libstdc++\*.dll \
- libsynfig\*.dll \
- libtiff\*.dll \
- libturbojpeg.dll \
- libvorbis*.dll \
- libwinpthread*.dll \
- libxml2\*.dll \
- libxml++\*.dll \
- libz\*.dll \
- postproc*.dll \
- pthread\*.dll \
- SDL.dll \
- swscale*.dll \
- swresample*.dll \
- zlib\*.dll \
- convert.exe \
- pango-querymodules.exe \
- synfig.exe \
- synfigstudio.exe \
-# this extra line is required!
-do
-	cp /usr/${TOOLCHAIN_HOST}/sys-root/mingw/bin/$file ${PREFIX}/bin || true
-done
-
- -d ${PREFIX}/etc || mkdir -p ${PREFIX}/etc
-for file in \
- fonts \
- gtk-3.0 \
- pango \
-# this extra line is required!
-do
-	cp -rf /usr/${TOOLCHAIN_HOST}/sys-root/mingw/etc/$file ${PREFIX}/etc || true
-done
-
- -d ${PREFIX}/lib || mkdir -p ${PREFIX}/lib
-for file in \
- gtk-3.0 \
- gdk-pixbuf-2.0 \
- pango \
- pkgconfig \
-# this extra line is required!
-do
-	cp -rf /usr/${TOOLCHAIN_HOST}/sys-root/mingw/lib/$file ${PREFIX}/lib || true
-done
-
- -d ${PREFIX}/share || mkdir -p ${PREFIX}/share
-for file in \
- fontconfig \
- glib-2.0 \
- gtk-3.0 \
- icons \
- themes \
- xml \
-# this extra line is required!
-do
-	cp -rf /usr/${TOOLCHAIN_HOST}/sys-root/mingw/share/$file ${PREFIX}/share || true
-done
-
-# cleaning source tree
-for dir in ETL synfig-core synfig-studio; do
-	pushd $SCRIPTPATH/../$dir > /dev/null
-	make clean || true
-	popd > /dev/null
-done
-
-}
-
-#ImageMagick
-mkimagemagick()
-{
-PKG_NAME=ImageMagick
-#PKG_VERSION=6.8.6-10
-PKG_VERSION=6.8.7-10
-#PKG_VERSION=6.8.8-7
-TAREXT=xz
-
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION%-*} --print-errors; then
-	cd $CACHEDIR
-	 -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://www.imagemagick.org/download/releases/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd $SRCPREFIX
-	if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
-		tar -xf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	fi
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	${TOOLCHAIN}-configure \
-	--prefix=${PREFIX} \
-	--exec-prefix=${PREFIX} \
-	--bindir=${PREFIX}/bin \
-	--sbindir=${PREFIX}/sbin \
-	--libexecdir=${PREFIX}/lib \
-	--datadir=${PREFIX}/share \
-	--localstatedir=${PREFIX}/var \
-	--sysconfdir=${PREFIX}/etc \
-	--datarootdir=${PREFIX}/share \
-	--datadir=${PREFIX}/share \
-	--includedir=${PREFIX}/include \
-	--libdir=${PREFIX}/lib \
-	--mandir=${PREFIX}/share/man \
-	--program-prefix="" \
-	--disable-static --enable-shared \
-	--without-modules \
-	--without-perl \
-	--without-x \
-	--without-wmf \
-	--with-threads \
-	--with-magick_plus_plus
-
-	make install -j$THREADS
-fi
-}
-
-mklibogg()
-{
-
-PKG_NAME=libogg
-PKG_VERSION=1.3.1
-TAREXT=gz
-
-if ! pkg-config ogg --exact-version=${PKG_VERSION} --print-errors; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://downloads.xiph.org/releases/ogg/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ${TOOLCHAIN}-configure \
- --prefix=${PREFIX} \
- --exec-prefix=${PREFIX} \
- --bindir=${PREFIX}/bin \
- --sbindir=${PREFIX}/sbin \
- --libexecdir=${PREFIX}/lib \
- --libdir=${PREFIX}/lib \
- --includedir=${PREFIX}/include \
- --datadir=${PREFIX}/share \
- --localstatedir=${PREFIX}/var \
- --sysconfdir=${PREFIX}/etc \
- --datarootdir=${PREFIX}/share
-
- make all -j$THREADS
- make install -j$THREADS
-
-fi
-}
-
-mklibvorbis()
-{
-mklibogg
-
-PKG_NAME=libvorbis
-PKG_VERSION=1.3.4
-TAREXT=gz
-
-if ! pkg-config vorbis --exact-version=${PKG_VERSION} --print-errors; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://downloads.xiph.org/releases/vorbis/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ${TOOLCHAIN}-configure \
- --prefix=${PREFIX} \
- --exec-prefix=${PREFIX} \
- --bindir=${PREFIX}/bin \
- --sbindir=${PREFIX}/sbin \
- --libexecdir=${PREFIX}/lib \
- --libdir=${PREFIX}/lib \
- --includedir=${PREFIX}/include \
- --datadir=${PREFIX}/share \
- --localstatedir=${PREFIX}/var \
- --sysconfdir=${PREFIX}/etc \
- --datarootdir=${PREFIX}/share
-
- make all -j$THREADS
- make install -j$THREADS
-
-fi
-}
-
-mklibsamplerate()
-{
-PKG_NAME=libsamplerate
-PKG_VERSION=0.1.8
-TAREXT=gz
-
-if ! pkg-config samplerate --exact-version=${PKG_VERSION} --print-errors; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://www.mega-nerd.com/SRC/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ${TOOLCHAIN}-configure \
- --prefix=${PREFIX} \
- --exec-prefix=${PREFIX} \
- --bindir=${PREFIX}/bin \
- --sbindir=${PREFIX}/sbin \
- --libexecdir=${PREFIX}/lib \
- --libdir=${PREFIX}/lib \
- --includedir=${PREFIX}/include \
- --datadir=${PREFIX}/share \
- --localstatedir=${PREFIX}/var \
- --sysconfdir=${PREFIX}/etc \
- --datarootdir=${PREFIX}/share
-
- make all -j$THREADS
- make install -j$THREADS
-
-fi
-}
-
-mksox()
-{
-PKG_NAME=sox
-PKG_VERSION=14.4.1
-TAREXT=gz
-
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
- cd $CACHEDIR
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://download.tuxfamily.org/synfig/packages/sources/base/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd $SRCPREFIX
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf $CACHEDIR/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ${TOOLCHAIN}-configure \
- --prefix=${PREFIX} \
- --exec-prefix=${PREFIX} \
- --bindir=${PREFIX}/bin \
- --sbindir=${PREFIX}/sbin \
- --libexecdir=${PREFIX}/lib \
- --libdir=${PREFIX}/lib \
- --includedir=${PREFIX}/include \
- --mandir=${PREFIX}/man \
- --datadir=${PREFIX}/share \
- --localstatedir=${PREFIX}/var \
- --sysconfdir=${PREFIX}/etc \
- --datarootdir=${PREFIX}/share 
-
- make all -j$THREADS
- make install -j$THREADS
-
-fi
-}
-
-mkffmpeg()
-{
- export FFMPEG_VERSION=3.4.2
- if ! pkg-config libswscale --exact-version=${FFMPEG_VERSION} --print-errors; then
- cd $CACHEDIR
- -e ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev.zip || wget http://ffmpeg.zeranoe.com/builds/win${ARCH}/dev/ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev.zip
- -e ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared.zip || wget http://ffmpeg.zeranoe.com/builds/win${ARCH}/shared/ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared.zip
- ! -d ffmpeg || rm -rf ffmpeg
- cd $SRCPREFIX
- mkdir -p ffmpeg
- cd ffmpeg
-	
-	
-	if -e /usr/bin/7z ; then
-		SZIP_BINARY=7z
-	else
-		SZIP_BINARY=7za
-	fi
-		
-	
- $SZIP_BINARY x -y $CACHEDIR/ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev.zip
- cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev/include/* ${PREFIX}/include/
- cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev/lib/* ${PREFIX}/lib/
- $SZIP_BINARY x -y $CACHEDIR/ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared.zip
- cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared/bin/ffmpeg.exe ${PREFIX}/bin
- cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared/bin/*.dll ${PREFIX}/bin
- mkdir -p ${PREFIX}/share/ffmpeg/presets/ || true
- cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared/presets/* /${PREFIX}/share/ffmpeg/presets/
-
-		for PKG in avcodec avutil avformat swscale avdevice; do
-			cat > ${PREFIX}/lib/pkgconfig/lib${PKG}.pc <<EOF
-prefix=${PREFIX}
-exec_prefix=${PREFIX}
-libdir=${PREFIX}/lib
-includedir=${PREFIX}/include
-
-Name: lib${PKG}
-Description: Dynamic module loader for GLib
-Version: ${FFMPEG_VERSION}
-
-Libs: -l${PKG}
-
-EOF
-		done
- fi
-}
-
-mkmlt()
-{
-mkffmpeg
-mklibsamplerate
-mklibvorbis
-mksox
-	
-PKG_NAME=mlt
-PKG_VERSION=6.4.0
-TAREXT=gz
-# version 6.6.0 build failed, TODO
-
-if ! pkg-config ${PKG_NAME}\+\+ --exact-version=${PKG_VERSION} --print-errors; then
-
- export CPPFLAGS=" -I/usr/${TOOLCHAIN_HOST}/sys-root/mingw/include/SDL $CPPFLAGS"
- export LDFLAGS=" $LDFLAGS -lmingw32 -lSDLmain -lSDL -mwindows"
-	
- # -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://download.tuxfamily.org/synfig/packages/sources/base/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- #if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- # tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- #fi
- #cd ${PKG_NAME}-${PKG_VERSION}
-
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget https://github.com/mltframework/mlt/releases/download/v${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
-
- 
- #https://github.com/mltframework/mlt/releases/download/v6.8.0/mlt-6.8.0.tar.gz
- 
- #cd $SRCPREFIX
- #if ! -d ${PKG_NAME} ; then
- # git clone https://github.com/morevnaproject/mlt
- #fi
- #cd mlt
- #git reset --hard
- #git checkout master
- #git reset --hard
- #git pull
- #git clean -f -d
- ! -e config.cache || rm config.cache
- rm -rf ${PREFIX}/lib/libmlt* || true
- rm -rf ${PREFIX}/bin/libmlt* || true
-
- ${TOOLCHAIN}-configure \
- --prefix=${PREFIX} \
- --exec-prefix=${PREFIX} \
- --bindir=${PREFIX}/bin \
- --sbindir=${PREFIX}/sbin \
- --libexecdir=${PREFIX}/lib \
- --libdir=${PREFIX}/lib \
- --datadir=${PREFIX}/share \
- --mandir=${PREFIX}/man \
- --localstatedir=${PREFIX}/var \
- --sysconfdir=${PREFIX}/etc \
- --datarootdir=${PREFIX}/share \
- --avformat-shared=${PREFIX}/ \
- --enable-gpl --disable-decklink \
- --target-os=MinGW --target-arch=$EXT_ARCH \
- $DEBUG
- 
- if $ARCH == "64" ; then
- touch src/modules/disable-motion_est
- touch src/modules/disable-xine
- fi
- 
- touch src/modules/disable-gtk2
-
- make all -j$THREADS
- make install -j$THREADS
-
- mv ${PREFIX}/melt ${PREFIX}/bin/melt.exe
- mv ${PREFIX}/libmlt*.dll ${PREFIX}/bin
-
- mkdir -p ${PREFIX}/bin/lib || true
- mkdir -p ${PREFIX}/bin/share || true
- cp -rf ${PREFIX}/lib/mlt ${PREFIX}/bin/lib/
- cp -rf ${PREFIX}/share/mlt ${PREFIX}/bin/share/
-
-fi
-}
-
-# not used
-mkmesa()
-{
-PKG_NAME=mesa
-PKG_VERSION=11.0.5
-TAREXT=gz
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
-	#( cd ${WORKSPACE}/cache/ && wget -c --no-check-certificate ftp://ftp.freedesktop.org/pub/mesa/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} )
-	pushd ${SRCPREFIX}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xzf ${WORKSPACE}/cache/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	# TODO: change machine! (64bit)
-	#LDFLAGS="-static -s"
-	scons build=release platform=windows toolchain=crossmingw machine=x86 libgl-gdi
-#	./configure --host=${HOST} --prefix=${DEPSPREFIX} --includedir=${DEPSPREFIX}/include \
-#		--with-gallium-drivers="swrast" \
-#		--with-dri-drivers="swrast" \
-#		--disable-static --enable-shared
-		
-#		 \
-#		--disable-egl \
-
-	#make -j${THREADS}
-	#make install
-	cd ..
-	popd
-	
-fi
-}
-
-#ETL
-mketl()
-{
-cd $SCRIPTPATH/../ETL
-make clean || true
-autoreconf --install --force
-${TOOLCHAIN}-configure --prefix=${PREFIX} --includedir=${PREFIX}/include --libdir=${PREFIX}/lib --bindir=${PREFIX}/bin $DEBUG
-make install
-}
-
-#synfig-core
-mksynfig()
-{
-cd $SCRIPTPATH/../synfig-core/
-make clean || true
- ! -e config.cache || rm config.cache
-/bin/sh ./bootstrap.sh
-cp ./configure ./configure.real
-echo -e "#!/bin/sh \n export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:/usr/${TOOLCHAIN_HOST}/sys-root/mingw/lib/pkgconfig/:$PKG_CONFIG_PATH \n ./configure.real \$@ \n " > ./configure
-chmod +x ./configure
-#this need for debug version for now
-#export CXXFLAGS="-mbig-obj"
-${TOOLCHAIN}-configure \
---prefix=${PREFIX} \
---exec-prefix=${PREFIX} \
---bindir=${PREFIX}/bin \
---sbindir=${PREFIX}/sbin \
---includedir=${PREFIX}/include \
---libexecdir=${PREFIX}/lib \
---libdir=${PREFIX}/lib \
---datadir=${PREFIX}/share \
---localstatedir=${PREFIX}/var \
---sysconfdir=${PREFIX}/etc \
---datarootdir=${PREFIX}/share \
---enable-optimization=3 \
---disable-static --enable-shared --with-magickpp --without-libavcodec --enable-warnings=minimum $DEBUG
-make install -j$THREADS
-}
-
-#synfig-studio
-mksynfigstudio()
-{
-cd $SCRIPTPATH/../synfig-studio/
-make clean || true
- ! -e config.cache || rm config.cache
-/bin/sh ./bootstrap.sh
-cp ./configure ./configure.real
-echo -e "#/bin/sh \n export PKG_CONFIG_PATH=${PREFIX}/lib/pkgconfig:/usr/${TOOLCHAIN_HOST}/sys-root/mingw/lib/pkgconfig/:$PKG_CONFIG_PATH \n ./configure.real \$@ \n " > ./configure
-chmod +x ./configure
-#export CPPFLAGS="$CPPFLAGS -std=c++11"
-${TOOLCHAIN}-configure \
---prefix=${PREFIX} \
---exec-prefix=${PREFIX} \
---bindir=${PREFIX}/bin \
---sbindir=${PREFIX}/sbin \
---includedir=${PREFIX}/include \
---libexecdir=${PREFIX}/lib \
---libdir=${PREFIX}/lib \
---datadir=${PREFIX}/share \
---localstatedir=${PREFIX}/var \
---sysconfdir=${PREFIX}/etc \
---datarootdir=${PREFIX}/share \
---enable-optimization=3 \
---disable-static --enable-shared $DEBUG
-make install -j$THREADS
-cp -rf ${PREFIX}/share/pixmaps/synfigstudio/* ${PREFIX}/share/pixmaps/ && rm -rf ${PREFIX}/share/pixmaps/synfigstudio
-
- -e ${PREFIX}/etc/gtk-2.0 || mkdir -p ${PREFIX}/etc/gtk-2.0
-cat > ${PREFIX}/etc/gtk-2.0/gtkrc <<EOF
-
-# Enable native look
-gtk-theme-name = "MS-Windows"
-
-# Use small toolbar buttons
-gtk-toolbar-style = 0
-
-EOF
-}
-
-mkpackage()
-{
-# ! -d DISTPREFIX || rm -rf $DISTPREFIX
-#mkdir -p $DISTPREFIX/bin
-#cp ${PREFIX}/bin/*.exe $DISTPREFIX/bin
-#cp ${PREFIX}/bin/*.dll $DISTPREFIX/bin
-#cp -rf ${PREFIX}/etc $DISTPREFIX/etc
-#mkdir -p $DISTPREFIX/lib
-#cp -rf ${PREFIX}/lib/synfig $DISTPREFIX/lib
-#mkdir -p $DISTPREFIX/share
-#cp -rf ${PREFIX}/share/pixmaps $DISTPREFIX/share
-#cp -rf ${PREFIX}/share/synfig $DISTPREFIX/share
-cp -rf $SCRIPTPATH/../synfig-core/examples $PREFIX/
-cp -rf $SCRIPTPATH/gtk-3.0/settings.ini $PREFIX/share/gtk-3.0
-mkdir -p $PREFIX/licenses
-cp -rf $SCRIPTPATH/../synfig-studio/COPYING $PREFIX/licenses/synfigstudio.txt
-cp -rf $SCRIPTPATH/../synfig-studio/images/installer_logo.bmp $PREFIX/
-
- -d $CACHEDIR || mkdir -p $CACHEDIR
-cd $CACHEDIR
-
- -e portable-python-3.2.5.1.zip || wget http://download.tuxfamily.org/synfig/packages/sources/portable-python-3.2.5.1.zip
- ! -d python || rm -rf python
-unzip portable-python-3.2.5.1.zip
- ! -d $PREFIX/python || rm -rf $PREFIX/python
-mv python $PREFIX
-
-gen_list_nsh()
-{
- ! -e $2.nsh || rm $2.nsh
- ! -e $2-uninst.nsh || rm $2-uninst.nsh
-touch $2.nsh
-touch $2-uninst.nsh
-for line in `find $1 -print`; do
-	directory=`dirname $line`
-	line1=`echo $directory | sed "s|\./||g" | sed "s|/|\\\\\|g"`
-	line2=`echo $line | sed "s|\./||g" | sed "s|/|\\\\\|g"`
-	if -d $line ; then
-		echo "RMDir \"\$INSTDIR\\$line2\"" >> $2-uninst.nsh
-	elif ! -L $line ; then
-		echo "SetOutPath \"\$INSTDIR\\$line1\"" >> $2.nsh
-		echo "File \"$line2\"" >> $2.nsh
-		echo "Delete \"\$INSTDIR\\$line2\"" >> $2-uninst.nsh
-	fi
-done
-# reverse order of uninstall commands
-cp $2-uninst.nsh $2-uninst.nsh.tmp
-tac $2-uninst.nsh.tmp > $2-uninst.nsh
-rm $2-uninst.nsh.tmp
-}
-
-cd $PREFIX
-
-#generate file lists
-
-gen_list_nsh bin bin
-sed -i '/ffmpeg\.exe/d' bin.nsh		# exclude ffmpeg from he list of binaries - it will go into separate group
-gen_list_nsh etc etc
-gen_list_nsh examples examples
-gen_list_nsh lib/gdk-pixbuf-2.0 lib-gdk-pixbuf
-gen_list_nsh lib/gtk-3.0 lib-gtk
-gen_list_nsh lib/pango lib-pango
-gen_list_nsh lib/synfig lib-synfig
-gen_list_nsh licenses licenses
-#gen_list_nsh python python # -- takes too long
-gen_list_nsh share share
-
-cp -f $SCRIPTPATH/synfigstudio.nsi $PREFIX/synfigstudio.nsi
-sed -i "s/@VERSION@/$VERSION/g" $PREFIX/synfigstudio.nsi
-cp -f $SCRIPTPATH/win${ARCH}-specific.nsh $PREFIX/arch-specific.nsh
-makensis synfigstudio.nsi
-
-mv synfigstudio-${VERSION}.exe ${WORKSPACE}/synfigstudio-${VERSION}-${REVISION}-${ARCH}bit.exe
-}
-
-mkall()
-{
-	mkprep
-	mkimagemagick
-	mkmlt
-	mketl
-	mksynfig
-	mksynfigstudio
-	mkpackage
-}
-
-if -z $1 ; then
-	mkall
-else
-	echo "Executing custom user command..."
-	$@
-fi
-

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/git2cl Deleted

@@ -1,372 +0,0 @@
-#!/usr/bin/perl
-
-# Copyright (C) 2007, 2008 Simon Josefsson <simon@josefsson.org>
-# Copyright (C) 2007 Luis Mondesi <lemsx1@gmail.com>
-# * calls git directly. To use it just: 
-# cd ~/Project/my_git_repo; git2cl > ChangeLog
-# * implements strptime()
-# * fixes bugs in $comment parsing
-# - copy input before we remove leading spaces
-# - skip "merge branch" statements as they don't
-# have information about files (i.e. we never
-# go into $state 2)
-# - behaves like a pipe/filter if input is given from the CLI
-# else it calls git log by itself
-#
-# The functions mywrap, last_line_len, wrap_log_entry are derived from
-# the cvs2cl tool, see <http://www.red-bean.com/cvs2cl/>:
-# Copyright (C) 2001,2002,2003,2004 Martyn J. Pearce <fluffy@cpan.org>
-# Copyright (C) 1999 Karl Fogel <kfogel@red-bean.com>
-#
-# git2cl is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# git2cl is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with git2cl; see the file COPYING. If not, write to the Free
-# Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-use strict;
-use POSIX qw(strftime);
-use Text::Wrap qw(wrap);
-use FileHandle;
-
-use constant EMPTY_LOG_MESSAGE => '*** empty log message ***';
-
-# this is a helper hash for stptime.
-# Assumes you are calling 'git log ...' with LC_ALL=C
-my %month = (
- 'Jan'=>0,
- 'Feb'=>1,
- 'Mar'=>2,
- 'Apr'=>3,
- 'May'=>4,
- 'Jun'=>5,
- 'Jul'=>6,
- 'Aug'=>7,
- 'Sep'=>8,
- 'Oct'=>9,
- 'Nov'=>10,
- 'Dec'=>11,
-);
-
-my $fh = new FileHandle;
-
-sub key_ready
-{
- my ($rin, $nfd);
- vec($rin, fileno(STDIN), 1) = 1;
- return $nfd = select($rin, undef, undef, 0);
-}
-
-sub strptime {
- my $str = shift;
- return undef if not defined $str;
-
- # we are parsing this format
- # Fri Oct 26 00:42:56 2007 -0400
- # to these fields
- # sec, min, hour, mday, mon, year, wday = -1, yday = -1, isdst = -1
- # Luis Mondesi <lemsx1@gmail.com>
- my @date;
- if ($str =~ /(:alpha:{3})\s+(:alpha:{3})\s+(:digit:{1,2})\s+(:digit:{1,2}):(:digit:{1,2}):(:digit:{1,2})\s+(:digit:{4})/){
- push(@date,$6,$5,$4,$3,$month{$2},($7 - 1900),-1,-1,-1);
- } else {
- die ("Cannot parse date '$str'\n'");
- }
- return @date;
-}
-
-sub mywrap {
- my ($indent1, $indent2, @text) = @_;
- # If incoming text looks preformatted, don't get clever
- my $text = Text::Wrap::wrap($indent1, $indent2, @text);
- if ( grep /^\s+/m, @text ) {
-	return $text;
- }
- my @lines = split /\n/, $text;
- $indent2 =~ s!^((?: {8})+)!"\t" x (length($1)/8)!e;
- $lines0 =~ s/^$indent1\s+/$indent1/;
- s/^$indent2\s+/$indent2/
-	for @lines1..$#lines;
- my $newtext = join "\n", @lines;
- $newtext .= "\n"
-	if substr($text, -1) eq "\n";
- return $newtext;
-}
-
-sub last_line_len {
- my $files_list = shift;
- my @lines = split (/\n/, $files_list);
- my $last_line = pop (@lines);
- return length ($last_line);
-}
-
-# A custom wrap function, sensitive to some common constructs used in
-# log entries.
-sub wrap_log_entry {
- my $text = shift; # The text to wrap.
- my $left_pad_str = shift; # String to pad with on the left.
-
- # These do NOT take left_pad_str into account:
- my $length_remaining = shift; # Amount left on current line.
- my $max_line_length = shift; # Amount left for a blank line.
-
- my $wrapped_text = ''; # The accumulating wrapped entry.
- my $user_indent = ''; # Inherited user_indent from prev line.
-
- my $first_time = 1; # First iteration of the loop?
- my $suppress_line_start_match = 0; # Set to disable line start checks.
-
- my @lines = split (/\n/, $text);
- while (@lines) # Don't use `foreach' here, it won't work.
- {
-	my $this_line = shift (@lines);
-	chomp $this_line;
-
-	if ($this_line =~ /^(\s+)/) {
-	 $user_indent = $1;
-	}
-	else {
-	 $user_indent = '';
-	}
-
-	# If it matches any of the line-start regexps, print a newline now...
-	if ($suppress_line_start_match)
-	{
-	 $suppress_line_start_match = 0;
-	}
-	elsif (($this_line =~ /^(\s*)\*\s+a-zA-Z0-9/)
-	 || ($this_line =~ /^(\s*)\* a-zA-Z0-9_\.\/\+-+/)
-	 || ($this_line =~ /^(\s*)$a-zA-Z0-9_\.\/\+-+($|,\s*)/)
-	 || ($this_line =~ /^(\s+)(\S+)/)
-	 || ($this_line =~ /^(\s*)- +/)
-	 || ($this_line =~ /^()\s*$/)
-	 || ($this_line =~ /^(\s*)\*\) +/)
-	 || ($this_line =~ /^(\s*)a-zA-Z0-9(\)|\.|\:) +/))
-	{
-	 $length_remaining = $max_line_length - (length ($user_indent));
-	}
-
-	# Now that any user_indent has been preserved, strip off leading
-	# whitespace, so up-folding has no ugly side-effects.
-	$this_line =~ s/^\s*//;
-
-	# Accumulate the line, and adjust parameters for next line.
-	my $this_len = length ($this_line);
-	if ($this_len == 0)
-	{
-	 # Blank lines should cancel any user_indent level.
-	 $user_indent = '';
-	 $length_remaining = $max_line_length;
-	}
-	elsif ($this_len >= $length_remaining) # Line too long, try breaking it.
-	{
-	 # Walk backwards from the end. At first acceptable spot, break
-	 # a new line.
-	 my $idx = $length_remaining - 1;
-	 if ($idx < 0) { $idx = 0 };
-	 while ($idx > 0)
-	 {
-		if (substr ($this_line, $idx, 1) =~ /\s/)
-		{
-		 my $line_now = substr ($this_line, 0, $idx);
-		 my $next_line = substr ($this_line, $idx);
-		 $this_line = $line_now;
-
-		 # Clean whitespace off the end.
-		 chomp $this_line;
-
-		 # The current line is ready to be printed.
-		 $this_line .= "\n${left_pad_str}";
-
-		 # Make sure the next line is allowed full room.
-		 $length_remaining = $max_line_length - (length ($user_indent));
-
-		 # Strip next_line, but then preserve any user_indent.
-		 $next_line =~ s/^\s*//;
-
-		 # Sneak a peek at the user_indent of the upcoming line, so
-		 # $next_line (which will now precede it) can inherit that
-		 # indent level. Otherwise, use whatever user_indent level
-		 # we currently have, which might be none.
-		 my $next_next_line = shift (@lines);
-		 if ((defined ($next_next_line)) && ($next_next_line =~ /^(\s+)/)) {
-			$next_line = $1 . $next_line if (defined ($1));
-			# $length_remaining = $max_line_length - (length ($1));
-			$next_next_line =~ s/^\s*//;
-		 }
-		 else {
-			$next_line = $user_indent . $next_line;
-		 }
-		 if (defined ($next_next_line)) {
-			unshift (@lines, $next_next_line);
-		 }
-		 unshift (@lines, $next_line);
-
-		 # Our new next line might, coincidentally, begin with one of
-		 # the line-start regexps, so we temporarily turn off
-		 # sensitivity to that until we're past the line.
-		 $suppress_line_start_match = 1;
-
-		 last;
-		}
-		else
-		{
-		 $idx--;
-		}
-	 }
-
-	 if ($idx == 0)
-	 {
-		# We bottomed out because the line is longer than the
-		# available space. But that could be because the space is
-		# small, or because the line is longer than even the maximum
-		# possible space. Handle both cases below.
-
-		if ($length_remaining == ($max_line_length - (length ($user_indent))))
-		{
-		 # The line is simply too long -- there is no hope of ever
-		 # breaking it nicely, so just insert it verbatim, with
-		 # appropriate padding.
-		 $this_line = "\n${left_pad_str}${this_line}";
-		}
-		else
-		{
-		 # Can't break it here, but may be able to on the next round...
-		 unshift (@lines, $this_line);
-		 $length_remaining = $max_line_length - (length ($user_indent));
-		 $this_line = "\n${left_pad_str}";
-		}
-	 }
-	}
-	else # $this_len < $length_remaining, so tack on what we can.
-	{
-	 # Leave a note for the next iteration.
-	 $length_remaining = $length_remaining - $this_len;
-
-	 if ($this_line =~ /\.$/)
-	 {
-		$this_line .= " ";
-		$length_remaining -= 2;
-	 }
-	 else # not a sentence end
-	 {
-		$this_line .= " ";
-		$length_remaining -= 1;
-	 }
-	}
-
-	# Unconditionally indicate that loop has run at least once.
-	$first_time = 0;
-
-	$wrapped_text .= "${user_indent}${this_line}";
- }
-
- # One last bit of padding.
- $wrapped_text .= "\n";
-
- return $wrapped_text;
-}
-
-# main
-
-my @date;
-my $author;
-my @files;
-my $comment;
-
-my $state; # 0-header 1-comment 2-files
-my $done = 0;
-
-$state = 0;
-
-# if reading from STDIN, we assume that we are
-# getting git log as input
-if (key_ready())
-{
-
- #my $dummyfh; # don't care about writing
- #($fh,$dummyfh) = FileHandle::pipe;
- $fh->fdopen(*STDIN, 'r');
-}
-else
-{
- $fh->open("LC_ALL=C git log --pretty --numstat --summary . |")
-	or die("Cannot execute git log...$!\n");
-}
-
-while (my $_l = <$fh>) {
- #print STDERR "debug ($state, " . (@date ? (strftime "%Y-%m-%d", @date) : "") . "): `$_'\n";
- if ($state == 0) {
-	if ($_l =~ m,^Author: (.*),) {
-	 $author = $1;
-	}
-	if ($_l =~ m,^Date: (.*),) {
-	 @date = strptime($1);
-	}
-	$state = 1 if ($_l =~ m,^$, and $author and (@date+0>0));
- } elsif ($state == 1) {
- # * modifying our input text is a bad choice
- # let's make a copy of it first, then we remove spaces 
- # * if we meet a "merge branch" statement, we need to start
- # over and find a real entry
- # Luis Mondesi <lemsx1@gmail.com>
- my $_s = $_l;
-	$_s =~ s/^ //g;
- if ($_s =~ m/^Merge branch/)
- {
- $state=0;
- next;
- }
-	$comment = $comment . $_s;
-	$state = 2 if ($_l =~ m,^$,);
- } elsif ($state == 2) {
-	if ($_l =~ m,^(0-9+)\t(0-9+)\t(.*)$,) {
-	 push @files, $3;
-	}
-	$done = 1 if ($_l =~ m,^$,);
- }
-
- if ($done) {
-	print (strftime "%Y-%m-%d $author\n\n", @date);
-
-	my $files = join (", ", @files);
-	$files = mywrap ("\t", "\t", "* $files"), ": ";
-
-	if (index($comment, EMPTY_LOG_MESSAGE) > -1 ) {
-	 $comment = "no log message\n";
-	}
-
-	my $files_last_line_len = 0;
-	$files_last_line_len = last_line_len($files) + 1;
-	my $msg = wrap_log_entry($comment, "\t", 69-$files_last_line_len, 69);
-
-	$msg =~ s/ \t+\n/\n/g;
-
-	print "$files: $msg\n";
-
-	@date = ();
-	$author = "";
-	@files = ();
-	$comment = "";
-
-	$state = 0;
-	$done = 0;
- }
-}
-
-if (@date + 0)
-{
- print (strftime "%Y-%m-%d $author\n\n", @date);
- my $msg = wrap_log_entry($comment, "\t", 69, 69);
- $msg =~ s/ \t+\n/\n/g;
- print "\t* $msg\n";
-}

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/gtk-3.0 Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/gtk-3.0/settings.ini Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/lottie_test.sh Deleted

@@ -1,64 +0,0 @@
-#!/bin/bash
-# Don't abort on Error
-# set -e
-
-WORKDIR=`dirname "$0"`
-pushd "${WORKDIR}/.." > /dev/null
-WORKDIR=`pwd`
-popd > /dev/null
-
-# Python program to run lottie
-LOTTIE="${WORKDIR}/synfig-studio/plugins/lottie-exporter/lottie-exporter.py"
-
-# Clone the tests directory
-git clone https://gitlab.com/synfig/synfig-tests.git
-test_files="${WORKDIR}/synfig-tests/export/lottie/*.sif"
-
-# Color escape codes in bash
-GREEN='\0330;32m'
-RED='\0330;31m'
-YELLOW='\0330;33m'
-no_color='\0330m'
-
-Error_count=0
-Support_soon=0
-
-for filename in $test_files;
-do 
-    pass=1      # 0 -> File is failing to export unexpectedly, 1 -> File is exporting, 2 -> File is allowed to fail
-    python3 $LOTTIE $filename "${filename%.sif}.json" || { # This line catches errors in python script
-
-        # Check if the current file is allowed to failATF
-        if  `basename $filename` == *"ATF"* ; then
-            ((Support_soon=Support_soon+1))
-            pass=2
-        fi
-
-        # If it is not allowed to fail, then increase the number of errored files
-        if  $pass -eq 1 
-        then
-            ((Error_count=Error_count+1))
-            ((pass=0))
-        fi
-    }
-
-    # To display whether a file ran successfully or not
-    if  $pass -eq 1 
-    then
-        echo -e "${GREEN}OK${no_color} $filename";
-    elif  $pass -eq 2 
-    then
-        echo -e "${YELLOW}SUPPORT SOON${no_color} $filename";
-    else
-        echo -e "${RED}FAIL${no_color} $filename";
-    fi
-done
-echo -e "\nFiles failed to export: $Error_count"
-echo -e "Files failed, but the failure is expected: $Support_soon\n"
-
-if  $Error_count -gt 0 
-    then
-        exit 1  # Job should fail
-    else
-        exit 0  # Job should pass
-fi

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports/PortIndex Deleted

@@ -1,4 +0,0 @@
-ffmpeg 1761
-variants {universal x11 libdc1394 librtmp libx265 gpl2 gpl3 nonfree} depends_build {port:pkgconfig port:gmake port:texinfo port:libvpx port:yasm} portdir multimedia/ffmpeg description {FFmpeg is a complete solution to play, record, convert and stream audio and video.} homepage http://www.ffmpeg.org/ epoch 1 platforms darwin name ffmpeg depends_lib {port:lame port:libiconv port:libvorbis port:libopus port:libogg port:libtheora port:libmodplug port:schroedinger port:libass port:libbluray port:gnutls port:openjpeg15 port:fontconfig port:freetype port:fribidi path:lib/libspeex.dylib:speex port:libsdl port:bzip2 port:xz port:zlib port:xorg-libxcb port:xorg-libXext port:xorg-libXfixes port:XviD port:x264} maintainers {devans jeremyhu openmaintainer} license GPL-2+ long_description {FFmpeg is a complete solution to record, convert and stream audio and video. It includes libavcodec, the leading audio/video codec library. The project is made of several components: ffmpeg is a command line tool to convert one video file format to another. It also supports grabbing and encoding in real time from a TV card. ffserver is an HTTP (RTSP is being developed) multimedia streaming server for live broadcasts. Time shifting of live broadcast is also supported. ffplay is a simple media player based on SDL and on the ffmpeg libraries. ffprobe gathers information from multimedia streams and prints it in human- and machine-readable fashion. libavcodec is a library containing all the ffmpeg audio/video encoders and decoders. Most codecs were developed from scratch to ensure best performance and high code reusability. libavformat is a library containing parsers and generators for all common audio/video formats.} categories multimedia version 2.7.2 revision 0
-mlt 969
-variants {gtk2 universal} depends_build {port:git port:doxygen} portdir multimedia/mlt description {Open source multimedia framework - core libraries} homepage http://www.mltframework.org/ epoch 3 platforms darwin depends_lib {port:atk path:lib/libavcodec.dylib:ffmpeg port:libdv port:libsamplerate port:libsdl port:libsdl_image port:libvorbis port:sox port:libxml2} name mlt long_description {MLT is an open source multimedia framework, designed and developed for television broadcasting. It provides a toolkit for broadcasters, video editors, media players, transcoders, web streamers and many more types of applications. The functionality of the system is provided via an assortment of ready to use tools, xml authoring components, and an extendible plug-in based API. This package contains the files necessary for running applications that use the MLT multimedia framework.} maintainers dennedy.org:dan license GPL-2+ categories multimedia version 0.9.2 revision 7

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports/PortIndex.quick Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports/multimedia Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports/multimedia/ffmpeg Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports/multimedia/ffmpeg/Portfile Deleted

@@ -1,318 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-PortSystem 1.0
-PortGroup xcodeversion 1.0
-PortGroup muniversal 1.0
-PortGroup compiler_blacklist_versions 1.0
-PortGroup active_variants 1.1
-name ffmpeg
-conflicts ffmpeg-devel
-epoch 1
-version 2.7.2
-license LGPL-2.1+
-categories multimedia
-maintainers devans jeremyhu openmaintainer
-description FFmpeg is a complete solution to play, record, convert and \
- stream audio and video.
-long_description FFmpeg is a complete solution to record, convert and \
- stream audio and video. It includes libavcodec, the \
- leading audio/video codec library. \
- \
- The project is made of several components: \
- \
- ffmpeg is a command line tool to convert one video \
- file format to another. It also supports grabbing and \
- encoding in real time from a TV card. \
- \
- ffserver is an HTTP (RTSP is being developed) \
- multimedia streaming server for live broadcasts. Time \
- shifting of live broadcast is also supported. \
- \
- ffplay is a simple media player based on SDL and on \
- the ffmpeg libraries. \
- \
- ffprobe gathers information from multimedia streams and \
- prints it in human- and machine-readable fashion. \
- \
- libavcodec is a library containing all the ffmpeg \
- audio/video encoders and decoders. Most codecs were \
- developed from scratch to ensure best performance \
- and high code reusability. \
- \
- libavformat is a library containing parsers and \
- generators for all common audio/video formats.
-platforms darwin
-homepage http://www.ffmpeg.org/
-master_sites http://www.ffmpeg.org/releases/
-use_bzip2 yes
-checksums rmd160 6f37e04000258faf2680279fcc0fa58fec169769 \
- sha256 7ceb7550ad628c526fa6c9ff23fdfb687a62f54d90c4a730998d8c2b417b9ef2
-depends_build port:pkgconfig \
- port:gmake \
- port:texinfo
-# libvpx is static only so can be considered a build dependency (#47934)
-depends_build-append \
- port:libvpx
-depends_lib port:lame \
- port:libiconv \
- port:libvorbis \
- port:libopus \
- port:libogg \
- port:libtheora \
- port:libmodplug \
- port:schroedinger \
- port:libass \
- port:libbluray \
- port:gnutls \
- port:openjpeg15 \
- port:fontconfig \
- port:freetype \
- port:fribidi \
- path:lib/libspeex.dylib:speex \
- port:libsdl \
- port:bzip2 \
- port:xz \
- port:zlib
-build.cmd ${prefix}/bin/gmake
-build.env-append V=1
-#
-# enable auto configure of asm optimizations
-# requires Xcode 3.1 or better on Leopard
-#
-minimum_xcodeversions {9 3.1}
-if {lsearch get_canonical_archs i386 != -1} {
- # clang-3.1 hits https://trac.macports.org/ticket/30137 (<rdar://problem/11542429>)
- # clang-139 hits https://trac.macports.org/ticket/38141
- compiler.blacklist-append {clang < 422.1.7} macports-clang-3.1
-}
-# The old ffmpeg port was GPL-2+ as base and had a no_gpl variant, so this keeps us consistent
-# Also, -gpl2 causes other ports to fail to build due to the missing libpostproc (#35473)
-default_variants-append +gpl2
-configure.cflags-append -DHAVE_LRINTF ${configure.cppflags}
-configure.args --enable-swscale \
- --enable-avfilter \
- --enable-avresample \
- --enable-libmp3lame \
- --enable-libvorbis \
- --enable-libopus \
- --enable-libtheora \
- --enable-libschroedinger \
- --enable-libopenjpeg \
- --enable-libmodplug \
- --enable-libvpx \
- --enable-libspeex \
- --enable-libass \
- --enable-libbluray \
- --enable-lzma \
- --enable-gnutls \
- --enable-fontconfig \
- --enable-libfreetype \
- --enable-libfribidi \
- --disable-libxcb \
- --disable-libxcb-shm \
- --disable-libxcb-xfixes \
- --disable-indev=jack \
- --disable-outdev=xv \
- --disable-vda \
- --mandir=${prefix}/share/man \
- --enable-shared --enable-pthreads \
- --cc=${configure.cc}
-# disable asm on Tiger
-# libblueray doesn't build on Tiger so disable for now (#39442)
-platform darwin {
- if {${os.major} < 9} {
- depends_lib-delete port:libbluray
- configure.args-delete --enable-libbluray
- configure.args-append --disable-libbluray
- configure.args-append --disable-asm
- }
- # VDA (video hardware acceleration, mostly H264) is only supported on 10.6.3+
- if {${os.major} > 10 || (${os.major} == 10 && ${os.minor} >= 3)} {
- configure.args-delete --disable-vda
- configure.args-append --enable-vda
- }
- # kCVPixelFormatType_OneComponent8 used in avfoundation indev is only available on 10.8+
- if {${os.major} < 12} {
- configure.args-append --disable-indev=avfoundation
- }
-}
-test.run yes
-#
-# configure isn't autoconf and they do use a dep cache
-#
-post-destroot {
- file mkdir ${destroot}${prefix}/share/doc/ffmpeg
- file copy ${worksrcpath}/doc/APIchanges ${destroot}${prefix}/share/doc/ffmpeg
- foreach f glob ${worksrcpath}/doc/*.txt {
- file copy $f ${destroot}${prefix}/share/doc/ffmpeg
- }
-}
-platform powerpc {
- # absence of altivec is not automatically detected
- if {catch {sysctl hw.vectorunit} result || $result == 0} {
- configure.args-append --disable-altivec
- }
-}
-platform darwin 8 {
- post-patch {
- reinplace "s:,-compatibility_version,$$LIBMAJOR$::" ${worksrcpath}/configure
- }
-}
-configure.universal_args-delete --disable-dependency-tracking
-if {variant_isset universal} {
- foreach arch ${configure.universal_archs} {
- set merger_host($arch) ""
- lappend merger_configure_args($arch) --arch=${arch}
- lappend merger_configure_env($arch) ASFLAGS='-arch ${arch}'
- }
- if {string match "*86*" ${configure.universal_archs}} {
- depends_build-append port:yasm
- }
- lappend merger_configure_args(i386) --enable-yasm
- lappend merger_configure_args(x86_64) --enable-yasm
-} else {
- configure.args-append --arch=${configure.build_arch}
- configure.env-append ASFLAGS='get_canonical_archflags'
- if {${build_arch} eq "i386" || ${build_arch} eq "x86_64"} {
- depends_build-append port:yasm
- configure.args-append --enable-yasm
- }
-}
-variant x11 {
-#
-# enable x11grab_xcb input device
-#
- depends_lib-append port:xorg-libxcb \
- port:xorg-libXext \
- port:xorg-libXfixes
- configure.args-delete --disable-libxcb \
- --disable-libxcb-shm \
- --disable-libxcb-xfixes \
-}
-default_variants +x11
-if {variant_isset x11} {
- require_active_variants libsdl x11
-} else {
- require_active_variants libsdl "" x11
-}
-variant libdc1394 description {Enable IIDC-1394 frame grabbing using libdc1394 (experimental)} {
- depends_lib-append port:libdc1394
- configure.args-append --enable-libdc1394
-}
-# Allow use of librtmp instead of ffmpeg's internal rtmp implementation
-# May address interoperability issues with CRtmpServer and others
-# https://trac.macports.org/ticket/32219
-# https://groups.google.com/forum/#!topic/c-rtmp-server/ywQPjvciPgc
-# https://trac.ffmpeg.org/ticket/1700
-variant librtmp description {Use librtmp (from rtmpdump) as rtmptes:// protocol handler} {
- configure.args-append --enable-librtmp
- depends_lib-append port:rtmpdump
-}
-# x265 currently does not support OS X < 10.6 (#48336, #48338)
-# x265 cmake issues cause universal build to fail (#48331)
-# make libx265 support optional via +libx265 variant
-# only define variant for non-universal builds on 10.6 or greater
-platform darwin {
- if {${os.major} > 8 && variant_isset gpl2 && !variant_isset universal} {
- variant libx265 description {Build with support for encoding HEVC video using libx265} {
- configure.args-append --enable-libx265
- depends_lib-append port:x265
- }
- }
-}
-variant gpl2 description {Enable GPL code, license will be GPL-2+} {
- configure.args-append --enable-gpl \
- --enable-postproc \
- --enable-libx264 \
- --enable-libxvid
- depends_lib-append port:XviD \
- port:x264
- license GPL-2+
-}
-variant gpl3 requires gpl2 description {Enable GPL code, license will be GPL-3+} {
- configure.args-append --enable-version3 \
- --enable-libopencore-amrnb \
- --enable-libopencore-amrwb \
- --enable-libsmbclient
- depends_lib-append port:opencore-amr \
- port:samba3
- license GPL-3+
-}
-# the build server uses the default variants, and we want distributable binaries
-# nonfree code is disabled by default but can be enabled using the +nonfree variant
-variant nonfree description {enable nonfree code, libraries and binaries will not be redistributable} {
- configure.args-append --enable-nonfree \
- --enable-libfdk-aac \
- --enable-libfaac
- depends_lib-append port:libfdk-aac \
- port:faac
- license Restrictive
-}
-if {variant_isset nonfree} {
-notes "
-*******
-******* This build of ${name} includes nonfree code as follows:
-*******
-******* libfaac
-******* libfdk-aac
-*******
-******* The following libraries and binaries may not be redistributed:
-*******
-******* ffmpeg
-******* libavcodec
-******* libavdevice
-******* libavfilter
-******* libavformat
-******* libavutil
-*******
-******* To remove this restriction remove the variant +nonfree
-*******
-"
-} elseif {variant_isset gpl3} {
-notes "
-*******
-******* This build of ${name} includes GPLed code and
-******* is therefore licensed under GPL v3 or later.
-*******
-******* The following modules are GPLed:
-*******
-******* postproc
-******* libsambaclient
-******* libx264
-******* libx265
-******* libxvid
-******* opencore-amr
-*******
-******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
-******* To remove nonfree and GPLed code leaving only LGPL code remove the
-******* +gpl2 and +gpl3 variants.
-*******
-"
-} elseif {variant_isset gpl2} {
-notes "
-*******
-******* This build of ${name} includes GPLed code and
-******* is therefore licensed under GPL v2 or later.
-*******
-******* The following modules are GPLed:
-*******
-******* postproc
-******* libx264
-******* libx265
-******* libxvid
-*******
-******* To include all nonfree, GPLed and LGPL code use variant +nonfree.
-******* To remove nonfree and GPLed code leaving only LGPL code remove the
-******* +gpl2 variant.
-*******
-"
-} else {
-notes "
-*******
-******* This build of ${name} includes no GPLed or nonfree
-******* code and is therefore licensed under LGPL v2.1 or later.
-*******
-"
-}
-livecheck.type regex
-livecheck.url ${master_sites}
-livecheck.regex "${name}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports/multimedia/mlt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports/multimedia/mlt/Portfile Deleted

@@ -1,72 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-PortSystem          1.0
-#PortGroup           qt4 1.0
-name                mlt
-epoch               3
-version             0.9.6
-revision            7
-categories          multimedia
-maintainers         dennedy.org:dan
-license             GPL-2+
-description         Open source multimedia framework - core libraries
-long_description    MLT is an open source multimedia framework, designed and developed for \
-                    television broadcasting. It provides a toolkit for broadcasters, video \
-                    editors, media players, transcoders, web streamers and many more types of \
-                    applications. The functionality of the system is provided via an assortment \
-                    of ready to use tools, xml authoring components, and an extendible plug-in \
-                    based API. \
-                    \
-                    This package contains the files necessary for running applications that use \
-                    the MLT multimedia framework.
-homepage            http://www.mltframework.org/
-master_sites        sourceforge:project/mlt/mlt
-platforms           darwin
-checksums           rmd160  c678a40b0fa362043d2a867152702cd8375d7bc7 \
-                    sha256  ab999992828a03dadbf62f6a131aada776cfd7afe63a94d994877fdba31a3000   
-# frei0r-plugins is not universal
-universal_variant   yes
-depends_build-append port:git \
-                    port:doxygen
-depends_lib-append  port:atk \
-                    path:lib/libavcodec.dylib:ffmpeg \
-                    port:libdv \
-                    port:libsamplerate \
-                    port:libsdl \
-                    port:libsdl_image \
-                    port:libvorbis \
-                    port:sox \
-                    port:libxml2
-configure.args      --enable-gpl \
-                    --disable-jackrack \
-                    --disable-mmx \
-                    --disable-gtk2 \
-                    --disable-dependency-tracking \
-                    --disable-swfdec
-platform darwin x86_64 {
-    if {${build_arch} eq "x86_64"} {
-        configure.args-delete --disable-mmx
-    }
-}
-
-platform darwin {
-     patch.pre_args  -p1
-     patchfiles      cppflags.patch
-}
-
-configure.cflags-append     "-I${prefix}/include"
-configure.ldflags-delete    "-L${prefix}/lib"
-configure.ldflags-append    "-L${worksrcpath}/src/framework"
-configure.ldflags-append    "-L${prefix}/lib"
-if {variant_isset universal} {
-build.env-append            CFLAGS="${configure.cflags} ${configure.universal_cflags}" CXXFLAGS="${configure.cxxflags} ${configure.universal_cxxflags}" LDFLAGS="${configure.ldflags} ${configure.universal_ldflags}"
-} else {
-build.env-append            CFLAGS="${configure.cflags}" LDFLAGS="${configure.ldflags}"
-}
-build.args-append           CC="${configure.cc}" CXX="${configure.cxx}" CPP="${configure.cpp}"
-variant gtk2 description {include the gtk2 module (for additional image and text producers)} {
-    configure.args-delete   --disable-gtk2
-    depends_lib-append      port:gtk2
-}
-livecheck.type      regex
-livecheck.url       http://sourceforge.net/projects/${name}/files/
-livecheck.regex     /${name}-(\0-9.\+)${extract.suffix}

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports/multimedia/mlt/files Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports/multimedia/mlt/files/cppflags.patch Deleted

@@ -1,454 +0,0 @@
-diff --git a/configure b/configure
---- a/configure
-+++ b/configure
-@@ -94,6 +94,7 @@ build_config()
- 		case $targetos in
- 		Darwin)
- 		echo "CFLAGS+=-fPIC -D__DARWIN__ `sdl-config --cflags`"
-+		echo "CPPFLAGS+=-fPIC -D__DARWIN__ `sdl-config --cflags`"
- 		echo "SHFLAGS=-dynamiclib"
- 		echo "LDFLAGS+=`sdl-config --libs`"
- 		;;
-diff --git a/src/framework/Makefile b/src/framework/Makefile
---- a/src/framework/Makefile
-+++ b/src/framework/Makefile
-@@ -100,7 +100,7 @@ $(TARGET): $(OBJS)
- 		fi
- 
- depend:	$(SRCS)
--	$(CC) -MM $(CFLAGS) $^ 1>.depend
-+	$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/melt/Makefile b/src/melt/Makefile
---- a/src/melt/Makefile
-+++ b/src/melt/Makefile
-@@ -5,6 +5,8 @@ OBJS = melt.o \
- 
- CFLAGS += -I.. $(RDYNAMIC) -DVERSION=\"$(version)\"
- 
-+CPPFLAGS += -I..
-+
- LDFLAGS += -L../framework -lmlt -lpthread
- 
- SRCS := $(OBJS:.o=.c)
-@@ -23,7 +25,7 @@ $(meltname): $(OBJS)
- 		$(CC) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/mlt++/Makefile b/src/mlt++/Makefile
---- a/src/mlt++/Makefile
-+++ b/src/mlt++/Makefile
-@@ -20,6 +20,7 @@ LIBFLAGS += -Wl,-soname,$(SONAME)
- endif
- 
- CXXFLAGS += -I.. $(RDYNAMIC) -DVERSION=\"$(version)\" -fvisibility=hidden
-+CPPFLAGS += -I..
- 
- LDFLAGS += -L../framework -lmlt
- ifeq ($(targetos), Linux)
-@@ -62,7 +63,7 @@ $(TARGET):	$(OBJS)
- 	fi
- 
- depend:	$(SRCS)
--	$(CXX) -MM $(CXXFLAGS) $^ 1>.depend
-+	$(CXX) -MM $(CPPFLAGS) $^ 1>.depend
- 
- clean:
- 	$(RM) $(OBJS) $(TARGET) $(NAME) $(SONAME)
-diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
---- a/src/modules/avformat/Makefile
-+++ b/src/modules/avformat/Makefile
-@@ -1,4 +1,5 @@
- CFLAGS += -I../..
-+CPPFLAGS += -I../..
- LDFLAGS += -L../../framework -lmlt -lpthread -lm
- 
- include ../../../config.mak
-@@ -45,7 +46,7 @@ $(TARGET): $(OBJS)
- 	$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--	$(CC) -MM $(CFLAGS) $^ 1>.depend
-+	$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 	rm -f .depend
-diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
---- a/src/modules/core/Makefile
-+++ b/src/modules/core/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../..
-+
- LDFLAGS += -L../../framework -lmlt -lm -lpthread
- 
- include ../../../config.mak
-@@ -69,7 +71,7 @@ composite_line_yuv_mmx.o: composite_line_yuv_mmx.S
- 	$(CC) -o $@ -c composite_line_yuv_mmx.S
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/decklink/Makefile b/src/modules/decklink/Makefile
---- a/src/modules/decklink/Makefile
-+++ b/src/modules/decklink/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../..
-+
- LDFLAGS += -L../../framework -lmlt -lpthread
- 
- include ../../../config.mak
-@@ -12,14 +14,17 @@ OBJS = consumer_decklink.o \
- 
- ifeq ($(targetos), MinGW)
- CFLAGS += -Iwin
-+CPPFLAGS += -Iwin
- OBJS += win/DeckLinkAPI_i.o
- LDFLAGS += -lole32
- else
- ifeq ($(targetos), Darwin)
- CFLAGS += -Idarwin
-+CPPFLAGS += -Idarwin
- OBJS += darwin/DeckLinkAPIDispatch.o
- else
- CFLAGS += -Ilinux
-+CPPFLAGS += -Ilinux
- OBJS += linux/DeckLinkAPIDispatch.o
- endif
- endif
-@@ -36,7 +41,7 @@ $(TARGET): $(OBJS)
- 		$(CXX) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CXX) -MM $(CFLAGS) $^ 1>.depend
-+		$(CXX) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/kdenlive/Makefile b/src/modules/kdenlive/Makefile
---- a/src/modules/kdenlive/Makefile
-+++ b/src/modules/kdenlive/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../..
-+
- LDFLAGS += -L../../framework -lmlt
- 
- include ../../../config.mak
-@@ -23,7 +25,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/motion_est/Makefile b/src/modules/motion_est/Makefile
---- a/src/modules/motion_est/Makefile
-+++ b/src/modules/motion_est/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../.. 
- 
-+CPPFLAGS += -I../.. 
-+
- LDFLAGS += -L../../framework -lmlt -lm
- 
- include ../../../config.mak
-@@ -22,7 +24,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/normalize/Makefile b/src/modules/normalize/Makefile
---- a/src/modules/normalize/Makefile
-+++ b/src/modules/normalize/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../.. 
-+
- LDFLAGS += -L../../framework -lmlt -lm
- 
- include ../../../config.mak
-@@ -18,7 +20,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/oldfilm/Makefile b/src/modules/oldfilm/Makefile
---- a/src/modules/oldfilm/Makefile
-+++ b/src/modules/oldfilm/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../.. 
-+
- LDFLAGS += -L../../framework -lmlt -lm
- 
- include ../../../config.mak
-@@ -22,7 +24,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
---- a/src/modules/plus/Makefile
-+++ b/src/modules/plus/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../.. 
-+
- LDFLAGS += -L../../framework -lmlt -lm -lpthread
- 
- include ../../../config.mak
-@@ -30,7 +32,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/plusgpl/Makefile b/src/modules/plusgpl/Makefile
---- a/src/modules/plusgpl/Makefile
-+++ b/src/modules/plusgpl/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../.. 
-+
- LDFLAGS += -L../../framework -lmlt -lm -lpthread
- 
- include ../../../config.mak
-@@ -28,7 +30,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile
---- a/src/modules/resample/Makefile
-+++ b/src/modules/resample/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../.. 
-+
- LDFLAGS += -L../../framework -lmlt
- 
- include ../../../config.mak
-@@ -21,7 +23,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/rtaudio/Makefile b/src/modules/rtaudio/Makefile
---- a/src/modules/rtaudio/Makefile
-+++ b/src/modules/rtaudio/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../.. 
-+
- LDFLAGS += -L../../framework -lmlt -lpthread
- 
- include ../../../config.mak
-@@ -39,7 +41,7 @@ $(TARGET): $(OBJS)
- 		$(CXX) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CXX) -MM $(CFLAGS) $^ 1>.depend
-+		$(CXX) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
---- a/src/modules/sdl/Makefile
-+++ b/src/modules/sdl/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../.. 
-+
- LDFLAGS += -L../../framework -lmlt -lpthread -lm
- 
- include ../../../config.mak
-@@ -22,6 +24,7 @@ LDFLAGS += -lX11
- endif
- 
- CFLAGS += $(shell sdl-config --cflags)
-+CPPFLAGS += $(shell sdl-config --cflags)
- 
- LDFLAGS += $(shell sdl-config --libs)
- 
-@@ -43,7 +46,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
---- a/src/modules/sox/Makefile
-+++ b/src/modules/sox/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../..
-+
- LDFLAGS += -L../../framework -lmlt -lm
- 
- include ../../../config.mak
-@@ -19,7 +21,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/sox/configure b/src/modules/sox/configure
---- a/src/modules/sox/configure
-+++ b/src/modules/sox/configure
-@@ -20,8 +20,9 @@ then
- 	then
- 		disable_sox=0
- 		echo "CFLAGS += $(pkg-config --cflags sox)" > config.mak
-+		echo "CPPFLAGS += $(pkg-config --cflags sox)" >> config.mak
- 		echo "LDFLAGS += $(pkg-config --libs sox)" >> config.mak
--		 $(pkg-config --modversion sox | cut -d. -f1) -gt 13  && echo "CFLAGS += -DSOX14" >> config.mak
-+		 $(pkg-config --modversion sox | cut -d. -f1) -gt 13  && echo "CFLAGS += -DSOX14" >> config.mak && echo "CPPFLAGS += -DSOX14" >> config.mak
- 	else
- 		which libst-config > /dev/null 2>&1
- 		if  $? -eq 0 
-diff --git a/src/modules/videostab/Makefile b/src/modules/videostab/Makefile
---- a/src/modules/videostab/Makefile
-+++ b/src/modules/videostab/Makefile
-@@ -1,8 +1,10 @@
- include ../../../config.mak
- 
- CFLAGS += -I../..
-+CPPFLAGS += -I../..
- ifdef SSE2_FLAGS
- CFLAGS += -msse2
-+CPPFLAGS += -msse2
- endif
- 
- LDFLAGS += -L../../framework -lmlt -lm
-@@ -25,7 +27,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/vmfx/Makefile b/src/modules/vmfx/Makefile
---- a/src/modules/vmfx/Makefile
-+++ b/src/modules/vmfx/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../..
-+
- LDFLAGS += -L../../framework -lmlt
- 
- include ../../../config.mak
-@@ -21,7 +23,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile
---- a/src/modules/xine/Makefile
-+++ b/src/modules/xine/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../../
- 
-+CPPFLAGS += -I../../
-+
- LDFLAGS += -L../../framework -lmlt
- 
- include ../../../config.mak
-@@ -24,7 +26,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend
-diff --git a/src/modules/xml/Makefile b/src/modules/xml/Makefile
---- a/src/modules/xml/Makefile
-+++ b/src/modules/xml/Makefile
-@@ -1,5 +1,7 @@
- CFLAGS += -I../..
- 
-+CPPFLAGS += -I../../
-+
- LDFLAGS += -L../../framework -lmlt -lpthread
- 
- include ../../../config.mak
-@@ -12,6 +14,8 @@ OBJS = factory.o \
- 
- CFLAGS += $(shell pkg-config libxml-2.0 --cflags)
- 
-+CPPFLAGS += $(shell pkg-config libxml-2.0 --cflags)
-+
- LDFLAGS += $(shell pkg-config libxml-2.0 --libs)
- 
- SRCS := $(OBJS:.o=.c)
-@@ -22,7 +26,7 @@ $(TARGET): $(OBJS)
- 		$(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
- 
- depend:	$(SRCS)
--		$(CC) -MM $(CFLAGS) $^ 1>.depend
-+		$(CC) -MM $(CPPFLAGS) $^ 1>.depend
- 
- distclean:	clean
- 		rm -f .depend

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/macports/multimedia/mlt/files/patch-configure-clang.diff Deleted

@@ -1,22 +0,0 @@
-diff --git a/configure b/configure
-index eb20880..7f230ce 100755
---- a/configure
-+++ b/configure
-@@ -81,10 +81,13 @@ build_config()
- 		if  "$optimisations" = "true" 
- 		then
- 			echo "OPTIMISATIONS=-O2 -pipe"
--			# Since gcc 4.6, this optimization enabled with -O1 causes filter_line_sse2 to crash.
--			echo "OPTIMISATIONS+=-fno-tree-dominator-opts"
--			# Since gcc 4.6, this optimization enabled with -O2 causes filter_line_sse2 to crash.
--			echo "OPTIMISATIONS+=-fno-tree-pre"
-+			"$CC" --version | grep gcc >/dev/null
-+			if  "$?" = "0" ; then
-+				# Since gcc 4.6, this optimization enabled with -O1 causes filter_line_sse2 to crash.
-+				echo "OPTIMISATIONS+=-fno-tree-dominator-opts"
-+				# Since gcc 4.6, this optimization enabled with -O2 causes filter_line_sse2 to crash.
-+				echo "OPTIMISATIONS+=-fno-tree-pre"
-+			fi
- 		fi
- 
- 		echo "CFLAGS+=-Wall -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(SSE2_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
\ No newline at end of file

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/msys2 Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/msys2/build_mlt.sh Deleted

@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-# -------------------------------------------------------------------------------
-# This script builds mlt++ on MSYS2 required by synfig-core
-# -------------------------------------------------------------------------------
-set -e # exit on error
-
-VERSION_MLT="7.2.0"
-# CMake cannot invoke `ccache` binaries in MSYS2 because they are just
-# bash scripts so it ends up with "invalid Win32 application" error
-# PATH="${MINGW_PREFIX}/lib/ccache/bin:${PATH}"
-MLT_PATH="/opt/mlt-${VERSION_MLT}"
-
-if  ! -f ${MLT_PATH}/done  ||  ! -f ${MLT_PATH}/lib/mlt/libmltavformat.dll ; then
-
-echo " ======================= Compiling MLT++ ======================= "
-
-mkdir -p ${MLT_PATH}
-
-pushd /tmp
-wget "https://github.com/mltframework/mlt/releases/download/v${VERSION_MLT}/mlt-${VERSION_MLT}.tar.gz"
-tar xzf ./mlt-${VERSION_MLT}.tar.gz
-
-pushd mlt-${VERSION_MLT}/
-FIXED_MLT_PATH=$(cygpath -m ${MLT_PATH})
-echo "Install path: ${MLT_PATH}"
-echo "Fixed MLT Path: ${FIXED_MLT_PATH}"
-mkdir -p build && pushd build
-cmake -G"Ninja" -DMOD_GDK=OFF -DMOD_QT=OFF -DMOD_KDENLIVE=OFF -DCMAKE_INSTALL_PREFIX=${FIXED_MLT_PATH} ..
-cmake --build .
-cmake --install .
-popd
-popd
-
-touch ${MLT_PATH}/done
-
-popd
-fi

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/README_FIRST.odt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/README_FIRST.pdf Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/app-template Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/app-template/Contents Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/app-template/Contents/Info.plist Deleted

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-
-	<key>LSMultipleInstancesProhibited</key>
-	<true/>
-
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-
-	<key>CFBundleIdentifier</key>
-	<string>org.synfig.SynfigStudio</string>
-
-	<key>CFBundleExecutable</key>
-	<string>SynfigStudio</string>
-
-	<key>CFBundleGetInfoString</key>
-	<string>_VERSION_, © 2001-2024 Synfig developers &#38; contributors</string>
-	<key>CFBundleShortVersionString</key>
-	<string>_VERSION_</string>
-	<key>CFBundleVersion</key>
-	<string>_VERSION_</string>
-	<key>NSHumanReadableCopyright</key>
-	<string>© 2001-2024 Synfig developers &#38; contributors</string>
-	<key>CFBundleIconFile</key>
-	<string>SynfigStudio</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>sif</string>
-				<string>SIF</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>sif_file.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>image/x-sif</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Synfig Animation</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>SIF </string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>LSIsAppleDefaultForType</key>
-			<true/>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>org.synfig.sif</string>
-			</array>
-		</dict>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>sifz</string>
-				<string>SIFZ</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>sif_file.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>image/x-compressed-sif</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Synfig Compressed Animation</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>SIFZ </string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>LSIsAppleDefaultForType</key>
-			<true/>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>org.synfig.sifz</string>
-			</array>
-		</dict>
-	</array>
-</dict>
-</plist>

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/app-template/Contents/MacOS Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/app-template/Contents/MacOS/SynfigStudio.sh Deleted

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-set -e
-
-DIR=`dirname "$0"`
-cd "$DIR/../Resources"
-CWD=`pwd`
-
-#export DYLD_LIBRARY_PATH="$CWD/lib:$CWD/synfig/lib:$CWD/Library/Frameworks/Python.framework/Versions/3.3/:/Volumes/data/SynfigStudio.app/Contents/Resources/Library/Frameworks/Python.framework/Versions/3.3/Resources/Python.app/Contents/MacOS/:$DYLD_LIBRARY_PATH"
-
-export GTK_EXE_PREFIX="$CWD"
-export GTK_DATA_PREFIX="$CWD/share"
-
-export GSETTINGS_SCHEMA_DIR="$CWD/share/glib-2.0/schemas/"
-export FONTCONFIG_PATH="$CWD/etc/fonts"
-export MLT_DATA="$CWD/share/mlt/"
-export MLT_REPOSITORY="$CWD/lib/mlt/"
-
-export PATH="$CWD/bin:$CWD/synfig-production/bin:$PATH"
-export SYNFIG_ROOT="$CWD/"
-export SYNFIG_MODULE_LIST="$CWD/etc/synfig_modules.cfg"
-
-export PYTHON_VERSION=`ls -1 $CWD/Frameworks/Python.framework/Versions/ | head -n 1`
-export PYTHONHOME="$CWD/Frameworks/Python.framework/Versions/${PYTHON_VERSION}/"
-
-export MAGICK_DIR=`ls -1 -d ${CWD}/lib/ImageMagick* | head -n 1`
-export MAGICK_DIR=`basename $MAGICK_DIR`
-export MAGICK_DIR_CONFIG=`ls -1 -d ${CWD}/lib/${MAGICK_DIR}/config-* | head -n 1`
-export MAGICK_DIR_CONFIG=`basename $MAGICK_DIR_CONFIG`
-export MAGICK_DIR_MODULES=`ls -1 -d ${CWD}/lib/${MAGICK_DIR}/modules-* | head -n 1`
-export MAGICK_DIR_MODULES=`basename $MAGICK_DIR_MODULES`
-export MAGICK_CONFIGURE_PATH="${CWD}/lib/${MAGICK_DIR}/${MAGICK_DIR_CONFIG}/"
-export MAGICK_CODER_MODULE_PATH="${CWD}/lib/${MAGICK_DIR}/${MAGICK_DIR_MODULES}/coders/"
-export MAGICK_CODER_FILTER_PATH="${CWD}/lib/${MAGICK_DIR}/${MAGICK_DIR_MODULES}/filters/"
-
-export XDG_DATA_DIRS="$CWD/share/:$XDG_DATA_DIRS"
-export GDK_PIXBUF_MODULEDIR="$CWD/lib/gdk-pixbuf-2.0/2.10.0/loaders/"
-export GDK_PIXBUF_MODULE_FILE=$HOME/.synfig-gdk-loaders
- ! -f $HOME/.synfig-gdk-loaders  || rm -f  $HOME/.synfig-gdk-loaders
-"$CWD/bin/gdk-pixbuf-query-loaders" > "$GDK_PIXBUF_MODULE_FILE"
-
-cd "$CWD"
-exec "$SYNFIG_ROOT/bin/synfigstudio" "$@"

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/app-template/Contents/PkgInfo Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/app-template/Contents/Resources Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/app-template/Contents/Resources/SynfigStudio.icns Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/app-template/Contents/Resources/sif_file.icns Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/fribidi.rb Deleted

@@ -1,34 +0,0 @@
-class Fribidi < Formula
- desc "Implementation of the Unicode BiDi algorithm"
- homepage "https://fribidi.org/"
- url "https://github.com/fribidi/fribidi/releases/download/0.19.7/fribidi-0.19.7.tar.bz2"
- sha256 "08222a6212bbc2276a2d55c3bf370109ae4a35b689acbc66571ad2a670595a8e"
- revision 1
-
- bottle do
- cellar :any
- sha256 "328217d2ad90d4f183a44572c59cef7ec0cae37fdfb5b03ace41b37c48d8c72d" => :high_sierra
- sha256 "5d1e95fc89934750643b1a684cd6738839ecc2d05721282dcf72b9c3481092fd" => :sierra
- sha256 "6ba76553f8ec26d4de32e84ce0a99e758d1bb5b7272ac2a985ff71322957d1ac" => :el_capitan
- sha256 "e414b99827d9a472609639ab5030bf5344077763bc178ce743a082008874f232" => :yosemite
- sha256 "70caed8cb2f44044c41e0b91c2645111b9f177d98b4d49cef01fb0d8558c0f98" => :mavericks
- end
-
- depends_on "pkg-config" => :build
- depends_on "glib"
- depends_on "pcre"
-
- def install
- system "./configure", "--disable-debug", "--disable-dependency-tracking",
- "--with-glib", "--prefix=#{prefix}"
- system "make", "install"
- end
-
- test do
- (testpath/"test.input").write <<~EOS
- a _lsimple _RteST_o th_oat
- EOS
-
- assert_match /a simple TSet that/, shell_output("#{bin}/fribidi --charset=CapRTL --test test.input")
- end
-end

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/gobject-introspection.rb Deleted

@@ -1,51 +0,0 @@
-class GobjectIntrospection < Formula
- desc "Generate introspection data for GObject libraries"
- homepage "https://live.gnome.org/GObjectIntrospection"
- url "https://download.gnome.org/sources/gobject-introspection/1.54/gobject-introspection-1.54.1.tar.xz"
- sha256 "b88ded5e5f064ab58a93aadecd6d58db2ec9d970648534c63807d4f9a7bb877e"
- revision 1
-
- bottle do
- sha256 "af8872721600cf3b5c033bad125fcef08a59e3ddfde4093fe6bc6bce5331e004" => :high_sierra
- sha256 "4f07bc2e12b9015a670a999744d8201c575ea9d49421ec617507aa01407d841e" => :sierra
- sha256 "88736baecfbab3cf709cb6b09de85f9e4a4382ac1d1c59f33af22c522dab81a4" => :el_capitan
- end
-
- depends_on "pkg-config" => :run
- depends_on "glib"
- depends_on "cairo"
- depends_on "libffi"
- depends_on "python@2" if MacOS.version <= :mavericks
-
- resource "tutorial" do
- url "https://gist.github.com/7a0023656ccfe309337a.git",
- :revision => "499ac89f8a9ad17d250e907f74912159ea216416"
- end
-
- def install
- ENV"GI_SCANNER_DISABLE_CACHE" = "true"
- inreplace "giscanner/transformer.py", "/usr/share", "#{HOMEBREW_PREFIX}/share"
- inreplace "configure" do |s|
- s.change_make_var! "GOBJECT_INTROSPECTION_LIBDIR", "#{HOMEBREW_PREFIX}/lib"
- end
-
- python = if MacOS.version >= :yosemite
- "/usr/bin/python2.7"
- else
- Formula"python@2".opt_bin/"python2.7"
- end
-
- system "./configure", "--disable-dependency-tracking",
- "--prefix=#{prefix}",
- "--with-python=#{python}"
- system "make"
- system "make", "install"
- end
-
- test do
- ENV.prepend_path "PKG_CONFIG_PATH", Formula"libffi".opt_lib/"pkgconfig"
- resource("tutorial").stage testpath
- system "make"
- assert_predicate testpath/"Tut-0.1.typelib", :exist?
- end
-end

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/relocate-binary.sh Deleted

@@ -1,149 +0,0 @@
-#!/bin/bash
-
-set -e
-#set -x
-
- -z "$2" && echo "usage: \"$0\" <file> <source-prefix> <destination-dir>" && echo "This utility relocates binary <file> from <source-prefix> to <destonation-dir> together with all dependencies and adds rpath support." && exit 1
-
-readlink_f() {
-	TARGET_FILE=$1
-
-	cd `dirname $TARGET_FILE`
-	TARGET_FILE=`basename $TARGET_FILE`
-
-	# Iterate down a (possible) chain of symlinks
-	while -L "$TARGET_FILE" 
-	do
-		TARGET_FILE=`readlink $TARGET_FILE`
-		cd `dirname $TARGET_FILE`
-		TARGET_FILE=`basename $TARGET_FILE`
-	done
-
-	# Compute the canonicalized name by finding the physical path 
-	# for the directory we're in and appending the target file.
-	PHYS_DIR=`pwd -P`
-	RESULT=$PHYS_DIR/$TARGET_FILE
-	echo $RESULT
-}
-
-remove_prefix() {
-	local INPUT="$1"
-	local OUTPUT=""
-	if "$INPUT" == /usr/local/Cellar/* ; then
-		TMP="${INPUT#*/}" # usr/local/Cellar/pkgname/pkgversion/path
-		TMP="${TMP#*/}" # local/Cellar/pkgname/pkgversion/path
-		TMP="${TMP#*/}" # Cellar/pkgname/pkgversion/path
-		TMP="${TMP#*/}" # pkgname/pkgversion/path
-		TMP="${TMP#*/}" # pkgversion/path
-		TMP="${TMP#*/}" # path
-		OUTPUT="${TMP}"
-	elif "$INPUT" == /usr/local/opt/* ; then
-		TMP="${INPUT#*/}" # usr/local/opt/pkgname/path
-		TMP="${TMP#*/}" # local/opt/pkgname/path
-		TMP="${TMP#*/}" # opt/pkgname/path
-		TMP="${TMP#*/}" # pkgname/path
-		TMP="${TMP#*/}" # path
-		OUTPUT="${TMP}"
-	elif "$INPUT" == /usr/local/lib/* ; then
-		TMP="${INPUT#*/}" # usr/local/lib/file
-		TMP="${TMP#*/}" # local/lib/file
-		TMP="${TMP#*/}" # lib/file = path
-		OUTPUT="${TMP}"
-	elif "$INPUT" == /usr/local/share/* ; then
-		TMP="${INPUT#*/}" # usr/local/share/file
-		TMP="${TMP#*/}" # local/share/file
-		TMP="${TMP#*/}" # share/file = path
-		OUTPUT="${TMP}"
-	elif "$INPUT" == $PREFIX* ; then
-		#LINE2=`echo "${INPUT}" | cut -c1-$PREFIXLEN`
-		OUTPUT="${INPUT:$PREFIXLEN}"
-	fi
-	echo "$OUTPUT"
-}
-
-process_lib() {
-
-local FILESRC="$1"
-local FILEDEST_SHORT="$2"
-
-#local FILE_PARENT="$2"
-
-
-
-	local FILEDEST="${DEST}/${FILEDEST_SHORT}"
-
-	if ! -f "${FILEDEST}" ; then
-		
-		
-		if ! -d `dirname "${FILEDEST}"` ; then
-			mkdir -p `dirname "${FILEDEST}"`
-		fi
-		REALPATH=`readlink_f "${FILESRC}"`
-		cp "${REALPATH}" "${FILEDEST}"
-		chmod a+rw "$FILEDEST"
-		
-		
-		install_name_tool -add_rpath ./ "$FILEDEST" > /dev/null 2>&1 || true
-		
-		
-		echo "Relinking ${FILEDEST_SHORT} ..."
-		local FIRST=true
-		local LINE=
-		local LINE2=
-		otool -L "${FILEDEST}" | while read -r LINE; do
-			#echo "$LINE"
-			if $FIRST; then
-				FIRST=false
-			else
-				LINE=`echo "$LINE" | sed -e 's/^ \t*//' | sed -e 's/ $.*$$//'`
-		 
-				# make sure file isn't referencing itself
-				#A=$(basename "$FILEDEST")
-				#B=$(basename "$LINE")
-				if ! "$LINE" == "$FILESRC" ; then
-					LINE2=`remove_prefix "$LINE"`
-					if ! -z "$LINE2" ; then
-					#if ! -z "$FILE_PARENT" ; then
-						#echo " install_name_tool -change \"$LINE\" \"@rpath/$LINE2\" \"$FILEDEST\""
-						install_name_tool -change "$LINE" "@rpath/$LINE2" "$FILEDEST"
-						process_lib "$LINE" "$LINE2"
-					#fi
-					
-					fi
-				fi
- 	
-			fi
- 	done
-		#echo "... finished ${FILEDEST_SHORT}"
-	fi
-
-
-}
-
-#scan "$BASE_FILE"
-#scan "$BASE_FILE" subscan
-
-#TARGET_FILE=`readlink_f "$1"`
-TARGET_FILE="$1"
-echo "Gathering deps for: $TARGET_FILE"
-
-export DEST="$3"
-#echo "DESTINATION: $DEST"
-
-export PREFIX="$2"
-export PREFIXLEN=${#PREFIX}
-
-if ! -f "${TARGET_FILE}" ; then
-	echo "ERROR: File not found."
-	exit 1
-fi
-
-FILEDEST_SHORT=`remove_prefix "${TARGET_FILE}"`
-
-if "${TARGET_FILE}" == ${PREFIX}* ; then
-	process_lib "${TARGET_FILE}" "${FILEDEST_SHORT}"
-fi
-
-echo "Success."
-echo ""
-

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/osx/synfig_osx_launcher.cpp Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/snap-stable Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/snap-stable/snapcraft.yaml Deleted

@@ -1,151 +0,0 @@
-name: synfigstudio
-title: 'Synfig Studio'
-version: '1.4.2'
-summary: Create and edit 2D animations and compositions
-description: |
-  Synfig Studio is a free and open-source 2D animation software, designed as
-  powerful industrial-strength solution for creating film-quality animation
-  using a vector and bitmap artwork. It eliminates the need to create
-  animation frame-by frame, allowing you to produce 2D animation of a higher
-  quality with fewer people and resources.
-
-  Features:
-
-  - Can manipulate vector and bitmap artwork
-  - Automatic tweening (independent from FPS)
-  - Multitude of layers of various types (geometry primitives, shapes,
-  gradients, fractals)
-  - Full-featured bone system
-  - Filters and effects for compositing (blurs, distortions, color
-  manipulation, masks)
-  - All color operations use High Dynamic-Range Imaging (HDRI)
-  - Pentablet-friendly tools
-  - Sound support
-  - Linking data on file- or parameter-level
-  - Automatic animation using mathematical functions
-
-base: core18
-confinement: strict
-license: GPL-3.0
-grade: stable
-
-architectures:
-  - build-on: arm64
-  - build-on: armhf
-  - build-on: amd64
-
-apps:
-  synfigstudio: &app
-    command: usr/bin/synfigstudio
-    common-id: org.synfig.SynfigStudio
-    desktop: usr/share/applications/org.synfig.SynfigStudio.desktop
-    extensions: gnome-3-34
-    plugs: &plugs opengl, home, removable-media, gsettings, network
-    environment: &env
-      __EGL_VENDOR_LIBRARY_DIRS: $SNAP/gnome-platform/usr/share/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d
-      PYTHONPATH: $SNAP/usr/lib/python3/dist-packages:$PYTHONPATH
-
-  synfig:
-    command: usr/bin/synfig
-    extensions: gnome-3-34
-    plugs: *plugs
-    environment: *env
-
-layout:
-  /usr/share/synfig:
-    symlink: $SNAP/usr/share/synfig
-  /usr/share/pixmaps/synfigstudio:
-    symlink: $SNAP/usr/share/pixmaps/synfigstudio
-
-parts:
-  synfig-deps:
-    plugin: nil
-    build-packages:
-      - g++
-      - intltool
-      - gettext
-      - libmagickcore-dev
-      - libmagick++-dev
-      - libopenexr-dev
-      - libsigc++-2.0-dev
-      - libxml++2.6-dev
-      - libfftw3-dev
-      - libmlt-dev
-      - libmlt++-dev
-      - libmlt-data
-      - libmng-dev
-      - git
-    stage-packages:
-      - libilmbase12
-      - libmagick++-6.q16-7
-      - libmagic1
-      - libmlt++3
-      - libmlt6
-      - libmng2
-      - libopenexr22
-      - libsigc++-2.0-0v5
-      - libxml++2.6-2v5
-      - libdv-bin # mod_dv
-      - ffmpeg # mod_ffmpeg
-      - libflite1 # ffmpeg required
-      - imagemagick # mod_imagemagick
-      - libglu1-mesa
-      - freeglut3
-      - python3-lxml # lottie exporter
-
-  etl:
-    after: synfig-deps
-    plugin: autotools
-    source: https://github.com/synfig/synfig/releases/download/v1.4.2/ETL-1.4.2.tar.gz
-    source-checksum: sha256/e54192d284df16305ddfdfcc5bdfe93e139e6db5bc283dd4bab2413ebbead7c7
-    configflags: &cfgflags
-      - --prefix=/usr
-
-  synfig-core:
-    after: etl
-    plugin: autotools
-    source: https://github.com/synfig/synfig/releases/download/v1.4.2/synfig-1.4.2.tar.gz
-    source-checksum: sha256/e66688b908ab2f05f87cc5a364f958a1351f101ccab3b3ade33a926453002f4e
-    configflags: *cfgflags
-    override-build: &build |
-      set -xe
-      autoreconf -if
-      intltoolize --force
-      snapcraftctl build
-
-  synfig-studio:
-    after: synfig-core
-    plugin: autotools
-    source: https://github.com/synfig/synfig/releases/download/v1.4.2/synfigstudio-1.4.2.tar.gz
-    source-checksum: sha256/4e86d4d8def6675fc92855a411795cc4062a1669cda82535d18b48a68b4d5497
-    configflags: *cfgflags
-    override-build: *build
-    override-stage: |
-      set -xe
-      snapcraftctl stage
-
-      appdata_file="usr/share/appdata/org.synfig.SynfigStudio.appdata.xml"
-
-      # fix the icon path and point it to a file inside the snap
-      sed -i -E "s|^Icon=(.*)|Icon=\${SNAP}/usr/share/icons/hicolor/scalable/apps/\1.svg|g" \
-        usr/share/applications/org.synfig.SynfigStudio.desktop
-
-  cleanup:
-    after: synfig-studio
-    plugin: nil
-    build-snaps: core18, gnome-3-34-1804
-    override-prime: |
-      set -eux
-      for lib in "libharfbuzz" "libglibmm" "libgiomm" "libQt" "qt5"; do
-        rm -rf "usr/lib/$SNAPCRAFT_ARCH_TRIPLET/$lib"*
-      done
-      for cruft in "bug" "lintian" "man" "icons/Humanity"; do
-        rm -rf "$SNAPCRAFT_PRIME/usr/share/$cruft"
-      done
-      find $SNAPCRAFT_PRIME/usr/share/doc/ -type f -not -name 'copyright' -delete
-      find $SNAPCRAFT_PRIME/usr/share -type d -empty -delete
-      # Remove all files from snap that are already included in the base snap or in
-      # any connected content snaps
-      for snap in "core18" "gnome-3-34-1804"; do  # List all content-snaps and base snaps you're using here
-        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
-      done

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/synfigrenderer-regression-test.sh Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/synfigstudio-cygwin-mingw-build.sh Deleted

@@ -1,1249 +0,0 @@
-#!/bin/bash
-#
-# SynfigStudio Windows package build script
-# Copyright (c) 2013 Konstantin Dmitriev
-#
-# This file is part of Synfig.
-#
-# Synfig is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# Synfig is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Synfig. If not, see <https://www.gnu.org/licenses/>.
-#
-#
-# = Usage notes =
-# 
-# * Download and install Git (http://msysgit.github.io/).
-# * Open Git Bash and execute following commands:
-# ** mkdir C:\synfig-build
-# ** cd C:\synfig-build
-# ** git clone https://github.com/synfig/synfig.git
-# ** mkdir cygwin-dist
-# ** cd synfig
-# ** git config --global core.autocrlf input
-# ** exit
-# * Download Cygwin setup binary (http://www.cygwin.com/) and save it into C:\synfig-build\cygwin-dist\ directory.
-# * Run Cygwin setup and install with the default parameters.
-# * Download and install NSIS >=3.0 (http://nsis.sourceforge.net/). Install into C:\synfig-build\NSIS\ directory.
-# * (64-bit build only!) Download and install 7zip (http://downloads.sourceforge.net/sevenzip/7z920-x64.msi). Install into C:\synfig-build\7zip\ directory.
-# * Open Cygwin console (with administrator previlegies) and run the build script:
-# ** bash C:/synfig-build/synfig/autobuild/synfigstudio-cygwin-mingw-build.sh
-# * Installation bundle will be written to C:\synfig-build\
-#
-#
-# = Other notes =
-# * Builds from current repository, current revision. So you should manually checkout the desired revision to build
-# * Executing script without arguments makes a full clean build and produces installer package
-# * You can pass arguments to the script to invoke particular stage. 
-#	Available stages: mkprep, mketl, mksynfig, mksynfigstudio, mkpackage
-#	Example: 
-#		synfigstudio-cygwin-mingw-build.sh mkpackage
-# * You can pass a custom command to be invoked in the build environment.
-#	Example (executes make with respect to the build environment):
-#		synfigstudio-cygwin-mingw-build.sh make -j2
-
-
-
-#================= EDIT THOSE VARIABLES BEFORE FIRST RUN! ======================
-
-export NSIS_BINARY="C:/synfig-build/NSIS/makensis.exe"
-export WORKSPACE="/cygdrive/c/synfig-build"
-if -z $ARCH ; then
- export ARCH="32"
-fi
-if -z $DEBUG ; then
-	export DEBUG=1
-fi
-if -z $THREADS ; then
-	export THREADS=4
-fi
-#=========================== EDIT UNTIL HERE ===================================
-
-export DISTPREFIX=$WORKSPACE/dist
-export SRCPREFIX=`dirname "$0"`
-SRCPREFIX=$(cd "$SRCPREFIX/.."; pwd)
-
-if $ARCH == "32" ; then
- export TOOLCHAIN_HOST="i686-w64-mingw32"
- export TOOLCHAIN="mingw64-i686" # mingw64-i686 | mingw64-x86_64 | mingw
- export EXT_ARCH=i386
- export EXT_ARCH2=i686
- export CYGWIN_SETUP="C:/synfig-build/cygwin-dist/setup-x86.exe"
- export SZIP_BINARY="7z"
-elif $ARCH == "64" ; then
- export TOOLCHAIN_HOST="x86_64-w64-mingw32"
- export TOOLCHAIN="mingw64-x86_64"
- export EXT_ARCH=x86_64
- export EXT_ARCH2=x86_64
- export CYGWIN_SETUP="C:/synfig-build/cygwin64-dist/setup-x86_64.exe"
- export SZIP_BINARY="C:/synfig-build/7zip/7z.exe"
-fi
-export MINGWPREFIX="/usr/${TOOLCHAIN_HOST}/sys-root/mingw"
-set -e
-
-if $DEBUG == 1 ; then
-	DEBUG='--enable-debug --enable-optimization=0'
-else
-	DEBUG=''
-fi
-
-export VERSION=`cat ${SRCPREFIX}/synfig-core/configure.ac |egrep "AC_INIT\(\Synfig Core\,"| sed "s|.*Core\,\||" | sed "s|\,\.*||"`
-pushd "${SRCPREFIX}" > /dev/null
-export REVISION=`git show --pretty=format:%ci HEAD | head -c 10 | tr -d '-'`
-popd > /dev/null
-
-
-if ! -e "$SZIP_BINARY" ; then
- if $ARCH == "64" ; then
- echo "7zip not found! Please download and install 7zip (http://downloads.sourceforge.net/sevenzip/7z920-x64.msi). Install into C:\synfig-build\7zip\ directory."
- exit 1
- fi
-fi
-if ! -e "$NSIS_BINARY" ; then
- echo "NSIS not found! Please download and install NSIS >=3.0 (http://nsis.sourceforge.net/). Install into C:\synfig-build\NSIS\ directory."
- exit 1
-fi
-
-chmod a+x ${MINGWPREFIX}/bin/*.dll || true
-
-prepare_mingw_env()
-{
-export CBUILD=i686-pc-cygwin
-export CHOST=${TOOLCHAIN_HOST}
-export CTARGET=${TOOLCHAIN_HOST}
-export CC=${TOOLCHAIN_HOST}-gcc
-export CXX=${TOOLCHAIN_HOST}-g++
-export F77=${TOOLCHAIN_HOST}-gfortran
-export FC=${TOOLCHAIN_HOST}-gfortran
-export GCJ=${TOOLCHAIN_HOST}-gcj
-export GOC=${TOOLCHAIN_HOST}-gccgo
-export OBJC=${TOOLCHAIN_HOST}-gcc
-export OBJCXX=${TOOLCHAIN_HOST}-g++
-export AR=${TOOLCHAIN_HOST}-ar
-export OBJDUMP=${TOOLCHAIN_HOST}-objdump
-export RANLIB=${TOOLCHAIN_HOST}-ranlib
-export STRIP=${TOOLCHAIN_HOST}-strip
-export RC=${TOOLCHAIN_HOST}-windres
-export CFLAGS=' -O2 -pipe -mms-bitfields'
-export CXXFLAGS=" -O2 -pipe -mms-bitfields"
-#export CXXFLAGS=" -O2 -pipe -mms-bitfields -I${MINGWPREFIX}/include/c++ -I${MINGWPREFIX}/include/c++/${TOOLCHAIN_HOST}"
-export F77FLAGS=' -mms-bitfields'
-export FCFLAGS=' -O2 -pipe -mms-bitfields'
-export GCJFLAGS=' -O2 -pipe -mms-bitfields'
-export GOCFLAGS=' -mms-bitfields'
-export OBJCFLAGS=' -O2 -pipe -mms-bitfields'
-export OBJCXXFLAGS=' -O2 -pipe -mms-bitfields'
-export PKG_CONFIG=/usr/bin/pkg-config
-export PKG_CONFIG_PATH="${MINGWPREFIX}/lib/pkgconfig"
-export PKG_CONFIG_LIBDIR="${MINGWPREFIX}/lib/pkgconfig:${MINGWPREFIX}/share/pkgconfig:/usr/share/pkgconfig"
-export PKG_CONFIG_SYSTEM_INCLUDE_PATH=${MINGWPREFIX}/include
-export PKG_CONFIG_SYSTEM_LIBRARY_PATH=${MINGWPREFIX}/lib
-export CPPFLAGS=" -I${MINGWPREFIX}/include "
-export LDFLAGS=" -L${MINGWPREFIX}/lib "
-export LIBS=""
-export PATH="${MINGWPREFIX}/bin/:$PATH"
-alias convert="${MINGWPREFIX}/bin/convert"
-}
-
-mknative()
-{
-export CBUILD=""
-export CHOST=""
-export CTARGET=""
-export CC="gcc"
-export CXX="g++"
-export F77=""
-export FC=""
-export GCJ=""
-export GOC=""
-export OBJC=""
-export OBJCXX=""
-export AR=""
-export OBJDUMP=""
-export RANLIB=""
-export STRIP=""
-export RC=""
-export CFLAGS=""
-export CXXFLAGS=""
-export F77FLAGS=""
-export FCFLAGS=""
-export GCJFLAGS=""
-export GOCFLAGS=""
-export OBJCFLAGS=""
-export OBJCXXFLAGS=""
-export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/local/lib/pkgconfig"
-export PKG_CONFIG_LIBDIR=""
-export PKG_CONFIG_SYSTEM_INCLUDE_PATH=""
-export PKG_CONFIG_SYSTEM_LIBRARY_PATH=""
-export CPPFLAGS=""
-export LDFLAGS=""
-export PATH="/usr/local/bin:/usr/bin"
-
-$@
-}
-
-mkpopt()
-{
-PKG_NAME=popt
-PKG_VERSION=1.10.3
-
-cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.gz || wget http://rpm5.org/files/popt/${PKG_NAME}-${PKG_VERSION}.tar.gz
- -d ${PKG_NAME}-${PKG_VERSION} || tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.gz
-cd ${PKG_NAME}-${PKG_VERSION}
-./autogen.sh --noconfigure
-./configure --prefix=/usr/local --libdir=/usr/local/lib 
-make -j$THREADS install
-if $ARCH == "64" ; then
-	mv /usr/local/lib64/* /usr/local/lib
-fi
-
-# remove old version of popt
- ! -e /usr/bin/cygpopt-0.dll || rm /usr/bin/cygpopt-0.dll
-}
-
-mkrpm()
-{
-PKG_NAME=rpm
-#PKG_VERSION=4.11.1
-PKG_VERSION=4.10.3.1
-#PKG_VERSION=4.7.0
-TAREXT=bz2
-
-cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://rpm.org/releases/rpm-4.10.x/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xjf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd ${PKG_NAME}-${PKG_VERSION}
- patch -p1 < $SRCPREFIX/autobuild/cygwin/${PKG_NAME}-${PKG_VERSION}.patch
- patch -p1 < $SRCPREFIX/autobuild/cygwin/${PKG_NAME}-${PKG_VERSION}-python-fixes.patch
-else
- cd ${PKG_NAME}-${PKG_VERSION}
-fi
-LDFLAGS=" -L/usr/local/lib" CPPFLAGS="-I/usr/include/nspr -I/usr/include/nss -I/usr/include/db4.8/ -I/usr/include/python2.7/" ./autogen.sh \
- --with-external-db \
- --without-lua \
- --enable-python
-make -j$THREADS install
-
-cd python
-export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:$PKG_CONFIG_PATH"
-export LDFLAGS=" -L/usr/local/lib" 
-python setup.py build
-python setup.py install
-}
-
-mkpyliblzma()
-{
-PKG_NAME=pyliblzma
-PKG_VERSION=0.5.3
-TAREXT=bz2
-
-cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget https://pypi.python.org/packages/source/p/pyliblzma/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd ${PKG_NAME}-${PKG_VERSION}
-else
- cd ${PKG_NAME}-${PKG_VERSION}
-fi
-
-export PKG_CONFIG_PATH="/usr/lib/pkgconfig:/usr/local/lib/pkgconfig"
-
-python setup.py build
-python setup.py install
-}
-
-mkpycurl()
-{
-PKG_NAME=pycurl
-PKG_VERSION=7.19.0
-TAREXT=gz
-
-cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://pycurl.sourceforge.net/download/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd ${PKG_NAME}-${PKG_VERSION}
-else
- cd ${PKG_NAME}-${PKG_VERSION}
-fi
-
-python setup.py build
-python setup.py install
-}
-
-mkurlgrabber()
-{
-PKG_NAME=urlgrabber
-PKG_VERSION=3.9.1
-TAREXT=gz
-
-cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://urlgrabber.baseurl.org/download/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd ${PKG_NAME}-${PKG_VERSION}
-else
- cd ${PKG_NAME}-${PKG_VERSION}
-fi
-
-python setup.py build
-python setup.py install
-}
-
-mkyum-metadata-parser()
-{
-PKG_NAME=yum-metadata-parser
-PKG_VERSION=1.1.4
-TAREXT=gz
-
-cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://yum.baseurl.org/download/yum-metadata-parser/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd ${PKG_NAME}-${PKG_VERSION}
-else
- cd ${PKG_NAME}-${PKG_VERSION}
-fi
-
-python setup.py build
-python setup.py install
-}
-
-mkyum()
-{
-PKG_NAME=yum
-PKG_VERSION=3.4.3
-TAREXT=gz
-
-cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://yum.baseurl.org/download/3.4/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd ${PKG_NAME}-${PKG_VERSION}
-else
- cd ${PKG_NAME}-${PKG_VERSION}
-fi
-rm INSTALL || true
-make install PREFIX="//" DESTDIR=""
-}
-
-mkyum-utils()
-{
-PKG_NAME=yum-utils
-PKG_VERSION=1.1.31
-TAREXT=gz
-
-cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://yum.baseurl.org/download/yum-utils/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd ${PKG_NAME}-${PKG_VERSION}
-else
- cd ${PKG_NAME}-${PKG_VERSION}
-fi
-make install || true
-if ! -e /usr/bin/yumdownloader ; then
- exit 1
-fi
-}
-
-mklibcroco()
-{
-PKG_NAME=libcroco
-PKG_VERSION=0.6.8
-TAREXT=xz
-if ! pkg-config ${PKG_NAME}-0.6 --exact-version=${PKG_VERSION} --print-errors; then
-	cd ${WORKSPACE}
-	wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure \
-		--prefix=${MINGWPREFIX} \
-		--exec-prefix=${MINGWPREFIX} \
-		--bindir=${MINGWPREFIX}/bin \
-		--sbindir=${MINGWPREFIX}/sbin \
-		--libexecdir=${MINGWPREFIX}/lib \
-		--datadir=${MINGWPREFIX}/share \
-		--localstatedir=${MINGWPREFIX}/var \
-		--sysconfdir=${MINGWPREFIX}/etc \
-		--datarootdir=${MINGWPREFIX}/share \
-		--docdir=/usr/share/doc/mingw-synfig -C \
-		--build=i686-pc-cygwin --host=${TOOLCHAIN_HOST} \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-fi
-}
-
-mkgobjectintrospection()
-{
-
-#mkflex
-
-PKG_NAME=gobject-introspection
-PKG_VERSION=1.42.0
-TAREXT=xz
-if ! pkg-config ${PKG_NAME}-1.0 --exact-version=${PKG_VERSION} --print-errors; then
-	cd ${WORKSPACE}
-	wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	CPPFLAGS="$CPPFLAGS -I/usr/include" ./configure \
-		--prefix=${MINGWPREFIX} \
-		--exec-prefix=${MINGWPREFIX} \
-		--bindir=${MINGWPREFIX}/bin \
-		--sbindir=${MINGWPREFIX}/sbin \
-		--libexecdir=${MINGWPREFIX}/lib \
-		--datadir=${MINGWPREFIX}/share \
-		--localstatedir=${MINGWPREFIX}/var \
-		--sysconfdir=${MINGWPREFIX}/etc \
-		--datarootdir=${MINGWPREFIX}/share \
-		--docdir=/usr/share/doc/mingw-synfig -C \
-		--build=i686-pc-cygwin --host=${TOOLCHAIN_HOST} \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-fi
-}
-
-
-mklibrsvg()
-{
-	
-	mklibcroco
-	mkgobjectintrospection
-	
-PKG_NAME=librsvg
-PKG_VERSION=2.40.6
-TAREXT=xz
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
-	cd ${WORKSPACE}
-	wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure \
-		--prefix=${MINGWPREFIX} \
-		--exec-prefix=${MINGWPREFIX} \
-		--bindir=${MINGWPREFIX}/bin \
-		--sbindir=${MINGWPREFIX}/sbin \
-		--libexecdir=${MINGWPREFIX}/lib \
-		--datadir=${MINGWPREFIX}/share \
-		--localstatedir=${MINGWPREFIX}/var \
-		--sysconfdir=${MINGWPREFIX}/etc \
-		--datarootdir=${MINGWPREFIX}/share \
-		--docdir=/usr/share/doc/mingw-synfig -C \
-		--build=i686-pc-cygwin --host=${TOOLCHAIN_HOST} \
-		--disable-static --enable-shared
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkgnomethemes()
-{
-	
-mklibrsvg
-
-PKG_NAME=gnome-themes-standard
-PKG_VERSION=3.15.2
-TAREXT=xz
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
-	cd ${WORKSPACE}
-	wget -c --no-check-certificate http://ftp.gnome.org/pub/gnome/sources/${PKG_NAME}/${PKG_VERSION%.*}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	 ! -d ${PKG_NAME}-${PKG_VERSION} && tar -xf ${WORKSPACE}/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
-	cd ${PKG_NAME}-${PKG_VERSION}
-	 ! -e config.cache || rm config.cache
-	./configure \
-		--prefix=${MINGWPREFIX} \
-		--exec-prefix=${MINGWPREFIX} \
-		--bindir=${MINGWPREFIX}/bin \
-		--sbindir=${MINGWPREFIX}/sbin \
-		--libexecdir=${MINGWPREFIX}/lib \
-		--datadir=${MINGWPREFIX}/share \
-		--localstatedir=${MINGWPREFIX}/var \
-		--sysconfdir=${MINGWPREFIX}/etc \
-		--datarootdir=${MINGWPREFIX}/share \
-		--docdir=/usr/share/doc/mingw-synfig -C \
-		--build=i686-pc-cygwin --host=${TOOLCHAIN_HOST} \
-		--disable-static --enable-shared \
-		--disable-gtk2-engine
-	make -j${THREADS}
-	make install
-	cd ..
-	popd
-fi
-}
-
-mkimagemagick()
-{
-PKG_NAME=ImageMagick
-#PKG_VERSION=6.8.6-10
-PKG_VERSION=6.8.7-10
-TAREXT=xz
-
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION%-*} --print-errors; then
- cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://www.imagemagick.org/download/releases/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- cd ${PKG_NAME}-${PKG_VERSION}
- else
- cd ${PKG_NAME}-${PKG_VERSION}
- fi
- ! -e config.cache || rm config.cache
- autoreconf -i --verbose # does this really required?
- ./configure \
- --prefix=${MINGWPREFIX} \
- --exec-prefix=${MINGWPREFIX} \
- --bindir=${MINGWPREFIX}/bin \
- --sbindir=${MINGWPREFIX}/sbin \
- --libexecdir=${MINGWPREFIX}/lib \
- --datadir=${MINGWPREFIX}/share \
- --localstatedir=${MINGWPREFIX}/var \
- --sysconfdir=${MINGWPREFIX}/etc \
- --datarootdir=${MINGWPREFIX}/share \
- --docdir=/usr/share/doc/mingw-synfig -C \
- --build=i686-pc-cygwin --host=${TOOLCHAIN_HOST} \
- --disable-static --enable-shared \
- --without-modules \
- --without-perl \
- --without-x \
- --with-threads \
- --with-magick_plus_plus
-
- make -j${THREADS}
- make install
-fi
-}
-
-mklibogg()
-{
-
-PKG_NAME=libogg
-PKG_VERSION=1.3.1
-TAREXT=gz
-
-if ! pkg-config ogg --exact-version=${PKG_VERSION} --print-errors; then
- cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://downloads.xiph.org/releases/ogg/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure \
- --prefix=${MINGWPREFIX} \
- --exec-prefix=${MINGWPREFIX} \
- --bindir=${MINGWPREFIX}/bin \
- --sbindir=${MINGWPREFIX}/sbin \
- --libexecdir=${MINGWPREFIX}/lib \
- --datadir=${MINGWPREFIX}/share \
- --localstatedir=${MINGWPREFIX}/var \
- --sysconfdir=${MINGWPREFIX}/etc \
- --datarootdir=${MINGWPREFIX}/share \
- --docdir=/usr/share/doc/mingw-synfig -C \
- --build=i686-pc-cygwin --host=${TOOLCHAIN_HOST}
-
- make all
- make install
-
-fi
-}
-
-mklibvorbis()
-{
-mklibogg
-
-PKG_NAME=libvorbis
-PKG_VERSION=1.3.4
-TAREXT=gz
-
-if ! pkg-config vorbis --exact-version=${PKG_VERSION} --print-errors; then
- cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://downloads.xiph.org/releases/vorbis/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure \
- --prefix=${MINGWPREFIX} \
- --exec-prefix=${MINGWPREFIX} \
- --bindir=${MINGWPREFIX}/bin \
- --sbindir=${MINGWPREFIX}/sbin \
- --libexecdir=${MINGWPREFIX}/lib \
- --datadir=${MINGWPREFIX}/share \
- --localstatedir=${MINGWPREFIX}/var \
- --sysconfdir=${MINGWPREFIX}/etc \
- --datarootdir=${MINGWPREFIX}/share \
- --docdir=/usr/share/doc/mingw-synfig -C \
- --build=i686-pc-cygwin --host=${TOOLCHAIN_HOST}
-
- make all
- make install
-
-fi
-}
-
-mklibsamplerate()
-{
-PKG_NAME=libsamplerate
-PKG_VERSION=0.1.8
-TAREXT=gz
-
-if ! pkg-config samplerate --exact-version=${PKG_VERSION} --print-errors; then
- cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://www.mega-nerd.com/SRC/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure \
- --prefix=${MINGWPREFIX} \
- --exec-prefix=${MINGWPREFIX} \
- --bindir=${MINGWPREFIX}/bin \
- --sbindir=${MINGWPREFIX}/sbin \
- --libexecdir=${MINGWPREFIX}/lib \
- --datadir=${MINGWPREFIX}/share \
- --localstatedir=${MINGWPREFIX}/var \
- --sysconfdir=${MINGWPREFIX}/etc \
- --datarootdir=${MINGWPREFIX}/share \
- --docdir=/usr/share/doc/mingw-synfig -C \
- --build=i686-pc-cygwin --host=${TOOLCHAIN_HOST}
-
- make all
- make install
-
-fi
-}
-
-mksox()
-{
-PKG_NAME=sox
-PKG_VERSION=14.4.1
-TAREXT=gz
-
-if ! pkg-config ${PKG_NAME} --exact-version=${PKG_VERSION} --print-errors; then
- cd $WORKSPACE
- -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://download.tuxfamily.org/synfig/packages/sources/base/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- fi
- cd ${PKG_NAME}-${PKG_VERSION}
- ! -e config.cache || rm config.cache
- ./configure \
- --prefix=${MINGWPREFIX} \
- --exec-prefix=${MINGWPREFIX} \
- --bindir=${MINGWPREFIX}/bin \
- --sbindir=${MINGWPREFIX}/sbin \
- --libexecdir=${MINGWPREFIX}/lib \
- --datadir=${MINGWPREFIX}/share \
- --localstatedir=${MINGWPREFIX}/var \
- --sysconfdir=${MINGWPREFIX}/etc \
- --datarootdir=${MINGWPREFIX}/share \
- --docdir=/usr/share/doc/mingw-synfig -C \
- --build=i686-pc-cygwin --host=${TOOLCHAIN_HOST}
-
- make all
- make install
-
-fi
-}
-
-mkmlt()
-{
-PKG_NAME=mlt
-PKG_VERSION=0.9.6
-TAREXT=gz
-
-if ! pkg-config ${PKG_NAME}\+\+ --exact-version=${PKG_VERSION} --print-errors; then
- cd $WORKSPACE
- # -e ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT} || wget http://download.tuxfamily.org/synfig/packages/sources/base/${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- #if ! -d ${PKG_NAME}-${PKG_VERSION} ; then
- # tar -xzf ${PKG_NAME}-${PKG_VERSION}.tar.${TAREXT}
- #fi
- #cd ${PKG_NAME}-${PKG_VERSION}
- if ! -d ${PKG_NAME} ; then
- git clone https://github.com/morevnaproject/mlt
- fi
- cd mlt
- git reset --hard
- git checkout master
- git reset --hard
- git pull
- git clean -f -d
- ! -e config.cache || rm config.cache
- #autoreconf -i --verbose # does this really required?
- rm -rf ${MINGWPREFIX}/lib/libmlt* || true
- rm -rf ${MINGWPREFIX}/bin/libmlt* || true
- ./configure \
- --prefix=${MINGWPREFIX} \
- --exec-prefix=${MINGWPREFIX} \
- --bindir=${MINGWPREFIX}/bin \
- --sbindir=${MINGWPREFIX}/sbin \
- --libexecdir=${MINGWPREFIX}/lib \
- --datadir=${MINGWPREFIX}/share \
- --localstatedir=${MINGWPREFIX}/var \
- --sysconfdir=${MINGWPREFIX}/etc \
- --datarootdir=${MINGWPREFIX}/share \
- --docdir=/usr/share/doc/mingw-synfig -C \
- --build=i686-pc-cygwin --host=${TOOLCHAIN_HOST} \
- --avformat-shared=${MINGWPREFIX}/ \
- --enable-gpl --disable-decklink \
- --target-os=MinGW --target-arch=$EXT_ARCH \
- #$DEBUG
- 
- if $ARCH == "64" ; then
- touch src/modules/disable-motion_est
- touch src/modules/disable-xine
- fi
- touch src/modules/disable-gtk2
-
- make all
- make install
-
- mv ${MINGWPREFIX}/melt.exe ${MINGWPREFIX}/bin
- mv ${MINGWPREFIX}/libmlt*.dll ${MINGWPREFIX}/bin
-
- mkdir -p ${MINGWPREFIX}/bin/lib || true
- mkdir -p ${MINGWPREFIX}/bin/share || true
- cp -rf ${MINGWPREFIX}/lib/mlt ${MINGWPREFIX}/bin/lib/
- cp -rf ${MINGWPREFIX}/share/mlt ${MINGWPREFIX}/bin/share/
-
-fi
-}
-
-#mktoolchain()
-#{
-#	cd ${WORKSPACE}
-#	if ! -e mingw${ARCH}/done ; then
-#		 ! -e ${WORKSPACE}/mingw32 || rm -rf ${WORKSPACE}/mingw32
-#		TOOLCHAIN_ARCHIVE=${EXT_ARCH2}-4.9.2-release-posix-sjlj-rt_v3-rev1.7z
-#		 -e ${TOOLCHAIN_ARCHIVE} || wget http://downloads.sourceforge.net/project/mingw-w64/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-posix/sjlj/${TOOLCHAIN_ARCHIVE}
-#		$SZIP_BINARY x ${TOOLCHAIN_ARCHIVE}
-#		mkdir -p ${MINGWPREFIX} | true
-#		mv mingw32/${TOOLCHAIN_HOST}/* ${MINGWPREFIX}
-#		cp ${MINGWPREFIX}/lib/*.dll ${MINGWPREFIX}/bin
-#		touch mingw${ARCH}/done
-#	fi
-#}
-mkffmpeg()
-{
- export FFMPEG_VERSION=2.5.2
- if ! pkg-config libswscale --exact-version=${FFMPEG_VERSION} --print-errors; then
- pushd $WORKSPACE
- -e ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev.7z || wget http://ffmpeg.zeranoe.com/builds/win${ARCH}/dev/ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev.7z
- -e ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared.7z || wget http://ffmpeg.zeranoe.com/builds/win${ARCH}/shared/ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared.7z
- ! -d ffmpeg || rm -rf ffmpeg
- mkdir -p ffmpeg
- cd ffmpeg
- $SZIP_BINARY x ../ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev.7z
- cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev/include/* ${MINGWPREFIX}/include/
- cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-dev/lib/* ${MINGWPREFIX}/lib/
- $SZIP_BINARY x ../ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared.7z
- cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared/bin/ffmpeg.exe ${MINGWPREFIX}/bin
- cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared/bin/*.dll ${MINGWPREFIX}/bin
- mkdir -p ${MINGWPREFIX}/share/ffmpeg/presets/ || true
- cp -rf ffmpeg-${FFMPEG_VERSION}-win${ARCH}-shared/presets/* ${MINGWPREFIX}/share/ffmpeg/presets/
-
-		mkdir -p ${MINGWPREFIX}/lib/pkgconfig/ || true
-		for PKG in avcodec avutil avformat swscale avdevice; do
-			cat > ${MINGWPREFIX}/lib/pkgconfig/lib${PKG}.pc <<EOF
-prefix=${MINGWPREFIX}
-exec_prefix=${MINGWPREFIX}
-libdir=${MINGWPREFIX}/lib
-includedir=${MINGWPREFIX}/include
-
-Name: lib${PKG}
-Description: FFMpeg
-Version: ${FFMPEG_VERSION}
-
-Libs: -l${PKG}
-
-EOF
-		done
- popd
- fi
-}
-
-fedora-mingw-install()
-{
- -d $WORKSPACE/mingw-rpms || mkdir $WORKSPACE/mingw-rpms
-
-cd $WORKSPACE/mingw-rpms
-
-# Prepare custom yum.conf
-cat > $WORKSPACE/mingw-rpms/yum.conf <<EOF
-main
-cachedir=${WORKSPACE}mingw-rpms/yum
-keepcache=0
-debuglevel=2
-logfile=/var/log/yum.log
-exactarch=1
-obsoletes=1
-plugins=1
-installonly_limit=3
-
-fedora
-name=Fedora \$releasever - \$basearch
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=fedora-\$releasever&arch=\$basearch
-baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/21/Everything/i386/os/
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/21/Everything/i386/os/
-enabled=1
-metadata_expire=7d
-
-updates
-name=Fedora \$releasever - \$basearch - Updates
-failovermethod=priority
-#mirrorlist=http://mirrors.fedoraproject.org/metalink?repo=updates-released-f\$releasever&arch=\$basearch
-baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/updates/21/i386/
-#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/21/i386/
-enabled=1
-EOF
-
-if -z $2 ; then
-RPMROOT=/
-else
-RPMROOT=$2
-fi
-
-URLS=`yumdownloader --urls --resolve -c $WORKSPACE/mingw-rpms/yum.conf --releasever=20 --installroot="$WORKSPACE/mingw-rpms" $1`
-for URL in $URLS; do
-if ( echo "$URL" | egrep "^http:" > /dev/null ); then
- PKG=`basename $URL`
- if ( echo "$PKG" | egrep "^mingw" > /dev/null ); then
- if -z $3 ; then
- if ! ( echo $PKG | egrep "^mingw..-headers|^mingw..-gcc|^mingw-|^mingw..-filesystem|^mingw..-binutils|^mingw..-crt|^mingw..-cpp" > /dev/null); then
- echo $PKG
- wget -c "$URL"
- rpm -Uhv --ignoreos --nodeps --force --root "$RPMROOT" "$PKG"
- fi
- else
-			if ( echo $PKG | egrep "$1" > /dev/null); then
-				echo $PKG
- wget -c "$URL"
- rpm -Uhv --ignoreos --nodeps --force --root "$RPMROOT" "$PKG"
-			fi
-		fi
- fi
-fi
-done
-
-# Ensure all dlls have executable flag, otherwise the compiled binaries won't run
-chmod a+x ${MINGWPREFIX}/bin/*.dll
-}
-
-# Install dependencies
-mkprep()
-{
-
-export PREP_VERSION=6
-
-if `cat /prep-done` != "${PREP_VERSION}" ; then
-
-$CYGWIN_SETUP \
--s http://www.mirrorservice.org/sites/sourceware.org/pub/cygwin/ \
--P git \
--P make \
--P gcc-core \
--P gcc-g++ \
--P $TOOLCHAIN-gcc \
--P $TOOLCHAIN-gcc-g++ \
--P gdb \
--P intltool \
--P autoconf \
--P automake \
--P libtool \
--P pkg-config \
--P p7zip \
--P ImageMagick \
--P cygport \
--P zlib-devel \
--P libnspr-devel \
--P liblzma-devel \
--P libnss-devel \
--P libiconv \
--P libdb4.8-devel \
--P libpcre-devel \
--P python \
--P file-devel \
--P zlib-devel \
--P libdb-devel \
--P flex \
--P bison \
--P python-setuptools \
--q
-
-# yum dependencies
-$CYGWIN_SETUP \
--s http://www.mirrorservice.org/sites/sourceware.org/pub/cygwin/ \
--P urlgrabber \
--P rpm-devel \
--P rpm-python \
--P libglib2.0-devel \
--P libxml2-devel \
--P libsqlite3-devel \
--q
-
-
-#-P libglib2.0-devel \ # yum req
-#-P libsqlite3-devel \ # yum req
-#-P libxml2-devel \ # yum req
-#-P libcurl-devel \ # pycurl req
-
-#mktoolchain
-
-#echo "Building popt..."
-#mknative mkpopt
-echo "Building pyliblzma..."
-mknative mkpyliblzma
-#echo "Building rpm..."
-#mknative mkrpm
-#mknative mkurlgrabber
-echo "Building yum-metadata-parser..."
-mknative mkyum-metadata-parser
-
-
-#mknative mkyum
-#mknative mkyum-utils
-
-install_fedora_env
-
-echo ${PREP_VERSION} > /prep-done
-
-fi
-}
-
-install_fedora_env()
-{
-cd $WORKSPACE
-wget -c http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Everything/i386/os/Packages/y/yum-3.4.3-106.fc20.noarch.rpm
-rpm -Uhv --force --ignoreos --nodeps yum-3.4.3-106.fc20.noarch.rpm
-wget -c http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Everything/i386/os/Packages/y/yum-utils-1.1.31-18.fc20.noarch.rpm
-rpm -Uhv --force --ignoreos --nodeps yum-utils-1.1.31-18.fc20.noarch.rpm
-#wget -c http://fedora.inode.at/fedora/linux/releases/21/Everything/i386/os/Packages/y/yum-3.4.3-153.fc21.noarch.rpm
-#rpm -Uhv --force --ignoreos --nodeps yum-3.4.3-153.fc21.noarch.rpm
-#wget -c http://fedora.inode.at/fedora/linux/releases/21/Everything/i386/os/Packages/y/yum-utils-1.1.31-24.fc21.noarch.rpm
-#rpm -Uhv --force --ignoreos --nodeps yum-utils-1.1.31-24.fc21.noarch.rpm
-
-# ! -e C:/synfig-build/mingw-rpms/tmp || rm -rf C:/synfig-build/mingw-rpms/tmp
-#mkdir -p C:/synfig-build/mingw-rpms/tmp
-#fedora-mingw-install mingw${ARCH}-gcc-c++ C:/synfig-build/mingw-rpms/tmp 1
-#cp C:/synfig-build/mingw-rpms/tmp${MINGWPREFIX}/bin/libstdc++-6.dll ${MINGWPREFIX}/bin/
-
-#fedora-mingw-install mingw${ARCH}-adwaita-icon-theme
-#fedora-mingw-install mingw${ARCH}-hicolor-icon-theme
-fedora-mingw-install mingw${ARCH}-libxml++
-fedora-mingw-install mingw${ARCH}-cairo
-fedora-mingw-install mingw${ARCH}-pango
-fedora-mingw-install mingw${ARCH}-libjpeg-turbo
-fedora-mingw-install mingw${ARCH}-gtkmm30
-fedora-mingw-install mingw${ARCH}-SDL
-fedora-mingw-install mingw${ARCH}-fftw
-cp ${MINGWPREFIX}/include/SDL/* ${MINGWPREFIX}/include/
-
-# Somehow this is required too...
-fedora-mingw-install mingw${ARCH}-pcre
-
-# Dependencies for magick++
-fedora-mingw-install mingw${ARCH}-libltdl
-fedora-mingw-install mingw${ARCH}-libtiff
-}
-
-mketl()
-{
-cd $SRCPREFIX/ETL
- ! -e config.cache || rm config.cache
-autoreconf --install --force
-./configure \
---prefix=${MINGWPREFIX} \
---exec-prefix=${MINGWPREFIX} \
---bindir=${MINGWPREFIX}/bin \
---sbindir=${MINGWPREFIX}/sbin \
---libexecdir=${MINGWPREFIX}/lib \
---datadir=${MINGWPREFIX}/share \
---localstatedir=${MINGWPREFIX}/var \
---sysconfdir=${MINGWPREFIX}/etc \
---datarootdir=${MINGWPREFIX}/share \
---docdir=/usr/share/doc/mingw-synfig -C \
---build=i686-pc-cygwin --host=${TOOLCHAIN_HOST} \
---enable-shared --disable-static \
---with-libiconv-prefix=no --with-libintl-prefix=no \
---enable-maintainer-mode $DEBUG
-make install
-}
-
-mksynfig()
-{
-cd $SRCPREFIX/synfig-core
- ! -e config.cache || rm config.cache
-./bootstrap.sh
-./configure \
---prefix=${MINGWPREFIX} \
---exec-prefix=${MINGWPREFIX} \
---bindir=${MINGWPREFIX}/bin \
---sbindir=${MINGWPREFIX}/sbin \
---libexecdir=${MINGWPREFIX}/lib \
---datadir=${MINGWPREFIX}/share \
---localstatedir=${MINGWPREFIX}/var \
---sysconfdir=${MINGWPREFIX}/etc \
---datarootdir=${MINGWPREFIX}/share \
---docdir=/usr/share/doc/mingw-synfig -C \
---build=i686-pc-cygwin --host=${TOOLCHAIN_HOST} \
---enable-shared --disable-static \
---with-libiconv-prefix=no --with-libintl-prefix=no \
---with-magickpp=yes \
---enable-maintainer-mode $DEBUG
-make -j$THREADS
-make install
-}
-
-mksynfigstudio()
-{
-cd $SRCPREFIX/synfig-studio
- ! -e config.cache || rm config.cache
-./bootstrap.sh
-./configure \
---prefix=${MINGWPREFIX} \
---exec-prefix=${MINGWPREFIX} \
---bindir=${MINGWPREFIX}/bin \
---sbindir=${MINGWPREFIX}/sbin \
---libexecdir=${MINGWPREFIX}/lib \
---datadir=${MINGWPREFIX}/share \
---localstatedir=${MINGWPREFIX}/var \
---sysconfdir=${MINGWPREFIX}/etc \
---datarootdir=${MINGWPREFIX}/share \
---docdir=/usr/share/doc/mingw-synfig -C \
---build=i686-pc-cygwin --host=${TOOLCHAIN_HOST} \
---enable-shared --disable-static \
---with-libiconv-prefix=no --with-libintl-prefix=no \
---enable-maintainer-mode $DEBUG
-make -j$THREADS
-make install 
-cp -rf ${MINGWPREFIX}/share/pixmaps/synfigstudio/* ${MINGWPREFIX}/share/pixmaps
-rm -rf ${MINGWPREFIX}/share/pixmaps/synfigstudio
-mkdir -p $MINGWPREFIX/licenses
-cp -rf COPYING $MINGWPREFIX/licenses/synfigstudio.txt
-
-cat > ${MINGWPREFIX}/etc/gtk-3.0/gtkrc <<EOF
-
-# Enable native look
-gtk-theme-name = "MS-Windows"
-
-# Use small toolbar buttons
-gtk-toolbar-style = 0
-
-EOF
-}
-
-mkpackage()
-{
-
-cp -rf ${SRCPREFIX}/autobuild/gtk-3.0/settings.ini $MINGWPREFIX/share/gtk-3.0
-
- ! -d $DISTPREFIX || rm -rf $DISTPREFIX
-mkdir -p $DISTPREFIX
- -d $DISTPREFIX/bin || mkdir -p $DISTPREFIX/bin
- -d $DISTPREFIX/licenses || mkdir -p $DISTPREFIX/licenses
- -d $DISTPREFIX/lib || mkdir -p $DISTPREFIX/lib
- -d $DISTPREFIX/share || mkdir -p $DISTPREFIX/share
-
-cd $WORKSPACE
-
- -e portable-python-3.2.5.1.zip || wget http://download.tuxfamily.org/synfig/packages/sources/portable-python-3.2.5.1.zip
- ! -d python || rm -rf python
-unzip portable-python-3.2.5.1.zip
- ! -d $DISTPREFIX/python || rm -rf $DISTPREFIX/python
-mv python $DISTPREFIX
-
-cp -rf $SRCPREFIX/synfig-core/examples $DISTPREFIX/
-cp -rf $SRCPREFIX/synfig-studio/COPYING $DISTPREFIX/licenses/synfigstudio.txt
-
-#copy compiled files
-#cp -rf $MINGWPREFIX/bin/*.exe $DISTPREFIX/bin/
-#TODO: strip binaries?
-#cp -rf $MINGWPREFIX/bin/*.dll $DISTPREFIX/bin/
- -d ${DISTPREFIX}/bin || mkdir -p ${DISTPREFIX}/bin
-for file in \
- av*.dll \
- ffmpeg.exe \
- iconv.dll \
- libatk-\*.dll \
- libatkmm-1.6-1.dll \
- libbz2\*.dll \
- libcairo\*.dll \
- libdl.dll \
- libexpat\*.dll \
- libffi\*.dll \
- libfftw\*.dll \
- libfontconfig\*.dll \
- libfreetype\*.dll \
- libgcc_s_\*.dll \
- libgdk\*.dll \
- libgettext\*.dll \
- libgio\*.dll \
- libglib\*.dll \
- libgmodule\*.dll \
- libgobject\*.dll \
- libgomp*.dll \
- libgthread\*.dll \
- libgtk\*.dll \
- libharfbuzz\*.dll \
- libiconv\*.dll \
- libintl\*.dll \
- libjasper\*.dll \
- libjpeg\*.dll \
- libltdl*.dll \
- liblzma\*.dll \
- libMagick*.dll \
- libmlt*.dll \
- libogg*.dll \
- libpango\*.dll \
- libpixman\*.dll \
- libpng\*.dll \
- libsamplerate*.dll \
- libsigc\*.dll \
- libsox*.dll \
- libstdc++\*.dll \
- libsynfig\*.dll \
- libtiff\*.dll \
- libturbojpeg.dll \
- libvorbis*.dll \
- libwinpthread*.dll \
- libxml2\*.dll \
- libxml++\*.dll \
- libz\*.dll \
- postproc*.dll \
- pthread\*.dll \
- SDL.dll \
- swscale*.dll \
- swresample*.dll \
- zlib\*.dll \
- convert.exe \
- pango-querymodules.exe \
- synfig.exe \
- synfigstudio.exe \
- lib \
- share \
-# this extra line is required!
-do
-	cp -rf $MINGWPREFIX/bin/$file $DISTPREFIX/bin || true
-done
-cp -rf $MINGWPREFIX/etc $DISTPREFIX
-cp -rf $MINGWPREFIX/lib/gdk-pixbuf-2.0 $DISTPREFIX/lib
-cp -rf $MINGWPREFIX/lib/gtk-3.0 $DISTPREFIX/lib
-cp -rf $MINGWPREFIX/lib/pango $DISTPREFIX/lib
-cp -rf $MINGWPREFIX/lib/synfig $DISTPREFIX/lib
-cp -rf $MINGWPREFIX/share/fontconfig $DISTPREFIX/share
-cp -rf $MINGWPREFIX/share/glib-2.0 $DISTPREFIX/share
-cp -rf $MINGWPREFIX/share/gtk-3.0 $DISTPREFIX/share
-cp -rf $MINGWPREFIX/share/icons $DISTPREFIX/share || true
-cp -rf $MINGWPREFIX/share/locale $DISTPREFIX/share
-cp -rf $MINGWPREFIX/share/pixmaps $DISTPREFIX/share
-if -d $DISTPREFIX/share/pixmaps/synfigstudio ; then
-	cp -rf $DISTPREFIX/share/pixmaps/synfigstudio/* $DISTPREFIX/share/pixmaps
-	rm -rf $DISTPREFIX/share/pixmaps/synfigstudio
-fi
-cp -rf $MINGWPREFIX/share/synfig $DISTPREFIX/share
-cp -rf $MINGWPREFIX/share/themes $DISTPREFIX/share
-cp -rf $MINGWPREFIX/share/xml $DISTPREFIX/share
-
-#cleanup
-
-
-gen_list_nsh()
-{
- ! -e $2.nsh || rm $2.nsh
- ! -e $2-uninst.nsh || rm $2-uninst.nsh
-for line in `find $1 -print`; do
-	directory=`dirname $line`
-	line1=`echo $directory | sed "s|\./||g" | sed "s|/|\\\\\|g"`
-	line2=`echo $line | sed "s|\./||g" | sed "s|/|\\\\\|g"`
-	if -d $line ; then
-		echo "RMDir \"\$INSTDIR\\$line2\"" >> $2-uninst.nsh
-	else
-		echo "SetOutPath \"\$INSTDIR\\$line1\"" >> $2.nsh
-		echo "File \"$line2\"" >> $2.nsh
-		echo "Delete \"\$INSTDIR\\$line2\"" >> $2-uninst.nsh
-	fi
-done
-# reverse order of uninstall commands
-cp $2-uninst.nsh $2-uninst.nsh.tmp
-tac $2-uninst.nsh.tmp > $2-uninst.nsh
-rm $2-uninst.nsh.tmp
-}
-
-cd $DISTPREFIX
-
-#generate file lists
-
-gen_list_nsh bin bin
-sed -i '/ffmpeg\.exe/d' bin.nsh		# exclude ffmpeg from the list of binaries - it will go into separate group
-gen_list_nsh etc etc
-gen_list_nsh examples examples
-gen_list_nsh lib/gdk-pixbuf-2.0 lib-gdk-pixbuf
-gen_list_nsh lib/gtk-3.0 lib-gtk
-gen_list_nsh lib/pango lib-pango
-gen_list_nsh lib/synfig lib-synfig
-gen_list_nsh licenses licenses
-#gen_list_nsh python python # -- takes too long
-gen_list_nsh share share
-
-
-#make installer
-cp -f $SRCPREFIX/autobuild/synfigstudio.nsi ./
-sed -i "s/@VERSION@/$VERSION/g" ./synfigstudio.nsi
-cp -f $SRCPREFIX/autobuild/win${ARCH}-specific.nsh ./arch-specific.nsh
-"$NSIS_BINARY" -nocd -- synfigstudio.nsi
-
-mv synfigstudio-${VERSION}.exe ../synfigstudio-${VERSION}-${REVISION}-${ARCH}bit.exe
-
-INSTALLER_PATH=`cygpath -w "$WORKSPACE"`
-echo
-echo
-echo
-echo "Installer package generated:"
-echo " ${INSTALLER_PATH}synfigstudio-${VERSION}-${REVISION}-${ARCH}bit.exe"
-echo
-}
-
-mkall()
-{
-	mkprep
-	mkffmpeg
-	prepare_mingw_env
-	mkimagemagick
-	mklibsamplerate
-	mksox
-	mklibvorbis
-	mkmlt
-	mketl
-	mksynfig
-	mksynfigstudio
-	mkpackage
-}
-
-if -z $1 ; then
-	mkall
-else
-	echo "Executing custom user command..."
-	prepare_mingw_env
-	$@
-fi

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/synfigstudio-cygwin-native-build.sh Deleted

@@ -1,42 +0,0 @@
-#!/bin/bash
-
-export CYGWIN_SETUP="/cygdrive/c/synfig-build/cygwin-dist/setup-x86.exe"
-export SRCPREFIX=`dirname "$0"`
-SRCPREFIX=$(cd "$SRCPREFIX/.."; pwd)
-
-# Install dependencies
-#-K http://cygwinports.org/ports.gpg -s ftp://ftp.cygwinports.org/pub/cygwinports -s http://mirrors.163.com/cygwin \
-CYGPORT_MIRROR=http://mirrors.kernel.org/sources.redhat.com/cygwinports
-
-$CYGWIN_SETUP \
--K http://cygwinports.org/ports.gpg -s $CYGPORT_MIRROR -s http://ftp.linux.kiev.ua/pub/cygwin/ \
--P git \
--P make \
--P gcc-core \
--P gcc-g++ \
--P gdb \
--P intltool \
--P autoconf \
--P automake \
--P libtool \
--P pkg-config \
--P libcairo-devel \
--P libpango1.0-devel \
--P libjpeg-devel \
--P libpng-devel \
--P p7zip \
--P ImageMagick \
--P libxml++2.6-devel  \
--P libgtkmm2.4-devel \
--q
-
-cd $SRCPREFIX/ETL
-autoreconf --install --force
-./configure --prefix=/usr
-make install
-
-cd $SRCPREFIX/synfig-core
-./bootstrap.sh
-./configure --prefix=/usr
-make -j4
-make install

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/synfigstudio-linux-cmake.sh Deleted

@@ -1,40 +0,0 @@
-#!/bin/bash
-
-set -e
-
-export CC="ccache gcc"
-export CXX="ccache g++"
-
-#BUILD_FLAGS=(-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_FLAGS="-fdiagnostics-color")
-CXX_FLAGS="-fdiagnostics-color"
-BUILD_FLAGS="-GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_CXX_FLAGS=\"${CXX_FLAGS}\""
-#echo ${BUILD_FLAGS}
-#exit
-
-cd ..
-pushd ETL
-mkdir -p build && pushd build
-cmake .. ${BUILD_FLAGS}
-cmake --build . -- all test
-sudo cmake --build . -- install
-popd # build
-popd # ETL
-
-pushd synfig-core
-mkdir -p build && pushd build
-cmake .. ${BUILD_FLAGS}
-cmake --build . -- all
-sudo cmake --build . -- install
-popd # build
-popd # synfig-core
-
-pushd synfig-studio
-mkdir -p build && pushd build
-cmake .. ${BUILD_FLAGS}
-cmake --build . -- all
-# this will take a while; alternatively, you can move/copy required images
-# to build/images directory and skip this step
-cmake --build . -- build_images
-sudo cmake --build . -- install
-popd # build
-popd # synfig-studio
\ No newline at end of file

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/synfigstudio-osx-build.sh Deleted

@@ -1,701 +0,0 @@
-#!/bin/bash
-#
-# SynfigStudio mac package build script
-# Copyright (c) 2008-2009 Simone Karin Lehmann (GimpOSX parts)
-# Copyright (c) 2012-2013 Konstantin Dmitriev
-#
-# This file is part of Synfig.
-#
-# Synfig is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# Synfig is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Synfig. If not, see <https://www.gnu.org/licenses/>.
-#
-#
-# = Usage notes =
-#
-# * You need to have XCode and git installed
-# * Builds from current repository, current revision. So you should manually checkout the desired revision to build
-# * If no repository found - then sources fetched into ~/src/synfig and the latest master branch is built
-# * Executing script without arguments makes a full clean build and produces dmg package
-# * You can pass arguments to the script to invoke particular stage.
-#	Available stages: mkmacports, mkdeps, mketl, mksynfig, mksynfigstudio, mkapp, mkdmg
-#	Example:
-#		synfigstudio-osx-build.sh mkdeps
-# * You can pass a custom command to be invoked in the build environment.
-#	Example (uninstalls glibmm package from the buildroot):
-#		synfigstudio-osx-build.sh port uninstall glibmm
-# * If you suspect something is wrong with your macports installation you can always start from scratch by removing ~/src/macports dir
-
-# TODO: Don't build into /tmp/skl
-# TODO: Disable 32bit?
-
-
-#======= HEADER ===========
-
-set -e
-
-export RELEASE=1
-export BUILDROOT_VERSION=1
-
-if `whoami` != "root" ; then
-	echo "Please use sudo to run this script. Aborting."
-	exit 1
-fi
-
-export SCRIPTPATH=$(cd `dirname "$0"`; pwd)
-
-SYNFIG_REPO_DIR=$(dirname "$SCRIPTPATH")
-SCRIPTDIR_IS_REPO=0
-
-if -e "$SYNFIG_REPO_DIR/build.conf" ; then
-	source "$SYNFIG_REPO_DIR/build.conf"
-fi
-
-if ! -z $UNIVERSAL && ! $UNIVERSAL == 0 ; then
-export BUILDDIR=~/synfig-buildroot/build.u
-else
-export BUILDDIR=~/synfig-buildroot/build
-export UNIVERSAL=0
-fi
-
-if ! -z $X11 && ! $X11 == 0 ; then
-	export X11=1
-	export BUILDDIR=${BUILDDIR}.x11
-fi
-
-if ! -z $DEBUG && ! $DEBUG == 0 ; then
-	echo
-	echo "Debug mode: enabled"
-	echo
-	DEBUG='--enable-debug --enable-optimization=0'
-	export BUILDDIR=${BUILDDIR}.debug
-else
-	DEBUG=''
-fi
-
-LNKDIR=/tmp/skl/SynfigStudio
-MACPORTS=$LNKDIR/Contents/Resources
-MPSRC=MacPorts-2.3.3
-
-
-export SYNFIG_PREFIX=${MACPORTS}/synfig/
-export PATH="$MACPORTS/bin:${SYNFIG_PREFIX}/bin:$MACPORTS/sbin:$PATH"
-export SYNFIG_MODULE_LIST=${SYNFIG_PREFIX}/etc/synfig_modules.cfg
-export PKG_CONFIG_PATH=${MACPORTS}/lib/pkgconfig:${SYNFIG_PREFIX}/lib/pkgconfig$PKG_CONFIG_PATH
-export LD_LIBRARY_PATH=${MACPORTS}/lib:${SYNFIG_PREFIX}/lib:${SYNFIG_PREFIX}/lib64:$LD_LIBRARY_PATH
-
-#export ACLOCAL_FLAGS="-I ${SYNFIG_PREFIX}/share/aclocal -I ${MACPORTS}/share/aclocal"
-#export CPPFLAGS="-fpermissive -I${MACPORTS}/include -I${SYNFIG_PREFIX}/include"
-export CPPFLAGS="-I${MACPORTS}/include -I${SYNFIG_PREFIX}/include"
-export LDFLAGS="-L${MACPORTS}/lib -L${SYNFIG_PREFIX}/lib"
-if ! $UNIVERSAL == 0 ; then
-export CFLAGS="-arch i386 -arch x86_64"
-export CXXFLAGS="-arch i386 -arch x86_64"
-export LDFLAGS="$LDFLAGS -arch i386 -arch x86_64"
-fi
-
-#======= HEADER END ===========
-
-
-
-prepare()
-{
-	# == workarounds ==
-
-	#We should do that, otherwise python won't build:
-	if -e $MACPORTS/tmp/app ; then
-		 ! -e $MACPORTS/tmp/app.bak || rm -rf $MACPORTS/tmp/app.bak
-		echo "Backing up custom /Applications/MacPorts dir..."
-		mv $MACPORTS/tmp/app $MACPORTS/tmp/app.bak || true
-	fi
-
-	# Cleanup some stuff, remaining from older installations
-	rm /Library/LaunchDaemons/org.macports.rsyncd.plist || true
-
-	# == symlinks ==
-
-	if ! -e "$BUILDDIR" ; then
-	 mkdir -p "$BUILDDIR"
-	fi
-
-	echo -n setting symlink to build directory...
-	test -d /tmp/skl || mkdir -p /tmp/skl
-	chmod a+w /tmp/skl
-	test -L $LNKDIR && rm $LNKDIR
-	test -L $MACPORTS && rm $MACPORTS
-	mkdir -p `dirname $MACPORTS`
-	ln -s "$BUILDDIR" $MACPORTS
-	chmod a+w $MACPORTS
-	echo
-}
-
-mkmacports()
-{
-
-# cleanup previous installation
-if -e "$BUILDDIR/" ; then
- rm -rf "$BUILDDIR/"
-fi
-
-mkdir -p "$BUILDDIR/"
-mkdir -p ~/src
-cd ~/src
-
-# compile MacPorts and do a selfupdate
-if ! -d "$MPSRC" ; then
- #curl -LO http://svn.macports.org/repository/macports/downloads/$MPSRC/$MPSRC.tar.bz2
- curl -LO http://distfiles.macports.org/MacPorts/$MPSRC.tar.bz2
- echo -n extracting MacPorts sources ...
- bunzip2 $MPSRC.tar.bz2
- tar -xf $MPSRC.tar
- rm $MPSRC.tar
- echo done.
-fi
-
-# this is the main part on which this building and packaging process relies on
-echo Compiling and updating MacPorts...
-cd $MPSRC
-./configure --prefix $MACPORTS --with-tclpackage=$MACPORTS/share/macports/Tcl \
-	--with-install-user=`id -un` \
-	--with-install-group=`id -gn`
-make clean
-make -j$JOBS
-#sudo make install
-make install
-cd - > /dev/null
-export PATH="$MACPORTS/bin:$MACPORTS/sbin:$PATH"
-
-# give our build directory user perms so we don't need sudo in further steps. Avoid sudo whenever it's possible!
-#sudo chown -R $UID "$BUILDDIR"
-
-# do a selfupdate
-echo Now selfupdating MacPorts. Please wait ...
-port -d selfupdate
-
-# now give some hints
-echo
-echo "Yor MacPorts installation is now ready to build SynfigStudio for Mac OS X."
-}
-
-mkdeps()
-{
-	# test if we have MacPorts installed
-	if ! -e "$MACPORTS/bin/port" ; then
-		mkmacports
-	fi
-
-	if -e "$MACPORTS/bin/synfig" ; then
-		echo "=========================== !!! =========================="
-		echo " Macports installation is outdated. Force rebuild..."
-		echo "=========================== !!! =========================="
-		sleep 10
-		rm -rf "$MACPORTS"
-		mkmacports
-	fi
-
-	echo $BUILDROOT_VERSION > "$MACPORTS/etc/buildroot-id"
-	if `cat "$MACPORTS/etc/buildroot-id"` != "${BUILDROOT_VERSION}" ; then
-		echo "======================= !!! ======================"
-		echo " Buildroot version changed. Force rebuild..."
-		echo "======================= !!! ======================"
-		sleep 10
-		rm -rf "$MACPORTS"
-		mkmacports
-	fi
-
-	# Don't write into /Applications/MacPorts
-	 -d $MACPORTS/tmp/app || mkdir -p $MACPORTS/tmp/app
-	sed -i "" -e "s|/Applications/MacPorts|$MACPORTS/tmp/app|g" "$MACPORTS/etc/macports/macports.conf" || true
-
-	if ! $UNIVERSAL == 0 ; then
-		if $X11 == 1 ; then
-			echo "+universal +x11 +nonfree" > $MACPORTS/etc/macports/variants.conf
-		else
-			echo "+universal +no_x11 +quartz -x11 +nonfree" > $MACPORTS/etc/macports/variants.conf
-		fi
-	else
-		if $X11 == 1 ; then
-			echo "+x11 +nonfree" > $MACPORTS/etc/macports/variants.conf
-		else
-			echo "+no_x11 +quartz -x11 +nonfree" > $MACPORTS/etc/macports/variants.conf
-		fi
-	fi
-
-	pushd ${SCRIPTPATH}/macports
-	portindex
-	popd
-	echo "file://${SCRIPTPATH}/macports nosync" > $MACPORTS/etc/macports/sources.conf
-	echo "rsync://rsync.macports.org/release/tarballs/ports.tar default" >> $MACPORTS/etc/macports/sources.conf
-
-	# workaround the bug introduced in MacPorts 2.2.0 - https://trac.macports.org/ticket/39850
-	cp -rf $MACPORTS/etc/macports/macports.conf $MACPORTS/etc/macports/macports.conf.bak
-	sed '/sandbox_enable/d' $MACPORTS/etc/macports/macports.conf.bak > $MACPORTS/etc/macports/macports.conf
-	echo "sandbox_enable no" >> $MACPORTS/etc/macports/macports.conf
-
-	port selfupdate
-
-	# We have to make sure python 2 is default, because some packages won't build with python 3
-	port select --set python python27 || true
-
-	port upgrade outdated || true
-
-	CORE_DEPS=" \
-		fontconfig \
-		freetype \
-		gettext \
-		ImageMagick \
-		libmng \
-		libpng \
-		libsigcxx2 \
-		libtool \
-		libxmlxx2 \
-		mlt \
-		openexr \
-		pkgconfig \
-		ffmpeg \
-		cairo \
-		libtool \
-		libsdl2"
-	STUDIO_DEPS=" \
-		gtkmm3 \
-		python33 \
-		gnome-themes-standard \
-		intltool"
-	port install -f $CORE_DEPS $STUDIO_DEPS
-
-	# We have to make sure python 2 is default, because some packages won't build with python 3
-	port select --set python python27
-
-	# ...but we still need python3 binary available
-	pushd $MACPORTS/bin/ > /dev/null
-	ln -sf python3.3 python3
-	popd > /dev/null
-
-	cp ${SCRIPTPATH}/gtk-3.0/settings.ini ${MACPORTS}/etc/gtk-3.0/
-
-}
-
-mketl()
-{
-	# building ETL
-	pushd ${SYNFIG_REPO_DIR}/ETL
-	rm -f aclocal.m4
-	autoreconf --install --force
-	make clean || true
-	./configure --prefix=${SYNFIG_PREFIX} --includedir=${SYNFIG_PREFIX}/include
-	make -j$JOBS install
-	popd
-}
-
-mksynfig()
-{
-	# building synfig-core
-	pushd ${SYNFIG_REPO_DIR}/synfig-core
-	export CXXFLAGS="$CXXFLAGS -I${SYNFIG_PREFIX}/include/ImageMagick"
-	make clean || true
- 	bash ./bootstrap.sh
-	if ! $UNIVERSAL == 0 ; then
-	export DEPTRACK="--disable-dependency-tracking"
-	fi
-	/bin/sh ./configure ${DEPTRACK} --prefix=${SYNFIG_PREFIX} --includedir=${SYNFIG_PREFIX}/include --disable-static --enable-shared --with-magickpp --without-libavcodec ${DEBUG}
-	make -j$JOBS install
-	popd
-}
-
-mksynfigstudio()
-{
-	# Copy launch script, so we can test synfigstudio without building an app package
-	 ! -e "${MACPORTS}/../MacOS" || rm -rf "${MACPORTS}/../MacOS"
-	cp -rf $SCRIPTPATH/app-template/Contents/MacOS ${MACPORTS}/../MacOS
-
-	# building synfig-studio
-	pushd ${SYNFIG_REPO_DIR}/synfig-studio
-
-	make clean || true
-	CONFIGURE_PACKAGE_OPTIONS='--disable-update-mimedb'
-	/bin/sh ./bootstrap.sh
-	if ! $UNIVERSAL == 0 ; then
-	export DEPTRACK="--disable-dependency-tracking"
-	fi
-	/bin/sh ./configure ${DEPTRACK} --prefix=${SYNFIG_PREFIX} --includedir=${SYNFIG_PREFIX}/include --disable-static --enable-shared $DEBUG $CONFIGURE_PACKAGE_OPTIONS
-	make -j$JOBS install
-
-	for n in AUTHORS COPYING NEWS README
-	do
-	 	cp -f $n ${MACPORTS}
-	done
-
-	popd
-}
-
-mkapp()
-{
-	VERSION=`get_version_release_string`
-	echo Now trying to build your new SynfigStudio app ...
-
-	DIR=`dirname "$BUILDDIR"`
-	APPDIR="$DIR/SynfigStudio-new-app"
-	APPCONTENTS="$APPDIR/Contents/Resources"
-
-	# initial cleanup
-	 ! -e $DIR/SynfigStudio-new-app || rm -rf $DIR/SynfigStudio-new-app
-	 ! -e $DIR/SynfigStudio.app || rm -rf $DIR/SynfigStudio.app
-
-	cp -R "$SCRIPTPATH/app-template" "$APPDIR"
-	mv $APPDIR/Contents/MacOS/synfigstudio $APPDIR/Contents/MacOS/SynfigStudio || true
-
-	#mkdir -p "$APPCONTENTS/bin"
-	#cp -R "$MACPORTS/bin/ffmpeg" "$APPCONTENTS/bin"
-	#"$SCRIPTPATH/macos-gather-deps.sh" 	"$APPCONTENTS/bin/ffmpeg"
-	#exit 0
-
-	#cp -R "$MACPORTS/synfig/bin/synfig" "$APPCONTENTS/bin"
-	mkdir -p "$APPCONTENTS/etc"
-	mkdir -p "$APPCONTENTS/share"
-
-	# Synfig
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/synfig/bin/synfig" "$MACPORTS" "$APPCONTENTS"
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/synfig/bin/synfigstudio" "$MACPORTS" "$APPCONTENTS"
-	pushd "$MACPORTS/synfig/lib/synfig/modules/"
-	for FILE in `ls -1 *.so`; do
-		"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/synfig/lib/synfig/modules/$FILE" "$MACPORTS" "$APPCONTENTS"
-	done
-	cp -R $MACPORTS/synfig/lib/synfig/modules/*.la "$APPCONTENTS/synfig/lib/synfig/modules/"
-	popd
-	cp -R "$MACPORTS/synfig/etc" "$APPCONTENTS/synfig/"
-	cp -R "$MACPORTS/synfig/share" "$APPCONTENTS/synfig/"
-
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/ffmpeg" "$MACPORTS" "$APPCONTENTS"
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/ffprobe" "$MACPORTS" "$APPCONTENTS"
-
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/encodedv" "$MACPORTS" "$APPCONTENTS"
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/sox" "$MACPORTS" "$APPCONTENTS"
-
-	# Gtk3
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/gdk-pixbuf-query-loaders" "$MACPORTS" "$APPCONTENTS"
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/gdk-pixbuf-pixdata" "$MACPORTS" "$APPCONTENTS"
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/gtk3-demo" "$MACPORTS" "$APPCONTENTS"
-	pushd "$MACPORTS/lib/gdk-pixbuf-2.0/2.10.0/loaders/"
-	for FILE in `ls -1 *.so`; do
-		"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/lib/gdk-pixbuf-2.0/2.10.0/loaders/$FILE" "$MACPORTS" "$APPCONTENTS"
-	done
-	popd
-	pushd "$MACPORTS/lib/gtk-3.0/3.0.0/immodules/"
-	for FILE in `ls -1 *.so`; do
-		"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/lib/gtk-3.0/3.0.0/immodules/$FILE" "$MACPORTS" "$APPCONTENTS"
-	done
-	popd
-	pushd "$MACPORTS/lib/gtk-3.0/3.0.0/printbackends/"
-	for FILE in `ls -1 *.so`; do
-		"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/lib/gtk-3.0/3.0.0/printbackends/$FILE" "$MACPORTS" "$APPCONTENTS"
-	done
-	popd
-	pushd "$MACPORTS/lib/cairo/"
-	for FILE in `ls -1 *.so`; do
-		"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/lib/cairo/$FILE" "$MACPORTS" "$APPCONTENTS"
-	done
-	cp -R $MACPORTS/lib/cairo/*.la "$APPCONTENTS/lib/cairo/"
-	popd
-	#pushd "$MACPORTS/lib/engines/"
-	#for FILE in `ls -1 *.so`; do
-	#	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/lib/engines/$FILE" "$MACPORTS" "$APPCONTENTS"
-	#done
-	#popd
-	cp -R "$MACPORTS/etc/gtk-3.0" "$APPCONTENTS/etc/"
-	cp -R "$MACPORTS/lib/girepository-1.0" "$APPCONTENTS/lib/"
-	mkdir -p "$APPCONTENTS/share/glib-2.0/"
-	cp -R "$MACPORTS/share/glib-2.0/schemas" "$APPCONTENTS/share/glib-2.0"
-
-	# Python 3
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/python3" "$MACPORTS" "$APPCONTENTS"
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/Library/Frameworks/Python.framework/Versions/3.3/Resources/Python.app/Contents/MacOS/Python" "$MACPORTS" "$APPCONTENTS"
-	mkdir -p "$APPCONTENTS/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/"
-	rsync -av --exclude "__pycache__" "$MACPORTS/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/" "$APPCONTENTS/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3/"
-	#cp -R "$MACPORTS/Library/Frameworks/Python.framework/Versions/3.3/lib/python3.3" "$APPCONTENTS/Library/Frameworks/Python.framework/Versions/3.3/lib/"
-	#find $APPCONTENTS/Library/Frameworks/Python.framework/Versions/3.3/lib -name "__pycache__" -exec rm -rf {} \;
-
-	# MLT
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/melt" "$MACPORTS" "$APPCONTENTS"
-	pushd "$MACPORTS/lib/mlt/"
-	for FILE in `ls -1 *.dylib`; do
-		"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/lib/mlt/$FILE" "$MACPORTS" "$APPCONTENTS"
-	done
-	popd
-	cp -R "$MACPORTS/share/mlt" "$APPCONTENTS/share/"
-
-	# ImageMagick
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/animate" "$MACPORTS" "$APPCONTENTS"
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/composite" "$MACPORTS" "$APPCONTENTS"
-	"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/bin/convert" "$MACPORTS" "$APPCONTENTS"
-	pushd "$MACPORTS/lib/ImageMagick-6.9.2/modules-Q16/coders/"
-	for FILE in `ls -1 *.so`; do
-		"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/lib/ImageMagick-6.9.2/modules-Q16/coders/$FILE" "$MACPORTS" "$APPCONTENTS"
-	done
-	cp -R $MACPORTS/lib/ImageMagick-6.9.2/modules-Q16/coders/*.la "$APPCONTENTS/lib/ImageMagick-6.9.2/modules-Q16/coders/"
-	popd
-	pushd "$MACPORTS/lib/ImageMagick-6.9.2/modules-Q16/filters/"
-	for FILE in `ls -1 *.so`; do
-		"$SCRIPTPATH/osx-relocate-binary.sh" "$MACPORTS/lib/ImageMagick-6.9.2/modules-Q16/filters/$FILE" "$MACPORTS" "$APPCONTENTS"
-	done
-	cp -R $MACPORTS/lib/ImageMagick-6.9.2/modules-Q16/filters/*.la "$APPCONTENTS/lib/ImageMagick-6.9.2/modules-Q16/filters/"
-	popd
-	cp -R "$MACPORTS/lib/ImageMagick-6.9.2/config-Q16" "$APPCONTENTS/lib/ImageMagick-6.9.2/"
-	cp -R "$MACPORTS/etc/ImageMagick-6" "$APPCONTENTS/etc/"
-
-	cp -R "$MACPORTS/share/icons" "$APPCONTENTS/share/"
-	cp -R "$MACPORTS/share/themes" "$APPCONTENTS/share/"
-	cp -R "$MACPORTS/share/mime" "$APPCONTENTS/share/"
-
-	# app bundle files
-	echo "*** Please do _NOT_ delete this file. The file script depends on it. ***" > "$APPCONTENTS/v$VERSION"
-	sed -i "" -e "s/_VERSION_/$VERSION/g" "$APPDIR/Contents/MacOS/SynfigStudio"
-	sed -i "" -e "s/_VERSION_/$VERSION/g" "$APPDIR/Contents/Info.plist"
-
-	# save information about the ports which make up this build
-	echo "Synfig Studio $VERSION for Mac OS X $OSNAME" > "$APPCONTENTS/build-info.txt"
-	date >> "$APPCONTENTS/build-info.txt"
-	port installed >> "$APPCONTENTS/build-info.txt"
-	sed -i "" -e "s/are currently installed:/were used to build this package:/g" "$APPCONTENTS/build-info.txt"
-
-	mv "$APPDIR" "$DIR/SynfigStudio.app"
-
-	echo
-	echo "Your new Synfig Studio app bundle should now be ready to run."
-	echo
-}
-
-mkdmg()
-{
-	cd ~
-
-	# get OS major version
-	OSXVER=`uname -r | cut -f 1 -d '.'`
-
-	#VERSION=`synfig --version 2>&1 | cut -d " " -f 2`
-	VERSION=`get_version_release_string`
-	#echo Synfig version is: $VERSION
-
-	ARCH=`uname -m`
-	if ! $UNIVERSAL == 0 ; then
-	export FINAL_FILENAME=SynfigStudio-"$VERSION"
-	else
-	export FINAL_FILENAME=SynfigStudio-"$VERSION"."$ARCH"
-	fi
-
-
-	VOLNAME="SynfigStudio"
-	TRANSITORY_FILENAME="synfig-wla.sparseimage"
-
-	APPDIR=`dirname "$BUILDDIR"`/SynfigStudio.app
-
-	/usr/bin/hdiutil detach /Volumes/"$VOLNAME" || true
-
-	echo "Creating and attaching disk image..."
-	 ! -e "$TRANSITORY_FILENAME" || rm -rf "$TRANSITORY_FILENAME"
-	/usr/bin/hdiutil create -type SPARSE -size 700m -fs "HFS+" -volname "$VOLNAME" -attach "$TRANSITORY_FILENAME"
-
-	echo "Copying files to disk image..."
-	cp -R $APPDIR /Volumes/"$VOLNAME"/SynfigStudio.app
-	cp -R ${SYNFIG_REPO_DIR}/synfig-studio/COPYING /Volumes/"$VOLNAME"/LICENSE.txt
-	mv /Volumes/"$VOLNAME"/SynfigStudio.app/Contents/MacOS/synfigstudio /Volumes/"$VOLNAME"/SynfigStudio.app/Contents/MacOS/SynfigStudio || true
-
-	# open the window so that the icon database is generated
-	open /Volumes/"$VOLNAME" || true
-	sleep 3
-
-	echo "Detaching disk image..."
-	/usr/bin/hdiutil detach /Volumes/"$VOLNAME"
-
-	echo "Compressing disk image..."
-	 ! -e "$FINAL_FILENAME" || rm -rf "$FINAL_FILENAME"
-	/usr/bin/hdiutil convert -imagekey zlib-level=9 -format UDBZ "$TRANSITORY_FILENAME" -o ./"$FINAL_FILENAME"
-
-	echo "Removing uncompressed transitory dmg..."
-	/bin/rm -f "$TRANSITORY_FILENAME"
-
-	echo "Done!"
-}
-
-get_version_release_string()
-{
-	pushd "$SYNFIG_REPO_DIR" > /dev/null
-	VERSION=`cat synfig-core/configure.ac |egrep "AC_INIT$\Synfig Core\,"| sed "s|.*Core\,\||" | sed "s|\,\.*||"`
-	#if -z $BREED ; then
-	#	BREED="`git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/\(no\ branch$// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//`"
-	#	if ( echo $BREED | egrep origin/master > /dev/null ); then
-	#		#give a priority to master branch
-	#		BREED='master'
-	#	else
-	#		BREED=`echo $BREED | cut -d ' ' -f 1`
-	#		BREED=${BREED##*/}
-	#	fi
-	#	BREED=${BREED%_master}
-	#fi
-	if ${VERSION##*-RC} != ${VERSION} ; then
-		#if $BREED == 'master' ; then
-			BREED=rc${VERSION##*-RC}
-		#else
-		#	BREED=rc${VERSION##*-RC}.$BREED
-		#fi
-		VERSION=${VERSION%%-*}
-	fi
-	if ! -z $BREED ; then
-		BREED=`echo $BREED | tr _ . | tr - .`	# No "-" or "_" characters, because RPM and DEB complain
-		BREED=.$BREED
-	fi
-	REVISION=`git show --pretty=format:%ci HEAD | head -c 10 | tr -d '-'`
-	echo "$VERSION-$REVISION$BREED"
-	#echo "$VERSION-$REVISION$BREED.$RELEASE"
-	popd >/dev/null
-}
-
-mkall()
-{
-	mkdeps
-
-	# cleanup previous synfig installation if any
-	 ! -d "$SYNFIG_PREFIX" || rm -rf "$SYNFIG_PREFIX"
-
-	mketl
-	mksynfig
-	mksynfigstudio
-
-	#port install synfigstudio || true
-
-	#synfig -q installer_logo.sif -o installer_logo.png --time 0
-	#synfig(294) 23:51:01 info: Loading modules from /tmp/skl/#SynfigStudio.app/Contents/Resources/etc/synfig_modules.cfg
-	#synfig: warning: Unable to find module "mod_magickpp" (file not found)
-	#synfig: warning: Unable to find module "mod_libavcodec" (file not found)
-	#synfig(294) 23:51:01 error: Standard Exception: basic_string::_S_construct NULL not valid
-	#Unable to load 'installer_logo.sif'.
-	#Throwing out job...
-	#Nothing to do!
-
-	#Workaround:
-	# ! -e ~/src/macports/synfig-build || rm -rf ~/src/macports/synfig-build
-	#cd $MACPORTS/var/macports/build/
-	#DIRPATH=`ls`
-	#cd -
-	#VERSION=`synfig --version 2>&1 | cut -d " " -f 2`
-	#cp -R "$MACPORTS/var/macports/build/$DIRPATH/synfigstudio/work/synfigstudio-$VERSION" ~/src/macports/synfig-build
-	#cd ~/src/macports/synfig-build/images
-	#make
-	#cd -
-	#cp -R ~/src/macports/synfig-build/images/* #"$MACPORTS/var/macports/build/$DIRPATH/synfigstudio/work/synfigstudio-$VERSION/images"
-	#Workaround end
-
-	#port install synfigstudio
-
-	mkapp
-	mkdmg
-
-}
-
-do_cleanup()
-{
-	#restore Applications/MacPorts dir
-	if -e $MACPORTS/tmp/app.bak ; then
-		echo "Restoring custom /Applications/MacPorts dir."
-		rm -rf $MACPORTS/tmp/app || true
-		mv $MACPORTS/tmp/app.bak $MACPORTS/tmp/app
-	fi
-	rm -rf $LNKDIR || true
-}
-
-###=================================== MAIN ======================================
-
-main() # dummy for navigation
-{
-	true
-}
-
-#Init traps
-trap do_cleanup INT
-
-# number of jobs
-export JOBS=`sysctl hw.ncpu | cut -f 2 -d " "`
-echo "Detected processors count: $JOBS"
-
-# get OS X version. 8=Tiger, 9=Leopard, 10=Snowleopard
-export OS=`uname -r | cut -d "." -f1`
-if $OS -eq 9 -o $OS -eq 10 ; then
-	GTKFONT=9.8
-	THEME=Leopard
-else
-	GTKFONT=12.5
-	THEME=Tiger
-fi
-
-# set OS code name
-OSNAME=$THEME
-if $OS -eq 10 ; then
-	OSNAME=Snowleopard
-fi
-
-if ! $OS -eq 13 ; then # if not Mountain Lion then set compatibility mode
-export MACOSX_DEPLOYMENT_TARGET=10.5
-echo "Enabling binary compatibility mode: MACOSX_DEPLOYMENT_TARGET=10.5"
-fi
-
-prepare
-
-# Fetch sources
-#port install python33
-#port select --set python python33
-#port install git-core
-if ! ( which git ); then
-	echo "ERROR: No git found. Please install git from http://code.google.com/p/git-osx-installer/"
-	exit 1
-fi
-
-#detecting repo
-pushd $SCRIPTPATH >/dev/null
-if git rev-parse --git-dir >/dev/null; then
-	SYNFIG_REPO_DIR=$(dirname `git rev-parse --git-dir`)
-	SCRIPTDIR_IS_REPO=1
-fi
-popd >/dev/null
-
-if ! -e ${SYNFIG_REPO_DIR} ; then
-	pushd `dirname "${SYNFIG_REPO_DIR}"`
-	git clone git://github.com/synfig/synfig.git
-	popd
-fi
-
-VERSION=`get_version_release_string`
-
-pushd ${SYNFIG_REPO_DIR} >/dev/null
-if $WORKDIR_IS_REPO == 0 ; then
-	git fetch
-	git reset --hard HEAD
-	SELECTEDREVISION=origin/master
-	git checkout $SELECTEDREVISION
-fi
-
-
-echo
-echo
-echo "BUILDING synfigstudio-$VERSION"
-echo
-echo
-#sleep 5
-
-popd > /dev/null
-
-if -z $1 ; then
-	mkall
-else
-	echo "Executing custom user command..."
-	$@
-fi
-
-do_cleanup

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/synfigstudio-release.sh Deleted

@@ -1,214 +0,0 @@
-#!/bin/bash
-
-# Usage notes
-#
-# Running this script will creates release tarballs for all synfig 
-# modules and testing them by installing into ~/local-synfig/.
-#
-# It is also possible to run procedure for each module separately by 
-# passing specific arguments to the script:
-# * Run procedures for ETL:
-#    synfigstudio-release.sh etl
-# * Run procedures for synfig-core:
-#    synfigstudio-release.sh core
-# * Run procedures for synfig-studio:
-#    synfigstudio-release.sh studio
-# * Run check for localization files:
-#    synfigstudio-release.sh l10n
-#
-
-set -e
-
-export SCRIPTPATH=$(cd `dirname "$0"`; pwd)
-export SRCPREFIX=`dirname "$SCRIPTPATH"`
-
-BUILD_RELEASE_DIR=${SRCPREFIX}/_release/
-
-export PREFIX="$HOME/local-synfig"
-export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:$PREFIX/lib/pkgconfig"
-export PATH="$PREFIX/bin:$PATH"
-export ETL_VERSION=`cat $SRCPREFIX/ETL/configure.ac |egrep "AC_INIT\(\Extended Template Library\,"| sed "s|.*Library\,\||" | sed "s|\,\.*||"`
-echo "ETL_VERSION=$ETL_VERSION"
-export CORE_VERSION=`cat $SRCPREFIX/synfig-core/configure.ac |egrep "AC_INIT\(\Synfig Core\,"| sed "s|.*Core\,\||" | sed "s|\,\.*||"`
-echo "CORE_VERSION=$CORE_VERSION"
-export STUDIO_VERSION=`cat $SRCPREFIX/synfig-studio/configure.ac |egrep "AC_INIT\(\Synfig Studio\,"| sed "s|.*Studio\,\||" | sed "s|\,\.*||"`
-echo "STUDIO_VERSION=$STUDIO_VERSION"
-
-# Colored output
-RED='\0330;31m'
-YLW='\0331;33m'
-GRN='\0330;32m'
-NC='\0330m' # No Color
-
-if  `uname` == "MINGW"* ; then # MacOS doesn't support `uname -o` flag
-	PATH="${MINGW_PREFIX}/lib/ccache/bin:${PATH}"
-	PKG_CONFIG_PATH="/opt/mlt-7.2.0/lib/pkgconfig:${PKG_CONFIG_PATH}"
-	echo "ccache enabled"
-fi
-
-if  -z $THREADS ; then
-	export THREADS=4
-fi
-
-start_stage()
-{
-	echo -e "Starting ${YLW}$1${NC} stage"
-}
-
-end_stage() {
-	echo "$1 complete."
-}
-
-l10n_check()
-{
-	cd $2
-	OUTPUT=`intltool-update -m 2>&1`
-	
-	if  ! -z "${OUTPUT}" ; then
-		echo -e "Checking $1 translations... ${RED}Error${NC}"
-		echo "${OUTPUT}"
-		exit 1
-	fi
-	echo -e "Checking $1 translations... ${GRN}Done${NC}"
-}
-
-l10n()
-{
-	start_stage "l10n"
-	l10n_check "Synfig Core" "$SRCPREFIX/synfig-core/po"
-	l10n_check "Synfig Studio" "$SRCPREFIX/synfig-studio/po"
-	end_stage "l10n"
-}
-
-pack-etl()
-{
-	start_stage "Pack ETL"
-	cd $SRCPREFIX/ETL
-	autoreconf -if
-	mkdir -p ${BUILD_RELEASE_DIR}/ETL && cd $BUILD_RELEASE_DIR/ETL
-	$SRCPREFIX/ETL/configure --prefix="$PREFIX"
-	make V=0 CXXFLAGS="-w" distcheck -j${THREADS}
-	mv ETL-${ETL_VERSION}.tar.gz ${BUILD_RELEASE_DIR}
-	end_stage "Pack ETL"
-}
-
-test-etl()
-{
-	start_stage "Test ETL"
-	cd ${BUILD_RELEASE_DIR}
-	tar xf ETL-${ETL_VERSION}.tar.gz
-	cd ETL-${ETL_VERSION}
-	./configure --prefix="$PREFIX"
-	make V=0 CXXFLAGS="-w" install -j${THREADS}
-	cd ..
-	rm -rf ${BUILD_RELEASE_DIR}/ETL-${ETL_VERSION}
-	end_stage "Test ETL"
-}
-
-etl()
-{
-	start_stage "ETL"
-	pack-etl
-	test-etl
-	end_stage "ETL"
-}
-
-pack-core()
-{
-	start_stage "Pack Synfig Core"
-	cd $SRCPREFIX/synfig-core
-	./bootstrap.sh
-	mkdir -p ${BUILD_RELEASE_DIR}/synfig-core && cd $BUILD_RELEASE_DIR/synfig-core
-	$SRCPREFIX/synfig-core/configure --prefix="$PREFIX"
-	echo "------------------------------------- pack-core make"
-	make V=0 CXXFLAGS="-w" distcheck -j${THREADS}
-	mv synfig-${CORE_VERSION}.tar.gz ${BUILD_RELEASE_DIR}
-	end_stage "Pack Synfig Core"
-}
-
-test-core()
-{
-	start_stage "Test Synfig Core"
-	cd ${BUILD_RELEASE_DIR}
-	tar xf synfig-${CORE_VERSION}.tar.gz
-	cd synfig-${CORE_VERSION}
-	./configure --prefix="$PREFIX"
-	make V=0 CXXFLAGS="-w" install -j${THREADS}
-	cd ..
-	rm -rf ${BUILD_RELEASE_DIR}/synfig-${CORE_VERSION}
-	end_stage "Test Synfig Core"
-}
-
-core()
-{
-	start_stage "Synfig Core"
-	pack-core
-	test-core
-	end_stage "Synfig Core"
-}
-
-pack-studio()
-{
-	start_stage "Pack Synfig Studio"
-	cd $SRCPREFIX/synfig-studio
-	./bootstrap.sh
-	mkdir -p ${BUILD_RELEASE_DIR}/synfig-studio && cd $BUILD_RELEASE_DIR/synfig-studio
-	$SRCPREFIX/synfig-studio/configure --prefix="$PREFIX"
-	make V=0 CXXFLAGS="-w" distcheck -j${THREADS}
-	mv synfigstudio-${STUDIO_VERSION}.tar.gz ${BUILD_RELEASE_DIR}
-	end_stage "Pack Synfig Studio"
-}
-
-test-studio()
-{
-	start_stage "Test Synfig Studio"
-	cd ${BUILD_RELEASE_DIR}
-	tar xf synfigstudio-${STUDIO_VERSION}.tar.gz
-	cd synfigstudio-${STUDIO_VERSION}
-	./configure --prefix="$PREFIX"
-	make install -j${THREADS}
-	cd ..
-	rm -rf ${BUILD_RELEASE_DIR}/synfigstudio-${STUDIO_VERSION}
-	end_stage "Test Synfig Studio"
-}
-
-studio()
-{
-	start_stage "Synfig Studio"
-	pack-studio
-	test-studio
-	end_stage "Synfig Studio"
-}
-
-mkall()
-{
-	if  -d "$BUILD_RELEASE_DIR" ;then
-		chmod -R u+w "$BUILD_RELEASE_DIR"
-		rm -rf "$BUILD_RELEASE_DIR"
-	fi
-	l10n
-	etl
-	core
-	studio
-}
-
-do_cleanup()
-{
-	start_stage "Clean up"
-	if  -d "$BUILD_RELEASE_DIR" ;then
-		chmod -R u+w "$BUILD_RELEASE_DIR"
-	fi
-}
-
-trap do_cleanup INT SIGINT SIGTERM SIGKILL EXIT
-
-if  -z $1 ; then
-	rm -rf "$PREFIX" || true
-	mkall
-else
-	echo "Executing custom user command..."
-
-	$@
-fi
-
-do_cleanup

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/synfigstudio.nsi Deleted

@@ -1,220 +0,0 @@
-; example2.nsi
-;
-; This script is based on example1.nsi, but it remember the directory, 
-; has uninstall support and (optionally) installs start menu shortcuts.
-;
-; It will install makensisw.exe into a directory that the user selects,
-
-!include "MUI2.nsh"
-
-;--------------------------------
-
-; The name of the installer
-Name "Synfig Studio @VERSION@"
-
-; The file to write
-OutFile "synfigstudio-@VERSION@.exe"
-
-; The default installation directory and registry
-!include "arch-specific.nsh"
-
-; Request application privileges for Windows Vista
-RequestExecutionLevel highest
-
-!define MUI_ABORTWARNING
-
-!define SHCNE_ASSOCCHANGED 0x8000000
-!define SHCNF_IDLIST 0
-
-!define PRODUCT_REG_KEY "Software\synfigstudio\0.0"
-!define PRODUCT_UNINSTALL_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\synfigstudio"
-!define PRODUCT_UNINSTALL_EXE "uninstall-synfigstudio.exe"
-
-;--------------------------------
-
-;!define MUI_HEADERIMAGE
-;!define MUI_HEADERIMAGE_BITMAP "installer_logo.bmp"
-;!define MUI_WELCOMEFINISHPAGE_BITMAP ".\share\pixmaps\installer_logo.bmp"
-
-; Pages
-
-!insertmacro MUI_PAGE_WELCOME
-;!insertmacro MUI_PAGE_LICENSE ".\alphalicense.txt"
-!insertmacro MUI_PAGE_LICENSE ".\licenses\synfigstudio.txt"
-!insertmacro MUI_PAGE_COMPONENTS
-!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
-
-!insertmacro MUI_UNPAGE_CONFIRM
-!insertmacro MUI_UNPAGE_INSTFILES
-
-!insertmacro MUI_LANGUAGE "English"
-
-;--------------------------------
-
-; The stuff to install
-Section "Synfig Studio"
-
-  SectionIn RO
-
-  SetOutPath "$INSTDIR\bin"
-  !include "bin.nsh"
-  
-  SetOutPath "$INSTDIR\etc"
-  !include "etc.nsh"
-
-  SetOutPath "$INSTDIR\lib"
-  !include "lib-gdk-pixbuf.nsh"
-  !include "lib-gtk.nsh"
-  !include "lib-pango.nsh"
-  !include "lib-synfig.nsh"
-  
-  SetOutPath "$INSTDIR\licenses"
-  !include "licenses.nsh"
-  
-  SetOutPath "$INSTDIR\share"
-  !include "share.nsh"
-
-  ;SetOutPath "$INSTDIR\python"
-  ;!include "python.nsh"
-  SetOutPath "$INSTDIR"
-  File /r /x .* python
-
-  WriteRegStr HKLM "${PRODUCT_REG_KEY}" "Path" "$INSTDIR"
-  WriteRegStr HKLM "${PRODUCT_REG_KEY}" "Version" "@VERSION@"
-  
-  ; Write the uninstall keys for Windows
-  WriteRegStr HKLM "${PRODUCT_UNINSTALL_KEY}" "DisplayName" "Synfig Studio"
-  WriteRegStr HKLM "${PRODUCT_UNINSTALL_KEY}" "DisplayVersion" "@VERSION@"
-  WriteRegStr HKLM "${PRODUCT_UNINSTALL_KEY}" "UninstallString" '"$INSTDIR\${PRODUCT_UNINSTALL_EXE}"'
-  WriteRegDWORD HKLM "${PRODUCT_UNINSTALL_KEY}" "NoModify" 1
-  WriteRegDWORD HKLM "${PRODUCT_UNINSTALL_KEY}" "NoRepair" 1
-
-
-	WriteRegStr HKCR ".sif" "" "Synfig.Composition"
-	WriteRegStr HKCR ".sif" "Content Type" "image/x-sif"
-	WriteRegStr HKCR ".sif" "PerceivedType" "image"
-
-	WriteRegStr HKCR ".sifz" "" "Synfig.Composition"
-	WriteRegStr HKCR ".sifz" "Content Type" "image/x-sifz"
-	WriteRegStr HKCR ".sifz" "PerceivedType" "image"
-
-	WriteRegStr HKCR "Synfig.Composition" "" "Synfig Composition File"
-	WriteRegStr HKCR "Synfig.Composition\DefaultIcon" "" "$INSTDIR\share\pixmaps\sif_icon.ico"
-	WriteRegStr HKCR "Synfig.Composition\shell" "" "open"
-	WriteRegStr HKCR "Synfig.Composition\shell\open\command" "" '$INSTDIR\bin\synfigstudio.exe "%1"'
-	
-	System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
-  WriteUninstaller "${PRODUCT_UNINSTALL_EXE}"
-SectionEnd
-
-Section "FFMpeg"
-	SetOutPath "$INSTDIR\bin"
-	File "bin\ffmpeg.exe"
-SectionEnd
-
-Section "Examples"
-	!include "examples.nsh"
-SectionEnd
-
-; Optional section (can be disabled by the user)
-Section "Start Menu Shortcuts"
-
-  SetOutPath "$INSTDIR\bin"
-
-  SetShellVarContext All
-  CreateDirectory "$SMPROGRAMS\Synfig"
-  CreateShortCut "$SMPROGRAMS\Synfig\Uninstall Synfig Studio.lnk" "$INSTDIR\uninstall-synfigstudio.exe" "" "$INSTDIR\uninstall-synfigstudio.exe" 0
-  CreateShortCut "$SMPROGRAMS\Synfig\Synfig Studio.lnk" "$INSTDIR\bin\synfigstudio.exe" "" "$INSTDIR\share\pixmaps\synfig_icon.ico" 0
-  CreateShortCut "$SMPROGRAMS\Synfig\Synfig Studio (Debug Console).lnk" "$INSTDIR\bin\synfigstudio.exe" "--console" "$INSTDIR\share\pixmaps\synfig_icon.ico" 0
-  
-SectionEnd
-
-;--------------------------------
-
-; Uninstaller
-
-Section "Uninstall"
-  
-  DeleteRegKey HKCR "Synfig.Composition\shell\open\command" 
-  DeleteRegKey HKCR "Synfig.Composition\DefaultIcon" 
-  DeleteRegKey HKCR "Synfig.Composition\shell"
-  DeleteRegKey HKCR "Synfig.Composition" 
-  DeleteRegKey HKCR ".sif"
-  DeleteRegKey HKCR ".sifz"
-  
-  ; Remove registry keys
-  DeleteRegKey HKLM "${PRODUCT_REG_KEY}"
-  DeleteRegKey HKLM "${PRODUCT_UNINSTALL_KEY}"
-
-  ; Remove files and uninstaller
-  Delete "$INSTDIR\${PRODUCT_UNINSTALL_EXE}"
-  !include "bin-uninst.nsh"
-  !include "etc-uninst.nsh"
-  !include "examples-uninst.nsh"
-  !include "lib-gdk-pixbuf-uninst.nsh"
-  !include "lib-gtk-uninst.nsh"
-  !include "lib-pango-uninst.nsh"
-  !include "lib-synfig-uninst.nsh"
-  RMDir "$INSTDIR\lib"
-  !include "licenses-uninst.nsh"
-  ;!include "python-uninst.nsh"
-  RMDir /r "$INSTDIR\python"
-  !include "share-uninst.nsh"
-  RMDir "$INSTDIR\share"
-
-  ; Remove shortcuts, if any
-  SetShellVarContext All
-  Delete "$SMPROGRAMS\Synfig\Uninstall Synfig Studio.lnk"
-  Delete "$SMPROGRAMS\Synfig\Synfig Studio.lnk"
-
-  ; Remove directories used
-  RMDir "$SMPROGRAMS\Synfig"
-  RMDir "$INSTDIR"
-
-	System::Call 'Shell32::SHChangeNotify(i ${SHCNE_ASSOCCHANGED}, i ${SHCNF_IDLIST}, i 0, i 0)'
-SectionEnd
-
-Function .onInit
-	; Get installer location
-	ReadRegStr $R0 HKLM "${PRODUCT_UNINSTALL_KEY}" "UninstallString"
-;	IfErrors 0 +2
-;	ReadRegStr $R0 HKCU "${PRODUCT_UNINSTALL_KEY}" "UninstallString"
-	
-	StrCmp $R0 "" done
-
-	; Get current installed version
-	ReadRegStr $R1 HKLM "${PRODUCT_UNINSTALL_KEY}" "DisplayVersion"
-;	IfErrors 0 +2
-;	ReadRegStr $R1 HKCU "${PRODUCT_UNINSTALL_KEY}" "DisplayVersion"
-
-;  StrCmp $R1 ${PRODUCT_VERSION} done
-
-	MessageBox MB_YESNOCANCEL|MB_ICONEXCLAMATION "A previous version of Synfig Studio appears to be installed. Would you like to uninstall it first?" IDNO done IDCANCEL abortInstall
-
-	; Run the uninstaller
-	
-	ClearErrors
-	; CopyFiles "$R0" $TEMP
-	ExecWait '$R0 _?=$INSTDIR'
-	IfErrors no_remove_uninstaller
-	Delete $R0
-	RMDir $INSTDIR
-
-no_remove_uninstaller:
-;    Delete "$TEMP\$R0"
-	
-    ; Check that the user completed the uninstallation by examining the registry
-    ReadRegStr $R0 HKLM "${PRODUCT_UNINSTALL_KEY}" "UninstallString"
-	StrCmp $R0 "" done abortInstall
-	ReadRegStr $R0 HKCU "${PRODUCT_UNINSTALL_KEY}" "UninstallString"
-	StrCmp $R0 "" done abortInstall
-
-abortInstall:
-    MessageBox MB_OK|MB_ICONEXCLAMATION "Unable to uninstall previous version of Synfig Studio"
-    Abort
-
-done:
-    BringToFront
-
-FunctionEnd

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/transifex-pull-translations.sh Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/transifex-push-template.sh Deleted

@@ -1,44 +0,0 @@
-#!/bin/bash
-
-set -e
-
-SCRIPTPATH="${BASH_SOURCE0}";
-pushd `dirname "${SCRIPTPATH}"` > /dev/null
-SCRIPTPATH=`pwd`;
-popd  > /dev/null
-
-
-fix-pot()
-{
-	if  -z "$1" ; then
-		echo "ERROR: Please specify .pot file"
-		exit 1
-	fi
-
-	PKGNAME="Package"
-	if  "$1" == "synfig.pot" ; then
-		PKGNAME="Synfig Core"
-	fi
-	if  "$1" == "synfigstudio.pot" ; then
-		PKGNAME="Synfig Studio"
-	fi
-
-	YEAR=`date +%Y`
-
-	sed -i "/# SOME DESCRIPTIVE TITLE/c\# Translation file for $PKGNAME package." "$1" || true
-	sed -i "/# Copyright (C) YEAR/c\# Copyright (C) $YEAR Synfig Contributors" "$1" || true
-	sed -i "/# This file is distributed under the same license as the PACKAGE package./c\# This file is distributed under the same license as the $PKGNAME package." "$1" || true
-}
-
-cd "$SCRIPTPATH/../synfig-core/po"
-rm synfig.pot || true
-intltool-update --pot
-fix-pot synfig.pot
-
-cd "$SCRIPTPATH/../synfig-studio/po"
-rm synfigstudio.pot || true
-intltool-update --pot
-fix-pot synfigstudio.pot
-
-cd "$SCRIPTPATH/.."
-tx push -s

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/transifex-push-translations.sh Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/translations-validation.sh Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/travis-linux.sh Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/update-languages.sh Deleted

@@ -1,113 +0,0 @@
-#!/bin/bash
-
-set -e
-
-update_linguas() {
- local DIR="$1"
- local LINGUAS_FILE="$DIR/LINGUAS"
- echo "update $LINGUAS_FILE"
- ls -1 "$DIR"/*.po | while read FILE; do
- basename -s .po "$FILE";
- done > "$LINGUAS_FILE"
-}
-
-firstword() {
- echo "$1"
-}
-
-read_linguas() {
- local FILE="$1"
- echo " - read $FILE"
- while read LINE; do
- local CODE="$(firstword $LINE)"
- if ! -z "$CODE" ; then
- CODE_MAP$CODE="$CODE"
- NAME_MAP$CODE=""
- COMMENT_MAP$CODE=" <------- TODO: Set language name and remove this comment"
- else
- echo "$LINE" >> "$TMPFILE"
- fi
- done < "$FILE"
-}
-
-update_languages_inc() {
- local LANGUAGES_FILE="synfig-studio/src/languages.inc.c"
- echo "update LANGUAGES_FILE"
-
- local TMPFILE="$LANGUAGES_FILE.process"
- rm -f "$TMPFILE"
-
- declare -A CODE_MAP
- declare -A NAME_MAP
- declare -A COMMENT_MAP
-
- read_linguas "synfig-core/po/LINGUAS"
- read_linguas "synfig-studio/po/LINGUAS"
-
- echo " - read $LANGUAGES_FILE"
- while read LINE; do
- local COMMENT="$(echo "$LINE" | sed "s|//|#|" | cut -d \# -f 2- -s)"
- local SUBLINE="$(echo "$LINE" | sed "s|//|#|" | cut -d \# -f 1)"
- local CODE="$(echo "$SUBLINE" | cut -d \" -f 2)"
- local NAME="$(echo "$SUBLINE" | cut -d \" -f 4)"
- if ! -z "$CODE" || ! -z "$NAME" ; then
- CODE_MAP$CODE="$CODE"
- NAME_MAP$CODE="$NAME"
- COMMENT_MAP$CODE="$COMMENT"
- else
- # write all unknown rows to beginning of file
- echo "$LINE" >> "$TMPFILE"
- fi
- done < "$LANGUAGES_FILE"
-
- # fit the columns to make beautifulest table in the world
- local CODE_LEN=0
- local NAME_LEN=0
- for i in ${!CODE_MAP@}; do
- if ${#CODE_MAP$i} -gt $CODE_LEN ; then
- CODE_LEN=${#CODE_MAP$i}
- fi
- if ${#NAME_MAP$i} -gt $NAME_LEN ; then
- NAME_LEN=${#NAME_MAP$i}
- fi
- done
- CODE_LEN=$((CODE_LEN+3))
- NAME_LEN=$((NAME_LEN+3))
-
- # sort
- SORTED=$(for i in ${!CODE_MAP@}; do echo $i; done | sort | while read l; do echo -n "$l "; done)
-
- # write languages
- NEW_LANGS=
- for i in $SORTED; do
- CODE=${CODE_MAP$i}
- NAME=${NAME_MAP$i}
- COMMENT=${COMMENT_MAP$i}
- if ! -z "$COMMENT" ; then
- COMMENT=" // $COMMENT"
- fi
- if -z "$NAME" ; then
- NEW_LANGS="$NEW_LANGS $CODE"
- fi
- printf "{ %-${CODE_LEN}s %-${NAME_LEN}s },%s\\n" "\"$CODE\"," "\"$NAME\"," "$COMMENT" >> "$TMPFILE"
- done
-
- # update file
- mv $TMPFILE $LANGUAGES_FILE
-
- if ! -z "$NEW_LANGS" ; then
- echo ""
- echo "please, enter names for following languages:$NEW_LANGS"
- echo ""
- echo "see file $LANGUAGES_FILE"
- echo ""
- fi
-}
-
-
-cd "$(cd `dirname "$0"`; pwd)/.."
-
-update_linguas "synfig-core/po"
-update_linguas "synfig-studio/po"
-update_languages_inc
-echo "done"

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/win32-specific.nsh Deleted

_service:obs_scm:synfig-1.5.3.obscpio/autobuild/win64-specific.nsh Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/README.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/genete Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/genete/000011.txt Deleted

@@ -1,32 +0,0 @@
-Subject: Edit a parent parameter waypoint doesn't seems to work
-
-Create a skeleton, go to animation mode, modify the parent paramter of a bone.
-It creates a waypoint. Expand the bone and right click the waypoint.
-It would open a dialog to edit the parent paramter.
-The drop down list doesn't seems to work.
-
-------------------------------------------------------------------------
-
-When I right-click a waypoint, I see a menu, not a dialog.  The menu
-seems to act as it should.  Did you mean 'menu' where you wrote
-'dialog'?  Or did you mean to say that I should click 'Edit' to get
-the edit dialog?  And what exactly doesn't work?
-
-------------------------------------------------------------------------
-
-(10:54:18) Genete: Create a skeleton, go to animation mode, modify the
-		   parent paramter of a bone.   It creates a waypoint
-		   (the waypoint is created in the parent parameter of
-		   the bone). Expand the bone and right click the
-		   waypoint of the parent parameter of the bone. It
-		   would offer a context menu (Jump to, Delete, Edit,
-		   Both, In, Out, etc.). Select Edit context menu
-		   entry. It would open a dialog window to edit the
-		   parent paramter.  The drop down list (in the dialog
-		   window) doesn't seems to work. Try to use the drop
-		   down list to select other parent bone and it
-		   remains unchanged
-(10:48:48) Genete: and some messages are placed in the terminal saying
-		   that 0 bones were found blabla
-
-------------------------------------------------------------------------

_service:obs_scm:synfig-1.5.3.obscpio/bugs/new Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/open Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/open/000008.txt Deleted

@@ -1,24 +0,0 @@
-Subject: Node::remove_child() is called carelessly
-
-A couple of recent bugs have been caused by remove_child() removing a
-node from the parent_set when it shouldn't have, due to a sibling
-using the same node.  One case was with two layer parameters linked to
-each other, and the other was two sub-parameters of the Switch
-valuenode being linked to each other.
-
-This same type of bug seems to be present in other places too, and
-should be killed.
-
-------------------------------------------------------------------------
-
-The two fixed bugs were:
-
-2353284: If two parameters in the same layer are connected to the same
-r2291	 valuenode and we disconnect one of them, the parent-child
-	 relationship for the remaining connection was being deleted.
-	 Now we search the parameter list to see if another parameter
-	 uses the same valuenode.
-
-2412072: Don't remove a node from the parent set of a linkable
-r2311	 valuenode when replacing a link if the link is still in use
-	 by one of the sibling links.

_service:obs_scm:synfig-1.5.3.obscpio/bugs/open/000014.txt Deleted

@@ -1,40 +0,0 @@
-Subject: Convert the Setup Origin or the Animated Origin subparams of a bone can lead a loop
-
-When the Setup Origin or the Animated Origin subparameters of a bone were available they
-can potentially converted to be a bone influence type so they can have a bone in the
-bone weight pair list. That bone could be linked to the bone itself so it can produce
-a loop.
-That convert types should not be allowed for the vertex type subparams of the bone
-or there must be a checking to prevent that bone sub-subparam being linked to any other bone reference
-that has the bone in question as parent or linked.
-
-------------------------------------------------------------------------
-
-Example
-
-Bone1 <---------------------------------------------------
-	Animated Origin (Bone Influence converted) |
-		Vertex Free |
-		Vertex Animated |
-		Bone Influence List |
-			BoneWeightPair1 |
-				Bone <--------------------------------
-				Weight
-	Setup Vertex
-	Animated Angle
-	Setup Angle
-	Length
-	Scale
-	Strength
-	Parent
-
-------------------------------------------------------------------------
-dooglus, Wed Dec 31 15:47:35 CET 2008
-
- 1. make a skeleton
- 2. add a bone to it, set the parent to 'none'
- 3. convert bone1's origin to bone influence
- 4. edit the bone in the bwp to be bone2
- 5. export the bwp list
- 6. convert bone2's origin to bone influence
- 7. connect bone2's origin's bwp list to the exported list

_service:obs_scm:synfig-1.5.3.obscpio/bugs/open/000026.txt Deleted

@@ -1,60 +0,0 @@
-Subject: edit a valuenode-valued waypoint doesn't trigger update of parent
-
-Example: ~chris/Desktop/anim/dynamic-waypoints.sifz
-
-set preview quality to 1 (best) and the time to be 5s
-edit the 'left rate' child node to be 1 instead of 0.
-the workarea doesn't reflect any change.
-move the time slider away from 5s and back to 5s.
-the workarea now reflects the change.
-
-Usually when a node is edited, the on_changed() methods cause all
-ancestors of the node to update themselves, but waypoints don't
-inherit from Node, and so don't have the concept of a parent_set to
-update when changed.
-
-The use of valuenodes as the value of waypoints is unusual in synfig,
-but the addition of bones makes it more common, since re-parenting
-causes the use of valuenode waypoints.
-
-Example: ~chris/Desktop/anim/bones/test2.sifz
-
-Select either of the 'anim' layers, edit the bone ducks, note that
-nothing gets updated.
-
-------------------------------------------------------------------------
-dooglus, Fri Jan  2 14:27:07 CET 2009
-
-a simple recipe:
-
-1. new document, make a circle, export the radius as 'r' ('r' is a ValueNode_Const)
-2. disconnect the radius, switch to animate edit mode, edit the radius, creating a waypoint
-3. in the Children tab, select 'r'
-4. in the Timetrack tab, right-click the waypoint
-5. 'connect' (the waypoint now has a ValueNode_Const value)
-6. switch out of animate edit mode
-7. in the Children tab, edit the value of 'r'
-8. watch the circle's radius fail to change
-9. slide the time slider, and see the radius change
-
-------------------------------------------------------------------------
-dooglus, Fri Jan  2 21:03:37 CET 2009
-
-Here's a patch that fixes the bug for the exact recipe above, but it
-must miss lots of similar cases.  The problem is that there's code
-spread all over that can add and modify waypoints.  We need a single
-function that does it, so we can make sure the parent_set is kept
-correctly up to date:
-
-diff --git a/synfig-studio/trunk/src/synfigapp/actions/waypointconnect.cpp b/synfig-studio/trunk/src/synfigapp/actions/waypointconnect.cpp
-index f86cc1e..9b304a6 100644
---- a/synfig-studio/trunk/src/synfigapp/actions/waypointconnect.cpp
-+++ b/synfig-studio/trunk/src/synfigapp/actions/waypointconnect.cpp
-@@ -134,6 +134,7 @@ Action::WaypointConnect::perform()
- 
- 	old_value_node=iter->get_value_node();
- 	iter->set_value_node(new_value_node);
-+	iter->get_parent_value_node()->add_child(new_value_node.get());
- 
- 	/*set_dirty(true);
-

_service:obs_scm:synfig-1.5.3.obscpio/bugs/open/000027.txt Deleted

@@ -1,207 +0,0 @@
-Subject: Crash when close old file
-
-Open /home/carlos/Animación/donempinado-/synfig/Montaje.sifz
-It complains about some png and jpg missing and that's not the problem
-The file looks fine
-Close the file and ss-debug crash.
-
-------------------------------------------------------------------------
-backtrace:
-
-Program received signal SIGSEGV, Segmentation fault.
-Switching to Thread 0x7ff0db2da780 (LWP 27987)
-0x000000000454a470 in ?? ()
-(gdb) where
-#0 0x000000000454a470 in ?? ()
-#1 0x0000000000705572 in handle (this=0x7fffe330f570, x=0x4549b10)
- at /home/carlos/Software/Synfig-git/install/include/ETL/_handle.h:175
-#2 0x0000000000705593 in etl::loose_handle<synfig::Canvas>::operator etl::handle<synfig::Canvas> (this=0x81ae100)
- at /home/carlos/Software/Synfig-git/install/include/ETL/_handle.h:748
-#3 0x00007ff0da7db025 in synfig::ValueBase::clear (this=0x81f9888)
- at value.cpp:255
-#4 0x00007ff0da7db228 in ~ValueBase (this=0x81f9888) at value.cpp:98
-#5 0x00007ff0da8703d6 in ~ValueNode_Const (this=0x81f9700)
- at valuenode_const.cpp:112
-#6 0x00000000006e4699 in etl::shared_object::unref (this=0x81f9700)
- at /home/carlos/Software/Synfig-git/install/include/ETL/_handle.h:115
-#7 0x00000000006fd6f3 in etl::handle<synfig::ValueNode>::detach (
- this=0x83ae908)
- at /home/carlos/Software/Synfig-git/install/include/ETL/_handle.h:240
-#8 0x0000000000751178 in etl::rhandle<synfig::ValueNode>::detach (
- this=0x83ae908)
- at /home/carlos/Software/Synfig-git/install/include/ETL/_handle.h:553
-#9 0x000000000075119e in ~rhandle (this=0x83ae908)
- at /home/carlos/Software/Synfig-git/install/include/ETL/_handle.h:466
-#10 0x0000000000751456 in ~Waypoint (this=0x83ae8f0)
- at /home/carlos/Software/Synfig-git/install/include/synfig-0.0/synfig/waypoi---Type <return> to continue, or q <return> to quit---
-nt.h:57
-#11 0x00007ff0dae1b8a8 in std::_Destroy<synfig::Waypoint> (__pointer=0x83ae8f0)
- at /usr/include/c++/4.3/bits/stl_construct.h:88
-#12 0x00007ff0dae1b8c5 in std::_Destroy<synfig::Waypoint*> (__first=0x83ae8f0,
- __last=0x83aeab8) at /usr/include/c++/4.3/bits/stl_construct.h:103
-#13 0x00007ff0dae1b8fa in std::_Destroy<synfig::Waypoint*, synfig::Waypoint> (
- __first=0x83ae8f0, __last=0x83aeab8)
- at /usr/include/c++/4.3/bits/stl_construct.h:128
-#14 0x00007ff0dae1d397 in ~vector (this=0x8398838)
- at /usr/include/c++/4.3/bits/stl_vector.h:300
-#15 0x00007ff0da829e35 in ~ValueNode_Animated (this=0x83986b0)
- at valuenode_animated.cpp:1097
-#16 0x00007ff0da833a4d in ~_Constant (this=0x83986b0)
- at valuenode_animated.cpp:536
-#17 0x00000000006e4699 in etl::shared_object::unref (this=0x83986b0)
- at /home/carlos/Software/Synfig-git/install/include/ETL/_handle.h:115
-#18 0x00000000006fd6f3 in etl::handle<synfig::ValueNode>::detach (
- this=0x81f9bd8)
- at /home/carlos/Software/Synfig-git/install/include/ETL/_handle.h:240
-#19 0x0000000000751178 in etl::rhandle<synfig::ValueNode>::detach (
- this=0x81f9bd8)
- at /home/carlos/Software/Synfig-git/install/include/ETL/_handle.h:553
-#20 0x000000000075119e in ~rhandle (this=0x81f9bd8)
----Type <return> to continue, or q <return> to quit---
-
-------------------------------------------------------------------------
-dooglus, Sun Jan 4 18:21:26 CET 2009
-
-Here's valgrind output:
-
- Invalid read of size 8
- at 0x70556C: etl::handle<synfig::Canvas>::handle(synfig::Canvas*) (_handle.h:175)
- by 0x7055A2: etl::loose_handle<synfig::Canvas>::operator etl::handle<synfig::Canvas>() const (_handle.h:748)
- by 0x53F5244: synfig::ValueBase::clear() (value.cpp:255)
- by 0x53F5447: synfig::ValueBase::~ValueBase() (value.cpp:98)
- by 0x548ABE1: synfig::ValueNode_Const::~ValueNode_Const() (valuenode_const.cpp:112)
- by 0x6E46A8: etl::shared_object::unref() const (_handle.h:115)
- by 0x6FD702: etl::handle<synfig::ValueNode>::detach() (_handle.h:240)
- by 0x751187: etl::rhandle<synfig::ValueNode>::detach() (_handle.h:553)
- by 0x7511AD: etl::rhandle<synfig::ValueNode>::~rhandle() (_handle.h:466)
- by 0x751465: synfig::Waypoint::~Waypoint() (waypoint.h:57)
- by 0x4FB7A6B: void std::_Destroy<synfig::Waypoint>(synfig::Waypoint*) (stl_construct.h:88)
- by 0x4FB7A88: void std::_Destroy<synfig::Waypoint*>(synfig::Waypoint*, synfig::Waypoint*) (stl_construct.h:103)
- by 0x4FB7ABD: void std::_Destroy<synfig::Waypoint*, synfig::Waypoint>(synfig::Waypoint*, synfig::Waypoint*, ...) (stl_construct.h:128)
- by 0x4FB95D0: std::vector<synfig::Waypoint, std::allocator<synfig::Waypoint> >::~vector() (stl_vector.h:300)
- by 0x5444054: synfig::ValueNode_Animated::~ValueNode_Animated() (valuenode_animated.cpp:1118)
- by 0x544DFD6: _Constant<etl::loose_handle<synfig::Canvas> >::~_Constant() (valuenode_animated.cpp:536)
- by 0x6E46A8: etl::shared_object::unref() const (_handle.h:115)
- by 0x6FD702: etl::handle<synfig::ValueNode>::detach() (_handle.h:240)
- by 0x751187: etl::rhandle<synfig::ValueNode>::detach() (_handle.h:553)
- by 0x7511AD: etl::rhandle<synfig::ValueNode>::~rhandle() (_handle.h:466)
- by 0x553B261: std::pair<std::string const, etl::rhandle<synfig::ValueNode> >::~pair() (stl_pair.h:73)
- by 0x5564068: std::map<std::string, etl::rhandle<synfig::ValueNode>, ...>::erase(...) (stl_map.h:523)
- by 0x555F392: synfig::Layer::~Layer() (layer.cpp:166)
- by 0x5401F68: synfig::Layer_Composite::~Layer_Composite() (layer_composite.h:49)
- by 0x5412421: synfig::Layer_PasteCanvas::~Layer_PasteCanvas() (layer_pastecanvas.cpp:110)
- by 0x6E46A8: etl::shared_object::unref() const (_handle.h:115)
- by 0x6FD7C0: etl::handle<synfig::Layer>::detach() (_handle.h:240)
- by 0x6FD7D8: etl::handle<synfig::Layer>::~handle() (_handle.h:186)
- by 0x55283D0: synfig::Canvas::clear() (canvas.cpp:158)
- by 0x552BF7D: synfig::Canvas::~Canvas() (canvas.cpp:121)
-
- by 0x6E46A8: etl::shared_object::unref() const (_handle.h:115)
- by 0x6FD818: etl::handle<synfig::Canvas>::detach() (_handle.h:240)
- by 0x6FD830: etl::handle<synfig::Canvas>::~handle() (_handle.h:186)
- by 0x5001164: __gnu_cxx::new_allocator<etl::handle<synfig::Canvas> >::destroy(etl::handle<synfig::Canvas>*) (new_allocator.h:118)
- by 0x5001FDB: std::_List_base<etl::handle<synfig::Canvas>, std::allocator<etl::handle<synfig::Canvas> > >::_M_clear() (list.tcc:78)
- by 0x5002045: std::_List_base<etl::handle<synfig::Canvas>, std::allocator<etl::handle<synfig::Canvas> > >::~_List_base() (stl_list.h:358)
- by 0x50020A0: std::list<etl::handle<synfig::Canvas>, std::allocator<etl::handle<synfig::Canvas> > >::~list() (stl_list.h:417)
- by 0x552C636: synfig::Canvas::~Canvas() (canvas.cpp:123)
- by 0x6E46A8: etl::shared_object::unref() const (_handle.h:115)
- by 0x6FD818: etl::handle<synfig::Canvas>::detach() (_handle.h:240)
- by 0x6FD830: etl::handle<synfig::Canvas>::~handle() (_handle.h:186)
- by 0x8BFEFA: studio::WorkArea::~WorkArea() (workarea.cpp:833)
- by 0x7F49B7: std::auto_ptr<studio::WorkArea>::~auto_ptr() (auto_ptr.h:173)
- by 0x7E9934: studio::CanvasView::~CanvasView() (in /home/chris/programs/synfig/git/install/bin/synfigstudio)
- by 0x6E46A8: etl::shared_object::unref() const (_handle.h:115)
- by 0x6E7269: etl::handle<studio::CanvasView>::detach() (_handle.h:240)
- by 0x6E7280: etl::handle<studio::CanvasView>::~handle() (_handle.h:186)
-
- Address 0x17484b50 is 0 bytes inside a block of size 1,080 free'd
- at 0x4C24DAD: operator delete(void*) (vg_replace_malloc.c:342)
- by 0x552CB46: synfig::Canvas::~Canvas() (canvas.cpp:123)
- by 0x6E46A8: etl::shared_object::unref() const (_handle.h:115)
- by 0x6FD818: etl::handle<synfig::Canvas>::detach() (_handle.h:240)
- by 0x6FD830: etl::handle<synfig::Canvas>::~handle() (_handle.h:186)
- by 0x5001164: __gnu_cxx::new_allocator<etl::handle<synfig::Canvas> >::destroy(etl::handle<synfig::Canvas>*) (new_allocator.h:118)
- by 0x5001FDB: std::_List_base<etl::handle<synfig::Canvas>, std::allocator<etl::handle<synfig::Canvas> > >::_M_clear() (list.tcc:78)
- by 0x5002045: std::_List_base<etl::handle<synfig::Canvas>, std::allocator<etl::handle<synfig::Canvas> > >::~_List_base() (stl_list.h:358)
- by 0x50020A0: std::list<etl::handle<synfig::Canvas>, std::allocator<etl::handle<synfig::Canvas> > >::~list() (stl_list.h:417)
- by 0x552C636: synfig::Canvas::~Canvas() (canvas.cpp:123)
-
- by 0x6E46A8: etl::shared_object::unref() const (_handle.h:115)
- by 0x6FD818: etl::handle<synfig::Canvas>::detach() (_handle.h:240)
- by 0x6FD830: etl::handle<synfig::Canvas>::~handle() (_handle.h:186)
- by 0x5001164: __gnu_cxx::new_allocator<etl::handle<synfig::Canvas> >::destroy(etl::handle<synfig::Canvas>*) (new_allocator.h:118)
- by 0x5001FDB: std::_List_base<etl::handle<synfig::Canvas>, std::allocator<etl::handle<synfig::Canvas> > >::_M_clear() (list.tcc:78)
- by 0x5002045: std::_List_base<etl::handle<synfig::Canvas>, std::allocator<etl::handle<synfig::Canvas> > >::~_List_base() (stl_list.h:358)
- by 0x50020A0: std::list<etl::handle<synfig::Canvas>, std::allocator<etl::handle<synfig::Canvas> > >::~list() (stl_list.h:417)
- by 0x552C636: synfig::Canvas::~Canvas() (canvas.cpp:123)
- by 0x6E46A8: etl::shared_object::unref() const (_handle.h:115)
- by 0x6FD818: etl::handle<synfig::Canvas>::detach() (_handle.h:240)
- by 0x6FD830: etl::handle<synfig::Canvas>::~handle() (_handle.h:186)
- by 0x8BFEFA: studio::WorkArea::~WorkArea() (workarea.cpp:833)
- by 0x7F49B7: std::auto_ptr<studio::WorkArea>::~auto_ptr() (auto_ptr.h:173)
- by 0x7E9934: studio::CanvasView::~CanvasView() (in /home/chris/programs/synfig/git/install/bin/synfigstudio)
- by 0x6E46A8: etl::shared_object::unref() const (_handle.h:115)
- by 0x6E7269: etl::handle<studio::CanvasView>::detach() (_handle.h:240)
- by 0x6E7280: etl::handle<studio::CanvasView>::~handle() (_handle.h:186)
- by 0x86A1DF: studio::Instance::safe_close() (instance.cpp:709)
- by 0x77C2D5: studio::App::quit() (app.cpp:1776)
-
-------------------------------------------------------------------------
-dooglus, Sun Jan 4 20:42:52 CET 2009
-
-Here's a simple .sifz file that causes the same crash:
-
- <?xml version="1.0"?>
- <canvas>
- <defs>
- <canvas id="xxx">
- <defs>
- <canvas id="yyy"></canvas>
- </defs>
- </canvas>
- <canvas id="zzz">
- <layer type="PasteCanvas" active="true" version="0.1">
- <param name="canvas">
- <animated type="canvas">
- <waypoint time="0s" use=":xxx:yyy"/>
- </animated>
- </param>
- </layer>
- </canvas>
- </defs>
- </canvas>
-
-The bug always happened, it just didn't crash before. valgrind shows
-the same error in the svn version. It started showing up after the
-revision with commit message:
- "Define ref() and unref() as virtual so they can be overridden in
- derived classes."
-with this diff:
-
-------------------------------------------------------------------------
---- a/ETL/trunk/ETL/_handle.h
-+++ b/ETL/trunk/ETL/_handle.h
-@@ -81,7 +81,7 @@ protected:
- #endif
-
- public:
--	void ref()const
-+	virtual void ref()const
- 	{
- #ifdef ETL_LOCK_REFCOUNTS
- 		etl::mutex::lock lock(mtx);
-@@ -91,7 +91,7 @@ public:
- 	}
-
- 	//! Returns \c false if object needs to be deleted
--	bool unref()const
-+	virtual bool unref()const
- 	{
- 		bool ret = true;
- 		{
-------------------------------------------------------------------------
-I've updated to the patch you proposed at the following git commit:
-606daa09d274196be856a6f7a0fa35f934d00a7f
-and the crash has dissapeared.
-I don't see any "error: 1 canvas(es) not yet deleted!" message.
-------------------------------------------------------------------------

_service:obs_scm:synfig-1.5.3.obscpio/bugs/open/summary.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/rejected Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/rejected/000001.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/rejected/000005.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000003.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000004.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000006.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000009.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000010.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000011.txt Deleted

@@ -1,33 +0,0 @@
-Subject: Edit a parent parameter waypoint doesn't seems to work
-
-Create a skeleton, go to animation mode, modify the parent paramter of a bone.
-It creates a waypoint. Expand the bone and right click the waypoint.
-It would open a dialog to edit the parent paramter.
-The drop down list doesn't seems to work.
-
-------------------------------------------------------------------------
-
-When I right-click a waypoint, I see a menu, not a dialog.  The menu
-seems to act as it should.  Did you mean 'menu' where you wrote
-'dialog'?  Or did you mean to say that I should click 'Edit' to get
-the edit dialog?  And what exactly doesn't work?
-
-------------------------------------------------------------------------
-
-(10:54:18) Genete: Create a skeleton, go to animation mode, modify the
-		   parent paramter of a bone.   It creates a waypoint
-		   (the waypoint is created in the parent parameter of
-		   the bone). Expand the bone and right click the
-		   waypoint of the parent parameter of the bone. It
-		   offers a context menu (Jump to, Delete, Edit,
-		   Both, In, Out, etc.). Select Edit context menu
-		   entry. It opens a dialog window to edit the
-		   parent paramter.  The drop down list (in the dialog
-		   window) doesn't seem to work. Try to use the drop
-		   down list to select a different parent bone and it
-		   remains unchanged
-
-------------------------------------------------------------------------
-
-Resolved: it's just a case of putting the currently selected value at
-the top of the menu.

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000012.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000013.txt Deleted

@@ -1,32 +0,0 @@
-Subject: Insert Item smart in Bone Weight Pair List Crash
-
-Create a Bline, expand a vertex and do right click on the Vertice parameter.
-Convert it to Bone Influence. Expand the convert type and select the first item
-of the Bone Weight Pair list. Do right click "Insert Item Smart".
-It crashes.
-
-Console message:
-synfig(10168) 00:57:16 warning: ValueNode_StaticList::operator()():List type/item type mismatch, throwing away mismatch
-value.h:246 !'matrix'.same_type_as('bone_weight_pair')
-ss-debug: value.h:248: const T& synfig::ValueBase::get(const T&) const with T = synfig::BoneWeightPair: Assertion `is_valid() && same_type_as(x)' failed
-
-------------------------------------------------------------------------
-It crashes too if you delete item smart
-
-------------------------------------------------------------------------
-dooglus, Tue Dec 16 00:13:19 CET 2008
-
-'insert' no longer seems to crash.
-'delete' still crashes.
-in valuenode_staticlist.cpp, the "if(get_non_inline_ancestor_canvas())" fails, so this never runs:
-	get_non_inline_ancestor_canvas()->invoke_signal_value_node_child_removed(this,value_node);
-so the param tree isn't redrawn.  it's the same as this bug:
-	https://sourceforge.net/tracker2/?func=detail&aid=1420091&group_id=144022&atid=757416
-
-the canvas of the static_list is null.
-cloning (copy/paste) or duplicating the bline layer and doing the delete in the new copy doesn't crash
-
-------------------------------------------------------------------------
-dooglus, Tue Dec 16 17:54:34 CET 2008
-
-Fixed.

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000015.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000016.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000017.txt Deleted

@@ -1,41 +0,0 @@
-Subject: Vertices converted to Bone Influence saved to file doesn't load
-
-Create a bline, convert the Vertex paramterer to Bone Influence
-Save
-Close ss
-Open ss and load the saved file. It fails.
-
-------------------------------------------------------------------------
-But if you create a skeleton, and link the bones form the Bone Influence
-to exported bones of the skeleton and clear the history (to remove the bones
-form the Bone influence) you can save and load the file properly.
-
-------------------------------------------------------------------------
-dooglus, Tue Dec 16 01:09:13 CET 2008
-
-The bone in the BoneInfluence node doesn't have its canvas set, and so
-it isn't saved in the <bones> section of the canvas when it's saved.
-Most of these bugs seem to be related to the canvas not being set.
-
-------------------------------------------------------------------------
-dooglus, Tue Dec 16 11:58:39 CET 2008
-
-the bone is created here:
-
-(gdb) where
-#0 ValueNode_Bone (this=0x2dd65b0, value=@0x7fff0dca0220) at valuenode_bone.cpp:232
-#1 synfig::ValueNode_Bone::create (x=@0x7fff0dca0220) at valuenode_bone.cpp:296
-#2 ValueNode_BoneWeightPair (this=0x2dd62c0, value=@0x7fff0dca05d0) at valuenode_boneweightpair.cpp:66
-#3 synfig::ValueNode_BoneWeightPair::create (x=@0x7fff0dca05d0) at valuenode_boneweightpair.cpp:98
-#4 ValueNode_BoneInfluence (this=0x2dd5db0, x=@0x7fff0dca06e0) at valuenode_boneinfluence.cpp:69
-#5 synfig::ValueNode_BoneInfluence::create (x=@0x7fff0dca0860) at valuenode_boneinfluence.cpp:85
-#6 synfig::LinkableValueNode::create (name=@0x2dd5140, x=@0x7fff0dca0860) at valuenode.cpp:259
-#7 synfigapp::Action::ValueDescConvert::prepare (this=0x2dd50a0) at actions/valuedescconvert.cpp:168
-#8 synfigapp::Action::Super::perform (this=0x2dd50a0) at action.cpp:396
-#9 synfigapp::Action::System::perform_action (this=0x2bebe00, action={obj = 0x7fff0dca1280}) at action_system.cpp:128
-#10 synfigapp::CanvasInterface::convert (... , canvas = {obj = 0x7fff0dca12e0}}, ...) at canvasinterface.cpp:383
-
-------------------------------------------------------------------------
-dooglus, Tue Dec 16 17:37:36 CET 2008
-
-Fixed in the most recent commit.

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000018.txt Deleted

@@ -1,34 +0,0 @@
-Subject: Edit context menu entry is not shown for waypoints of parent params
-
-New skeleton, go to animation mode
-animate the parent of any bone
-In the Time track or the param time track
-right click on the waypoint doesn't show the
-"Edit" entry. Before it was shown.
-
-------------------------------------------------------------------------
-dooglus, Tue Dec 16 03:44:36 CET 2008
-
-layertree.cpp "if (param_tree_store_->find_first_value_node(value_node, row) && row)"
-isn't finding the valuenode in the parameter panel.  that's why the
-edit menu entry isn't being shown.
-
-if I
-	export SYNFIG_DISABLE_EXPANDABLE_BONE_PARENTS=1
-then it works, and:
-     canvastreestore.cpp:367 CanvasTreeStore::find_first_value_node vn = ValueNode_Animated
-     layertree.cpp:761 found 'ValueNode (Skeleton):Bones>Static List:Item 001>Bone:Parent'
-
-if I
-	unset SYNFIG_DISABLE_EXPANDABLE_BONE_PARENTS
-then it doesn't work, and:
-     canvastreestore.cpp:367 CanvasTreeStore::find_first_value_node vn = ValueNode_Animated
-     layertree.cpp:764 didn't find
-
-SYNFIG_DISABLE_EXPANDABLE_BONE_PARENTS affects only canvastreestore.cpp's:
-	CanvasTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc, bool do_children)
-
-------------------------------------------------------------------------
-dooglus, Tue Dec 16 10:31:40 CET 2008
-
-Fixed.

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000019.txt Deleted

@@ -1,69 +0,0 @@
-Subject: Unexport a exported bone crash
-
-Recipe:
-Create a new skeleton layer
-Export a parent parameter
-save the file
-unexport the valuenode
-crash
-
-------------------------------------------------------------------------
-
-
-------------------------------------------------------------------------
-
-#0 0x00007f28581a1fd5 in raise () from /lib/libc.so.6
-#1 0x00007f28581a3b43 in abort () from /lib/libc.so.6
-#2 0x00007f2858cced9e in g_logv () from /usr/lib/libglib-2.0.so.0
-#3 0x00007f2858ccee33 in g_log () from /usr/lib/libglib-2.0.so.0
-#4 0x00007f285c2abe28 in Glib::exception_handlers_invoke ()
- from /usr/lib/libglibmm-2.4.so.1
-#5 0x00007f285d903254 in Gtk::TreeModel_Class::get_value_vfunc_callback (
- self=0x32ea320, iter=0x7fff6745fda0, column=3, value=0x7fff6745fc50)
- at treemodel.cc:1255
-#6 0x00007f285cb3bce2 in IA__gtk_tree_view_column_cell_set_cell_data (
- tree_column=0x32f0980, tree_model=0x32ea320, iter=0x7fff6745fda0,
- is_expander=0, is_expanded=0)
- at /build/buildd/gtk+2.0-2.14.4/gtk/gtktreeviewcolumn.c:2550
-#7 0x00007f285cb35f17 in gtk_tree_view_bin_expose (widget=0x2a7f280,
- event=0x7fff67460450)
- at /build/buildd/gtk+2.0-2.14.4/gtk/gtktreeview.c:4380
-#8 0x00007f285cb37965 in gtk_tree_view_expose (widget=0x25c6,
- event=0x7fff67460450)
- at /build/buildd/gtk+2.0-2.14.4/gtk/gtktreeview.c:4945
-#9 0x00007f285ca46908 in _gtk_marshal_BOOLEAN__BOXED (closure=0x26c4df0,
- return_value=0x7fff67460130, n_param_values=<value optimized out>,
- param_values=0x7f284805e000, invocation_hint=<value optimized out>,
- marshal_data=0x7f285d918600)
----Type <return> to continue, or q <return> to quit---
- at /build/buildd/gtk+2.0-2.14.4/gtk/gtkmarshalers.c:84
-#10 0x00007f285956f25d in g_closure_invoke () from /usr/lib/libgobject-2.0.so.0
-#11 0x00007f2859584c3b in ?? () from /usr/lib/libgobject-2.0.so.0
-#12 0x00007f285958648a in g_signal_emit_valist ()
- from /usr/lib/libgobject-2.0.so.0
-#13 0x00007f2859586b33 in g_signal_emit () from /usr/lib/libgobject-2.0.so.0
-#14 0x00007f285cb4974e in gtk_widget_event_internal (widget=0x2a7f280,
- event=0x7fff67460450) at /build/buildd/gtk+2.0-2.14.4/gtk/gtkwidget.c:4745
-#15 0x00007f285ca4059d in IA__gtk_main_do_event (event=0x7fff67460450)
- at /build/buildd/gtk+2.0-2.14.4/gtk/gtkmain.c:1553
-#16 0x00007f285be065b5 in gdk_window_process_updates_internal (
- window=0x27e2d30) at /build/buildd/gtk+2.0-2.14.4/gdk/gdkwindow.c:2598
-#17 0x00007f285be06b41 in IA__gdk_window_process_all_updates ()
- at /build/buildd/gtk+2.0-2.14.4/gdk/gdkwindow.c:2664
-#18 0x00007f285c9c8381 in gtk_container_idle_sizer (data=<value optimized out>)
- at /build/buildd/gtk+2.0-2.14.4/gtk/gtkcontainer.c:1309
-#19 0x00007f285bdea95b in gdk_threads_dispatch (data=0x7f2848057da0)
- at /build/buildd/gtk+2.0-2.14.4/gdk/gdk.c:473
-#20 0x00007f2858cc4d3b in g_main_context_dispatch ()
- from /usr/lib/libglib-2.0.so.0
-#21 0x00007f2858cc850d in ?? () from /usr/lib/libglib-2.0.so.0
-#22 0x00007f2858cc8a3d in g_main_loop_run () from /usr/lib/libglib-2.0.so.0
-#23 0x00007f285ca407a7 in IA__gtk_main ()
----Type <return> to continue, or q <return> to quit---
- at /build/buildd/gtk+2.0-2.14.4/gtk/gtkmain.c:1200
-#24 0x0000000000768cf7 in main (argc=0, argv=0x7fff674608a8) at main.cpp:99
-
-------------------------------------------------------------------------
-dooglus, Tue Dec 16 10:39:29 CET 2008
-
-This seems to have been fixed by the previous commit for #18.

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000020.txt Deleted

@@ -1,23 +0,0 @@
-Subject: Inserted BoneWeight pairs in a Bone influence convert type are not available for other bones
-
--Create a fresh file.
--Create a skeleton (it provides bone1, bone2, bone3)
--Create a bline.
--Convert one of the vertices parameter to Bone Influience (from now BI). It provides a bone4
-inside the first automatically created Bone Weight Pair valuenode (from now BWP).
--Expand the Bone Weight List (BWL) and right click on the first BWP.
--Select Insert Item smart. Do it twice. It creates other two BWPs that provide bone5 and bone6.
--Go to the skeleton and try to find the bone6 or 5 in any of the parent param of any bone. You cannot.
--Go to bone4 from the 1st created BWP and try to select bone5 or bone6 form the àrent parameter. You cannot.
--Go to bone5 and select the bone6 form the parent param chooser. You can.
- You should be able to do it for any bone.
-
-------------------------------------------------------------------------
-dooglus, Wed Dec 17 00:46:11 CET 2008
-
-It looks like bones 5 and 6 have a different parent canvas than 1 through 4.
-
-------------------------------------------------------------------------
-dooglus, Wed Dec 17 01:09:59 CET 2008
-
-It's just another case where the canvas wasn't being set.

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000021.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000022.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000023.txt Deleted

@@ -1,27 +0,0 @@
-Subject: origin of a child bone affected badly by Local Length Scale
-& Local Width Scale
-
-Open the file: ~/Animación/bones/weird-origin.sifz
-That file has a skeleton layer, select it
-in local mode try to drag the origin of the child bone a long distance.
-When the origin duck is released it jumps to other position.
-The jump is greater as greater is the duck displacement.
-To avoid that effect just restore the Local Length Scale of the parent
-bone from 0.470404 to 1.0
-When you do that you can drag the origin and it still jumping a little
-amount perpendicualar to the parent bone. It is due to the Loacal Width
-Scale. If you change it from 0.921387 to 1.0 the problem dissapears
-completely.
-Those values are discounted (the value is multiplied by) in some way
-from the drop position of the duck when the mouse is released.
-
-------------------------------------------------------------------------
-dooglus, Wed Dec 24 02:18:46 CET 2008
-
-in my simplified copy ( ~/Desktop/anim/bones/weird-origin.sifz ) drag
-the top bone's origin to see the bug.
-
-------------------------------------------------------------------------
-dooglus, Wed Dec 24 15:16:15 CET 2008
-
-Fixed.

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000024.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/resolved/000025.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/template.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/upstream Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/upstream/000002.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/bugs/upstream/000007.txt Deleted

@@ -1,40 +0,0 @@
-Subject: Duplicate a skeleton layer and delete a bone in the duplicated crash
-
-Add skeleton, duplicate the layer, edit the duplicated and try to delete a
-bone, it crashes.
-
-CONSOLE OUTPUT
-ss-debug: /home/carlos/Software/Synfig-git/install/include/ETL/_handle.h:280: T* etl::handle<T>::operator->() const with T = synfig::ValueNode: Afirmación `obj' fallida.
-Cancelado
-
-Git Revision: "New bug #6"
-(Maybe related with the 000001)
-
-------------------------------------------------------------------------
-
-This also happens in the master branch with blines.
-
-1. draw a bline outline
-2. right-click it and 'duplicate'
-3. select the duplicate (it's the top one in the layer list)
-4. stretch the params dialog so it's about half the screen width and height
-5. expand the vertices
-6. scroll down so the vertices start towards the top of the params panel
-7. remove (smart) the first vertex - it crashes
-
-See sf.net bug #2412776.
-
-------------------------------------------------------------------------
-
-A recent commit mostly fixed the problem, but it still crashes like this:
-
-1. draw a bline outline
-2. encapsulate it
-3. export the canvas parameter
-4. open the new canvas in its own window
-5. focus the new window
-6. copy and paste the outline layer
-7. stretch the params dialog so it's about half the screen width and height
-8. expand the vertices
-9. scroll down so the vertices start towards the top of the params panel
-10. remove (smart) the first vertex - it crashes

_service:obs_scm:synfig-1.5.3.obscpio/cmake/CPackConfig.cmake Deleted

@@ -1,53 +0,0 @@
-set(CPACK_PACKAGE_NAME "Synfig")
-set(CPACK_PACKAGE_VENDOR "Synfig")
-set(CPACK_PACKAGE_VERSION_MAJOR ${STUDIO_VERSION_MAJOR})
-set(CPACK_PACKAGE_VERSION_MINOR ${STUDIO_VERSION_MINOR})
-set(CPACK_PACKAGE_VERSION_PATCH ${STUDIO_VERSION_PATCH})
-set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/packaging/PACKAGING.md")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Create and edit 2D animations and compositions")
-set(CPACK_PACKAGE_HOMEPAGE_URL "https://synfig.org")
-#set(CPACK_PACKAGE_ICON "${SYNFIG_BUILD_ROOT}/share/synfig/icons/classic/logo.png")
-set(CPACK_PACKAGE_CONTACT "https://synfig.org")
-set(CPACK_PROJECT_CONFIG_FILE "${CMAKE_SOURCE_DIR}/cmake/CPackProjectConfig.cmake")
-
-set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE")
-set(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.md")
-
-set(CPACK_PACKAGE_EXECUTABLES "synfigstudio;Synfig Studio")
-set(CPACK_CREATE_DESKTOP_LINKS "synfigstudio")
-if(WIN32)
-    set(CPACK_PACKAGE_INSTALL_DIRECTORY "Synfig")
-else()
-    set(CPACK_PACKAGE_INSTALL_DIRECTORY "synfig")
-endif()
-
-
-## Generator-specific configuration ##
-
-# DEB (Linux .deb bundle)
-set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON)
-set(CPACK_DEBIAN_PACKAGE_SECTION "animation")
-if(LINUX)
-    set(CPACK_DEB_COMPONENT_INSTALL ON)
-    set(CPACK_COMPONENTS_ALL_IN_ONE_PACKAGE 1)
-endif()
-
-# NSIS (Windows .exe installer)
-
-set(CPACK_NSIS_MUI_ICON "${SYNFIG_BUILD_ROOT}/share/synfig/icons/classic/synfig_icon.ico")
-set(CPACK_NSIS_MUI_HEADERIMAGE "${CMAKE_SOURCE_DIR}/packaging/nsis/header.bmp")
-set(CPACK_NSIS_MUI_WELCOMEFINISHPAGE_BITMAP "${CMAKE_SOURCE_DIR}/packaging/nsis/welcomefinish.bmp")
-set(CPACK_NSIS_INSTALLED_ICON_NAME "bin/synfigstudio.exe")
-set(CPACK_NSIS_HELP_LINK "${CPACK_PACKAGE_HOMEPAGE_URL}")
-set(CPACK_NSIS_URL_INFO_ABOUT "${CPACK_PACKAGE_HOMEPAGE_URL}")
-set(CPACK_NSIS_MENU_LINKS "${CPACK_PACKAGE_HOMEPAGE_URL}" "Synfig Homepage")
-set(CPACK_NSIS_COMPRESSOR "/SOLID lzma") # zlib|bzip2|lzma
-set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL ON)
-set(CPACK_NSIS_MODIFY_PATH ON) # while the name does not suggest it, this also provides the possibility to add desktop icons
-set(CPACK_NSIS_MUI_FINISHPAGE_RUN "synfigstudio") # TODO: this results in instance with administrative privileges!
-
-set(CPACK_NSIS_COMPRESSOR "${CPACK_NSIS_COMPRESSOR}\n  SetCompressorDictSize 64") # hack (improve compression)
-set(CPACK_NSIS_COMPRESSOR "${CPACK_NSIS_COMPRESSOR}\n  BrandingText '${CPACK_PACKAGE_DESCRIPTION_SUMMARY}'") # hack (overwrite BrandingText)
-
-include(CPack)

_service:obs_scm:synfig-1.5.3.obscpio/cmake/CPackProjectConfig.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/cmake/FindPkgConfig.cmake Deleted

@@ -1,997 +0,0 @@
-# Distributed under the OSI-approved BSD 3-Clause License. See accompanying
-# file Copyright.txt or https://cmake.org/licensing for details.
-
-#========================================.rst:
-FindPkgConfig
--------------
-
-A ``pkg-config`` module for CMake.
-
-Finds the ``pkg-config`` executable and adds the :command:`pkg_get_variable`,
-:command:`pkg_check_modules` and :command:`pkg_search_module` commands. The
-following variables will also be set:
-
-``PKG_CONFIG_FOUND``
- True if a pkg-config executable was found.
-
-``PKG_CONFIG_VERSION_STRING``
- .. versionadded:: 2.8.8
-
- The version of pkg-config that was found.
-
-``PKG_CONFIG_EXECUTABLE``
- The pathname of the pkg-config program.
-
-``PKG_CONFIG_ARGN``
- .. versionadded:: 3.22
-
- A list of arguments to pass to pkg-config.
-
-Both ``PKG_CONFIG_EXECUTABLE`` and ``PKG_CONFIG_ARGN`` are initialized by the
-module, but may be overridden by the user. See `Variables Affecting Behavior`_
-for how these variables are initialized.
-
-#========================================
-
-if("${CMAKE_VERSION}" VERSION_GREATER_EQUAL "3.22")
- message(STATUS "CMake version >= 3.22. Falling back to default FindPkgConfig")
- set(__CMAKE_MODULE_PATH_OLD ${CMAKE_MODULE_PATH})
- set(CMAKE_MODULE_PATH "")
- include(FindPkgConfig)
- set(CMAKE_MODULE_PATH ${__CMAKE_MODULE_PATH_OLD})
- return()
-else()
- message(STATUS "CMake version < 3.22. Using custom FindPkgConfig")
-endif()
-
-cmake_policy(PUSH)
-cmake_policy(SET CMP0054 NEW) # if() quoted variables not dereferenced
-cmake_policy(SET CMP0057 NEW) # if IN_LIST
-
-### Common stuff ####
-set(PKG_CONFIG_VERSION 1)
-
-# find pkg-config, use PKG_CONFIG if set
-if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT "$ENV{PKG_CONFIG}" STREQUAL ""))
- separate_arguments(PKG_CONFIG_FROM_ENV_SPLIT NATIVE_COMMAND PROGRAM SEPARATE_ARGS "$ENV{PKG_CONFIG}")
- list(LENGTH PKG_CONFIG_FROM_ENV_SPLIT PKG_CONFIG_FROM_ENV_SPLIT_ARGC)
- if(PKG_CONFIG_FROM_ENV_SPLIT_ARGC GREATER 0)
- list(GET PKG_CONFIG_FROM_ENV_SPLIT 0 PKG_CONFIG_FROM_ENV_ARGV0)
- if(PKG_CONFIG_FROM_ENV_SPLIT_ARGC GREATER 1)
- list(SUBLIST PKG_CONFIG_FROM_ENV_SPLIT 1 -1 PKG_CONFIG_ARGN)
- endif()
- set(PKG_CONFIG_EXECUTABLE "${PKG_CONFIG_FROM_ENV_ARGV0}" CACHE FILEPATH "pkg-config executable")
- endif()
-endif()
-
-set(PKG_CONFIG_NAMES "pkg-config")
-if(CMAKE_HOST_WIN32)
- set(PKG_CONFIG_NAMES "pkg-config.bat" ${PKG_CONFIG_NAMES})
-endif()
-list(APPEND PKG_CONFIG_NAMES "pkgconf")
-
-find_program(PKG_CONFIG_EXECUTABLE
- NAMES ${PKG_CONFIG_NAMES}
- NAMES_PER_DIR
- DOC "pkg-config executable")
-mark_as_advanced(PKG_CONFIG_EXECUTABLE)
-
-set(PKG_CONFIG_ARGN "${PKG_CONFIG_ARGN}" CACHE STRING "Arguments to supply to pkg-config")
-mark_as_advanced(PKG_CONFIG_ARGN)
-
-set(_PKG_CONFIG_FAILURE_MESSAGE "")
-if (PKG_CONFIG_EXECUTABLE)
- execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} ${PKG_CONFIG_ARGN} --version
- OUTPUT_VARIABLE PKG_CONFIG_VERSION_STRING OUTPUT_STRIP_TRAILING_WHITESPACE
- ERROR_VARIABLE _PKG_CONFIG_VERSION_ERROR ERROR_STRIP_TRAILING_WHITESPACE
- RESULT_VARIABLE _PKG_CONFIG_VERSION_RESULT
- )
-
- if (NOT _PKG_CONFIG_VERSION_RESULT EQUAL 0)
- string(REPLACE "\n" "\n " _PKG_CONFIG_VERSION_ERROR " ${_PKG_CONFIG_VERSION_ERROR}")
- if(PKG_CONFIG_ARGN)
- string(REPLACE ";" " " PKG_CONFIG_ARGN " ${PKG_CONFIG_ARGN}")
- endif()
- string(APPEND _PKG_CONFIG_FAILURE_MESSAGE
- "The command\n"
- " \"${PKG_CONFIG_EXECUTABLE}\"${PKG_CONFIG_ARGN} --version\n"
- " failed with output:\n${PKG_CONFIG_VERSION_STRING}\n"
- " stderr: \n${_PKG_CONFIG_VERSION_ERROR}\n"
- " result: \n${_PKG_CONFIG_VERSION_RESULT}"
- )
- set(PKG_CONFIG_EXECUTABLE "")
- set(PKG_CONFIG_ARGN "")
- unset(PKG_CONFIG_VERSION_STRING)
- endif ()
- unset(_PKG_CONFIG_VERSION_RESULT)
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(PkgConfig
- REQUIRED_VARS PKG_CONFIG_EXECUTABLE
- VERSION_VAR PKG_CONFIG_VERSION_STRING)
-
-# This is needed because the module name is "PkgConfig" but the name of
-# this variable has always been PKG_CONFIG_FOUND so this isn't automatically
-# handled by FPHSA.
-set(PKG_CONFIG_FOUND "${PKGCONFIG_FOUND}")
-
-# Unsets the given variables
-macro(_pkgconfig_unset var)
- # Clear normal variable (possibly set by project code).
- unset(${var})
- # Store as cache variable.
- # FIXME: Add a policy to switch to a normal variable.
- set(${var} "" CACHE INTERNAL "")
-endmacro()
-
-macro(_pkgconfig_set var value)
- # Clear normal variable (possibly set by project code).
- unset(${var})
- # Store as cache variable.
- # FIXME: Add a policy to switch to a normal variable.
- set(${var} ${value} CACHE INTERNAL "")
-endmacro()
-
-# Invokes pkgconfig, cleans up the result and sets variables
-macro(_pkgconfig_invoke _pkglist _prefix _varname _regexp)
- set(_pkgconfig_invoke_result)
-
- execute_process(
- COMMAND ${PKG_CONFIG_EXECUTABLE} ${PKG_CONFIG_ARGN} ${ARGN} ${_pkglist}
- OUTPUT_VARIABLE _pkgconfig_invoke_result
- RESULT_VARIABLE _pkgconfig_failed
- OUTPUT_STRIP_TRAILING_WHITESPACE)
-
- if (_pkgconfig_failed)
- set(_pkgconfig_${_varname} "")
- _pkgconfig_unset(${_prefix}_${_varname})
- else()
- string(REGEX REPLACE "\r\n" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
-
- if (NOT ${_regexp} STREQUAL "")
- string(REGEX REPLACE "${_regexp}" " " _pkgconfig_invoke_result "${_pkgconfig_invoke_result}")
- endif()
-
- # pkg-config can represent "spaces within an argument" by backslash-escaping the space.
- # UNIX_COMMAND mode treats backslash-escaped spaces as "not a space that delimits arguments".
- separate_arguments(_pkgconfig_invoke_result UNIX_COMMAND "${_pkgconfig_invoke_result}")
-
- #message(STATUS " ${_varname} ... ${_pkgconfig_invoke_result}")
- set(_pkgconfig_${_varname} ${_pkgconfig_invoke_result})
- _pkgconfig_set(${_prefix}_${_varname} "${_pkgconfig_invoke_result}")
- endif()
-endmacro()
-
-# Internal version of pkg_get_variable; expects PKG_CONFIG_PATH to already be set
-function (_pkg_get_variable result pkg variable)
- _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
- set("${result}"
- "${prefix_result}"
- PARENT_SCOPE)
-endfunction ()
-
-# Invokes pkgconfig two times; once without '--static' and once with
-# '--static'
-macro(_pkgconfig_invoke_dyn _pkglist _prefix _varname cleanup_regexp)
- _pkgconfig_invoke("${_pkglist}" ${_prefix} ${_varname} "${cleanup_regexp}" ${ARGN})
- _pkgconfig_invoke("${_pkglist}" ${_prefix} STATIC_${_varname} "${cleanup_regexp}" --static ${ARGN})
-endmacro()
-
-# Splits given arguments into options and a package list
-macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
- set(${_is_req} 0)
- set(${_is_silent} 0)
- set(${_no_cmake_path} 0)
- set(${_no_cmake_environment_path} 0)
- set(${_imp_target} 0)
- set(${_imp_target_global} 0)
- if(DEFINED PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
- if(NOT PKG_CONFIG_USE_CMAKE_PREFIX_PATH)
- set(${_no_cmake_path} 1)
- set(${_no_cmake_environment_path} 1)
- endif()
- elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1)
- set(${_no_cmake_path} 1)
- set(${_no_cmake_environment_path} 1)
- endif()
-
- foreach(_pkg ${ARGN})
- if (_pkg STREQUAL "REQUIRED")
- set(${_is_req} 1)
- endif ()
- if (_pkg STREQUAL "QUIET")
- set(${_is_silent} 1)
- endif ()
- if (_pkg STREQUAL "NO_CMAKE_PATH")
- set(${_no_cmake_path} 1)
- endif()
- if (_pkg STREQUAL "NO_CMAKE_ENVIRONMENT_PATH")
- set(${_no_cmake_environment_path} 1)
- endif()
- if (_pkg STREQUAL "IMPORTED_TARGET")
- set(${_imp_target} 1)
- endif()
- if (_pkg STREQUAL "GLOBAL")
- set(${_imp_target_global} 1)
- endif()
- endforeach()
-
- if (${_imp_target_global} AND NOT ${_imp_target})
- message(SEND_ERROR "the argument GLOBAL may only be used together with IMPORTED_TARGET")
- endif()
-
- set(${_result} ${ARGN})
- list(REMOVE_ITEM ${_result} "REQUIRED")
- list(REMOVE_ITEM ${_result} "QUIET")
- list(REMOVE_ITEM ${_result} "NO_CMAKE_PATH")
- list(REMOVE_ITEM ${_result} "NO_CMAKE_ENVIRONMENT_PATH")
- list(REMOVE_ITEM ${_result} "IMPORTED_TARGET")
- list(REMOVE_ITEM ${_result} "GLOBAL")
-endmacro()
-
-# Add the content of a variable or an environment variable to a list of
-# paths
-# Usage:
-# - _pkgconfig_add_extra_path(_extra_paths VAR)
-# - _pkgconfig_add_extra_path(_extra_paths ENV VAR)
-function(_pkgconfig_add_extra_path _extra_paths_var _var)
- set(_is_env 0)
- if(ARGC GREATER 2 AND _var STREQUAL "ENV")
- set(_var ${ARGV2})
- set(_is_env 1)
- endif()
- if(NOT _is_env)
- if(NOT "${${_var}}" STREQUAL "")
- list(APPEND ${_extra_paths_var} ${${_var}})
- endif()
- else()
- if(NOT "$ENV{${_var}}" STREQUAL "")
- file(TO_CMAKE_PATH "$ENV{${_var}}" _path)
- list(APPEND ${_extra_paths_var} ${_path})
- unset(_path)
- endif()
- endif()
- set(${_extra_paths_var} ${${_extra_paths_var}} PARENT_SCOPE)
-endfunction()
-
-# scan the LDFLAGS returned by pkg-config for library directories and
-# libraries, figure out the absolute paths of that libraries in the
-# given directories
-function(_pkg_find_libs _prefix _no_cmake_path _no_cmake_environment_path)
- unset(_libs)
- unset(_find_opts)
-
- # set the options that are used as long as the .pc file does not provide a library
- # path to look into
- if(_no_cmake_path)
- list(APPEND _find_opts "NO_CMAKE_PATH")
- endif()
- if(_no_cmake_environment_path)
- list(APPEND _find_opts "NO_CMAKE_ENVIRONMENT_PATH")
- endif()
-
- unset(_search_paths)
- unset(_next_is_framework)
- foreach (flag IN LISTS ${_prefix}_LDFLAGS)
- if (_next_is_framework)
- list(APPEND _libs "-framework ${flag}")
- unset(_next_is_framework)
- continue()
- endif ()
- if (flag MATCHES "^-L(.*)")
- list(APPEND _search_paths ${CMAKE_MATCH_1})
- continue()
- endif()
- if (flag MATCHES "^-l(.*)")
- set(_pkg_search "${CMAKE_MATCH_1}")
- else()
- if (flag STREQUAL "-framework")
- set(_next_is_framework TRUE)
- endif ()
- continue()
- endif()
-
- if(_search_paths)
- # Firstly search in -L paths
- find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
- NAMES ${_pkg_search}
- HINTS ${_search_paths} NO_DEFAULT_PATH)
- endif()
- find_library(pkgcfg_lib_${_prefix}_${_pkg_search}
- NAMES ${_pkg_search}
- ${_find_opts})
- mark_as_advanced(pkgcfg_lib_${_prefix}_${_pkg_search})
- if(pkgcfg_lib_${_prefix}_${_pkg_search})
- list(APPEND _libs "${pkgcfg_lib_${_prefix}_${_pkg_search}}")
- else()
- list(APPEND _libs ${_pkg_search})
- endif()
- endforeach()
-
- set(${_prefix}_LINK_LIBRARIES "${_libs}" PARENT_SCOPE)
-endfunction()
-
-# create an imported target from all the information returned by pkg-config
-function(_pkg_create_imp_target _prefix _imp_target_global)
- if (NOT TARGET PkgConfig::${_prefix})
- if(${_imp_target_global})
- set(_global_opt "GLOBAL")
- else()
- unset(_global_opt)
- endif()
- add_library(PkgConfig::${_prefix} INTERFACE IMPORTED ${_global_opt})
-
- if(${_prefix}_INCLUDE_DIRS)
- set_property(TARGET PkgConfig::${_prefix} PROPERTY
- INTERFACE_INCLUDE_DIRECTORIES "${${_prefix}_INCLUDE_DIRS}")
- endif()
- if(${_prefix}_LINK_LIBRARIES)
- set_property(TARGET PkgConfig::${_prefix} PROPERTY
- INTERFACE_LINK_LIBRARIES "${${_prefix}_LINK_LIBRARIES}")
- endif()
- if(${_prefix}_LDFLAGS_OTHER)
- set_property(TARGET PkgConfig::${_prefix} PROPERTY
- INTERFACE_LINK_OPTIONS "${${_prefix}_LDFLAGS_OTHER}")
- endif()
- if(${_prefix}_CFLAGS_OTHER)
- set_property(TARGET PkgConfig::${_prefix} PROPERTY
- INTERFACE_COMPILE_OPTIONS "${${_prefix}_CFLAGS_OTHER}")
- endif()
- endif()
-endfunction()
-
-# recalculate the dynamic output
-# this is a macro and not a function so the result of _pkg_find_libs is automatically propagated
-macro(_pkg_recalculate _prefix _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global)
- _pkg_find_libs(${_prefix} ${_no_cmake_path} ${_no_cmake_environment_path})
- if(${_imp_target})
- _pkg_create_imp_target(${_prefix} ${_imp_target_global})
- endif()
-endmacro()
-
-###
-macro(_pkg_set_path_internal)
- set(_extra_paths)
-
- if(NOT _no_cmake_path)
- _pkgconfig_add_extra_path(_extra_paths CMAKE_PREFIX_PATH)
- _pkgconfig_add_extra_path(_extra_paths CMAKE_FRAMEWORK_PATH)
- _pkgconfig_add_extra_path(_extra_paths CMAKE_APPBUNDLE_PATH)
- endif()
-
- if(NOT _no_cmake_environment_path)
- _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_PREFIX_PATH)
- _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_FRAMEWORK_PATH)
- _pkgconfig_add_extra_path(_extra_paths ENV CMAKE_APPBUNDLE_PATH)
- endif()
-
- if(NOT _extra_paths STREQUAL "")
- # Save the PKG_CONFIG_PATH environment variable, and add paths
- # from the CMAKE_PREFIX_PATH variables
- set(_pkgconfig_path_old "$ENV{PKG_CONFIG_PATH}")
- set(_pkgconfig_path "${_pkgconfig_path_old}")
- if(NOT _pkgconfig_path STREQUAL "")
- file(TO_CMAKE_PATH "${_pkgconfig_path}" _pkgconfig_path)
- endif()
-
- # Create a list of the possible pkgconfig subfolder (depending on
- # the system
- set(_lib_dirs)
- if(NOT DEFINED CMAKE_SYSTEM_NAME
- OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$"
- AND NOT CMAKE_CROSSCOMPILING))
- if(EXISTS "/etc/debian_version") # is this a debian system ?
- if(CMAKE_LIBRARY_ARCHITECTURE)
- list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig")
- endif()
- else()
- # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties
- get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS)
- if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4)
- list(APPEND _lib_dirs "lib32/pkgconfig")
- endif()
- get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS)
- if(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
- list(APPEND _lib_dirs "lib64/pkgconfig")
- endif()
- get_property(uselibx32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS)
- if(uselibx32 AND CMAKE_INTERNAL_PLATFORM_ABI STREQUAL "ELF X32")
- list(APPEND _lib_dirs "libx32/pkgconfig")
- endif()
- endif()
- endif()
- if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_CROSSCOMPILING)
- list(APPEND _lib_dirs "libdata/pkgconfig")
- endif()
- list(APPEND _lib_dirs "lib/pkgconfig")
- list(APPEND _lib_dirs "share/pkgconfig")
-
- # Check if directories exist and eventually append them to the
- # pkgconfig path list
- foreach(_prefix_dir ${_extra_paths})
- foreach(_lib_dir ${_lib_dirs})
- if(EXISTS "${_prefix_dir}/${_lib_dir}")
- list(APPEND _pkgconfig_path "${_prefix_dir}/${_lib_dir}")
- list(REMOVE_DUPLICATES _pkgconfig_path)
- endif()
- endforeach()
- endforeach()
-
- # Prepare and set the environment variable
- if(NOT _pkgconfig_path STREQUAL "")
- # remove empty values from the list
- list(REMOVE_ITEM _pkgconfig_path "")
- file(TO_NATIVE_PATH "${_pkgconfig_path}" _pkgconfig_path)
- if(CMAKE_HOST_UNIX)
- string(REPLACE ";" ":" _pkgconfig_path "${_pkgconfig_path}")
- string(REPLACE "\\ " " " _pkgconfig_path "${_pkgconfig_path}")
- endif()
- set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path}")
- endif()
-
- # Unset variables
- unset(_lib_dirs)
- unset(_pkgconfig_path)
- endif()
-
- # Tell pkg-config not to strip any -L paths so we can search them all.
- if(DEFINED ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS})
- set(_pkgconfig_allow_system_libs_old "$ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS}")
- else()
- unset(_pkgconfig_allow_system_libs_old)
- endif()
- set(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} 1)
-endmacro()
-
-macro(_pkg_restore_path_internal)
- if(NOT _extra_paths STREQUAL "")
- # Restore the environment variable
- set(ENV{PKG_CONFIG_PATH} "${_pkgconfig_path_old}")
- endif()
- if(DEFINED _pkgconfig_allow_system_libs_old)
- set(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS} "${_pkgconfig_allow_system_libs_old}")
- unset(_pkgconfig_allow_system_libs_old)
- else()
- unset(ENV{PKG_CONFIG_ALLOW_SYSTEM_LIBS})
- endif()
-
- unset(_extra_paths)
- unset(_pkgconfig_path_old)
-endmacro()
-
-# pkg-config returns frameworks in --libs-only-other
-# they need to be in ${_prefix}_LIBRARIES so "-framework a -framework b" does
-# not incorrectly be combined to "-framework a b"
-function(_pkgconfig_extract_frameworks _prefix)
- set(ldflags "${${_prefix}_LDFLAGS_OTHER}")
- list(FIND ldflags "-framework" FR_POS)
- list(LENGTH ldflags LD_LENGTH)
-
- # reduce length by 1 as we need "-framework" and the next entry
- math(EXPR LD_LENGTH "${LD_LENGTH} - 1")
- while (FR_POS GREATER -1 AND LD_LENGTH GREATER FR_POS)
- list(REMOVE_AT ldflags ${FR_POS})
- list(GET ldflags ${FR_POS} HEAD)
- list(REMOVE_AT ldflags ${FR_POS})
- math(EXPR LD_LENGTH "${LD_LENGTH} - 2")
-
- list(APPEND LIBS "-framework ${HEAD}")
-
- list(FIND ldflags "-framework" FR_POS)
- endwhile ()
- set(${_prefix}_LIBRARIES ${${_prefix}_LIBRARIES} ${LIBS} PARENT_SCOPE)
- set(${_prefix}_LDFLAGS_OTHER "${ldflags}" PARENT_SCOPE)
-endfunction()
-
-# pkg-config returns -isystem include directories in --cflags-only-other,
-# depending on the version and if there is a space between -isystem and
-# the actual path
-function(_pkgconfig_extract_isystem _prefix)
- set(cflags "${${_prefix}_CFLAGS_OTHER}")
- set(outflags "")
- set(incdirs "${${_prefix}_INCLUDE_DIRS}")
-
- set(next_is_isystem FALSE)
- foreach (THING IN LISTS cflags)
- # This may filter "-isystem -isystem". That would not work anyway,
- # so let it happen.
- if (THING STREQUAL "-isystem")
- set(next_is_isystem TRUE)
- continue()
- endif ()
- if (next_is_isystem)
- set(next_is_isystem FALSE)
- list(APPEND incdirs "${THING}")
- elseif (THING MATCHES "^-isystem")
- string(SUBSTRING "${THING}" 8 -1 THING)
- list(APPEND incdirs "${THING}")
- else ()
- list(APPEND outflags "${THING}")
- endif ()
- endforeach ()
- set(${_prefix}_CFLAGS_OTHER "${outflags}" PARENT_SCOPE)
- set(${_prefix}_INCLUDE_DIRS "${incdirs}" PARENT_SCOPE)
-endfunction()
-
-###
-macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global _prefix)
- _pkgconfig_unset(${_prefix}_FOUND)
- _pkgconfig_unset(${_prefix}_VERSION)
- _pkgconfig_unset(${_prefix}_PREFIX)
- _pkgconfig_unset(${_prefix}_INCLUDEDIR)
- _pkgconfig_unset(${_prefix}_LIBDIR)
- _pkgconfig_unset(${_prefix}_MODULE_NAME)
- _pkgconfig_unset(${_prefix}_LIBS)
- _pkgconfig_unset(${_prefix}_LIBS_L)
- _pkgconfig_unset(${_prefix}_LIBS_PATHS)
- _pkgconfig_unset(${_prefix}_LIBS_OTHER)
- _pkgconfig_unset(${_prefix}_CFLAGS)
- _pkgconfig_unset(${_prefix}_CFLAGS_I)
- _pkgconfig_unset(${_prefix}_CFLAGS_OTHER)
- _pkgconfig_unset(${_prefix}_STATIC_LIBDIR)
- _pkgconfig_unset(${_prefix}_STATIC_LIBS)
- _pkgconfig_unset(${_prefix}_STATIC_LIBS_L)
- _pkgconfig_unset(${_prefix}_STATIC_LIBS_PATHS)
- _pkgconfig_unset(${_prefix}_STATIC_LIBS_OTHER)
- _pkgconfig_unset(${_prefix}_STATIC_CFLAGS)
- _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_I)
- _pkgconfig_unset(${_prefix}_STATIC_CFLAGS_OTHER)
-
- # create a better addressable variable of the modules and calculate its size
- set(_pkg_check_modules_list ${ARGN})
- list(LENGTH _pkg_check_modules_list _pkg_check_modules_cnt)
-
- if(PKG_CONFIG_EXECUTABLE)
- # give out status message telling checked module
- if (NOT ${_is_silent})
- if (_pkg_check_modules_cnt EQUAL 1)
- message(STATUS "Checking for module '${_pkg_check_modules_list}'")
- else()
- message(STATUS "Checking for modules '${_pkg_check_modules_list}'")
- endif()
- endif()
-
- set(_pkg_check_modules_packages)
- set(_pkg_check_modules_failed)
-
- _pkg_set_path_internal()
-
- # iterate through module list and check whether they exist and match the required version
- foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
- set(_pkg_check_modules_exist_query)
-
- # check whether version is given
- if (_pkg_check_modules_pkg MATCHES "(.*^><)(=|><=?)(.*)")
- set(_pkg_check_modules_pkg_name "${CMAKE_MATCH_1}")
- set(_pkg_check_modules_pkg_op "${CMAKE_MATCH_2}")
- set(_pkg_check_modules_pkg_ver "${CMAKE_MATCH_3}")
- else()
- set(_pkg_check_modules_pkg_name "${_pkg_check_modules_pkg}")
- set(_pkg_check_modules_pkg_op)
- set(_pkg_check_modules_pkg_ver)
- endif()
-
- _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION)
- _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX)
- _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_INCLUDEDIR)
- _pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_LIBDIR)
-
- list(APPEND _pkg_check_modules_packages "${_pkg_check_modules_pkg_name}")
-
- # create the final query which is of the format:
- # * <pkg-name> > <version>
- # * <pkg-name> >= <version>
- # * <pkg-name> = <version>
- # * <pkg-name> <= <version>
- # * <pkg-name> < <version>
- # * --exists <pkg-name>
- list(APPEND _pkg_check_modules_exist_query --print-errors --short-errors)
- if (_pkg_check_modules_pkg_op)
- list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name} ${_pkg_check_modules_pkg_op} ${_pkg_check_modules_pkg_ver}")
- else()
- list(APPEND _pkg_check_modules_exist_query --exists)
- list(APPEND _pkg_check_modules_exist_query "${_pkg_check_modules_pkg_name}")
- endif()
-
- # execute the query
- execute_process(
- COMMAND ${PKG_CONFIG_EXECUTABLE} ${PKG_CONFIG_ARGN} ${_pkg_check_modules_exist_query}
- RESULT_VARIABLE _pkgconfig_retval
- ERROR_VARIABLE _pkgconfig_error
- ERROR_STRIP_TRAILING_WHITESPACE)
-
- # evaluate result and tell failures
- if (_pkgconfig_retval)
- if(NOT ${_is_silent})
- message(STATUS " ${_pkgconfig_error}")
- endif()
-
- set(_pkg_check_modules_failed 1)
- endif()
- endforeach()
-
- if(_pkg_check_modules_failed)
- # fail when requested
- if (${_is_required})
- message(FATAL_ERROR "A required package was not found")
- endif ()
- else()
- # when we are here, we checked whether requested modules
- # exist. Now, go through them and set variables
-
- _pkgconfig_set(${_prefix}_FOUND 1)
- list(LENGTH _pkg_check_modules_packages pkg_count)
-
- # iterate through all modules again and set individual variables
- foreach (_pkg_check_modules_pkg ${_pkg_check_modules_packages})
- # handle case when there is only one package required
- if (pkg_count EQUAL 1)
- set(_pkg_check_prefix "${_prefix}")
- else()
- set(_pkg_check_prefix "${_prefix}_${_pkg_check_modules_pkg}")
- endif()
-
- _pkgconfig_invoke(${_pkg_check_modules_pkg} "${_pkg_check_prefix}" VERSION "" --modversion )
- pkg_get_variable("${_pkg_check_prefix}_PREFIX" ${_pkg_check_modules_pkg} "prefix")
- pkg_get_variable("${_pkg_check_prefix}_INCLUDEDIR" ${_pkg_check_modules_pkg} "includedir")
- pkg_get_variable("${_pkg_check_prefix}_LIBDIR" ${_pkg_check_modules_pkg} "libdir")
- foreach (variable IN ITEMS PREFIX INCLUDEDIR LIBDIR)
- _pkgconfig_set("${_pkg_check_prefix}_${variable}" "${${_pkg_check_prefix}_${variable}}")
- endforeach ()
- _pkgconfig_set("${_pkg_check_prefix}_MODULE_NAME" "${_pkg_check_modules_pkg}")
-
- if (NOT ${_is_silent})
- message(STATUS " Found ${_pkg_check_modules_pkg}, version ${_pkgconfig_VERSION}")
- endif ()
- endforeach()
-
- # set variables which are combined for multiple modules
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARIES "(^| )-l" --libs-only-l )
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LIBRARY_DIRS "(^| )-L" --libs-only-L )
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS "" --libs )
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" LDFLAGS_OTHER "" --libs-only-other )
-
- if (APPLE AND "-framework" IN_LIST ${_prefix}_LDFLAGS_OTHER)
- _pkgconfig_extract_frameworks("${_prefix}")
- endif()
-
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" INCLUDE_DIRS "(^| )(-I|-isystem ?)" --cflags-only-I )
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS "" --cflags )
- _pkgconfig_invoke_dyn("${_pkg_check_modules_packages}" "${_prefix}" CFLAGS_OTHER "" --cflags-only-other )
-
- if (${_prefix}_CFLAGS_OTHER MATCHES "-isystem")
- _pkgconfig_extract_isystem("${_prefix}")
- endif ()
-
- _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
- endif()
-
- _pkg_restore_path_internal()
- else()
- if (${_is_required})
- message(SEND_ERROR "pkg-config tool not found")
- endif ()
- endif()
-endmacro()
-
-
-#========================================.rst:
-.. command:: pkg_check_modules
-
- Checks for all the given modules, setting a variety of result variables in
- the calling scope.
-
- .. code-block:: cmake
-
- pkg_check_modules(<prefix>
- REQUIRED QUIET
- NO_CMAKE_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- IMPORTED_TARGET GLOBAL
- <moduleSpec> <moduleSpec>...)
-
- When the ``REQUIRED`` argument is given, the command will fail with an error
- if module(s) could not be found.
-
- When the ``QUIET`` argument is given, no status messages will be printed.
-
- .. versionadded:: 3.1
- The :variable:`CMAKE_PREFIX_PATH`,
- :variable:`CMAKE_FRAMEWORK_PATH`, and :variable:`CMAKE_APPBUNDLE_PATH` cache
- and environment variables will be added to the ``pkg-config`` search path.
- The ``NO_CMAKE_PATH`` and ``NO_CMAKE_ENVIRONMENT_PATH`` arguments
- disable this behavior for the cache variables and environment variables
- respectively.
- The :variable:`PKG_CONFIG_USE_CMAKE_PREFIX_PATH` variable set to ``FALSE``
- disables this behavior globally.
-
- .. This didn't actually work until 3.3.
-
- .. versionadded:: 3.6
- The ``IMPORTED_TARGET`` argument will create an imported target named
- ``PkgConfig::<prefix>`` that can be passed directly as an argument to
- :command:`target_link_libraries`.
-
- .. This didn't actually work until 3.7.
-
- .. versionadded:: 3.13
- The ``GLOBAL`` argument will make the
- imported target available in global scope.
-
- .. versionadded:: 3.15
- Non-library linker options reported by ``pkg-config`` are stored in the
- :prop_tgt:`INTERFACE_LINK_OPTIONS` target property.
-
- .. versionchanged:: 3.18
- Include directories specified with ``-isystem`` are stored in the
- :prop_tgt:`INTERFACE_INCLUDE_DIRECTORIES` target property. Previous
- versions of CMake left them in the :prop_tgt:`INTERFACE_COMPILE_OPTIONS`
- property.
-
- Each ``<moduleSpec>`` can be either a bare module name or it can be a
- module name with a version constraint (operators ``=``, ``<``, ``>``,
- ``<=`` and ``>=`` are supported). The following are examples for a module
- named ``foo`` with various constraints:
-
- - ``foo`` matches any version.
- - ``foo<2`` only matches versions before 2.
- - ``foo>=3.1`` matches any version from 3.1 or later.
- - ``foo=1.2.3`` requires that foo must be exactly version 1.2.3.
-
- The following variables may be set upon return. Two sets of values exist:
- One for the common case (``<XXX> = <prefix>``) and another for the
- information ``pkg-config`` provides when called with the ``--static``
- option (``<XXX> = <prefix>_STATIC``).
-
- ``<XXX>_FOUND``
- set to 1 if module(s) exist
- ``<XXX>_LIBRARIES``
- only the libraries (without the '-l')
- ``<XXX>_LINK_LIBRARIES``
- the libraries and their absolute paths
- ``<XXX>_LIBRARY_DIRS``
- the paths of the libraries (without the '-L')
- ``<XXX>_LDFLAGS``
- all required linker flags
- ``<XXX>_LDFLAGS_OTHER``
- all other linker flags
- ``<XXX>_INCLUDE_DIRS``
- the '-I' preprocessor flags (without the '-I')
- ``<XXX>_CFLAGS``
- all required cflags
- ``<XXX>_CFLAGS_OTHER``
- the other compiler flags
-
- All but ``<XXX>_FOUND`` may be a :ref:`;-list <CMake Language Lists>` if the
- associated variable returned from ``pkg-config`` has multiple values.
-
- .. versionchanged:: 3.18
- Include directories specified with ``-isystem`` are stored in the
- ``<XXX>_INCLUDE_DIRS`` variable. Previous versions of CMake left them
- in ``<XXX>_CFLAGS_OTHER``.
-
- There are some special variables whose prefix depends on the number of
- ``<moduleSpec>`` given. When there is only one ``<moduleSpec>``,
- ``<YYY>`` will simply be ``<prefix>``, but if two or more ``<moduleSpec>``
- items are given, ``<YYY>`` will be ``<prefix>_<moduleName>``.
-
- ``<YYY>_VERSION``
- version of the module
- ``<YYY>_PREFIX``
- prefix directory of the module
- ``<YYY>_INCLUDEDIR``
- include directory of the module
- ``<YYY>_LIBDIR``
- lib directory of the module
-
- .. versionchanged:: 3.8
- For any given ``<prefix>``, ``pkg_check_modules()`` can be called multiple
- times with different parameters. Previous versions of CMake cached and
- returned the first successful result.
-
- .. versionchanged:: 3.16
- If a full path to the found library can't be determined, but it's still
- visible to the linker, pass it through as ``-l<name>``. Previous versions
- of CMake failed in this case.
-
- Examples:
-
- .. code-block:: cmake
-
- pkg_check_modules (GLIB2 glib-2.0)
-
- Looks for any version of glib2. If found, the output variable
- ``GLIB2_VERSION`` will hold the actual version found.
-
- .. code-block:: cmake
-
- pkg_check_modules (GLIB2 glib-2.0>=2.10)
-
- Looks for at least version 2.10 of glib2. If found, the output variable
- ``GLIB2_VERSION`` will hold the actual version found.
-
- .. code-block:: cmake
-
- pkg_check_modules (FOO glib-2.0>=2.10 gtk+-2.0)
-
- Looks for both glib2-2.0 (at least version 2.10) and any version of
- gtk2+-2.0. Only if both are found will ``FOO`` be considered found.
- The ``FOO_glib-2.0_VERSION`` and ``FOO_gtk+-2.0_VERSION`` variables will be
- set to their respective found module versions.
-
- .. code-block:: cmake
-
- pkg_check_modules (XRENDER REQUIRED xrender)
-
- Requires any version of ``xrender``. Example output variables set by a
- successful call::
-
- XRENDER_LIBRARIES=Xrender;X11
- XRENDER_STATIC_LIBRARIES=Xrender;X11;pthread;Xau;Xdmcp
-#========================================
-macro(pkg_check_modules _prefix _module0)
- _pkgconfig_parse_options(_pkg_modules _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global "${_module0}" ${ARGN})
- # check cached value
- if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND OR
- (NOT "${ARGN}" STREQUAL "" AND NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0};${ARGN}") OR
- ( "${ARGN}" STREQUAL "" AND NOT "${__pkg_config_arguments_${_prefix}}" STREQUAL "${_module0}"))
- _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" ${_pkg_modules})
-
- _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
- if (${_prefix}_FOUND)
- _pkgconfig_set(__pkg_config_arguments_${_prefix} "${_module0};${ARGN}")
- endif()
- else()
- if (${_prefix}_FOUND)
- _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
- endif()
- endif()
-endmacro()
-
-
-#========================================.rst:
-.. command:: pkg_search_module
-
- The behavior of this command is the same as :command:`pkg_check_modules`,
- except that rather than checking for all the specified modules, it searches
- for just the first successful match.
-
- .. code-block:: cmake
-
- pkg_search_module(<prefix>
- REQUIRED QUIET
- NO_CMAKE_PATH
- NO_CMAKE_ENVIRONMENT_PATH
- IMPORTED_TARGET GLOBAL
- <moduleSpec> <moduleSpec>...)
-
- .. versionadded:: 3.16
- If a module is found, the ``<prefix>_MODULE_NAME`` variable will contain the
- name of the matching module. This variable can be used if you need to run
- :command:`pkg_get_variable`.
-
- Example:
-
- .. code-block:: cmake
-
- pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2)
-#========================================
-macro(pkg_search_module _prefix _module0)
- _pkgconfig_parse_options(_pkg_modules_alt _pkg_is_required _pkg_is_silent _no_cmake_path _no_cmake_environment_path _imp_target _imp_target_global "${_module0}" ${ARGN})
- # check cached value
- if (NOT DEFINED __pkg_config_checked_${_prefix} OR __pkg_config_checked_${_prefix} LESS ${PKG_CONFIG_VERSION} OR NOT ${_prefix}_FOUND)
- set(_pkg_modules_found 0)
-
- if (NOT ${_pkg_is_silent})
- message(STATUS "Checking for one of the modules '${_pkg_modules_alt}'")
- endif ()
-
- # iterate through all modules and stop at the first working one.
- foreach(_pkg_alt ${_pkg_modules_alt})
- if(NOT _pkg_modules_found)
- _pkg_check_modules_internal(0 1 ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global} "${_prefix}" "${_pkg_alt}")
- endif()
-
- if (${_prefix}_FOUND)
- set(_pkg_modules_found 1)
- break()
- endif()
- endforeach()
-
- if (NOT ${_prefix}_FOUND)
- if(${_pkg_is_required})
- message(SEND_ERROR "None of the required '${_pkg_modules_alt}' found")
- endif()
- endif()
-
- _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION})
- elseif (${_prefix}_FOUND)
- _pkg_recalculate("${_prefix}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} ${_imp_target_global})
- endif()
-endmacro()
-
-#========================================.rst:
-.. command:: pkg_get_variable
-
- .. versionadded:: 3.4
-
- Retrieves the value of a pkg-config variable ``varName`` and stores it in the
- result variable ``resultVar`` in the calling scope.
-
- .. code-block:: cmake
-
- pkg_get_variable(<resultVar> <moduleName> <varName>)
-
- If ``pkg-config`` returns multiple values for the specified variable,
- ``resultVar`` will contain a :ref:`;-list <CMake Language Lists>`.
-
- For example:
-
- .. code-block:: cmake
-
- pkg_get_variable(GI_GIRDIR gobject-introspection-1.0 girdir)
-#========================================
-function (pkg_get_variable result pkg variable)
- _pkg_set_path_internal()
- _pkgconfig_invoke("${pkg}" "prefix" "result" "" "--variable=${variable}")
- set("${result}"
- "${prefix_result}"
- PARENT_SCOPE)
- _pkg_restore_path_internal()
-endfunction ()
-
-
-#========================================.rst:
-Variables Affecting Behavior
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.. variable:: PKG_CONFIG_EXECUTABLE
-
- This cache variable can be set to the path of the pkg-config executable.
- :command:`find_program` is called internally by the module with this
- variable.
-
- .. versionadded:: 3.1
- The ``PKG_CONFIG`` environment variable can be used as a hint if
- ``PKG_CONFIG_EXECUTABLE`` has not yet been set.
-
- .. versionchanged:: 3.22
- If the ``PKG_CONFIG`` environment variable is set, only the first
- argument is taken from it when using it as a hint.
-
-.. variable:: PKG_CONFIG_ARGN
-
- .. versionadded:: 3.22
-
- This cache variable can be set to a list of arguments to additionally pass
- to pkg-config if needed. If not provided, it will be initialized from the
- ``PKG_CONFIG`` environment variable, if set. The first argument in that
- environment variable is assumed to be the pkg-config program, while all
- remaining arguments after that are used to initialize ``PKG_CONFIG_ARGN``.
- If no such environment variable is defined, ``PKG_CONFIG_ARGN`` is
- initialized to an empty string. The module does not update the variable once
- it has been set in the cache.
-
-.. variable:: PKG_CONFIG_USE_CMAKE_PREFIX_PATH
-
- .. versionadded:: 3.1
-
- Specifies whether :command:`pkg_check_modules` and
- :command:`pkg_search_module` should add the paths in the
- :variable:`CMAKE_PREFIX_PATH`, :variable:`CMAKE_FRAMEWORK_PATH` and
- :variable:`CMAKE_APPBUNDLE_PATH` cache and environment variables to the
- ``pkg-config`` search path.
-
- If this variable is not set, this behavior is enabled by default if
- :variable:`CMAKE_MINIMUM_REQUIRED_VERSION` is 3.1 or later, disabled
- otherwise.
-#========================================
-
-
-### Local Variables:
-### mode: cmake
-### End:
-
-cmake_policy(POP)
-

_service:obs_scm:synfig-1.5.3.obscpio/cmake/InstallMSYS2.cmake Deleted

@@ -1,156 +0,0 @@
-set(MINGW_PATH $ENV{MINGW_PREFIX})
-
-set(MINGW_BIN "${MINGW_PATH}/bin")
-set(MINGW_LIB "${MINGW_PATH}/lib")
-set(MINGW_SHARE "${MINGW_PATH}/share")
-
-# MSYS2 Hacks
-
-# This code fixes MSYS2 related problems and can be safely removed after these problems are resolved
-
-# ImageMagick has problems finding modules in MSYS2. For example, if you copy `magick.exe` somewhere
-# outside the `/mingw64/bin` folder and try to do some manipulation with images, for example:
-# `./magick.exe test.jpg test.png`, then this command will fail with error
-# `magick.exe: NoDecodeDelegateForThisImageFormat `JPEG '@ error / Create.c / ReadImage / 562.`
-# `synfig-cli` also fails when trying to make icons and images, so to fix this issue we need to copy ImageMagick's
-# libs inside our build directory. Read more about ImageMagick paths and environment variables:
-# https://imagemagick.org/script/resources.php#environment
-
-file(GLOB MAGICK_LIBS ${MINGW_LIB}/ImageMagick-*)
-file(COPY ${MAGICK_LIBS} DESTINATION ${SYNFIG_BUILD_ROOT}/lib)
-
-# End of hacks
-
-
-# /output/bin
-file(GLOB MINGW_LIBS
-		${MINGW_BIN}/gspawn-win??-helper.exe
-		${MINGW_BIN}/gspawn-win??-helper-console.exe
-	    ${MINGW_BIN}/libatk-1.0-0-9*.dll
-	    ${MINGW_BIN}/libatkmm-1.6-0-9*.dll
-	    ${MINGW_BIN}/libbz2-0-9*.dll
-	    ${MINGW_BIN}/libbrotlicommon.dll
-	    ${MINGW_BIN}/libbrotlidec.dll
-	    ${MINGW_BIN}/libcairo-0-9*.dll
-	    ${MINGW_BIN}/libcairo-gobject-0-9*.dll
-	    ${MINGW_BIN}/libcairo-script-interpreter-0-9*.dll
-	    ${MINGW_BIN}/libcairomm-1.0-0-9*.dll
-	    ${MINGW_BIN}/libdatrie-0-9*.dll
-	    ${MINGW_BIN}/libdl.dll
-	    ${MINGW_BIN}/libepoxy-0-9*.dll
-	    ${MINGW_BIN}/libexpat-0-9*.dll
-	    ${MINGW_BIN}/libffi-0-9*.dll
-	    ${MINGW_BIN}/libfftw3-0-9*.dll
-	    ${MINGW_BIN}/libfftw3f-0-9*.dll
-	    ${MINGW_BIN}/libfribidi-0-9*.dll
-	    ${MINGW_BIN}/libfontconfig-0-9*.dll
-	    ${MINGW_BIN}/libfreetype-0-9*.dll
-	    ${MINGW_BIN}/libgailutil-3-0-9*.dll
-		${MINGW_BIN}/libgcc_s_*.dll
-	    ${MINGW_BIN}/libgdk_pixbuf-2.0-0-9*.dll
-	    ${MINGW_BIN}/libgdk-3-0-9*.dll
-	    ${MINGW_BIN}/libgdkmm-3.0-0-9*.dll
-	    ${MINGW_BIN}/libgio-2.0-0-9*.dll
-	    ${MINGW_BIN}/libgiomm-2.4-0-9*.dll
-	    ${MINGW_BIN}/libglib-2.0-0-9*.dll
-	    ${MINGW_BIN}/libglibmm_generate_extra_defs-2.4-0-9*.dll
-	    ${MINGW_BIN}/libglibmm-2.4-0-9*.dll
-	    ${MINGW_BIN}/libgmodule-2.0-0-9*.dll
-	    ${MINGW_BIN}/libgobject-2.0-0-9*.dll
-	    ${MINGW_BIN}/libgraphite0-9*.dll
-	    ${MINGW_BIN}/libgthread-2.0-0-9*.dll
-	    ${MINGW_BIN}/libgtk-3-0-9*.dll
-	    ${MINGW_BIN}/libgtkmm-3.0-0-9*.dll
-	    ${MINGW_BIN}/libharfbuzz-0-9*.dll
-	    ${MINGW_BIN}/libiconv-0-9*.dll
-	    ${MINGW_BIN}/libintl-0-9*.dll
-	    ${MINGW_BIN}/liblzma-0-9*.dll
-	    ${MINGW_BIN}/libltdl-0-9*.dll
-	    ${MINGW_BIN}/libMagick++-A-Z0-9.-*.dll
-	    ${MINGW_BIN}/libMagickCore-A-Z0-9.-*.dll
-	    ${MINGW_BIN}/libMagickWand-A-Z0-9.-*.dll
-	    ${MINGW_BIN}/libpango-1.0-0-9*.dll
-	    ${MINGW_BIN}/libpangocairo-1.0-0-9*.dll
-	    ${MINGW_BIN}/libpangoft2-1.0-0-9*.dll
-	    ${MINGW_BIN}/libpangomm-1.4-0-9*.dll
-	    ${MINGW_BIN}/libpangowin32-1.0-0-9*.dll
-	    ${MINGW_BIN}/libpcre2-0-9*.dll
-	    ${MINGW_BIN}/libpixman-1-0-9*.dll
-	    ${MINGW_BIN}/libpng16-10-9*.dll
-	    ${MINGW_BIN}/libpng16-config
-	    ${MINGW_BIN}/libquadmath-0-9*.dll
-	    ${MINGW_BIN}/librsvg-2-0-9*.dll
-	    ${MINGW_BIN}/libsigc-2.0-0-9*.dll
-	    ${MINGW_BIN}/libssp-0-9*.dll
-	    ${MINGW_BIN}/libstdc++-0-9*.dll
-	    ${MINGW_BIN}/libthai-0-9*.dll
-	    ${MINGW_BIN}/libtiff-0-9*.dll
-	    ${MINGW_BIN}/libtiffxx-0-9*.dll
-	    ${MINGW_BIN}/libwinpthread-0-9*.dll
-	    ${MINGW_BIN}/libxml++-2.6-0-9*.dll
-	    ${MINGW_BIN}/libxml2-0-9*.dll
-	    ${MINGW_BIN}/zlib0-9*.dll
-	    )
-#    file(COPY ${MINGW_LIBS} DESTINATION ${SYNFIG_BUILD_ROOT}/bin)
-install(FILES ${MINGW_LIBS} DESTINATION bin)
-
-find_program(CYGPATH_EXECUTABLE cygpath ${MINGW_PATH}/../usr/bin/)
-if(CYGPATH_EXECUTABLE)
-    set(MLT_PATH "/opt/mlt-7.2.0")
-    execute_process(
-		    COMMAND ${CYGPATH_EXECUTABLE} -m ${MLT_PATH}
-		    OUTPUT_VARIABLE MLT_DIRECTORY
-		    ERROR_QUIET
-		    OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    message(${MLT_DIRECTORY})
-else()
-    message(WARNING "-- cygpath tool not found, using relative path for MLT.")
-    set(MLT_DIRECTORY "${MINGW_PATH}/../opt/mlt-7.2.0")
-endif()
-
-file(GLOB MLT_FILES
-	    ${MLT_DIRECTORY}/libmlt++-*.dll
-	    ${MLT_DIRECTORY}/libmlt-*.dll
-	    ${MLT_DIRECTORY}/melt.exe
-	    )
-file(COPY ${MLT_FILES} DESTINATION ${SYNFIG_BUILD_ROOT}/bin)
-install(FILES ${MLT_FILES} DESTINATION bin)
-
-file(GLOB MLT_DIRECTORIES
-	    ${MLT_DIRECTORY}/lib
-	    ${MLT_DIRECTORY}/share
-	    )
-file(COPY ${MLT_DIRECTORIES} DESTINATION ${SYNFIG_BUILD_ROOT}/bin)
-install(DIRECTORY ${MLT_DIRECTORIES} DESTINATION bin)
-
-# /output/etc
-file(GLOB ETC_DIRECTORIES
-	    ${MINGW_PATH}/etc/ImageMagick-0-9*
-		${MINGW_PATH}/etc/fonts
-	    ${MINGW_PATH}/etc/gtk-3.0-9*
-	    )
-#    file(COPY ${ETC_DIRECTORIES} DESTINATION ${SYNFIG_BUILD_ROOT}/etc)
-INSTALL(DIRECTORY ${ETC_DIRECTORIES} DESTINATION etc)
-
-# /output/lib
-file(GLOB LIB_DIRECTORIES
-	    ${MINGW_LIB}/gdk-pixbuf-2.0-9
-	    ${MINGW_LIB}/gtk-3.0-9
-	    ${MINGW_LIB}/ImageMagick-*
-	    )
-#    file(COPY ${LIB_DIRECTORIES} DESTINATION ${SYNFIG_BUILD_ROOT}/lib)
-install(DIRECTORY ${LIB_DIRECTORIES} DESTINATION lib)
-
-# /output/share
-file(GLOB SHARE_DIRECTORIES
-	${MINGW_SHARE}/fontconfig
-	${MINGW_SHARE}/glib-2.0-9
-	${MINGW_SHARE}/gtk-3.0-9
-	${MINGW_SHARE}/icons
-	${MINGW_SHARE}/ImageMagick-*
-	${MINGW_SHARE}/mime
-	${MINGW_SHARE}/xml
-)
-
-install(DIRECTORY ${SHARE_DIRECTORIES} DESTINATION share)

_service:obs_scm:synfig-1.5.3.obscpio/cmake/SynfigFindGit.cmake Deleted

@@ -1,33 +0,0 @@
-#=============================================================
-
-Finds git and sets GIT_DATE, GIT_BRANCH and GIT_HASH
-for future use.
-
-#=============================================================
-
-find_package(Git)
-
-if (GIT_FOUND)
-    execute_process(
-        COMMAND ${GIT_EXECUTABLE} show -s --format=%ad --date=format:%Y-%m-%d HEAD
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_DATE
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    execute_process(
-        COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_BRANCH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    execute_process(
-        COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
-        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-        OUTPUT_VARIABLE GIT_HASH
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-else()
-    set(GIT_DATE    "unknown")
-    set(GIT_BRANCH  "unknown")
-    set(GIT_HASH    "unknown")
-endif()

_service:obs_scm:synfig-1.5.3.obscpio/cmake/SynfigGettext.cmake Deleted

@@ -1,103 +0,0 @@
-#=============================================================
-
-Although CMake provides functions for processing .po files,
-it cannot be used because GETTEXT_PROCESS_PO_FILES
-installs files with an invalid name. For example: for
-an en.gmo file, we should get the
-
-    ${LOCALE_DIR}/${language}/LC_MESSAGES/${project_name}.mo
-
-and not
-
-    ${LOCALE_DIR}/${language}/LC_MESSAGES/en.mo
-
-as it does, so we need to get the possibility to pass
-${project_name} to that function and use it for file naming.
-
-We also added an issue to CMake:
-https://gitlab.kitware.com/cmake/cmake/-/issues/20792
-
-#=============================================================
-
-find_program(MSGFMT_EXECUTABLE msgfmt)
-
-if(MSGFMT_EXECUTABLE)
-    execute_process(COMMAND ${MSGFMT_EXECUTABLE} --version
-        OUTPUT_VARIABLE GETTEXT_VERSION
-        ERROR_QUIET
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    get_filename_component(MSGMERGE_NAME ${MSGFMT_EXECUTABLE} NAME)
-    get_filename_component(MSGMERGE_NAMEWE ${MSGFMT_EXECUTABLE} NAME_WE)
-
-    if (GETTEXT_VERSION MATCHES "^(${MSGMERGE_NAME}|${MSGMERGE_NAMEWE}) \$^\$*\\) (0-9\\.+^ \n*)")
-        set(GETTEXT_VERSION_STRING "${CMAKE_MATCH_2}")
-    endif()
-
-    unset(GETTEXT_VERSION)
-    unset(MSGMERGE_NAME)
-    unset(MSGMERGE_NAMEWE)
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Gettext
-    REQUIRED_VARS GETTEXT_MSGMERGE_EXECUTABLE GETTEXT_MSGFMT_EXECUTABLE
-    VERSION_VAR GETTEXT_VERSION_STRING
-)
-
-function(SYNFIG_PROCESS_PO_FILES)
-    set(_options ALL)
-    set(_targetName TARGET_NAME)
-    set(_moName MO_NAME)
-    set(_installDestination INSTALL_DESTINATION)
-    set(_language LANGUAGES)
-    set(_moFiles)
-
-    cmake_parse_arguments(
-        _parsedArguments
-        "${_options}"
-        "${_targetName};${_moName};${_installDestination}"
-        "${_language}"
-        ${ARGN}
-    )
-
-    if(MSGFMT_EXECUTABLE)
-        foreach(_current_LANGUAGE ${_parsedArguments_LANGUAGES})
-            set(_poFile ${CMAKE_CURRENT_SOURCE_DIR}/${_current_LANGUAGE}.po)
-            set(_moDirectory ${SYNFIG_BUILD_ROOT}/share/locale/${_current_LANGUAGE}/LC_MESSAGES)
-            set(_moFile ${_moDirectory}/${_parsedArguments_MO_NAME}.mo)
-            add_custom_command(OUTPUT ${_moFile}
-                COMMAND ${CMAKE_COMMAND} -E make_directory ${_moDirectory}
-                COMMAND ${MSGFMT_EXECUTABLE} -o ${_moFile} ${_poFile}
-                WORKING_DIRECTORY "."
-                DEPENDS ${_poFile}
-            )
-
-            if(_parsedArguments_INSTALL_DESTINATION)
-                install(
-                    FILES ${_moFile} DESTINATION
-                    ${_parsedArguments_INSTALL_DESTINATION}/${_current_LANGUAGE}/LC_MESSAGES/
-                )
-            endif()
-
-            list(APPEND _moFiles ${_moFile})
-        endforeach()
-
-
-        if(NOT TARGET build_pofiles)
-            add_custom_target(build_pofiles)
-        endif()
-
-        if(_parsedArguments_TARGET_NAME)
-            if(_parsendArguments_ALL)
-                add_custom_target(${_parsedArguments_TARGET_NAME} ALL DEPENDS ${_moFiles})
-            else()
-                add_custom_target(${_parsedArguments_TARGET_NAME} DEPENDS ${_moFiles})
-            endif()
-
-            add_dependencies(build_pofiles ${_parsedArguments_TARGET_NAME})
-        endif()
-    else()
-        message(STATUS "-- Could not find msgfmt: Cannot process .po files for ${_parsedArguments_TARGET_NAME}.")
-    endif()
-endfunction()

_service:obs_scm:synfig-1.5.3.obscpio/cmake/SynfigIntltool.cmake Deleted

@@ -1,82 +0,0 @@
-find_program(INTLTOOL_MERGE_EXECUTABLE intltool-merge PATHS ${MSYS_ROOT}/usr/bin)
-mark_as_advanced(INTLTOOL_MERGE_EXECUTABLE)
-
-if(INTLTOOL_MERGE_EXECUTABLE)
-    execute_process(
-        COMMAND ${INTLTOOL_MERGE_EXECUTABLE} --version
-        OUTPUT_VARIABLE INTLTOOL_VERSION
-        ERROR_QUIET
-        OUTPUT_STRIP_TRAILING_WHITESPACE
-    )
-    if(INTLTOOL_VERSION MATCHES "^intltool-extract \$.*\$ 0-9")
-        string(REGEX REPLACE "^intltool-extract \$^\$*\\) (0-9\\.+^ \n*).*" "\\1" INTLTOOL_VERSION_STRING "${INTLTOOL_VERSION}")
-    endif()
-    unset(INTLTOOL_VERSION)
-endif()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(Intltool
-    REQUIRED_VARS INTLTOOL_MERGE_EXECUTABLE
-    VERSION_VAR INTLTOOL_VERSION_STRING
-)
-
-set(INTLTOOL_OPTIONS_DEFAULT "--quiet")
-
-# When MinGW is used without MSYS environment (for example, Ninja
-# generator uses the standard Windows `cmd` shell for building), `intltool-merge`
-# cannot be started, because it is just a Perl script, and `cmd` does not know how
-# to run it. In this case, we need to explicitly add the interpreter to the command.
-if(INTLTOOL_MERGE_EXECUTABLE AND MSYS)
-    message(STATUS "Fixing intltool-merge command...")
-    set(INTLTOOL_MERGE_EXECUTABLE ${MSYS_ROOT}/usr/bin/perl ${INTLTOOL_MERGE_EXECUTABLE})
-endif()
-
-function(STUDIO_INTLTOOL_MERGE)
-    set(_desktop DESKTOP)
-    set(_targetName TARGET_NAME)
-    set(_inputFile INPUT_FILE)
-    set(_outputFile OUTPUT_FILE)
-    set(_installDestination INSTALL_DESTINATION)
-
-    cmake_parse_arguments(
-            _parsedArguments
-            "${_desktop}"
-            "${_targetName};${_inputFile};${_installDestination};${_outputFile}"
-            ""
-            ${ARGN}
-    )
-
-    if(INTLTOOL_MERGE_EXECUTABLE)
-        if(_parsedArguments_OUTPUT_FILE)
-            set(_OUTPUT_FILE "${SYNFIG_BUILD_ROOT}/${_parsedArguments_INSTALL_DESTINATION}/${_parsedArguments_OUTPUT_FILE}")
-        else()
-            set(_OUTPUT_FILE "${SYNFIG_BUILD_ROOT}/${_parsedArguments_INSTALL_DESTINATION}/plugin.xml")
-        endif()
-
-        if(_parsedArguments_DESKTOP)
-            set(INTLTOOL_MERGE_OPTION "-d")
-        else()
-            set(INTLTOOL_MERGE_OPTION "-x")
-        endif()
-
-        add_custom_command(
-            OUTPUT ${_OUTPUT_FILE}
-            COMMAND ${INTLTOOL_MERGE_EXECUTABLE} ${INTLTOOL_MERGE_OPTION} -u
-            -c ${CMAKE_BINARY_DIR}/synfig-studio/po/.intltool-merge-cache
-            ${CMAKE_SOURCE_DIR}/synfig-studio/po
-            ${_parsedArguments_INPUT_FILE}
-            ${_OUTPUT_FILE}
-            DEPENDS ${_parsedArguments_INPUT_FILE}
-        )
-
-        add_custom_target(${_parsedArguments_TARGET_NAME}
-            DEPENDS ${_OUTPUT_FILE}
-        )
-
-        install(FILES ${_OUTPUT_FILE}
-            DESTINATION ${_parsedArguments_INSTALL_DESTINATION}
-        )
-    else()
-        message(WARNING "-- Could not find intltool-merge: No translations made for ${_parsedArguments_TARGET_NAME}.")
-    endif()
-endfunction()

_service:obs_scm:synfig-1.5.3.obscpio/cmake/SynfigVcpkg.cmake Deleted

@@ -1,213 +0,0 @@
-if(NOT VCPKG_TOOLCHAIN)
-	return()
-endif()
-
-# vcpkg supports linux, but the recipes and this file is only tested on Windows
-# using the MSVC compiler. Even though, I tried to make this file as generic as possible
-if(NOT MSVC)
-	message(FATAL_ERROR
-		"Synfig does not support building with vcpkg using anything other than the MSVC compiler yet!")
-endif()
-
-get_filename_component(VCPKG_TOOLCHAIN_DIR "${CMAKE_TOOLCHAIN_FILE}" DIRECTORY)
-
-# install dependencies
-# we could have required the user to pass the option X_VCPKG_APPLOCAL_DEPS_INSTALL
-# to enable installing dependencies automatically without this section, but this
-# current solution requires less work on the user side, and will give us more control
-# (for installing dependencies of gdk-pixbuf loaders for example)
-if(CMAKE_VERSION VERSION_GREATER_EQUAL "3.14")
-	if(WIN32)
-		macro(install_app_dependencies MOD MOD_NAME)
-			install(CODE "
-				message(\"-- Installing app dependencies for ${MOD_NAME}...\")
-				execute_process(
-					COMMAND ${CMAKE_COMMAND} -E copy \"${MOD}\" \"\${CMAKE_INSTALL_PREFIX}/bin/${MOD_NAME}.tmp\"
-				)
-				execute_process(
-					COMMAND powershell -noprofile -executionpolicy Bypass -file ${VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
-						-targetBinary \"\${CMAKE_INSTALL_PREFIX}/bin/${MOD_NAME}.tmp\"
-						-installedDir \"${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin\"
-				)
-				execute_process(
-					COMMAND ${CMAKE_COMMAND} -E remove \"\${CMAKE_INSTALL_PREFIX}/bin/${MOD_NAME}.tmp\"
-				)"
-			)
-		endmacro()
-	elseif(UNIX)
-		# TODO
-	endif()
-
-	# get all targets
-	# https://stackoverflow.com/questions/37434946/how-do-i-iterate-over-all-cmake-targets-programmatically/62311397#62311397
-	function(get_all_targets var)
-			set(targets)
-			get_all_targets_recursive(targets ${CMAKE_SOURCE_DIR})
-			set(${var} ${targets} PARENT_SCOPE)
-	endfunction()
-
-	macro(get_all_targets_recursive targets dir)
-			get_property(subdirectories DIRECTORY ${dir} PROPERTY SUBDIRECTORIES)
-			foreach(subdir ${subdirectories})
-					get_all_targets_recursive(${targets} ${subdir})
-			endforeach()
-
-			get_property(current_targets DIRECTORY ${dir} PROPERTY BUILDSYSTEM_TARGETS)
-			foreach(target ${current_targets})
-				get_target_property(target_type ${target} TYPE)
-				if ("${target_type}" MATCHES "^(EXECUTABLE|SHARED_LIBRARY|MODULE_LIBRARY)$")
-					list(APPEND targets ${target})
-				endif()
-			endforeach()
-	endmacro()
-
-	get_all_targets(all_targets)
-	foreach(target ${all_targets})
-		install_app_dependencies($<TARGET_FILE:${target}> $<TARGET_FILE_NAME:${target}>)
-	endforeach()
-else()
-	macro(install_app_dependencies MOD MOD_NAME)
-	endmacro()
-	# this is because generator expressions are required to get target output files
-	# and they're not allowed inside install CODE before cmake 3.14
-	message(WARNING "At least CMake 3.14 is required for installing the dependencies of synfig (current version: ${CMAKE_VERSION})")
-endif()
-
-# gdbus is required by gio on windows as a replacement for dbus on linux
-if(WIN32)
-	pkg_get_variable(GDBUS gio-2.0 gdbus)
-	file(
-		COPY "${GDBUS}${CMAKE_EXECUTABLE_SUFFIX}"
-		DESTINATION "${SYNFIG_BUILD_ROOT}/bin/"
-	)
-	install(
-		PROGRAMS "${SYNFIG_BUILD_ROOT}/bin/gdbus${CMAKE_EXECUTABLE_SUFFIX}"
-		DESTINATION "bin/"
-	)
-endif()
-
-# gdk-pixbuf loaders
-pkg_get_variable(GDKPIXBUF_LOADERS_DIR gdk-pixbuf-2.0 gdk_pixbuf_moduledir)
-pkg_get_variable(GDKPIXBUF_QUERYLOADERS gdk-pixbuf-2.0 gdk_pixbuf_query_loaders)
-
-if(GDKPIXBUF_LOADERS_DIR AND GDKPIXBUF_QUERYLOADERS)
-	set(SYNFIG_PIXBUF_LOADERS "${SYNFIG_BUILD_ROOT}/lib/gdk-pixbuf-2.0/2.10.0/loaders/")
-	file(MAKE_DIRECTORY "${SYNFIG_PIXBUF_LOADERS}")
-	file(
-		COPY "${GDKPIXBUF_QUERYLOADERS}${CMAKE_EXECUTABLE_SUFFIX}"
-		DESTINATION "${SYNFIG_BUILD_ROOT}/bin"
-	)
-
-	file(GLOB GDKPIXBUF_MODULES "${GDKPIXBUF_LOADERS_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}")
-	set(GDKPIXBUF_MODULES_DEPS)
-	foreach(MOD "${GDKPIXBUF_MODULES}")
-		file(COPY "${MOD}" DESTINATION "${SYNFIG_PIXBUF_LOADERS}")
-
-		# for these modules to work, their dependencies have to be linked against synfig
-		# or present in synfig's bin directory
-		if(WIN32)
-			get_filename_component(MOD_NAME "${MOD}" NAME)
-			add_custom_target(
-				copy_${MOD_NAME}_dependencies ALL
-				COMMAND ${CMAKE_COMMAND} -E copy "${MOD}" "${SYNFIG_BUILD_ROOT}/bin/${MOD_NAME}"
-				COMMAND powershell -noprofile -executionpolicy Bypass -file ${VCPKG_TOOLCHAIN_DIR}/msbuild/applocal.ps1
-					-targetBinary "${SYNFIG_BUILD_ROOT}/bin/${MOD_NAME}"
-					-installedDir "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}$<$<CONFIG:Debug>:/debug>/bin"
-				COMMAND ${CMAKE_COMMAND} -E remove "${SYNFIG_BUILD_ROOT}/bin/${MOD_NAME}"
-				DEPENDS "${MOD}"
-			)
-			install_app_dependencies(${MOD} ${MOD_NAME})
-			list(APPEND GDKPIXBUF_MODULES_DEPS "copy_${MOD_NAME}_dependencies")
-		elseif(UNIX)
-			# TODO: find the gdkpixbuf loader dependencies using something like "ldd",
-			# copy them and change their rpath to look at synfig's lib directory
-		endif()
-	endforeach()
-
-	install(
-		DIRECTORY "${SYNFIG_BUILD_ROOT}/lib/gdk-pixbuf-2.0/2.10.0/"
-		DESTINATION "lib/gdk-pixbuf-2.0/2.10.0/"
-	)
-
-	add_custom_target(
-		generate_pixbuf_loaders_cache ALL
-		BYPRODUCTS "${SYNFIG_PIXBUF_LOADERS}/../loaders.cache"
-		COMMAND "${SYNFIG_BUILD_ROOT}/bin/gdk-pixbuf-query-loaders${CMAKE_EXECUTABLE_SUFFIX}" > "${SYNFIG_PIXBUF_LOADERS}/../loaders.cache"
-	)
-	add_dependencies(generate_pixbuf_loaders_cache ${GDKPIXBUF_MODULES_DEPS})
-else()
-	message(WARNING "Gdk-pixbuf loaders directory cannot be found!")
-endif()
-
-# Glib schemas
-pkg_get_variable(GLIB_SCHEMAS_DIR gio-2.0 schemasdir)
-
-if(GLIB_SCHEMAS_DIR AND EXISTS "${GLIB_SCHEMAS_DIR}/gschemas.compiled")
-	set (GLIB_SCHEMAS_COMPILED "${GLIB_SCHEMAS_DIR}/gschemas.compiled")
-endif()
-
-if((NOT GLIB_SCHEMAS_DIR OR NOT EXISTS "${GLIB_SCHEMAS_DIR}") AND (NOT GLIB_SCHEMAS_COMPILED OR NOT EXISTS "${GLIB_SCHEMAS_COMPILED}"))
-	message(FATAL_ERROR "Could not find glib schemas directory! This will cause synfigstudio to crash\n"
-		"Please set GLIB_SCHEMAS_DIR or GLIB_SCHEMAS_COMPILED")
-endif()
-
-file (MAKE_DIRECTORY "${SYNFIG_BUILD_ROOT}/share/glib-2.0/schemas")
-
-if(NOT GLIB_SCHEMAS_COMPILED OR NOT EXISTS "${GLIB_SCHEMAS_COMPILED}")
-	set(_GLIB_SCHEMAS_COMPILED "${SYNFIG_BUILD_ROOT}/share/glib-2.0/schemas/gschemas.compiled")
-	pkg_get_variable(GLIB_COMPILE_SCHEMAS gio-2.0 glib_compile_schemas)
-	if(NOT GLIB_COMPILE_SCHEMAS OR NOT EXISTS "${GLIB_COMPILE_SCHEMAS}${CMAKE_EXECUTABLE_SUFFIX}")
-		message(FATAL_ERROR "Could not find glib_compile_schemas!")
-	endif()
-
-	add_custom_target(
-		compile_glib_schemas ALL
-		BYPRODUCTS "${SYNFIG_BUILD_ROOT}/share/glib-2.0/schemas/gschemas.compiled"
-		COMMAND "${GLIB_COMPILE_SCHEMAS}${CMAKE_EXECUTABLE_SUFFIX}" "${GLIB_SCHEMAS_DIR}" --targetdir="${SYNFIG_BUILD_ROOT}/share/glib-2.0/schemas"
-		DEPENDS "${GLIB_SCHEMAS_DIR}/gschema.dtd"
-	)
-else()
-	set(_GLIB_SCHEMAS_COMPILED "${GLIB_SCHEMAS_COMPILED}")
-	file(
-		COPY "${_GLIB_SCHEMAS_COMPILED}"
-		DESTINATION "${SYNFIG_BUILD_ROOT}/share/glib-2.0/schemas"
-	)
-endif()
-
-install(
-	PROGRAMS "${_GLIB_SCHEMAS_COMPILED}"
-	DESTINATION "share/glib-2.0/schemas"
-)
-
-# fonts
-pkg_get_variable(FONTCONFIG_CONFDIR fontconfig confdir)
-if(FONTCONFIG_CONFDIR AND EXISTS "${FONTCONFIG_CONFDIR}")
-	file(
-		COPY "${FONTCONFIG_CONFDIR}/"
-		DESTINATION "${SYNFIG_BUILD_ROOT}/etc/fonts"
-	)
-	install(
-		DIRECTORY "${SYNFIG_BUILD_ROOT}/etc/fonts/"
-		DESTINATION "etc/fonts"
-	)
-else()
-	message(WARNING "Could not locate fontconfig's fonts directory")
-endif()
-
-# icons
-# package hicolor-icon-theme (which is almost completely empty!)
-file(
-	COPY "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/hicolor-icon-theme/icons"
-	DESTINATION "${SYNFIG_BUILD_ROOT}/share/"
-)
-
-# package adwaita-icon-theme
-file(
-	COPY "${VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/adwaita-icon-theme/icons"
-	DESTINATION "${SYNFIG_BUILD_ROOT}/share/"
-)
-
-install(
-	DIRECTORY "${SYNFIG_BUILD_ROOT}/share/icons"
-	DESTINATION "share/"
-)

_service:obs_scm:synfig-1.5.3.obscpio/packaging/nsis Deleted

_service:obs_scm:synfig-1.5.3.obscpio/packaging/nsis/header.bmp Deleted

_service:obs_scm:synfig-1.5.3.obscpio/packaging/nsis/welcomefinish.bmp Deleted

_service:obs_scm:synfig-1.5.3.obscpio/perf/scripts Deleted

_service:obs_scm:synfig-1.5.3.obscpio/perf/scripts/requirements.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/perf/scripts/test_render_all_perf.py Deleted

@@ -1,111 +0,0 @@
-#!/usr/bin/python3
-#
-# This is a script that will run the synfig rendering multiple times on a set of
-# .sif files. Record the time it took each pass to render, and then store those
-# readings into a .csv file. To properly run this:
-#
-# 1. This script needs to be placed in the root of the build directory, and run
-# from that directory
-# 2. The `synfig-tests` repo needs to be cloned (in the build directory as well.
-# The repo is found here: https://gitlab.com/synfig/synfig-tests
-# 3. Don't have any applications running at the same time. It can mess with the
-# performance measurements.
-#
-# It can take an extremely long time to run (.e.g 25 mintues right now). Before
-# trying to do any perf tweaking in the rendering code, make sure you generate
-# a reference/baseline to go off from. This should be the latest commit on
-# `master`. Don't forget to copy this CSV file to another location in case you
-# accidentally purge it. Every so often (as new commits come in), you'll need
-# to run the script to get a new baseline. But as the renderer gets faster,
-# it shouldn't have to run as long.
-#
-# Be sure to see the `view_comparison_graph.py` script to see how to make use
-# of the generated CSV file
-
-
-
-import os
-import time, datetime
-import csv
-import subprocess
-from collections import OrderedDict
-
-SIF_DIR = 'synfig-tests/export/lottie/'
-SIF_EXE = 'output/bin/synfig'
-NUM_PASSES = 10 # if you want to work on this script, setting this value to `3` helps
-COMMIT_ID = 'perf_imps-' # TODO see list below
-
-
-# TODO list:
-# - get the current working branch and commit id and put it into the `COMMIT_ID` variable
-# - results files should not only be a CSV. It should also contain the metadata
-# about the environment & setup). So instead there should be a JSON file generated
-# - Add a way of getting the current environment (e.g. Ubuntu 18.04) and put it the
-# metadata
-# - Add a way of polling the current CPU and put it into the metadata
-# - Add a way of polling the compiler used by CMake (and build type) and put it into
-# the metadata
-
-
-
-def main():
- # Get all of the .sif files
- all_sif = os.listdir(SIF_DIR)
- all_sif = list(filter(lambda x: x.endswith('.sif'), all_sif))
- all_sif.sort()
-
-# all_sif = all_sif:10 # Uncomment this line when you want to do some development on the script. It's help to limit the amount of .sif files
-
- # Result of all the renders, key=<render filename>, value=listfloat
- all_renders = OrderedDict()
-
- print('Doing (%i x %i) render tests' % (len(all_sif), NUM_PASSES))
-
- total_render_time = 0.0
- for sif in all_sif:
- # Create the path to the file
- sif_path = os.path.join(SIF_DIR, sif)
-
- # Create result store
- render_times = 
-
- for i in range(0, NUM_PASSES):
- # Run (and time) the render
- st = time.time()
- subprocess.run(
- SIF_EXE, sif_path, '-t', 'null', '--quiet',
- cwd=os.getcwd()
- )
- et = time.time()
-
- # Store result
- rt = et - st
- render_times.append(rt)
- total_render_time += rt
-
- # Print it
- print('%s %02i :: %.4f' % (sif, i + 1, rt))
-
- # Store in dict
- all_renderssif = render_times
-
- # Write the results
- time_str = datetime.datetime.now().strftime('%Y_%m_%d-%H_%M_%S')
- result_filename = '%s_n%s_%s.csv' % (COMMIT_ID, NUM_PASSES, time_str)
- with open(result_filename, 'w') as csv_file:
- # Make the header, will be: '.sif file', 'Pass 1', 'Pass 2', ... 'Pass 10'
- fieldnames = '.sif file' + 'Pass %i time' % (x + 1) for x in range(0, NUM_PASSES)
-
- wr = csv.writer(csv_file)
- wr.writerow(fieldnames)
-
- # Write each result
- for sif, render_times in all_renders.items():
- wr.writerow(sif + render_times)
-
- print('Wrote results to %s' % result_filename)
- print('Total Render Time: %.4f sec (%.2f min)' % (total_render_time, total_render_time / 60.0))
-
-
-if __name__ == '__main__':
- main()

_service:obs_scm:synfig-1.5.3.obscpio/perf/scripts/view_comparison_graph.py Deleted

@@ -1,134 +0,0 @@
-#!/usr/bin/python3
-#
-# Be sure to read the `test_render_all_perf.py` script first. You'll need two
-# generated CSV files from that script. You'll also need matplotlib/pyplot
-# installed.
-#
-# This script takes two arguments, the filepaths of two runs. The first one
-# provided is considered the "reference" run. The second is the "test" run.
-# Interpreting the graph is pretty simple, Whichever bar is short means that
-# it was faster. Make sure you have enough passes from the
-# `test_render_all_perf.py` script (default should be set to 10). The `mean`
-# of all runs will be plotted as a bar's value. But black line will appear
-# on the edge of the bar's tip, as to mark the variance/error.
-
-import sys
-import matplotlib.pyplot as plt
-import csv
-import statistics
-
-plt.style.use('ggplot')
-
-
-def main():
- if len(sys.argv) < 3:
- print('Please supply at least two CSV files of runs')
- print(' First one should be the `master` reference, second is the comparison')
- sys.exit(0)
-
- run_data_filenames = sys.argv1:
-
- # First one is the reference
- ref_run_filename = run_data_filenames0
-
- # Chart data
- sif_files = 
- ref_mean_runs = 
- ref_fastest_runs = 
- ref_slowest_runs = 
-
- # Get the data (for the reference run)
- past_first_row = False
- with open(ref_run_filename) as csvfile:
- r = csv.reader(csvfile)
-
- for row in r:
- # First row only has meta-data
- if not past_first_row:
- past_first_row = True
- continue
-
- # Else, we've got data, first column is the filename
- sif_files.append(row0)
-
- # The rest are the runs of the data
- all_runs = float(x) for x in row1:
- mean_run = statistics.mean(all_runs)
- fastest_run = min(all_runs)
- slowest_run = max(all_runs)
-
- ref_mean_runs.append(mean_run)
- ref_fastest_runs.append(mean_run - fastest_run)
- ref_slowest_runs.append(slowest_run - mean_run)
-
- # test run
- # TODO, this should be put in a reusable function!!
- test_run_filename = run_data_filenames1
- test_mean_runs = 
- test_fastest_runs = 
- test_slowest_runs = 
- past_first_row = False
-
- with open(test_run_filename) as csvfile:
- r = csv.reader(csvfile)
-
- for row in r:
- # First row only has meta-data
- if not past_first_row:
- past_first_row = True
- continue
-
- # The rest are the runs of the data
- all_runs = float(x) for x in row1:
- mean_run = statistics.mean(all_runs)
- fastest_run = min(all_runs)
- slowest_run = max(all_runs)
-
- test_mean_runs.append(mean_run)
- test_fastest_runs.append(mean_run - fastest_run)
- test_slowest_runs.append(slowest_run - mean_run)
-
- # Reverse the order (os that we have 000 at the top, and NNN at the bottom)
- for x in sif_files, ref_mean_runs, ref_fastest_runs, ref_slowest_runs, test_mean_runs, test_fastest_runs, test_slowest_runs:
- x.reverse()
-
- # Create and show the graph
- sif_spacing = 2
- bar_spacing = 0
- bar_height = 0.5
- y = (x * sif_spacing) for x in range(0, len(sif_files))
-
- # Plot the Reference
- plt.barh(
- y,
- ref_mean_runs,
- bar_height,
- xerr=ref_fastest_runs, ref_slowest_runs,
- color='darkorchid',
- label='Reference',
- )
-
- # Plot the test
- y = (x - bar_height - bar_spacing) for x in y
- plt.barh(
- y,
- test_mean_runs,
- bar_height,
- xerr=test_fastest_runs, test_slowest_runs,
- color='dodgerblue',
- label='Test',
- )
-
- # Rest of the chart
- y = (x + (bar_height / 2)) for x in y
- plt.xlabel('Run time (seconds), smaller is better')
- plt.ylabel('.sif file')
- plt.yticks(y, sif_files)
- plt.title('Run Time Comparison')
- plt.legend(loc='best')
-
- plt.show()
-
-
-if __name__ == '__main__':
- main()

_service:obs_scm:synfig-1.5.3.obscpio/snap/local Deleted

_service:obs_scm:synfig-1.5.3.obscpio/snap/snapcraft.yaml Deleted

@@ -1,162 +0,0 @@
-name: synfigstudio
-title: 'Synfig Studio'
-summary: Create and edit 2D animations and compositions
-description: |
-  Synfig Studio is a free and open-source 2D animation software, designed as
-  powerful industrial-strength solution for creating film-quality animation
-  using a vector and bitmap artwork. It eliminates the need to create
-  animation frame-by frame, allowing you to produce 2D animation of a higher
-  quality with fewer people and resources.
-
-  Features:
-
-  - Can manipulate vector and bitmap artwork
-  - Automatic tweening (independent from FPS)
-  - Multitude of layers of various types (geometry primitives, shapes,
-  gradients, fractals)
-  - Full-featured bone system
-  - Filters and effects for compositing (blurs, distortions, color
-  manipulation, masks)
-  - All color operations use High Dynamic-Range Imaging (HDRI)
-  - Pentablet-friendly tools
-  - Sound support
-  - Linking data on file- or parameter-level
-  - Automatic animation using mathematical functions
-
-base: core18
-adopt-info: cleanup
-confinement: strict
-license: GPL-3.0
-
-architectures:
-  - build-on: amd64
-
-apps:
-  synfigstudio: &app
-    command: usr/bin/synfigstudio
-    common-id: org.synfig.SynfigStudio
-    desktop: usr/share/applications/org.synfig.SynfigStudio.desktop
-    extensions: gnome-3-34
-    plugs: &plugs opengl, home, removable-media, gsettings, network
-    environment: &env
-      __EGL_VENDOR_LIBRARY_DIRS: $SNAP/gnome-platform/usr/share/glvnd/egl_vendor.d:$SNAP/usr/share/glvnd/egl_vendor.d
-      PYTHONPATH: $SNAP/usr/lib/python3/dist-packages:$PYTHONPATH
-
-  synfig:
-    command: usr/bin/synfig
-    extensions: gnome-3-34
-    plugs: *plugs
-    environment: *env
-
-layout:
-  /usr/share/synfig:
-    symlink: $SNAP/usr/share/synfig
-  /usr/share/pixmaps/synfigstudio:
-    symlink: $SNAP/usr/share/pixmaps/synfigstudio
-
-parts:
-  synfig-deps:
-    plugin: nil
-    build-packages:
-      - g++
-      - intltool
-      - gettext
-      - libmagickcore-dev
-      - libmagick++-dev
-      - libopenexr-dev
-      - libsigc++-2.0-dev
-      - libxml++2.6-dev
-      - libfftw3-dev
-      - libmlt-dev
-      - libmlt++-dev
-      - libmlt-data
-      - libmng-dev
-      - git
-      - libxml2-utils # to extract version from appdata file
-    stage-packages:
-      - libilmbase12
-      - libmagick++-6.q16-7
-      - libmagic1
-      - libmlt++3
-      - libmlt6
-      - libmng2
-      - libopenexr22
-      - libsigc++-2.0-0v5
-      - libxml++2.6-2v5
-      - libdv-bin # mod_dv
-      - ffmpeg # mod_ffmpeg
-      - libflite1 # ffmpeg required
-      - imagemagick # mod_imagemagick
-      - libglu1-mesa
-      - freeglut3
-      - python3-lxml # lottie exporter
-
-  etl:
-    after: synfig-deps
-    plugin: autotools
-    source: ETL
-    configflags: &cfgflags
-      - --prefix=/usr
-
-  synfig-core:
-    after: etl
-    plugin: autotools
-    source: synfig-core
-    configflags: *cfgflags
-    override-build: &build |
-      set -xe
-      autoreconf -i
-      intltoolize --force
-      snapcraftctl build
-
-  synfig-studio:
-    after: synfig-core
-    plugin: autotools
-    source: synfig-studio
-    configflags: *cfgflags
-    override-build: *build
-
-  cleanup:
-    after: synfig-studio
-    plugin: nil
-    build-snaps: core18, gnome-3-34-1804
-
-    override-stage: |
-      set -xe
-      snapcraftctl stage
-
-      appdata_file="usr/share/appdata/org.synfig.SynfigStudio.appdata.xml"
-      appdata_version=$(xmllint --xpath 'string(//release1/@version)' "$appdata_file")
-
-      # fix the icon path and point it to a file inside the snap
-      sed -i -E "s|^Icon=(.*)|Icon=\${SNAP}/usr/share/icons/hicolor/scalable/apps/\1.svg|g" \
-        usr/share/applications/org.synfig.SynfigStudio.desktop
-
-      cd "$SNAPCRAFT_PROJECT_DIR"
-
-      # consider grade to be stable if commit is tagged
-      git describe --exact-match HEAD && grade="stable" || grade="devel"
-      snapcraftctl set-grade "$grade"
-
-      # append build date and git hash to version for untagged ("devel") builds
-      if  "$grade" = "devel" ; then
-        githash=$(git rev-parse --short=7 HEAD)
-        datestring=$(date -u +%Y%m%d)
-        snapcraftctl set-version "${appdata_version}-${datestring}~${githash}"
-      fi
-
-    override-prime: |
-      set -eux
-      for lib in "libharfbuzz" "libglibmm" "libgiomm" "libQt" "libflite" "qt5"; do
-        rm -rf "usr/lib/$SNAPCRAFT_ARCH_TRIPLET/$lib"*
-      done
-      for cruft in "bug" "lintian" "man" "icons/Humanity"; do
-        rm -rf "$SNAPCRAFT_PRIME/usr/share/$cruft"
-      done
-      find $SNAPCRAFT_PRIME/usr/share/doc/ -type f -not -name 'copyright' -delete
-      find $SNAPCRAFT_PRIME/usr/share -type d -empty -delete
-      # Remove all files from snap that are already included in the base snap or in
-      # any connected content snaps
-      for snap in "core18" "gnome-3-34-1804"; do  # List all content-snaps and base snaps you're using here
-        cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
-      done

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/config/ltmain.patch Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/config/package Deleted

@@ -1,292 +0,0 @@
-#! /bin/csh -ef
-# this file was originally distributed by Apple in the Developer Tools package 
-#it is distributed under the Apple Open Source License
-set version=0.2
-set prog = `/usr/bin/basename $0`
-set usage = "Usage: $prog -f root-dir info-file tiff-file -d dest-dir -r resource-dir -traditional | -gnutar -bzip"
-set noglob
-
-if (-x /usr/bin/mkbom) then
- set mkbom=/usr/bin/mkbom
- set lsbom=/usr/bin/lsbom
-else
- set mkbom=/usr/etc/mkbom
- set lsbom=/usr/etc/lsbom
-endif
-
-if (-x /usr/bin/awk) then
- set awk=/usr/bin/awk
-else
- set awk=/bin/awk
-endif
-set bzip2=`which bzip2`
-set gnutar=/usr/bin/gnutar
-set tar=/usr/bin/tar
-set pax=/bin/pax
-
-# gather parameters
-if ($#argv == 0) then
- echo $usage
- exit(1)
-endif
-unset usebzip
-while ( $#argv > 0 )
- switch ( $argv1 )
-	case -d:
-	 if ( $?destDir ) then
-		echo ${prog}: dest-dir parameter already set to ${destDir}.
-		echo $usage
-		exit(1)
-	 else if ( $#argv < 2 ) then
-		echo ${prog}: -d option requires destination directory.
-		echo $usage
-		exit(1)
-	 else
-		set destDir = $argv2
-		shift; shift
-		breaksw
-	 endif
-	case -f:
-	 if ( $?rootDir ) then
-		echo ${prog}: root-dir parameter already set to ${rootDir}.
-		echo $usage
-		exit(1)
-	 else if ( $#argv < 2 ) then
-		echo ${prog}: -f option requires package root directory.
-		echo $usage
-		exit(1)
-	 else
-		set rootDir = $argv2
-		set fflag
-		shift; shift
-		breaksw
-	 endif
-	case -r:
-	 if ( $?resDir ) then
-		echo ${prog}: resource-dir parameter already set to ${resDir}.
-		echo $usage
-		exit(1)
-	 else if ( $#argv < 2 ) then
-		echo ${prog}: -r option requires package resource directory.
-		echo $usage
-		exit(1)
-	 else
-		set resDir = $argv2
-		shift; shift
-		breaksw
-	 endif
-	case -traditional:
- echo using standard tar
-	 set usetar
- unset usegnutar
-	 unset usepax
-	 breaksw
- case -gnutar:
-	 echo using gnutar
-	 set usegnutar
- unset usepax
-	 unset usetar
- shift
-	case -bzip:
-	 if (-x $bzip2) then
-	 	set usebzip
- echo using bzip compression
-	 else
-		echo COMPRESSION ERROR: You can not use BZIP2 you do not have it installed
-		exit(1)
-	 endif
- shift
- breaksw
-	case -*:
-	 echo ${prog}: Unknown option: $argv1
-	 echo $usage
-	 exit(1)
-	case *.info:
-	 if ( $?info ) then
-		echo ${prog}: info-file parameter already set to ${info}.
-		echo $usage
-		exit(1)
-	 else
-		set info = "$argv1"
-		shift
-		breaksw
-	 endif
-	case *.tiff:
-	 if ( $?tiff ) then
-		echo ${prog}: tiff-file parameter already set to ${tiff}.
-		echo $usage
-		exit(1)
-	 else
-		set tiff = "$argv1"
-		shift
-		breaksw
-	 endif
-	default:
-	 if ( $?rootDir ) then
-		echo ${prog}: unrecognized parameter: $argv1
-		echo $usage
-		exit(1)
-	 else
-		set rootDir = "$argv1"
-		shift
-		breaksw
-	 endif
- endsw
-end
-
-# check for mandatory parameters
-if ( ! $?rootDir ) then
- echo ${prog}: missing root-dir parameter.
- echo $usage
- exit(1)
-else if ( ! $?info) then
- echo ${prog}: missing info-file parameter.
- echo $usage
- exit(1)
-endif
-
-# destDir gets default value if unset on command line
-if ( $?destDir ) then
- /bin/mkdir -p $destDir
-else
- set destDir = .
-endif
-
-# derive the root name for the package from the root name of the info file
-set root = `/usr/bin/basename $info .info`
-
-# create package directory
-set pkg = ${destDir}/${root}.pkg
-echo Generating Installer package $pkg ...
-if ( -e $pkg ) /bin/rm -rf $pkg
-/bin/mkdir -p -m 755 $pkg
-/bin/mkdir -p -m 755 $pkg/Contents
-/bin/mkdir -p -m 755 $pkg/Contents/Resources
-/bin/mkdir -p -m 755 $pkg/Contents/Resources/English.lproj/
-echo "gxpmpkg2" >$pkg/Contents/PkgInfo
-chmod 755 $pkg/Contents/PkgInfo
-# (gnu)tar/pax and compress root directory to package archive
-echo -n "	creating package archive ... "
-if ( $?fflag ) then
- set pkgTop = ${rootDir:t}
- set parent = ${rootDir:h}
- if ( "$parent" == "$pkgTop" ) set parent = "."
-else
- set parent = $rootDir
- set pkgTop = . 
-endif
-if ( $?usetar ) then
- set pkgArchive = $pkg/Contents/Resources/$root.tar.Z
- (cd $parent; $tar -w $pkgTop) | /usr/bin/tar -f -c > $pkgArchive
-else if ( $?usegnutar ) then
- if ( $?usebzip ) then
- set pkgArchive = $pkg/Contents/Resources/$root.tar.bz2
- (cd $parent; $gnutar c $pkgTop) | $bzip2 -f -c > $pkgArchive
- else 
- set pkgArchive = $pkg/Contents/Resources/$root.tar.gz
- (cd $parent; $gnutar zcf $pkgArchive $pkgTop)
- endif
-else
- set pkgArchive = $pkg/Contents/Resources/$root.pax.gz
- (cd $parent; $pax -w -z -x cpio $pkgTop) > $pkgArchive
-endif
-/bin/chmod 755 $pkgArchive
-echo done.
-
-# copy info file to package
-set pkgInfo = $pkg/Contents/Resources/English.lproj/$root.info
-echo -n "	copying ${info:t} ... "
-/bin/cp $info $pkgInfo
-/bin/chmod 755 $pkgInfo
-echo done.
-
-# copy tiff file to package
-if ( $?tiff ) then
- set pkgTiff = $pkg/$root.tiff
- echo -n "	copying ${tiff:t} ... "
- /bin/cp $tiff $pkgTiff
- /bin/chmod 444 $pkgTiff
- echo done.
-endif
-
-# copy resources to package
-if ( $?resDir ) then
- echo -n "	copying ${resDir:t} ... "
-
- # don't want to see push/pop output
- pushd $resDir > /dev/null
-	# get lists of resources. We'll want to change
-	# permissions on just these things later.
- set directoriesInResDir = `find . -type d | grep -v -e .git`
- set filesInResDir = `find . -type f | grep -v -e .git`
- popd > /dev/null
-
- # copy the resource directory contents into the package directory
- foreach resFile (`cd $resDir && find . | grep -v -e .git`)
-	cp -r "$resDir/$resFile" "$pkg/Contents/Resources"
- end
-
- pushd $pkg/Contents/Resources > /dev/null
-	# Change all directories to +r+x, except the package
-	# directory itself
- foreach resFileItem ($directoriesInResDir)
- if ( $resFileItem != "." ) then
- chmod 755 "$resFileItem"
- endif
- end
-	# change all flat files to read only
- foreach resFileItem ($filesInResDir)
- if ( $resFileItem != "./.DS_Store" ) then
- chmod 755 "$resFileItem"
-	 endif
- end
- popd > /dev/null
-
- echo done.
-endif
-
-# generate bom file
-set pkgBom = $pkg/Contents/Resources/$root.bom
-echo -n "	generating bom file ... "
-/bin/rm -f $pkgBom
-if ( $?fflag ) then
- $mkbom $parent $pkgBom >& /dev/null
-else
- $mkbom $rootDir $pkgBom >& /dev/null
-endif
-/bin/chmod 444 $pkgArchive
-echo done.
-	
-# generate sizes file
-set pkgSizes = $pkg/Contents/Resources/$root.sizes
-echo -n "	generating sizes file ... "
-
-# compute number of files in package
-set numFiles = `$lsbom -s $pkgBom | /usr/bin/wc -l`
-
-# compute package size when compressed
-@ compressedSize = `/usr/bin/du -k -s $pkg | $awk '{print $1}'`
-@ compressedSize += 3		# add 1KB each for sizes, location, status files
-
-@ infoSize = `/bin/ls -s $pkgInfo | $awk '{print $1}'`
-@ bomSize = `/bin/ls -s $pkgBom | $awk '{print $1}'`
-if ( $?tiff ) then
- @ tiffSize = `/bin/ls -s $pkgTiff | $awk '{print $1}'`
-else
- @ tiffSize = 0
-endif 
-
-@ installedSize = `/usr/bin/du -k -s $rootDir | $awk '{print $1}'`
-@ installedSize += $infoSize + $bomSize + $tiffSize + 3
-
-# echo size parameters to sizes file
-echo NumFiles $numFiles > $pkgSizes
-echo InstalledSize $installedSize >> $pkgSizes
-echo CompressedSize $compressedSize >> $pkgSizes
-echo done.
-echo " ... finished generating $pkg."
-
-exit(0)
-
-# end package
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/configure.ac Deleted

@@ -1,629 +0,0 @@
-# -- I N I T --------------------------------------------------
-
-AC_PREREQ(2.60)
-AC_INIT(Synfig Core,1.5.3,https://github.com/synfig/synfig/issues,synfig)
-AC_REVISION()
-
-AM_SILENT_RULES(yes)
-
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_HEADERS(config.h)
-AC_CANONICAL_HOST
-
-AM_INIT_AUTOMAKE(nostdinc subdir-objects)
-AM_MAINTAINER_MODE
-
-dnl SUPPRESSED_CPPFLAGS=SUPPRESS_WARNINGS($SOME_CPPFLAGS)
-dnl Replace -I with -isystem in $SOME_CPPFLAGS to suppress warnings from
-dnl headers from its include directories and return the result.
-dnl See -isystem documentation:
-dnl https://gcc.gnu.org/onlinedocs/gcc/Directory-Options.html
-dnl https://clang.llvm.org/docs/ClangCommandLineReference.html#cmdoption-clang-isystem-directory
-dnl Do not change "-I/usr/include" to "-isystem /usr/include" because that
-dnl is not necessary (/usr/include is already a system directory) and because
-dnl it would break GCC's #include_next.
-AC_DEFUN(SUPPRESS_WARNINGS,
-         $(echo $1 |${SED} -E -e 's/(^| )-I/\1-isystem /g' -e 's;-isystem /usr/include(/ |$);-I/usr/include\1;g'))
-
-dnl override platform specific check for dependent libraries
-dnl otherwise libtool linking of shared libraries will
-dnl fail on anything other than pass_all.
-# this hack is needed to link libsynfig with static libdl in MSYS2 environment
-AC_CACHE_VAL(lt_cv_deplibs_check_method, lt_cv_deplibs_check_method=pass_all)
-
-LT_CONFIG_LTDL_DIR(libltdl)
-
-LT_INIT(dlopen, win32-dll, disable-static)
-AC_SUBST(LIBTOOL_DEPS)
-
-LTDL_INIT(convenience)
-
-AC_DEFINE(LT_SCOPE,extern,LibLTDL is linked statically)
-
-# -- V A R I A B L E S ----------------------------------------
-
-API_VERSION=1.0
-MODULE_DIR='${libdir}/synfig/modules'
-SYNFIGLIB_DIR=${libdir}/synfig
-
-# -- P R O G R A M S ------------------------------------------
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_CXXCPP
-AC_PROG_INSTALL
-AX_CXX_COMPILE_STDCXX(11, noext)
-CXXFLAGS="$CXXFLAGS -std=gnu++11"
-
-AC_LANG(C++)
-
-AC_C_BIGENDIAN
-
-
-# -- A R G U M E N T S ----------------------------------------
-
-AC_ARG_OPTIMIZATION
-AC_ARG_DEBUG
-AC_ARG_WARNINGS
-AC_ARG_PROFILING
-AC_ARG_PROFILE_ARCS
-AC_ARG_BRANCH_PROBABILITIES
-
-AC_WIN32_QUIRKS
-
-dnl
-dnl dynamic linker
-dnl
-AC_CHECK_LIB(c, dlopen,
-	DYNAMIC_LD_LIBS="",
-	AC_CHECK_LIB(
-		dl,
-		dlopen,
-		DYNAMIC_LD_LIBS="-ldl",
-		DYNAMIC_LD_LIBS=""
-	)
-)
-
-AC_SUBST(DYNAMIC_LD_LIBS)
-
-AC_ARG_ENABLE(layer-profiling,
-	AS_HELP_STRING(--enable-layer-profiling, enable layer profiling),
-	use_layerprofiling=$enableval
-,
-
-	use_layerprofiling="no"
-)
-if test $use_layerprofiling = "yes" ; then {
-	AC_DEFINE(SYNFIG_PROFILE_LAYERS,1,enable layer profiling)
-} ; fi
-
-
-
-
-AC_ARG_WITH(imagemagick,
-	AS_HELP_STRING(--without-imagemagick, do not support ImageMagick),
-,
-	AC_CHECK_PROG(imagemagick_convert,convert,yes,no)
-	with_imagemagick=$imagemagick_convert
-)
-AM_CONDITIONAL(WITH_IMAGEMAGICK, test $with_imagemagick = yes)
-
-
-
-
-
-AC_ARG_WITH(magickpp,
-	AS_HELP_STRING(--without-magickpp, do not support Magick++),
-,
-	with_magickpp="yes"
-)
-AM_CONDITIONAL(HAVE_LIBMAGICKPP,false)
-if test $with_magickpp = "yes" ; then {
-	PKG_CHECK_MODULES(MAGICKPP, Magick++ >= 6.4.2,
-		with_magickpp="yes"
-		AM_CONDITIONAL(HAVE_LIBMAGICKPP,true)
-		CONFIG_DEPS="$CONFIG_DEPS Magick++"
-	,
-		with_magickpp="no"
-		AC_MSG_ERROR( *** Unable to find Magick++)
-	)
-} ; fi
-
-
-
-
-AC_ARG_WITH(ffmpeg,
-	AS_HELP_STRING(--without-ffmpeg, do not support FFMPEG),
-,
-	with_ffmpeg="yes"
-)
-AM_CONDITIONAL(WITH_FFMPEG, test $with_ffmpeg = yes)
-
-
-AC_ARG_WITH(vimage,
-	AS_HELP_STRING(--with-vimage, support Apple vImage),
-,
-	with_vimage="no"
-)
-if test $with_vimage = "no" ; then {
-	AM_CONDITIONAL(WITH_VIMAGE,false)
-} else {
-	AM_CONDITIONAL(WITH_VIMAGE,true)
-	AC_DEFINE(HAS_VIMAGE,1,enable apple vImage)
-	VIMAGE_LIBS="-Wc,-framework -Wc,Accelerate"
-
-} ; fi
-
-
-
-AC_ARG_WITH(libdv,
-	AS_HELP_STRING(--without-libdv, do not support libdv),
-,
-	with_libdv="yes"
-)
-AM_CONDITIONAL(WITH_LIBDV, test $with_libdv = yes)
-
-
-
-
-# LIBAVCODEC CHECK--------------------
-
-AC_ARG_WITH(libavcodec,
-	AS_HELP_STRING(--without-libavcodec, do not support libavcodec),
-,
-	with_libavcodec="yes"
-)
-
-if test $with_libavcodec != "no" ; then {
-	PKG_CHECK_MODULES(LIBAVCODEC, libavcodec >= 57.0 libavformat >= 57.0 libavutil >= 55.0 libswscale >= 4.0,
-		CONFIG_DEPS="$CONFIG_DEPS libavcodec libavformat libswscale",
-		echo no; with_libavcodec="no")
-} ; fi
-if test $with_libavcodec = "yes" ; then {
-	AC_DEFINE(WITH_LIBAVCODEC,,enable libavcodec support)
-	AM_CONDITIONAL(WITH_LIBAVCODEC,true)
-} else {
-	AM_CONDITIONAL(WITH_LIBAVCODEC,false)
-} ; fi
-
-if test $with_libavcodec = "yes" ; then {
-	# save flags
-	ac_save_CPPFLAGS="$CPPFLAGS"
-	ac_save_CFLAGS="$CFLAGS"
-
-	# Need to check both the new and old locations for the avformat header
-	CPPFLAGS="${ac_save_CPPFLAGS} ${LIBAVCODEC_CFLAGS}"
-	CFLAGS="${ac_save_CFLAGS} ${LIBAVCODEC_CFLAGS}"
-	AC_CHECK_HEADERS(libavformat/avformat.h avformat.h ffmpeg/avformat.h)
-
-	# Need to check both the new and old locations for the swscale header
-	CPPFLAGS="${ac_save_CPPFLAGS} ${LIBSWSCALE_CFLAGS}"
-	CFLAGS="${ac_save_CFLAGS} ${LIBSWSCALE_CFLAGS}"
-	AC_CHECK_HEADERS(libswscale/swscale.h swscale.h ffmpeg/swscale.h)
-
-	# restore flags
-	CPPFLAGS="${ac_save_CPPFLAGS}"
-	CFLAGS="${ac_save_CFLAGS}"
-} ; fi
-
-
-# FREETYPE2 CHECK--------------------
-
-AC_ARG_WITH(freetype,
-	AS_HELP_STRING(--without-freetype, do not support FreeType text rendering (default=auto)),
-,
-	with_freetype="yes"
-)
-
-if test $with_freetype != "no" ; then {
-	PKG_CHECK_MODULES(FREETYPE, freetype2,
-		with_freetype="yes"
-		CONFIG_DEPS="$CONFIG_DEPS freetype2"
-	,
-		PKG_CHECK_MODULES(FREETYPE, xft,
-			with_freetype="yes"
-		,
-			with_freetype="no"
-		)
-	)
-} ; fi
-AM_CONDITIONAL(WITH_FREETYPE, test $with_freetype = yes)
-
-
-# FONTCONFIG CHECK--------------------
-
-AC_ARG_WITH(fontconfig,
-	AS_HELP_STRING(--without-fontconfig, do not support fontconfig (default=auto)),
-,
-	with_fontconfig="yes"
-)
-
-if test $with_fontconfig != "no" ; then {
-	PKG_CHECK_MODULES(FONTCONFIG, fontconfig,
-		with_fontconfig="yes"
-		CONFIG_DEPS="$CONFIG_DEPS fontconfig"
-	,
-		with_fontconfig="no"
-	)
-} ; fi
-
-if test $with_fontconfig = "yes" ; then {
-	AC_DEFINE(WITH_FONTCONFIG,,enable fontconfig support)
-	AM_CONDITIONAL(WITH_FONTCONFIG,true)
-} else {
-	AM_CONDITIONAL(WITH_FONTCONFIG,false)
-} ; fi
-
-# HARFBUZZ CHECK--------------------
-
-AC_ARG_WITH(harfbuzz,
-	AS_HELP_STRING(--without-harfbuzz, disable support text rendering for non-latin scripts),
-	,
-	with_harfbuzz=yes
-)
-
-AS_IF(test "x$with_harfbuzz" != xno,
-	
-		AS_IF(test "x$with_freetype" != xyes,
-			AC_MSG_FAILURE(
-				--with-harfbuzz was given, but it depends on --with-freetype)
-		)
-	
-)
-
-AS_IF(test "x$with_harfbuzz" != xno,
-	PKG_CHECK_MODULES(HARFBUZZ, harfbuzz fribidi,
-		
-			with_harfbuzz="yes"
-			AC_DEFINE(HAVE_HARFBUZZ, 1,Enable harfbuzz support)
-		,
-			AC_MSG_FAILURE(
-				--with-harfbuzz was given, but harfbuzz or fribidi development files were not found)
-		
-	)
-)
-
-AM_CONDITIONAL(WITH_HARFBUZZ, test $with_harfbuzz = yes)
-
-
-# OPENEXR CHECK------------------------
-AC_ARG_WITH(openexr,
-	AS_HELP_STRING(--without-openexr, do not support OpenEXR),
-,
-	with_openexr="yes"
-)
-if test $with_openexr = "yes" ; then {
-	PKG_CHECK_MODULES(OPENEXR, OpenEXR,
-		CONFIG_DEPS="$CONFIG_DEPS OpenEXR"
-	,
-	
-		with_openexr="no"
-	)
-} ; fi
-AM_CONDITIONAL(WITH_OPENEXR, test $with_openexr = yes)
-
-
-# JPEG CHECK (commandline switch) ------------------------
-AC_ARG_WITH(jpeg,
-	AS_HELP_STRING(--without-jpeg, do not support JPEG),
-,
-	with_jpeg="yes"
-)
-AM_CONDITIONAL(WITH_JPEG, test $with_jpeg = yes)
-
-
-
-
-
-# -- L I B R A R I E S ----------------------------------------
-
-AC_LIB_LTDL
-
-IT_PROG_INTLTOOL(0.35.0)
-
-GETTEXT_PACKAGE=synfig
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-                     The domain to use with gettext)
-
-localedir="$datadir/locale"
-AC_SUBST(localedir)
-
-AM_GNU_GETTEXT(external)
-# This is here so autoreconf will run autopoint
-AM_GNU_GETTEXT_VERSION(0.15)
-
-PKG_CHECK_MODULES(ETL, ETL >= 1.5.3,,
-	AC_MSG_ERROR( ** You need to install the ETL (version 1.5.3 or greater).)
-)
-CONFIG_DEPS="$CONFIG_DEPS ETL"
-
-AC_CHECK_HEADER(zlib.h,
-	LIBZ_LIBS="-lz"
-	AC_SUBST(LIBZ_LIBS)
-,
-	AC_MSG_ERROR( ** You need to install zlib)
-)
-
-
-PKG_CHECK_MODULES(GLIBMM, glibmm-2.4 >= 2.24.2,
-	CONFIG_DEPS="$CONFIG_DEPS glibmm-2.4"
-,
-	AC_MSG_ERROR( ** You need to install glibmm-2.4 version 2.24.2 or higher.)
-)
-
-PKG_CHECK_MODULES(GIOMM, giomm-2.4 >= 2.18.2,
-	CONFIG_DEPS="$CONFIG_DEPS giomm-2.4"
-,
-	AC_MSG_ERROR( ** You need to install giomm-2.4 version 2.18.2 or higher.)
-)
-
-PKG_CHECK_MODULES(LIBXMLPP, libxml++-2.6,
-	CONFIG_DEPS="$CONFIG_DEPS libxml++-2.6"
-	LIBXMLPP_CFLAGS=SUPPRESS_WARNINGS($LIBXMLPP_CFLAGS)
-,
-	PKG_CHECK_MODULES(LIBXMLPP, libxml++-1.0,
-		CONFIG_DEPS="$CONFIG_DEPS libxml++-1.0"
-	,
-		AC_MSG_ERROR( ** You need to install libxml++, either version 2.6 or 1.0.)
-	)
-)
-
-PKG_CHECK_MODULES(LIBSIGC, sigc++-2.0,,
-	AC_MSG_ERROR( ** libsigc++-2.0 not found. It is required. You should really install it.)
-)
-CONFIG_DEPS="$CONFIG_DEPS sigc++-2.0"
-
-AC_MSG_CHECKING(for OpenGL)
-AC_ARG_WITH(opengl,
-	AS_HELP_STRING(--with-opengl, enable OpenGL (default=no)),
-,
-	with_opengl="no"
-)
-if test $with_opengl != "no" ; then {
-	case "$host" in
-		*darwin*)
-			AC_MSG_RESULT( ** OpenGL is not available for OSX yet. Disabled.)
-			with_opengl="no"
-		;;
-		*)
-			PKG_CHECK_MODULES(LIBGL, gl, 
-				CONFIG_DEPS="$CONFIG_DEPS gl"
-				LIBGL_CFLAGS="$LIBGL_CFLAGS -DGL_GLEXT_PROTOTYPES"
-				CONFIG_CFLAGS="$CONFIG_CFLAGS -DWITH_OPENGL"
-				with_opengl="yes"
-			,
-				AC_MSG_RESULT( ** Cannot find gl.pc. OpenGL disabled.)
-				with_opengl="no"
-			)
-		;;
-	esac
-} ; fi
-AM_CONDITIONAL(WITH_OPENGL, test $with_opengl = yes)
-
-AC_ARG_WITH(opencl,
-	AS_HELP_STRING(--with-opencl, enable OpenCL (default=auto)),
-,
-	with_opencl="no"
-)
-
-if test $with_opencl != "no" ; then {
-	AC_CHECK_HEADER(CL/opencl.h,,AC_MSG_ERROR( ** You need to install opencl-headers package.))
-	PKG_CHECK_MODULES(LIBCL, OpenCL,
-		CONFIG_DEPS="$CONFIG_DEPS OpenCL"
-		with_opencl="yes"
-	,
-		AC_MSG_ERROR( ** You need to install OpenCL.)
-		with_opencl="no"
-	)
-	
-} ; fi
-AM_CONDITIONAL(WITH_OPENCL, test $with_opencl = yes)
-
-PKG_CHECK_MODULES(LIBFFTW, fftw3,,
-	AC_MSG_ERROR( ** You need to install FFTW 3.)
-)
-CONFIG_DEPS="$CONFIG_DEPS fftw3"
-
-PKG_CHECK_MODULES(MLTPP, mlt++-7,
-	CONFIG_DEPS="$CONFIG_DEPS mlt++-7"
-,
-	PKG_CHECK_MODULES(MLTPP, mlt++,
-		CONFIG_DEPS="$CONFIG_DEPS mlt++"
-	,
-		AC_MSG_ERROR( ** You need to install mlt++.)
-	)
-)
-
-TARGET_PNG="yes"
-TARGET_MNG="yes"
-
-PKG_CHECK_MODULES(PNG, libpng,
-	AC_DEFINE(HAVE_LIBPNG,,  Define if PNG library is available )
-	AM_CONDITIONAL(HAVE_LIBPNG,true)
-,
-	AC_MSG_RESULT( *** PNG Output target disabled)
-	TARGET_PNG="no"
-	AM_CONDITIONAL(HAVE_LIBPNG,false)
-)
-
-AC_CHECK_LIB(mng, mng_initialize,
-	MNG_LIBS="-lmng -lz"
-	AC_DEFINE(HAVE_LIBMNG,,  Define if MNG library is available  )
-	AC_SUBST(MNG_LIBS)
-	AM_CONDITIONAL(HAVE_LIBMNG,true)
-,
-	AC_MSG_RESULT( *** MNG Output target disabled)
-	TARGET_MNG="no"
-	AM_CONDITIONAL(HAVE_LIBMNG,false)
-,-lz -L${exec_prefix}/lib)
-
-# check for JPEG availability
-if test $with_jpeg = "yes" ; then {
-	AC_CHECK_LIB(jpeg, jpeg_CreateCompress,
-		JPEG_LIBS="-ljpeg"
-		AC_DEFINE(HAVE_LIBJPEG,,  Define if JPEG library is available  )
-		AC_SUBST(JPEG_LIBS)
-		TARGET_JPEG="yes"
-		AM_CONDITIONAL(HAVE_LIBJPEG,true)
-	,
-		AC_MSG_RESULT( *** JPEG Output target disabled)
-		TARGET_JPEG="no"
-		AM_CONDITIONAL(HAVE_LIBJPEG,false)
-	,
-		-L${exec_prefix}/lib
-	)
-} else {
-	AC_MSG_RESULT( *** JPEG Output target disabled)
-	TARGET_JPEG="no"
-	AM_CONDITIONAL(HAVE_LIBJPEG,false)
-} ; fi
-
-
-AC_SUBST(MODULE_DIR)
-AC_SUBST(SYNFIGLIB_DIR)
-
-case "$host" in
-	*mingw* | *cygwin*)
-		AM_CONDITIONAL(WIN32_PKG, true)
-		AM_CONDITIONAL(MACOSX_PKG, false)
-	;;
-	*darwin*)
-		AM_CONDITIONAL(WIN32_PKG, false)
-		AM_CONDITIONAL(MACOSX_PKG, true)
-	;;
-	*)
-		AM_CONDITIONAL(WIN32_PKG, false)
-		AM_CONDITIONAL(MACOSX_PKG, false)
-	;;
-esac
-
-
-
-# -- H E A D E R S --------------------------------------------
-
-AC_HEADER_SYS_WAIT
-AC_CHECK_HEADERS(signal.h termios.h process.h io.h fcntl.h)
-
-# -- T Y P E S & S T R U C T S --------------------------------
-
-# -- F U N C T I O N S ----------------------------------------
-
-AC_CHECK_FUNCS(fork) # used by mod_dv, mod_ffmpeg, mod_imagemagick and synfig-osx launcher
-AC_CHECK_FUNCS(pipe)
-AC_CHECK_FUNCS(waitpid)
-
-# -- O U T P U T ----------------------------------------------
-
-AC_SUBST(CFLAGS)
-AC_SUBST(CXXFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-
-CONFIG_LIBS="-lsynfig"
-CONFIG_CFLAGS="$CONFIG_CFLAGS"
-AC_SUBST(CONFIG_LIBS)
-AC_SUBST(CONFIG_CFLAGS)
-AC_SUBST(CONFIG_DEPS)
-AC_SUBST(ETL_CFLAGS)
-
-SYNFIG_LIBS="$VIMAGE_LIBS $LIBZ_LIBS $GLIBMM_LIBS $GIOMM_LIBS $LIBXMLPP_LIBS $LIBGL_LIBS $LIBCL_LIBS $LIBFFTW_LIBS $MLTPP_LIBS $ETL_LIBS $LIBSIGC_LIBS $LTLIBINTL"
-SYNFIG_CFLAGS="$LIBZ_CFLAGS $GLIBMM_CFLAGS $GIOMM_CFLAGS $LIBXMLPP_CFLAGS $LIBGL_CFLAGS $LIBCL_CFLAGS $LIBFFTW_CFLAGS $MLTPP_CFLAGS $ETL_CFLAGS $LIBSIGC_CFLAGS $CONFIG_CFLAGS -DSYNFIG_NO_DEPRECATED -DLOCALEDIR=\\\"$localedir\\\""
-
-CONFIG_CFLAGS="`echo $CONFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
-SYNFIG_CFLAGS="`echo $SYNFIG_CFLAGS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
-SYNFIG_LIBS="`echo $SYNFIG_LIBS | sed s/-mno-cygwin//g | sed s/-mwindows//g`"
-
-AC_SUBST(SYNFIG_LIBS)
-AC_SUBST(SYNFIG_CFLAGS)
-
-AC_SUBST(API_VERSION)
-
-synfigincludedir=$includedir/synfig-$API_VERSION
-AC_SUBST(synfigincludedir)
-
-AC_CONFIG_FILES(synfig-config
-build_tools/Makefile
-synfig.pc
-doxygen.cfg
-Makefile
-po/Makefile.in
-src/Makefile
-src/synfig/Makefile
-src/modules/Makefile
-src/modules/lyr_freetype/Makefile
-src/modules/lyr_std/Makefile
-src/modules/mod_bmp/Makefile
-src/modules/mod_dv/Makefile
-src/modules/mod_ffmpeg/Makefile
-src/modules/mod_filter/Makefile
-src/modules/mod_geometry/Makefile
-src/modules/mod_gif/Makefile
-src/modules/mod_gradient/Makefile
-src/modules/mod_imagemagick/Makefile
-src/modules/mod_jpeg/Makefile
-src/modules/mod_libavcodec/Makefile
-src/modules/mod_magickpp/Makefile
-src/modules/mod_mng/Makefile
-src/modules/mod_noise/Makefile
-src/modules/mod_openexr/Makefile
-src/modules/mod_particle/Makefile
-src/modules/mod_png/Makefile
-src/modules/mod_ppm/Makefile
-src/modules/mod_yuv420p/Makefile
-src/modules/mod_svg/Makefile
-src/modules/mod_example/Makefile
-src/tool/Makefile
-src/modules/synfig_modules.cfg
-test/Makefile
-examples/walk/Makefile
-examples/Makefile
-pkg-info/macosx/synfig-core.info
-)
-## src/modules/trgt_mpg/Makefile
-## src/modules/mptr_mplayer/Makefile
-AC_OUTPUT
-
-# -- S U M M A R Y --------------------------------------------
-
-echo "
-$PACKAGE_NAME v.$VERSION
-Configuration Summary
-- - - - - - - - - - - - - - - - - -
-
-Install Prefix -------------------> $prefix
-Module directory -----------------> $MODULE_DIR
-Build Platform -------------------> $build
-Host Platform --------------------> $host
-Arc Profiling --------------------> $profile_arcs
-GProf Profiling ------------------> $profiling
-Debug Mode -----------------------> $debug ($debug_flags)
-Optimization ---------------------> $optimization
-PNG output target support --------> $TARGET_PNG
-MNG output target support --------> $TARGET_MNG
-JPEG output target support -------> $TARGET_JPEG
-ETL_CFLAGS -----------------------> $ETL_CFLAGS
-FreeType2 ------------------------> $with_freetype
-fontconfig -----------------------> $with_fontconfig
-libavcodec -----------------------> $with_libavcodec
-vImage ---------------------------> $with_vimage
-ImageMagick ----------------------> $with_imagemagick
-Magick++ -------------------------> $with_magickpp
-FFMPEG ---------------------------> $with_ffmpeg
-OpenGL ---------------------------> $with_opengl
-OpenCL ---------------------------> $with_opencl
-libdv ----------------------------> $with_libdv
-OpenEXR --------------------------> $with_openexr
-
-"'$'"CXX -----------------------------> '$CXX'
-"'$'"CXXFLAGS ------------------------> '$CXXFLAGS'
-"'$'"SYNFIG_LIBS ---------------------> '$SYNFIG_LIBS'
-"'$'"LIBZ_LIBS -----------------------> '$LIBZ_LIBS'
-"'$'"GLIBMM_LIBS ---------------------> '$GLIBMM_LIBS'
-"'$'"GIOMM_LIBS ----------------------> '$GIOMM_LIBS'
-"'$'"LIBXMLPP_LIBS -------------------> '$LIBXMLPP_LIBS'
-"'$'"ETL_LIBS ------------------------> '$ETL_LIBS'
-"'$'"LIBSIGC_LIBS --------------------> '$LIBSIGC_LIBS'
-"'$'"SYNFIG_CFLAGS -------------------> '$SYNFIG_CFLAGS'
-"

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/doc/hw-gfx-mapping.txt Deleted

@@ -1,75 +0,0 @@
-Shader Calculation Model:
-
-inputs - variables that control the object
-shader - joint vertex and pixel shader necessary for calculation
-
-Parameter Types:
-	Uniforms - things that are constant for the entire render setup
-
-Layer render properties:
-
-Blend - blends with layer behind (amount,blend-method), if complicated must use (pixel shader...).
-Algorithmic - gets colors without sampling textures (exception for function look ups...).
-
-Sampling - samples a texture map as part of the color calc process.
-	Behind - use result(s) below to calculate color.
-	Internal -
-		Functions/Inputs - CPU generated internal texture maps (uniform)
-		Dependent - GPU generated texture maps (unknown use...)
-
-Parameters:
-	Uniforms - layer-wide stats (color, blend-mode, amount, below texture, coverage map, etc.)
-	Varying - pixel coordinate (in canv-space), texture coordinates for samplers, etc.
-
-For optimized stuff:
-	For layer constants that aren't simple calculations (i.e. changing the blend type),
-	we can use global constants (however since OpenGL doesn't allow you to define those
-	manually, we can probably do it with #defines or the like)... Just in time compiling
-	(optimized by caching these changes of course) would allow us to operate in an optimal
-	manner (rather than having dynamic branching at run time).
-
-Considerations for Framework:
-
-For truly optimal rendering, caching textures would be great, but it would take up a lot of space.  So an intelligent resource system should be implemented.  The resource eviction routine should be intelligent and should deal with the resources deepest in the tree (of course this doesn't entirely count for CPU generated stuff).  A priority system should be generated, mostly depending on how often it's used and even more, how expensive it is to generate (cpu and gpu side...).
-
-Shader considerations for Operations:
-
-Blend functionality can be done in a separate pass unless the blending shader part is also programmable (requires less JIT compiling).
-
-Sampling function should be abstracted to use different forms of interpolation (for nearest and linear, the built in support is probably plenty).
-
-Iterated calculations: either done using dynamic looping in GLSL or multipass rendering.
-
-
-Shader considerations for layers:
-
-solid_color - just use blend with an input global color parameter
-
-circle - can calculate alpha in falloff based on interpolated pixel values and then use that and the amount... color to blend (must work out whether or not to out put an amount map + color blend, or a color map + amount blend... currently using the first on CPU side).
-
-checker_board - same as circle, but a simpler calculation (antialiasing will require a few calculations using the values of the derivatives of the pixel coordinates)
-
-rectangle - same thing as the checker_board, but only need to worry about 2 edges per dimension.
-
-Coverage Map Based: outline,polygon,region,star,text
-and Internal Samplers: import, noise
-	- would require CPU side computation of the coverage map/color map
-	  (tiling would be a little more difficult... we'll see how effective it would be...)
-
-Modifiers (algorithmic w/ direct below sample): clamp,colorcorrect (blend also classifies as this)
-	- modification of the colors underneath using math... easy....
-
-Basic Transform: translate,stretch,zoom (should require no sampling),super_sample (simple down sample)
-	- simply requires the repositioning (and resizing in the case of the super sample) of the window
-
-Behind Samplers:
-	Basic Transform: rotate,twirl,
-	In-place: bevel,blur,halftone2,shade
-	Warpers: inside_out, spherize, noise_distort (internal and behind sampler)
-	- requires access to the background texture (with increased window in order to not find distortions).
-
-Iterated: mandelbrot,julia (used to warp, index into gradient, etc.)
-	- requires iterative refinement of the fractal values (with crazy swapping to consider stopping points)
-
-Gradients (complicated... could require a CPU side color map, unless we have dynamic looping):
-	conical_gradient, linear_gradient, radial_gradient, spiral_gradient

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/doc/tangentproblem.txt Deleted

@@ -1,73 +0,0 @@
-THE PROBLEM OF THE TANGENT OF THE BLINES UNDER BONE INFLUENCE
-=============================================================
-Tangents are relative to vertices in any of its definitions (radius, angle)
-or (x,y). As the transformation performed by bones is prepaed to work on
-global coordinates vertices, the tangent transformation can not be directly
-transformed by bones in that way.
-
-There are some solutions to solve that:
-1) 	The solution that Anime Studio gives to the tangents: It doesn't
-	have real tangents but calculated ones based on the neighbour vertices
-	position and a parameter called 'curvature'.
-
-2) 	As well the tangents are relative to the vertex it belongs to, we
-	need to convert the tangent to global coordinates, transform it by the
-	bone(s) influence and then convert it to local coordinates again.
-
-
-
-1) PROPOSAL FOR TANGENTS 'CALCULATED' BASED ON NEIGHBOR VERTICES
-================================================================
-
-	param						convert type					value type
-	-----						------------					----------
-	Tangent                     AverageTangent					Vector
-		Current					BoneInfluence					Vector
-		Next					BoneInfluence					Vector
-		Previous				BoneInfluence					Vector
-		Link					Vector							Vector
-
-'Current' is the current vertex in the bline (where the tangent lies) it is not a parameter
-'Next' is the next vertex in the bline relative to Current
-'Previous' it is the previous vertex in the bline relative to Current.
-
-Resulting Tangent (radius, angle) is defined by:
-
-Let's call: V=Current-(Next+Previous)*0.5
-Let's call: V0=Current.Link-(Next.Link+Previous.Link)*0.5
-
-
-Radius:
-radius = Link.radius
-
-Angle:
-angle=atan2(V.x,V.y) - (atan2(V0.x,V0.y)-Link.angle)
-
-When the user manipulates the tangent duck it modifies Link as an offset.
-
-Problems:
--Insert a vertex
--Vertex "on", "off"
-
-2) PROPOSAL FOR TANGENTS IN GLOBAL COORDINATES
-==============================================
-
-Given a vertex V and a tangent T and a transformed position of the vertex
-after bone influence V', calculate the transformed position of the tangent.
-
-global position of the tangent:
-TG=V+T
-TG'=V'+T'
-
-T'=TG'-V' = (V+T)' -V' where ' means transformed by bones.
-
-	param						convert type					value type
-	-----						------------					----------
-	Tangent						BoneTangent						Vector
-		Bone Weight List		List							Static List
-		Link (T)												Vector
-		Vertex (V)												Vector
-
-It is reasonable that the Bone Weight List is the same for both parameters.
-
-When user manipulates the tangent duck it modifies the parameter T.

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/pkg-info/macosx Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/pkg-info/macosx/core-resources Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/pkg-info/macosx/core-resources/License.txt Deleted

@@ -1,515 +0,0 @@
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-^L
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes
-a de-facto standard. To achieve this, non-free programs must be
-allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-^L
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation
-and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-&#xc;
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-^L
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-^L
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at
- least three years, to give the same user the materials
- specified in Subsection 6a, above, for a charge no more
- than the cost of performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-^L
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-^L
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-^L
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-^L
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
- To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
- <one line to give the library's name and a brief idea of what it
-does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper
-mail.
-
-You should also get your employer (if you work as a programmer) or
-your
-school, if any, to sign a "copyright disclaimer" for the library, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James
-Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/pkg-info/macosx/core-resources/ReadMe.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/pkg-info/macosx/core-resources/Welcome.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/pkg-info/macosx/core-resources/install.sh Deleted

@@ -1,58 +0,0 @@
-#!/bin/sh
-# finish up the installation
-# this script should be executed using the sudo command
-# this file is copied to synfig-devel.post_install and synfig-devel.post_upgrade
-# inside the .pkg bundle
-LOGFILE="/synfig_install.log"
-
-exit 0
-
-
-umask 022
-
-RESOURCE_DIR=`dirname $0`
-PREFIX=/usr/local
-
-cd $RESOURCE_DIR
-
-echo "Creating synfig-config script"
- -d $PREFIX || mkdir $PREFIX
- -d $PREFIX/bin || mkdir $PREFIX/bin
- -d $PREFIX/include || mkdir $PREFIX/include
- -d $PREFIX/lib || mkdir $PREFIX/lib
- -d $PREFIX/sbin || mkdir $PREFIX/sbin
-
-echo "Cleaning up any previous installation"
- -d $PREFIX/include/synfig && rm -fr $PREFIX/include/synfig
-ln -s /Library/Frameworks/synfig.framework/Headers $PREFIX/include/synfig
-
-sed '
-s:@exec_prefix@:/usr/local:g;
-s:@prefix@:/usr/local:g;
-s:@bindir@:$exec_prefix/bin:g;
-s:@libdir@:$exec_prefix/lib:g;
-s:@includedir@:$prefix/include:g;
-s:@VERSION@:@_VERSION_@:g;
-s:@PACKAGE@:@_PACKAGE_@:g;
-s:@LIBS@::g;
-s:@VERSION@:@_VERSION_@:;
-s:@PACKAGE@:@_PACKAGE_@:;
-s:@CONFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@SYNFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@CONFIG_CFLAGS@:-framework synfig:;
-' < $RESOURCE_DIR/synfig-config.in > $PREFIX/bin/synfig-config
-chmod 775 $PREFIX/bin/synfig-config
-
-echo "Precompiling Headers"
-#/usr/bin/c++ -precomp /Library/Frameworks/synfig.framework/Headers/synfig.h -o /Library/Frameworks/synfig.framework/Headers/synfig.p
-
-echo "Moving synfig tool"
-cp $RESOURCE_DIR/synfig $PREFIX/bin || exit 1
-
-echo "Done with shell script"
-
-
-exit 0
-
-
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/pkg-info/macosx/core-resources/upgrade.sh Deleted

@@ -1,58 +0,0 @@
-#!/bin/sh
-# finish up the installation
-# this script should be executed using the sudo command
-# this file is copied to synfig-devel.post_install and synfig-devel.post_upgrade
-# inside the .pkg bundle
-LOGFILE="/synfig_install.log"
-
-exit 0
-
-
-umask 022
-
-RESOURCE_DIR=`dirname $0`
-PREFIX=/usr/local
-
-cd $RESOURCE_DIR
-
-echo "Creating synfig-config script"
- -d $PREFIX || mkdir $PREFIX
- -d $PREFIX/bin || mkdir $PREFIX/bin
- -d $PREFIX/include || mkdir $PREFIX/include
- -d $PREFIX/lib || mkdir $PREFIX/lib
- -d $PREFIX/sbin || mkdir $PREFIX/sbin
-
-echo "Cleaning up any previous installation"
- -d $PREFIX/include/synfig && rm -fr $PREFIX/include/synfig
-ln -s /Library/Frameworks/synfig.framework/Headers $PREFIX/include/synfig
-
-sed '
-s:@exec_prefix@:/usr/local:g;
-s:@prefix@:/usr/local:g;
-s:@bindir@:$exec_prefix/bin:g;
-s:@libdir@:$exec_prefix/lib:g;
-s:@includedir@:$prefix/include:g;
-s:@VERSION@:@_VERSION_@:g;
-s:@PACKAGE@:@_PACKAGE_@:g;
-s:@LIBS@::g;
-s:@VERSION@:@_VERSION_@:;
-s:@PACKAGE@:@_PACKAGE_@:;
-s:@CONFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@SYNFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@CONFIG_CFLAGS@:-framework synfig:;
-' < $RESOURCE_DIR/synfig-config.in > $PREFIX/bin/synfig-config
-chmod 775 $PREFIX/bin/synfig-config
-
-echo "Precompiling Headers"
-#/usr/bin/c++ -precomp /Library/Frameworks/synfig.framework/Headers/synfig.h -o /Library/Frameworks/synfig.framework/Headers/synfig.p
-
-echo "Moving synfig tool"
-cp $RESOURCE_DIR/synfig $PREFIX/bin || exit 1
-
-echo "Done with shell script"
-
-
-exit 0
-
-
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/pkg-info/macosx/synfig-core.info.in Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/paramdesc.cpp Deleted

@@ -1,94 +0,0 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file paramdesc.cpp
-**	\brief Template File
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2008 Chris Moore
-**
-**	This file is part of Synfig.
-**
-**	Synfig is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 2 of the License, or
-**	(at your option) any later version.
-**
-**	Synfig is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with Synfig. If not, see <https://www.gnu.org/licenses/>.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === H E A D E R S ======================================================= */
-
-#ifdef USING_PCH
-#	include "pch.h"
-#else
-#ifdef HAVE_CONFIG_H
-#	include <config.h>
-#endif
-
-#include "paramdesc.h"
-
-#include <synfig/localization.h>
-
-#endif
-
-/* === U S I N G =========================================================== */
-
-using namespace synfig;
-
-/* === M A C R O S ========================================================= */
-
-/* === G L O B A L S ======================================================= */
-
-/* === P R O C E D U R E S ================================================= */
-
-/* === M E T H O D S ======================================================= */
-
-ParamDesc::ParamDesc(const String& name)
-	: name_ (name),
-	 local_name_ (name),
-	 scalar_ (1.0),
-	 exponential_ (false),
-	 critical_ (true),
-	 hidden_ (false),
-	 invisible_duck_ (false),
-	 is_distance_ (false),
-	 animation_only_ (false),
-	 static_ (false),
-	 interpolation_ (INTERPOLATION_UNDEFINED)
-{
-	if (name == "blend_method") {
-		set_local_name(_("Blend Method"));
-		set_hint("enum");
-		add_enum_value(Color::BLEND_COMPOSITE, "composite", _("Composite"));
-		add_enum_value(Color::BLEND_STRAIGHT, "straight", _("Straight"));
-		add_enum_value(Color::BLEND_ONTO, "onto", _("Onto"));
-		add_enum_value(Color::BLEND_STRAIGHT_ONTO, "straightonto", _("Straight Onto"));
-		add_enum_value(Color::BLEND_BEHIND, "behind", _("Behind"));
-		add_enum_value(Color::BLEND_SCREEN, "screen", _("Screen"));
-		add_enum_value(Color::BLEND_OVERLAY, "overlay", _("Overlay"));
-		add_enum_value(Color::BLEND_HARD_LIGHT, "hard_light", _("Hard Light"));
-		add_enum_value(Color::BLEND_MULTIPLY, "multiply", _("Multiply"));
-		add_enum_value(Color::BLEND_DIVIDE, "divide", _("Divide"));
-		add_enum_value(Color::BLEND_ADD, "add", _("Add"));
-		add_enum_value(Color::BLEND_SUBTRACT, "subtract", _("Subtract"));
-		add_enum_value(Color::BLEND_DIFFERENCE, "difference", _("Difference"));
-		add_enum_value(Color::BLEND_BRIGHTEN, "brighten", _("Brighten"));
-		add_enum_value(Color::BLEND_DARKEN, "darken", _("Darken"));
-		add_enum_value(Color::BLEND_COLOR, "color", _("Color"));
-		add_enum_value(Color::BLEND_HUE, "hue", _("Hue"));
-		add_enum_value(Color::BLEND_SATURATION, "saturation", _("Saturation"));
-		add_enum_value(Color::BLEND_LUMINANCE, "luminance", _("Luminance"));
-		add_enum_value(Color::BLEND_ALPHA_OVER, "alphaover", _("Alpha Over"));
-		add_enum_value(Color::BLEND_ALPHA_BRIGHTEN, "alphabrighten",_("Alpha Brighten"));
-		add_enum_value(Color::BLEND_ALPHA_DARKEN, "alphadarken", _("Alpha Darken"));
-		add_enum_value(Color::BLEND_ALPHA, "alpha", _("Alpha"));
-	}
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/paramdesc.h Deleted

@@ -1,254 +0,0 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file paramdesc.h
-**	\brief ParamDesc Class Implementation
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**
-**	This file is part of Synfig.
-**
-**	Synfig is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 2 of the License, or
-**	(at your option) any later version.
-**
-**	Synfig is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with Synfig. If not, see <https://www.gnu.org/licenses/>.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === S T A R T =========================================================== */
-
-#ifndef __SYNFIG_PARAMDESC_H
-#define __SYNFIG_PARAMDESC_H
-
-/* === H E A D E R S ======================================================= */
-
-#include "string.h"
-#include "real.h"
-#include "color.h"
-#include "interpolation.h"
-#include <list>
-#include <cassert>
-
-/* === M A C R O S ========================================================= */
-
-/* === T Y P E D E F S ===================================================== */
-
-/* === C L A S S E S & S T R U C T S ======================================= */
-
-namespace synfig {
-
-/*!	\class ParamDesc
-**	\brief Parameter Description Class
-**	\todo writeme
-*/
-class ParamDesc
-{
-public:
-
-	//! \writeme
-	struct EnumData
-	{
-		int value;
-		String name;
-		String local_name;
-		EnumData(int value, const String &name, const String &local_name):
-			value(value),
-			name(name),
-			local_name(local_name)
-		{
-		}
-	};
-
-	/*
- --	** -- D A T A -------------------------------------------------------------
-	*/
-
-private:
- 	String name_;			//! The actual parameter name
- 	String local_name_; 	//! Localized name
- 	String desc_;			//! Short description of parameter (Think tooltops)
- 	String group_;			//! Which group this parameter is a member of (optional)
- 	String hint_;			//! Parameter hint
- 	String origin_;			//! Parameter origin
- 	String connect_;
- 	String box_;
-	Real scalar_;			//! Scalar value for visual editing
-	bool exponential_;		//! Allow range from -inf to inf for visual editing
- 	bool critical_;
-	bool hidden_;
-	bool invisible_duck_;
-	bool is_distance_;
-	bool animation_only_;
-	bool static_;
-	Interpolation interpolation_;
-
-	std::list<EnumData> enum_list_;
-
-	/*
- --	** -- C O N S T R U C T O R S ---------------------------------------------
-	*/
-
-public:
-
-	ParamDesc():
-		name_ ("IM_A_BUG_SO_REPORT_ME"),
-		local_name_ ("IM_A_BUG_SO_REPORT_ME"),
-		scalar_ (1.0),
-		exponential_ (false),
-		critical_ (true),
-		hidden_ (false),
-		invisible_duck_ (false),
-		is_distance_ (false),
-		animation_only_ (false),
-		static_ (false),
-		interpolation_ (INTERPOLATION_UNDEFINED)
-	{ }
-
-	ParamDesc(const String& name);
-
-	/*
- --	** -- M E M B E R F U N C T I O N S -------------------------------------
-	*/
-
-public:
-
-	//! \writeme
-	const std::list<EnumData> &get_enum_list()const { return enum_list_; }
-
- 	//! Sets the localized name of the parameter.
- 	ParamDesc &set_local_name(const String &n) { local_name_=n; return *this; }
-
- 	//! Sets the localized description of the parameter.
- 	ParamDesc &set_description(const String &d) { desc_=d; return *this; }
-
- 	//! Sets the group that this parameter is a member of
- 	ParamDesc &set_group(const String &n) { group_=n; return *this; }
-
- 	//! Sets a "hint" for the parameter.
- 	ParamDesc &set_hint(const String &h) { hint_=h; return *this; }
-
- 	//! \writeme
- 	ParamDesc &set_connect(const String &h) { connect_=h; return *this; }
-
- 	//! \writeme
- 	ParamDesc &set_box(const String &h) { box_=h; return *this; }
-
- 	//! Sets a flag regarding the duck visibility
- 	ParamDesc &set_invisible_duck(bool x=true) { invisible_duck_=x; return *this; }
-
- 	//! Returns the flag regarding duck visibility
-	bool get_invisible_duck() const { return invisible_duck_; }
-
-
- 	//! \writeme
- 	ParamDesc &set_animation_only(bool x=true) { animation_only_=x; return *this; }
-
- 	//! \writeme
-	bool get_animation_only() const { return animation_only_; }
-
-
- 	//! Sets which parameter is to be used as the origin when the user edits visually.
- 	ParamDesc &set_origin(const String &h) { origin_=h; return *this; }
-
- 	//! Sets the scalar value for the parameter
- 	/*! This value determines how the value is to be presented
- 	**	to the user when editing visually. */
- 	ParamDesc &set_scalar(const Real &n) { scalar_=n; return *this; }
-	
-	//! Sets if the parameter value should be exposed for visual editing using the exponential function
- 	/*!	Such representation allows to set the Real values in the range from \c -inf to \c inf . */
-	ParamDesc &set_exponential(bool x=true) { exponential_=x; return *this; }
-
- 	//!	Marks the parameter as not necessary for saving or copying
- 	ParamDesc &not_critical() { critical_=false; return *this; }
-
- 	//!	\writeme
- 	ParamDesc &hidden() { hidden_=true; return *this; }
-
- 	//!	Marks the parameter as only readable. Implies not_critical()
- 	/*!	\todo This function needs to be written, as it is only a stub */
- 	ParamDesc &read_only() { return *this; }
-
- 	//!	Marks the parameter as only writable. Implies not_critical()
- 	/*!	\todo This function needs to be written, as it is only a stub */
- 	ParamDesc &write_only() { return *this; }
-
- 	//! Adds a description of a possible enumeration value
- 	/*!	Only relevant if the parameter is of an integer type and hint set to \c "enum" . */
- 	ParamDesc &add_enum_value(int val, const String &enum_name,const String &enum_local_name)
-		{ enum_list_.push_back(EnumData(val,enum_name,enum_local_name)); return *this; }
-
- 	//! Returns the localized name of the parameter
- 	const String &get_local_name()const { return local_name_; }
-
- 	//! Returns the name of the parameter
- 	const String &get_name()const { return name_; }
-
- 	//! Returns the localized description of the parameter
- 	const String &get_description()const { return desc_; }
-
- 	//! Returns the parameter's group
- 	const String &get_group()const { return group_; }
-
- 	//! Returns a "hint" about the parameter, regarding how it is to be displayed to the user
- 	const String &get_hint()const { return hint_; }
-
- 	//! Returns the name of the parameter that is defined as the "origin". Used for visual editing.
- 	const String &get_origin()const { return origin_; }
-
- 	//! \writeme
- 	const String &get_connect()const { return connect_; }
-
-	 	//! \writeme
- 	const String &get_box()const { return box_; }
-
- 	//! Returns the scalar value for the parameter. Used for visual editing.
- 	const Real &get_scalar()const { return scalar_; }
-	
-	//! Tells if the value should be exposed for editing using the exponential function
- 	/*!	Such representation allows to set the Real values in the range from \c -inf to \c inf . */
-	bool get_exponential()const {return exponential_; }
-
- 	//! Returns \c true if the layer is critical, \c false otherwise.
- 	bool get_critical()const { return critical_; }
-
- 	//! Returns \c true if the layer is hidden, \c false otherwise.
- 	bool get_hidden()const { return hidden_; }
-	
-	bool get_static()const { return static_; }
-	ParamDesc &set_static(bool s) { static_=s; return *this; }
-
-	Interpolation get_interpolation()const { return interpolation_; }
-	ParamDesc &set_interpolation(Interpolation i) { interpolation_=i; return *this; }
-
- 	ParamDesc& set_is_distance(bool x=true) { is_distance_=x; return *this;}
- 	bool get_is_distance()const { return is_distance_; }
-}; // END of class ParamDesc
-
-class ParamVocab : public std::list< ParamDesc >
-{
-public:
-	const ParamDesc& operator (const String &name) const
-	{
-		static const ParamDesc blank;
-
-		for(const_iterator i = begin(); i != end(); ++i)
-			if (i->get_name() == name) return *i;
-		assert(false);
-		return blank;
-	}
-};
-
-} // END of namespace synfig
-
-/* === E N D =============================================================== */
-
-#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/IndexToDo Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/Makefile Deleted

@@ -1,165 +0,0 @@
-#Author: Jaime Irving Davila
-#Date: 23/09/2001
-#Modified on 15/04/2002
-#Given to the public domain
-
-#Variables useful for the customization of the makefile
-
-#Name of the document (without the sgml extension)
-
-DOC = synfig-studio
-
-#Name of the file used for the index (without the sgml extension)
-INDEX = index
-
-#Name of the compiler of the sgml, could be jade, openjade, ..
-COMPILER = openjade
-
-#Location of the stylesheet for the html output
-
-DBSTYLESHEET = /usr/share/sgml/docbook/stylesheet/dsssl/ldp/ldp.dsl
-
-#Options for generating multiple HTML output
-MULTIPLEHTMLOPT = -t sgml -ihtml -d${DBSTYLESHEET}\#html 
-
-#Name of the directory for the source sgml
-SGMLDIR = en
-
-#Name of the directory for the "others" files
-OTHERSDIR = ${SGMLDIR}/others
-
-#Name of the directory for the png files
-PNGDIR = png
-
-RESULTDIR = result/${SGMLDIR}
-
-#Name of the directory for the output of the multiple html
-MULTIPLEHTMLDIR = ${RESULTDIR}/out-htmls
-
-#Name of the directory for the output the ps file
-PSDIR = ${RESULTDIR}/out-ps
-
-#Name of the script which generates the ps file, in RedHat it's db2ps
-SCRIPTPS = db2ps
-
-#Name of the directory for the temp and tmp-output the pdf file
-PDFDIR = ${RESULTDIR}/tmp-pdf
-#Name of the script which generates the ps file, in RedHat it's db2ps
-SCRIPTPDF = db2pdf
-
-#Variables needed by the rules, should NOT be changed
-#Variable for including the sgml source file
-VPATH = ${SGMLDIR}
-
-#Variable for knowing if there exists the sgml index file, in case it
-#NOT exists its value is empty, otherwise it's the name of the index
-ISINDEX = ${findstring ${INDEX}, ${wildcard ${SGMLDIR}/*.sgml}}
-
-#Variable for knowing if the tag init will be needed
-ifneq (${ISINDEX}, ${INDEX})
-	USEINIT = init
-endif
-
-#Variable for storing the name of all the sgml source files directory
-SRCFILES = $(patsubst ${SGMLDIR}/${INDEX}.sgml,,$(wildcard ${SGMLDIR}/*))
-
-#Variable for storing the name of all the files in the "others" directory
-OTHERFILES = $(wildcard ${OTHERSDIR}/*)
-
-#Variable for storing the names of the "others" files placed in the
-
-#Variable for storing the names of the "others" files placed in the
-#multiple-html directory
-OTHERMULTIPLE = $(patsubst ${SGMLDIR}/others/%, ${MULTIPLEHTMLDIR}/%, ${OTHERFILES} )
-
-#Variable for storing the names of the png's pictures
-PNGFILES = $(wildcard ${PNGDIR}/*.png)
-
-#Variable for storing the names of the png's files placed on the
-
-#Variable for storing the names of the png's files placed on the
-#single-html directory
-PNGMULTIPLE = $(patsubst ${PNGDIR}/%, ${MULTIPLEHTMLDIR}/%, ${PNGFILES})
-
-#Variable for storing the names of the eps files
-FIGEPS = $(patsubst ${PNGDIR}/%.png, ${PSDIR}/%.eps, ${PNGFILES})
-
-PATH_LANG = ${CURDIR}/${SGMLDIR}
-
-all: multiple-html ps pdf
-
-.PHONY: all clean init cpfilessingle multiple-html cpfilesmultiple distsource ps
-
-#Rules needed for generating multiple html files
-
-multiple-html: ${MULTIPLEHTMLDIR}/${DOC}.html cpfilesmultiple
-
-${MULTIPLEHTMLDIR}/${DOC}.html: ${MULTIPLEHTMLDIR} ${INDEX}.sgml.m ${SGMLDIR}/${DOC}.tmp.sgml
-	#cp -f ${SGMLDIR}/${INDEX}.sgml.m ${SGMLDIR}/${INDEX}.sgml
-	${COMPILER} ${MULTIPLEHTMLOPT} ${SGMLDIR}/${DOC}.tmp.sgml
-	mv *.html ${MULTIPLEHTMLDIR}
-
-${SGMLDIR}/${DOC}.tmp.sgml: ${SGMLDIR}/${DOC}.sgml
-	sed "s:##PATHLANG##:${PATH_LANG}:" ${SGMLDIR}/${DOC}.sgml > ${SGMLDIR}/${DOC}.tmp.sgml
-
-HTML.index.m: ${DOC}.sgml ${SRCFILES} ${USEINIT} ${SGMLDIR}/${DOC}.tmp.sgml
-	${COMPILER} ${MULTIPLEHTMLOPT} -V html-index ${SGMLDIR}/${DOC}.tmp.sgml > /dev/null
-	mv HTML.index ${SGMLDIR}/HTML.index.m
-	rm *.html
-
-${INDEX}.sgml.m: HTML.index.m
-	perl -S collateindex.pl -o ${SGMLDIR}/${INDEX}.sgml.m ${SGMLDIR}/HTML.index.m
-
-${MULTIPLEHTMLDIR}:
-	mkdir -p ${MULTIPLEHTMLDIR}
-
-cpfilesmultiple: ${PNGMULTIPLE} ${OTHERMULTIPLE}
-
-${MULTIPLEHTMLDIR}/%.png: ${PNGDIR}/%.png
-	cp -rf $< $@
-
-${MULTIPLEHTMLDIR}/%: ${OTHERSDIR}/%
-	cp -rf $< $@
-
-#Rules needed for generating the ps file
-
-ps: ${PSDIR}/${DOC}.ps
-
-${PSDIR}/${DOC}.ps: ${PSDIR} ${FIGEPS} ${INDEX}.sgml.m
-	cp -rf ${SGMLDIR}/*.sgml ${PSDIR}
-	cd ${PSDIR}; ${SCRIPTPS} ${DOC}.tmp.sgml ; mv ${DOC}.tmp.ps ${DOC}.ps
-	cd ..
-
-${PSDIR}/%.eps: ${PNGDIR}/%.png ${PSDIR}
-	convert $< $@
-
-${PSDIR}:
-	mkdir -p ${PSDIR}
-
-#Rules needed for generating the pdf file
-
-pdf: ${PDFDIR}/${DOC}.pdf
-
-${PDFDIR}/${DOC}.pdf: ${PDFDIR} ${INDEX}.sgml.m
-	cp -rf ${PNGDIR}/* ${PDFDIR}
-	cp -rf ${SGMLDIR}/*.sgml ${PDFDIR}
-	cp -rf ${SGMLDIR}/* ${PDFDIR}
-	mv ${PDFDIR}/${DOC}.tmp.sgml ${PDFDIR}/${DOC}.sgml
-	cd ${PDFDIR};${SCRIPTPDF} ${DOC}.sgml
-	cd ..
-
-${PDFDIR}:
-	mkdir -p ${PDFDIR}
-
-#Some additional and standard tags
-init:
-	perl -S collateindex.pl -N -o ${SGMLDIR}/${INDEX}.sgml
-
-distsource: clean
-	tar cvfz ${DOC}.tar.gz *
-
-clean:
-	rm -rf ${MULTIPLEHTMLDIR} ${SGMLDIR}/*.index.* ${SGMLDIR}/${INDEX}.sgml* nil ${PSDIR} ${PDFDIR}
-
-
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/README Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/TODO Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/build-deps Deleted

@@ -1,1 +0,0 @@
-coreutils (>= 5.97-5.3 ), debianutils (>= 2.17.5 ), docbook (>= 4.4-1 ), docbook-dsssl (>= 1.79-4 ), docbook-html-forms (>= 1.1.0-3 ), docbook-jrefentry (>= 1.1.0-1 ), docbook-mathml (>= 1.0.0-2 ), docbook-simple (>= 1.0.0-6.1 ), docbook-slides (>= 3.3.1.0-1.1 ), docbook-utils (>= 0.6.14-1 ), docbook-website (>= 2.5.0.0-7.2 ), docbook-xml (>= 4.4-5 ), festival (>= 1.4.3-17.2 ), grep (>= 2.5.1.ds2-6 ), jadetex (>= 3.13-7.1 ), ldp-docbook-dsssl (>= 0.0.20040321-2 ), libacl1 (>= 2.2.42-1 ), libattr1 (>= 1 ), libbz2-1.0 (>= 1.0.3-6 ), libc6 (>= 2.3.6.ds1-13 ), libexpat1 (>= 1.95.8-3.4 ), libfontconfig1 (>= 2.4.2-1.2 ), libfreetype6 (>= 2.2.1-5 ), libgcc1 (>= 1 ), libice6 (>= 1 ), libjasper-1.701-1 (>= 1.701.0-2 ), libjpeg62 (>= 6b-13 ), libkpathsea4 (>= 3.0-30 ), liblcms1 (>= 1.15-1 ), libmagick9 (>= 7 ), libncurses5 (>= 5.5-5 ), libosp5 (>= 1.5.2-3 ), libpng12-0 (>= 1.2.15~beta5-1 ), libpoppler0c2 (>= 0.4.5-5.1 ), libselinux1 (>= 1.32-3 ), libsepol1 (>= 1.14-3 ), libsm6 (>= 1 ), libsp1c2 (>= 1.3.4-1.2.1-47 ), libstdc++6 (>= 4.1.1-21 ), libtiff4 (>= 3.8.2-7 ), libx11-6 (>= 2 ), libxau6 (>= 1 ), libxdmcp6 (>= 1 ), libxext6 (>= 1 ), libxml2 (>= 2.6.27.dfsg-1 ), libxt6 (>= 1 ), locales (>= 2.3.6.ds1-13 ), metacity-common (>= 1 ), openjade (>= 1.4devel1-18 ), openjade1.3 (>= 1.3.2-9 ), sgml-data (>= 2.0.3 ), sgmltools-lite (>= 3.0.3.0.cvs.20010909-13 ), tetex-base (>= 3.0.dfsg.3-5 ), tetex-bin (>= 3.0-30 ), tetex-extra (>= 3.0.dfsg.3-5 ), tex-common (>= 1.0.1 ), tipa (>= 2 ), w3c-dtd-xhtml (>= 1.1-5 ), w3-dtd-mathml (>= 2.0.0.0-1 ), xml-core (>= 0.09-0.1 ), zlib1g (>= 1 ), 
\ No newline at end of file

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/animation Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/animation/conclusion.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/animation/introduction.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/animation/keyframe.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/animation/movement.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/animation/rendering.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/animation/timeline.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/animation/workspace.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/appendix Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/appendix/apendices.sgml Deleted

@@ -1,46 +0,0 @@
-<appendix id="archivo-hola">
- <title>El archivo <filename>hola.txt</filename></title>
- <para>Por motivos de referencia incluímos el contenido del
- archivo <filename>hola.txt</filename></para>
- 
- <informalexample>
-<programlisting>
-Hola Mundo
-</programlisting>
- </informalexample>
-</appendix>
-
-<appendix id="faq">
- <title>Preguntas Frecuentes</title>
- <qandaset defaultlabel="number">
- <qandaentry>
- <question>
- <para>¿Qué es <acronym>DocBook</acronym>?</para>
- </question>
- <answer>
- <para>Es un lenguaje de marcado útil para escribir
- documentación técnica.</para>
- </answer>
- </qandaentry>
- </qandaset>
-</appendix>
-<glossary>
- <glossentry id="doc">
- <glossterm><acronym>DocBook</acronym></glossterm>
- <glossdef>
- <para>Lenguaje de marcado definido en
- <acronym>SGML</acronym>que permite escribir documentación
- técnica</para>
- </glossdef>
- </glossentry>
- <glossentry>
- <glossterm>emacs</glossterm>
- <glossdef>
- <para>Editor de amplio uso en <acronym>unix</acronym>. Su
- nombre proviene de Editor MACroS (Macros de Edición). </para>
- </glossdef>
- </glossentry>
-</glossary>
-
-
-
\ No newline at end of file

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/appendix/glossary.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/appendix/keyboard.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/installation Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/installation/installation.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/interface Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/interface/history.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/interface/interface.sgml Deleted

@@ -1,76 +0,0 @@
-
-
-
-<chapter id="interface">
-<title>The user Interface</title>
-<para>When you start Synfig Studio, it will display a splash graphic and boot 
-itself up. After it finishes loading, you should see three windows. The window 
-in the upper left is the toolbox. This is where you can open files, change tools, 
-etc. You'll notice that most of the buttons are greyed out--because there is no 
-file open yet.</para>
-
-<para>The other two windows (one on the bottom, and one to the right) are 
-customizable dock dialogs. You can rearrange the contents of these however 
-you wish by simply dragging the tab to where you want it. You can even create a 
-new dock dialog by dragging a tab out of the dock dialog it was inside of.</para>
-
-<para>If you ever accidentally close a dock tabs (by dragging it out of the dock 
-dialog, and closing the new dock dialog that gets created), no worries. Simply 
-goto the toolbox and goto "File->Dialogs", and then click on the name of the 
-dialog you need.</para>
-
-<para>There are a lot of dock tabs. If you have no idea what a dock tab does, 
-simply hold your mouse over its icon and a tooltip will pop up describing the 
-name of the tab.<para>
-
-Here are some of the more important ones:
-<itemizedlist>
- <listitem>
- <para>Layers Dialog (<xref linkend="layers"/>) - This tab shows you the layer 
- hierarchy for the currently selected canvas. It also allows you to manipulate 
- these layers.</para>
- </listitem>
- <listitem>
- <para>Params Dialog (<xref linkend="params"/>)- This tab will show you the 
- parameters of the currently selected layer, (OR, if multiple layers are 
- selected, it shows you only the parameters that the selected layers have 
- in common)</para>
- </listitem>
- <listitem>
- <para>Tool Options Dialog (<xref linkend="tooloptions"/>) - Shows you any 
- options specific to the currently selected tool</para>
- </listitem>
- <listitem>
- <para>Navigator (<xref linkend="navigator"/>) - Shows you a thumbnail of what the currently selected Canvas
- looks like. You can also zoom in and move the focus around with this tab.</para>
- </listitem>
- <listitem>
- <para>History Dialog (<xref linkend="history"/>- Shows you the history stack for the current composition. 
- You can also edit the actions in history.</para>
- </listitem>
-</itemizedlist>
-
-<para>If you click the "new composition" button in the toolbox, a new composition 
-will be opened and the canvas properties dialog will appear.</para>
-
-<para>The canvas properties dialog is a mess, I know. I'll have it re-designed into 
-something much more comprehendible in the next few days. For now, ignore the 
-"Image Area" and "Locks and Links" sections.</para>
-
-<para>If you click OK, the canvas properties dialog will disappear and you will see 
-the Canvas window. This window represents the Root Canvas, not that that means much 
-to you at the moment, but that's OK--I'm just trying to show you around.</para>
-
-<para>In the upper left corner of the Canvas Window, you'll see a button with a 
-caret If you click on this button, the canvas window menu will pop up. (As an aside, 
-if you right click in the canvas area and there is not a layer under the mouse 
-position, this menu will also appear) So now you know where the menu is in the Canvas 
-Window. Good. Everything else should be pretty self-explanatory in the Canvas Window. 
-(Explanations on the menu stuff is to come in a sec)</para>
-&toolbox.sgml;
-&layers.sgml;
-&params.sgml;
-&tooloptions.sgml;
-&navigator.sgml;
-&history.sgml;
-</chapter>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/interface/layers.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/interface/navigator.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/interface/params.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/interface/toolbox.eps Deleted

@@ -1,806 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Pages: 1
-%%BoundingBox: 0 0 138 432
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%EndComments
-%%Page: 1 1
-save 9 dict begin
-{/T currentfile/ASCII85Decode filter def/DeviceRGB setcolorspace
-/F T/LZWDecode filter def
-<</ImageType 1/Width 138/Height 432/BitsPerComponent
-8/ImageMatrix1 0 0 -1 0 432/Decode
-0 1 0 1 0 1/DataSource F>> image
- F closefile T closefile}
-%%BeginData:;
-exec
-J,gg3$1l+:uBJ0Sid)%VG>@F6KV:+3>73bZSgh&PgO%<cd3<YL6-'V!_;JB=>:Z%6AeR/R(2Z
-""7*pggFRFK<T29283W0_I7\WcE<17ABSP,m0C)&dp<hi`r<uXgj_hb8YZGWuq\>F=B;\/\'6mLs`
-f=6WmPbN=f'.ChhJUrG`U<\Q^gAcsr#Q(LLVmS?\@b9e'og:EnlY7U7k9eHAoej&'cn**a-a4I3t"
-LSC?_F)SK1\;m4bg2;9(#jI09,DDqB_k3m`0i,<j%Htb"WK7K.'B9u\j3HfYqHY/?6`dE*)`;;B3
-2"_ms'4$56$tgk43fr?Ctl*h<Xh4INLe@fAlW%IQlY\NonQjWpfOIlaY5,&:q28E3r%KYZr+O6-tQ6
-$,Q,0PWY+ZJ:M,&D2XkOH>\W&O__V9+f+i9MlPCnSD2A7?Mt/(rh\kD&L@`XDo9$;=&?G_MuXf8Je
-ZPMt^?9T^XBnnaR=8W\#t"\;#FIik.1`J#>1>KPqbS'!D.1eor;CIQ9ThJrj7PI^eNFGho0'&%l
-T<CUbj@Ph'AWOMckGLE5L=K#t*(h9aaD;'P/"KdM.)B+\75',e2:p4tD)<:)J;e!1(o0"3(Y9a+;
-?Z65bI6kgSA<OI6d=Orak>r.LM;!Lr76g8r(QaP45&;VOWUcamLX_1j@G&<LWfp7>_B\JcCX_Cs,Tj
-24NkF(afg_UE0E84KrZ#a1d^!h&Y=)HW7h0,pBE*\^%HJ(,tNCu.^<Dk$59SG)$JtVN"bOsm&DBSU
-!mVW<Pb<Qd?@`3XH446_J>u'C,,j+GA/IcHOl4E.>%8K63UV=NLV:E?*9Vc<P%7^eD49W*VKHe2pAg
-F1N+#7j*95k'uU*^3-8dR2/MAQ`T^QQQ$XAXqu\DO6mZ>#pk;T^RUTqEU"+\mt&WMEMcq_3CK
-*$l&!+K>*l8"Wt5h!C*?i\naJc@@$^7'/SiO5g!=VtA.XmLOmOCTGOICN#7?p<t3F?SF/nNkG+
-0>`9oQ."m-02=\%S3F@!nTP3Wa7;?a3*uNc4/-@>k_IRpR.Vl#!&MuMkf&k09>09r`=p\D%4#L;
-CpdY%J)/mKN!)52X'Aqk?p@8cT^\+?Z(-_#*d&@)2t"!:%YB7-L_Em*!#J'g1s6'#'8,H1h!9>DY
-TS+%b(gRYk*&Y9WPSh=%P\P$>=MOUAbF.So87L,EXeCt@*%LOA)'5(iHkO\A&qd3EML+S<qf#?Te
-Bu&AgChemJ&0J$8tT&,6G3TL1qpCjH<hUd5>r_qp5(Tm=Ie1$K62'28CH*ir\nD5tIM^#ST4NF!.h
-CID@+j<_?\+nQ=ZhPfmJhd"WZJrC&-E>7'St_\%RcEANrtmdLnVL%fUuXeTOD<'GhES%><H.8^.&K
--L,5Ll@h?MAmN'-&1rf+F%q6qV/9e`M"VA@P,8apfk(_:&BX/DP'K(Z.#e3AeYm<Xm:;=hol=E(XBQ
-1g+8hlnpNNc:c+VZ4p6(IFT6opH'Jjp7G*@(f-`fa4t=rkYq/_V1FJ.h+g951pi-9C'%__,="R>!@9
-`5m^LfgeKYrhH5#u?H;mm_go^a;a1ODW&I0jmm$>e"VcTh%lfH3cOILiF0&UcaTMqCbnEI;c/MEf
-3J01PHgFtk+3$E<5/`3c7D"'BE\E1.X#m$FJUN&8?%1=<rQ"U6+a.3M*%K2>%^$Q6431kC%J0`O
-CTL;d%oe*O?s>KbUj&;?T0-Uq0TJTN7#.67q\XLWXb>eLUr*'.IC=MFU`<>>)j//9hVIn4`X8ps#Up
-Rmar(0o;i));_"NE&RM/;F9H_$bSp+lls`TfbEQaC,^I,YD0S&Rd3uGmGRr`7>7f7:,S%UfVkKq
-Sf##J/cSE\aIo@@T49b4MO7XoPk51so@W"NbL"#*K<i^"'W\\PJK9oYUSK-3`'n4@kq_`";oq8Zj
-1=AFgE4B1PV2:N3h:;CQY%=E#SQ3>WUh*`8;_?n=o=:XQ/&QYhnj9M*rd.G!0)m5bMuj#J63<7k-NY
-$9$t<mg/1#rd`3A+5,51m?bN9rKN@26Dnk'.L3-Qq#=q)Y"E\bF.%P@5)&;#3</cf=KrBY;f'khXg
-Zf:N'u-hOCDGD>WH>Cfd'lc9&6;to$h/+N/f,0*4rbSr*?Gj1Mh_KKN?ACeCd)0,N2!BoT*odTIF
-Q%boXf4"j%_H'auV?<jePCSfj_2mU*"psk"j?>7Y%XA2!,!5jADBjgIu>)+h#3V0W_&#Wf$$f'aGfP
-hu=%VhQsVJtN1b0KoBLW>?mj-ju)p5>CkdntX2hr?1AV419<'2cC6-)oBE?>qRl\VUK/1dkhE*3T\
-_Cn@M-Oh6eC"dm7\2:@Fd24r6NdVkAfG4tF>.r*n<`Za2E9(CEj@:tefA,>`ttL'eE#FgX-X$pK/
-.Yh=a^REKcR;H+*.:5d^6o3m#AldrK`eX(Jln(f\"+_EjiHZMBof39dG^n<@k!g:J1Ca`$oohf-c1
-A;Bu)hJ,&GSYhF0F0q@Zr=+"\G+a^KL<K)5GTM7QA\\@4EJ_+ZZaakaG2piYMh3)6*:09spFfQjCM
-j.:nJXj)fI,F"T2:37.!OOS7%^IR2&P-RB:4Q5OdFZ^V'LRMN;3=EH0@bQOT1'sbl?/e0ca"mkB47
-.AXRX*T`2e`f9UUBfug"Z7ujZ=F=1:HV#`V*V.Q?XU;l4uQ):hY7lTYr+10L?3M:cZ$A<:+V=*Ot@$
-;Sr?,CsADgjDC=hd*Q51"-A*GNR#\#EoPtsDb&o;/sb1>PL3e,=ims5TkH:AUkOoM\9,Z:`dXu/m(X
-e+r?mg#'edg>mq)!"hJBMn6cq5Z;#S:=YOu5APPbW>$pj'5A)<ETDHKjrU8_#B&ua#D=I6U0BmGjX
-,DGafhTon#RI,>$h@*Upk5R5rI=;7J)B,_B>bC>)ZTU3:HLWDL*"j<2")LpkuHV6jfuuo`?VQ\kjM
-/n0J.p#m2>1P2X'o6!?OH`X\Z)9FRr9MG"j?N9Kl_<)O6LJ7iJ9`WN_4%P>5E+K2c$O4O8"qY\TN\
-&9@Ig7I6#I#cZMK\?i_$P#Kn^*FYK&HcKlAIDrugV7d'0EEZO630$a@/Kj9kEGEokZ$ZO?!YgEjJ
-cOE_"%*b4_m<WgRK^aqpFcb8dnCJ1)gCJ8n%'=uR/ZNQC8C%;4ETW#L8<",+oae;F&TJg%OWP1?+VJ
-b`2^>VlYfRP50b\O'<sD.d5^76aU0`kr8Y*_0,kW\;&+(H'sUaRd9.4SAJR"7((kC!EGlVt<;D9+q
-Z)jnl`^q_Eu8n:(pS3#nVFG_7i.4_Jg#lE!m<kOVlK0)R67nY<\XW&JF3)R=In\-u&`=uge(su%
-kn^/%*eJ&VK*AQ:hESVZji?!!r*jOfJdHM_BocGpa*teGnEW7,d!?cCd+L1EC"$%JWcN5dT+g<mKdM
-X5!,pG)n+qcIOE\AWB0dCr,I0*Mni7s.4X;dS,ZU);Ge^F;^Cp6-*gZ"nlI.n>p`HX,!ltK/23H*
-cR3aU-`Ul.dWm52Kd\^5-k_LfEfVWSOXY=9.C,-dnsLs?SLQCo.WVX@;R%^WZRYOR/$c9o!^/*e!
-'t-h;;q#o4On@kC"(/X"pAEoAUUj"9i`0!a^oo&hYm4VB-067"EZN2_C"YHP0Ja"ho*mE1$Sc70
-p<>,ZQV'p,r*jt1,CF6!PB</N@,0$/I@h!cFGNj6S:/b/kAALdnCd';(e&*/Q5FtZWf3L@l6R01p^
-Lo0kL!o/@=o2R@$REqM?>(H(W%2Nr2@dpY3lG;bXp3A3`du7lpRl9l+0p@;Ee#>;?GrbHS4*-lHF,
-;hS#r=@r/EVpJo*Mk;a"'3toRo'A5<C__&2l34%p6o9VZ4krBE</bA-iZgTtsX$BV?AeUq)PPI7<
-PsH()5ng.ToFjO=k<2a25h#B`PT_Nj$6Qs585>'1Yk:f"$O!f5;X$,F3-5%3A!%P3>:dKe)`u^1I4
-s'4>"";hjAOQ-r7MFBAoLh-lk=,!G82KX&o=VX)b4s>7oUp/<#&!S5=;fU85ogWY.7)fTh<fr8
-Mk3ToVjhBF%d9n0N:t5e6+Hr7$6299`jW<4+r4QV*LM:)"jH'<4R86dP:6BUFQ61Qf2'o25?-Z
-,'DYJT#>N_P7eD*d</486b>)%*:iu)%Pq,7&$Vqp;m\hBoZo>"c6)Wg9/L?^e6PkWI8q"$9,1H,Pn
-d;?V,fHJ89ET^'b+19'iHi'<qRb32.'>U.oR0;;q5SaoncaGT?C/<`N4(96T(V,t'g<css6'S.kO
-6Uc(D3u)8eSLO."'LnPAeg^r+<b#J,?E<J>a1(I1Po2`T3/MW=EO^L'k^cNh`A0n!Y\@8FRra;j&I
-t9=;9Y!KfkKX&uc8?8XB@p(:^K)dN(U?o;4q<53m0f)d/1Y#&M(%kV8lX6l:>rhPQ,R+<;e8^F@
-Q%"n<H350js\!Ab;a.G&_-&B4_onB6HpZFjk!S6XM`kB(g(L<Zu)+KkE;fB3':g<b#2hQY#lU@+M#
-dG("-A2a"K:9f+S+YJZ7AQb;qCpqT"Q@EK^d:jAsC"Ahl26CTdV.oY^D0Bu6G3qK%h-cOSD&1*(p;
-_%d_e?JUBpF6_G!g-@$ZT42<AtLqf&p_tVfDFfE-C&XQ*W)Cq!knD3ee_2\I/*6#;h:BfAD$e?2t
-=_-nU@hnZZp*G\'5a(CA@F:8G&(HoB6=mVFa%VBf5Yrb8RL(JD)YU@f,JU/GAgQ6Gnt1>pPX'YBmM
-_%BD7%)Q;)GP+aLOmHIe(!mbZ<+Zsp.9bk8tQ?@NF;0NglAQN;eel-\!omPGN%W.jA+qOeU-isCU$
-Qu7?+g$%!_gE81Dg0`Z(PdNbMdX#8ITHFY@,eC,o7(uJ)S*f>C\!I<0+&4#u>!YPS80FV@+$UN&
-XG4gDff6Q")GW6(QpfE1dTnR_/Ki\5.f<L'T>CIBnLA2:!\6jHIG@+CA$ngJ\9iqdt+/8F@K\m(L
-N#d<HhMB)o2djVbDW7XI&\^$tb#!@+#I.SV6a0>kk":QtMAFds-$>N;1SQiOs*`5K0k#skX2@@S>&
-98%i&%:I<fGh%@(@?*4n#sau?_6+ZlGb4\OMI-5!9?OiII<QN-NTq3*D)@-'NT$NS&*3=K?Za-^6
-TAG1f$4)*`nCf9CKOPo,F,eitfiToI^"P$'AuQHtmV_gU1*MBGe#!)f&4HTDaO^Xa_+@lVp<K*>1L
-,i+qq(adSX2@9R^(!q19GlH\GSjR/)r'32qacS<UJ7);2Ec!(30B6&BlDQMFIM\<WJm.@.MYPaLF
-#f@cBKT6f1cT%Q,hGgi:0M(^eHM"X,j)?HJ_X*7^=NVDIXR9-)KF+8J9D#%k?)+C:r':#".H?qN=Fk
-)K'oqJn@QMJFo)BkYRiM:c_T,CdtqE:Dg3MRK-UNr))DdQQ@AK1V"m"H>SPKa_R0PQ88E)GpeoH
-)l6^aN-^hE)C:?1H&S/?"?<lO3VB@3>G)msPBrLhR\,o`eZ!iWOPg*ZSRY';td*WS)9BKqKu8/U
-%-V-:p@)S)nNSYb$(Q$Ql>qIQi*M6>RST)+SOgBFhXf;8?\Y^43cG`?Lf;HSeX88T5g-pSHTmg+cK
-;Vk6qVW@P^)OnJRoh2,gB"?9n#b=VTlu'm)_JCR>U0%Zl-u>!K>Sk:QkT.QN3kDq7E$I*IbfeYPP`
-<g?k(#'<>=XY<)K2c,JQ+D:NTDMitS!fo'$^mDiCU_WqHLnA0rM^^1Z26Ieg)HBIh6r`VUgRX9J7
-94d1_Z@FV-=P:>FDe.`P3@YXZq6R=W'+i"MUCXkM$d)a/ik7>,'$UNWHc<_r_nTG$^RQair$T&0
-c*(A(YhVCY>V!QO5J+LbF.pX,*&4X"1#R@_qN/MN)\X(W7;+_#)b*'(rBAGd%a'85OghFgaKu^
-i_Q@*,ZqcCb,K?&A-_miL`qNK&AHcS8lQ5iWA37Ykb&'J*qUm:o%>bT"1ouih+bT(!/>fEpPaiPJ@b
-FH8hgp;k4"3l4uMB'IW43u!\@EdNOa^!H:^a-Lm@O7?c9.P-*9kchFj-BQd%&.p>m&=If7P&7F-,
->S?^E;7F#0t`XRUgi^;RF&W%d/?&Tr/K(Z$dG(edp4?NrC,667<`#4e"'@`I9Y2a@F3hKantDOm
-8!G1Y@,(eU7,C>ZoW`K@tTAb.G?ce,@B/CY,+eeN>#/IAb1V:'tcb6BuI:LnM?.Ri4e"*c!h9joH
-e(WX0gc\0^S9XZePH?cFqid*UhXogYTX:bl+a$4gX#dqqqALc(4+RI@\<i0Ah1Bh#/PU*U2P>%G-
-%Ji#R4Sh\uj9@UXXhjrffrZTb)3T0kli4_S:4q$Gbj5W<Pj^)6Ikue9/`H\;jZZ,gSgif.#G1lET
-S,HSc7(Y_</6\k5KSggILI6OlG5_i1=#t*Pr`OS!^mcia?k?Dlr"TBUg2krpK\hFlt$\*H4Zjo&u
-Z^0g6@OmLqul$dR8?9d^=NU)$Llb60I?L?p)'@PS@lFTLM?N'(0!UAPAdsf^1^*Dqc"6Ohm%2,br^
-G+jlenYllQW!^?P3;ga3ZgE/<@hXfbL$1kn$o"M<shOj0Vs7K_&n_YSa+!pFtCB5SkanL3?MEX2
-p):c5(Vb7ihg>+tL%mlhp`GLjIujB>OnjKlq7i-hs-`^*SbbRMqL>XD?a9IBZhj^0qnK=s0qnj^&2
-6Rr-uuh^X;lWF0\^TTt:!shr24tjo,5BrfZHs6d6%KAZX+:L\NWfQ:_-mn"<#QV\L;Mos(kNQk
-DD^&Z$;d&3>.@lj3eeJNXZki7O$7U</Oa&Q:p4XGgr:scXRGT".?sds#ldm,>^jN/W>?DRcr7Y4XQR
-iVc'N/g5S:m<N9'aB"Ap"'f)I.b1!tNj3-"=_eb`m/k$kZruf4CR)WYC6I<jeqBll$^9Qkr38ib%
-Wc)cKDD,r*@V.CL3t7S<cr"Q-3b1)48*"%:/<ZhX0Db6eSC%IR8hL?K*Yhkq*L=l0`n"Y,><UR+
-27:ciij2e#k7Knp7@W0:*oARkB!9nkM+mhc0=irI940rV:=$\c&LMnS*;oj$mm3o1\jj/:&?AF
-$jo_S@rN>=9an+u9DSr(<kTW4GIARqYr`4e,K/.&-KNJ^CN.O#!&n,fZ,f;9??D7Yku`B68,\b"
-hO3!!qJ4.idIemLp)#Yq^VcfK(CLS9LUqbFij1&L>+SamG`+NSRkJH7o+8g$9X/K<X1N+2"Hk+2(
-=XXVDtiU8=hn\^ob7^n0htHOFkTr51A9'3p/*%;i_B)pAoD,sGH4Gtr?e*M3&JGe>US.'tmm
-"AQh#efkPZphaGt@l83W96N;Gk\I-A2?nV`5A\B4k&F2ebb_+VrB`E>i6<Gc(aeoVX<>1WA+D\`h*
-4$\B/P(T-IdZn*N@TCs\Me,nqPr3/US5D!c?)KP44n_)ZWUHI7<<A"f*a@=*<ji@(mAP:`_h7
-u9QXl(UdT!mAhmi=dF#D=4aNk5EMpk?;p4odFEq&VV*I:)ScE\:M;.R`M<KA`-qhgs<Sbb3kFp
-H3FN9%G%@McMi%2iLa>2.;'t\UIVJ?<HFCC<kH5I@9,Mq9OiZpi_:GBGqqGKOREXa,K+\S=,E\Qgj=
-2jB73DP2dF7;_dE:ZPmnD@gJ;5KE+:T71k@,RB5G;FQjW2pWJJD<4+kdOQfqL9p6I73K,Bp,*8$7M*
-d;u.<)pa%E*76<t$AU/83JMaZM\:*=5XYo\dekaQZ2BHUh=;$N,X2ph22na:CDcPA0>n4,G("9l
-c?=6R9odhfL&JXV4h85db(COO+RDCE@Nd*C:kBD60Fm(qAtuqk'I$9WYC-f87Et6<=S*(Id_"i-/
-CCDpgY<5<HRr`G%_<rcfFq>Ng$mJ;9c0D56-,b>d*kb\M.3)Kf$0EqN-S.\.b?Ai6,3QS7GFmV$YV
-$A^0$o4P)MNGfP!>lkS"Lbh`-7)?j;PpLCJP/ZeI,5b/R'of%q5)nXYMI)@4SL90$Vd*fKfe*URQH
-\!JCbF*$YS/L(JqL)adHr'8+r>'ge3+3i4bEil!*qO^NIRVc;MXg)1F&fQ!$eK*^Gr8mq_\,(uXn1<
-2A$&OK<,$/m9o`A!MriefoiJ^5G`nD4gF0Q.83%3c#GOqE=M7L(X4*lO_S(r6J)KqTA/(p$l!0obhD
-!PJbBS=GK>qdUVZkS-@EsPXU0niH"*5^oCQ;Z,G#<?\!um=)+HQ^6;*=qK1XZ@<oFQZuU)'@,>)!
-+0;G((T"l8-iDN2V`UA/^ASLe90A))4<U!F&L.SgRenVW:aShli-:^gcs0p-ap3%!_5LC#XuLH)IU:
-1W7OZ?NtELe?W>aZ.`<(70/0P.hOq<`)3JF9/01FC9>&ooKd<B,BC,1mE>;EDWC3q%blTP??ha
-Fg_,;h^)Fi35)@%%%>M7a)UOA0LH9$JND`Rj_8J(Wd)Iem/-68(N&??OjrD=$V$/""+Z<a7Ds*r=4`
-fI"/(m?&k634Pb_?=EP*@21j4u`SjJH`b<fu0KTP1K?%\8c.%hu#9cV\b$)W*sbaTFY"A_:o#<
-9Gra"Q>ac4CoQ@?_d?5_\Wce7-t3e.UQuf3MBOu?%HCc'#<@DGkYrJc4#SAVC5T,RidesXpTcW9D:-
-k6(rnp'9ka6%:QuBDAmDG3iIZ!&'`Lg#XDluTMd\HM*S-F0ppe6KRZ@HY%T<9(.'8icg$m$"e
->ALjC;h?o8GA);OqQVUco8-cjLmqmH^pSXPJeSb&_/Y77'R#Kkf(l"eu`7aCKuiObnk;bFuS7R>U'E
-R2At!!B0n-j*:SbV"b<CY$EE7X3`6t+u-p$B-0^j\;`6(e.bN"\!ANWiFW!HpP@`J=E>o^Y$WHXZ
-L0-6d4XJ6gUE)iW"uoo>2Hr87(@M5;PZoE=R-uZrjD/h(`I8`R9Kfj(k%iK,cQZeO?i>CW"E?=4Z1
-Q@oLO^_F(.ef&$2J24&S&VmVc*Ln.9Q*4aO7!+YuALu'L.A`:^u#9W/X%AIkYLs^1mq;5"H%0@
-:>?MR3T@a\,GCjpl7\d(O\D$kGRhZB@KII=C#W88:blfVMTStUbB>^<&^6dSG`6;&;F4&#Po301/J
-h*_$9c,(ak04c<(Q_EFauR^k63n_@.mae-H6C2fJe10Q6&7?%,1K$dP7_As+mB0HSM7r/6kA!N_
-LF:1r\/qi/b(.(rG#si;X\&RugU,,r,3!EK<n%=8:n9`,Ku+mR$Z-gPIdTb1Y@9<ge1B9dZHLAWG
-$kqK,MDaK9O@\pEJR-@akPqkM+Y+U.r08fXCW\AkrU-@&eCeM32o_%.\gmutuoUZo=ka$anC$>8
-,ljPaC`:d+Pj;U"Xm1s$gf`g.eSZ@c0nXM9)kWUorJciQH;qCI2oLm$u:SS0GV(TS-'\'`,rIigp9
-pf*.HeW`@._uJoFR`?N0sm-\CgD$rGWp*0`SY27%::.#O5/\I*U&jbp$"=9s'$3#1LJhqLZ-VUEr
-dSji(aX0j>KU.>J>p;>4TsEXuV7JmY"DfFmQ>)34m6((aa?"V,$,?i+i_1=A(gXE!@6ab^p9GOIVq
-KI=6l(o0f3"pE`,Vk.b%3OP:XVdSJM./jSd(H"0SRlP;cAI4<,m7PNgqO"lqlnk>qCH4@!=g(d_
-KSI&r2))JUt^jJ\gci0GqSJj<EZ3%P9L>QP5I'S/dj!=NE$IFIcg)<=a#.+/_qte&(!!oXf94E
-$DlOhQ2X_/#4ME,DW`VmM$9^7`J3)u:_^T>/9./uZFr/)E843On%O(oti2a;=om(kG'9-Zf9HZLX
-%nahEu\SN3JUX:t%XXmtb2;r8cilA<G+$UE+'AN*o>%fHI?B.V_Kr`D*HMkYoq'cElZA^J#!/m^.?
-A7lLVeX##E'bt7<k"#RL"&H-4@2G06UXmA"gCn1j*\!82M2sffD;Vah#BbEi?W4kO%+n6WdaN.u:
-7Uktm3/6!=^HbFJ4!DFE?K3Z@dR6o(FKV1Ucj%Z:9S@pUK5s-=#lW?O,?@W"W!!@n*b&SjD@6OLO`b
-9(s6^:)fWI%J_o&N;oD:80i4dZINMF'k_qXO;o9k\).DGH13sZkoT_D0)sPDMS6-_W._1dJ+hJHo
-GX_flS%m;_!=O:iE$g/Ms?qYXlsQ&jFbN1KE\;e83DXJ?tk=.B1Rp;Kkl`;Hc6(dtG"hN$-J7Uhn
-'JF>C^J#'3lfn0LNi;CYirTqdjZFI5+:Q_JkqW,&<=U6gL76Nl<U!C.L*_;Q6,H+LA/Y"X45d2GUpT
-/D:!"k6EPa?hpsF/M\ZRQMFVWokZXDoH2uJRkCdP%lRb9Yg:)\VS,>j6a+>Bud<NM?1;kZgeXtN2NJ
-_/qLTtW3)R<,t!7m`KXM.fmh$T1aOcLH8oekXm=Teud_aaHVM)Crf:tahM+aL'*r#W6*7to;^-s
-/X&O=<D/aHFeX0^#0QYGL`C#bd`<;D.?roc>9*M7WK<nTR^'u8ctOp26>X;jPL)^i(ah@YnW`3
-i'IS=gT_:u!?`)oJFpkr>nA!k-Nqs``7BZ&?HGH)"dIDC,uKj4h0L<0:\t:/G)M\N_^Q3:Eud^bal
-lBYK!C&7@_i0KC$cLDTbk#KV1\$_Q1Km_TRcdbG%_6=j=eoSith9?8O)gLr^nYsJ$2-c4?Yls%6H.
-ePE!5o=?m#E5?F((R1E@+7"#&%H088d.L)\1BPC'e*56D`ZK%,tkirCW0^X)b%cg:\TC__UPFan
-h"u%ofPWj`@7P564W)uYRn5?mN<hJSV^sGu4A<&=Y/HCYJe0E:#Z?<u9a,@qc?r^uqkhcc$7Q++-L
-&e$oNY4*#mu+dNmItSCu/c>(hA!uO)I=@#:gscbf"J@X%%7>fA0rRc-u@WkUn1>'kW+=5._,.D
-.Fg/#rB8;J;gfb3**lAHDbH"p#oEDXsV_JiOG;bL:*t\hhl"#unS;Tf"f&CWrKf$io2o2kr&2(g>
-"n4bVp*uD3T4_%McI5edWL0TL-pe&53LhK@,!nX$fOlAG9L#?p/O`H3"W^%f2K(%0;p/ubFo+/?
-AdIQ"=/AJ+b`ObFXWL/Z.L?)$AX8T8kr)92Tk%)NEI:h=p*J59heF.>j8E!)pN\$;E.^/coB.Q.>:_
-eKs4n''6o5sH3L;IV%jucns27/;%%Zak\M,tUo1kg5jJfGZ;?d2>a4`M3<8M<r2P.,^EZ.qW=m
-_h8RFc6CHG2gL$_r<NEDb=2,9f58$XKXOW'tdLh'6JAb!fI:`Y(`&m"tg?ZYclb^HcK`ogq"L(%b
-b9hma!.p:a-%nFYE\l1/^Y3E8>(rHi/VVUq<EC^F!iR\S+CTujciTG^4I^k0OI@YRnjkf!`E$MeKk
-?+:KQ`kc@frd<5R@#V&B(>%kk/fFjWL0NR^;YuLZ258&>UnM)CMVZ2SXgb^-b?)(,#ua8`IC=iJ
-0bA%_"DTl8nuB-:*?)dh"8G<b"sh882hu3eQ&9+Xlr&\,.4-g+C0<JuG,lS5c_."Q`gY"jY^#$)
-?!KFRYW<BQ2:!<9KBP%`XnU^oJ)?VSW\WP,:b>P;.::MZ!`XBlF0qjiWDME%?1ieV"lidDX-&+1JV
-Y@(Qr=1Tie8jT!gAhcD8I@p,_?^'gd9gQCM,@ZHe+`Pffe+qX(XReOMhihY%&BSZ#OK?JEOI"D,9!
-?#s6C^g%Je@*QSj<MHgGnD&/6KOr81Uc;`kE8K^GS'@<Cjl)ranD*qe4hUlk_U+9MjKV0,@b__R6q
-sWUcCU(*/.IeboI5t!oe)#;i)>Z^i(=?$6G1oj/NT!ZGtqCA&En?$K\eN`YHSm%pE$iglQJX3?='L
-*^QTK53:GkXo6c%lWoTK:GN==>d^!UgG))3Ck:pkVsR2Q1:^"YLJ=IGLYf2.RI\*POlGrY=<2Ks//
-N@$i)=:('O<QM1Fi9e>@fi-"1&V?:(K@ih+7GSJT"m'%7)qHCAN#nmJ@>*bGk$DW$Qq@FFp2YZk3
-d,!rF"dlf@Qm?.%1ChR`o9s=9pfM@ou60Gu\F(>bqLOZZ)W\Hr+Iom8Km0kLmSAIXYr&&^Jrr22Zo%
-a81pfZP=N0?K/bV=A,QcbF@%Rh-J=bZ=h(foZ^WHmu?0.5o3U$)<Jl\#-$t8Mo!-Id?:It.H3s
-n+L<<3,j@GbPdDLSB21j@CVEt;+K5Whf>K=fJf;98tkk/5I:ZW'VAi<QfjqK=Rok9Wmk_:Hk%8GuB$
-'E@U;i$0qq_\a_*AtAlRTI14:(7JZYNAWcY#LMe`>d\$=$WhKcT!JG!SiQ=cLQ"=>U+)g1HE1eJ&
-Tapo/$ShY%&`4Bh@Cdk&_R18"rKO/Y=lctk7*j4;tYNug94(WWdIaCNp.;tBD$JGU(=MS$s0?bXMc
-DSCB"R+>cB:m&Z+k#6!f9/=TrNJl5p+:(t6dKRskOCED?&@DLgUrU'c(^Y=?lBIRXINeWOPGprL
-^<>@9r7R)YSNoq<#0f2Haq3Ac#''2W5Ya&T;Ok2g/Z*?&<q^HTq!Ug;DdN9&I>U6kp4tUYlbj<M\P6
-nbRr90OD\WI_IfAgbhsaA(D^FSs;l9$P!t>+UDt^>t`pgN!Uue&2TF.&W)87B:;='-jLB)*pW8aT
-r7s4nQ&BRQNc5plrYE@BqGFqIfot`U>qR5\$l$LY9/Fq*eeMSn#%<_>_)oDmPh69"rC9<m(UhQ=bL
-sS"Wi"rkDUE02Q9eo&_WCI_kU\#kI9@o'XA9#;:-g1@ng*Eur2=M3N&"cdP;1F&t9k0/N)^2KL6-6!
-lA+mm$EY0_6YOENg_LFr+12"UH(Eu.8e=#9I25k@cCFDf*)lp)>93HE_DoG9u=G>E=1:iu.poA<(.
-T+#b9#+T/TOg+L?V=.T2sb-BCbJ*InHCfCae6o7'5ET3_*(=!;8tol\UI=Y.(dLTDjL::a\!<M
-mi3YJW-:u>u=QY?)jCX.uTFq`$je&qAIU%9(-Fe+faG/JJ6F*6qoFl-R!s$,jo@?e5qjbI5c^KL:aG
-5'%*o3YUDmp:2IWcN$P.t""P1'%W6^TWOC7c((DT@KSl0N>FG=RF5Np:kMM<o_PGi$<ga,Ke*(8tX
-;GH(*=,6S>MKoYICd41GDhn++N-S3RGk#>(@(LBB(rKkGe76YFG?+Mg:)Gpt)27J!YH$N,-b&%f
-`,G?_dGcQhb9gHC(UVB8ZH(T6fCTGonJ2QUfYXW+TZ)g*NlM\Q<kXFjIMn?akBC\9jjVq`?a"
-+1!A.\pKdQqsV7Gs1S=@Gpm=;NrQch8&0KG_0f%uHsaC1ZSmm=_u+_tI':Qf\&J8qB+`aJieaKi=2X
-o"d3rYTW%ZSI5LY$Vdf!P&I:q)YDqI?2R&PI02D+GMIV-h#2`ZIG`q0-eXNpg5_fPrR^(Xn)OBHj
-F1I\IA,?mY\/Ddl$cFnIV7IJ*/@iYslu>*8>%Rqbj$nG`a`IkUAB5OnbLo7'j6IpE-TkoKe:q1!V
-^s0)7u\,(STX46V5LcK4qgh$UE*,LL'aBCZ@Bd7`7NiG#_d;d+_l_5QNCDn8<d.B,EPK-;J8IE3?
-*rMj_a.,(ihSUbf;C4`4B/7Q:BYHkC!85bV%gP^4>sNCp!El."F@18R+(:T?8JQ"%.&Y#>F.$%P
-?F!"eb_c^_`b<ZD"cV;^6`W8bU-7,M$b^/*G+PAEZCVaF5G*'o'_;EO`Z)7j4):RdTY<O.
-):D7,bSASuubT@IqRXH6T9rcXp"J5VZ!3`6AnBZ.m_<>EhJ@DJ^%TK\,gT)(_s9Q'CD$H'q@@'
-%n289s6@B>FidbbMdAFrs+=uj77JChL!fi0A:>fRbLOQUZM+DI;`:@URf0emJJdOZiL0B:W#6e4jN?
-u!C9OdcLik%@ef480!0(674kImjA@O#^aJ0r&kV/L_N1.6h)^!%n+fE;\6kZA472$nJ"&!2N00Ar>
-X(A20PSXB?F\;=mX"aHABB(J&O=r7SDjr-8iE&eosEa73tI&^$9L@k,JR"@jfZ0AJE79+q/d/BG-0
-?S5!WSDQ-Bll4ag\uWb!loK+'kaQ<S@?'oF2*;:iml\5Z#rrt/*b'cTKb@pBHk5On+G78UAA%n9
-E<%5UOC1ur.Ad"d"f-aV=85tt"2*Fa^1jrq#e^^BI8C3VpphpQaO\%%F`hOu<,R7>U/pTM*t@gV
-1(;58UMmJ-M,^Dbnp.8OZjjJ`fkX2Z3Sp>F,N4E7\/K:sQ:4S2"?m2^Rt>^$<6DdP?GdraI`/am-
-*FlJ1%h"VW9K\_\'n,&L*W(Vdo+B;Th=_SsHK-sp%u+M;FuO=!=EVq_@'W:Ra3M=Z\jj1"u1R(Vg
-GMB"=LKRT);uELUTdc9Hhhn\'IHhD1+:5\W40q7E2#(<%V3VCRpl?X'2-Ks*akGKO#G,_CsRU4+?
-B=b6uYA6hg?'m!!rg0<m\K8Xga9;'B,SN0rSFU0'T`KVRBi(@^EJCQ!3uop7^ua&i#t&#kodhk5:
-e#an!q'2p1Q9V8LDrR?ok,%VfS<cLX0u2:cl?+%=Lt?(Y/_Fa;OdU\-co4kk,S#@#o(IJ6%aEuftP
-Aa"N2q<0p+$8MX`pp3I!s/b8#R:EnH<V0!(P1Fb4hm2)BWD:1Pe-d%q3MW#$?O;f?^^&9o#Et2NW-
-=q>'06fquN>r;GO=K+O*WGdMTq8tHG#J1q`<NT%<B#@%:E&l"SQnnT\o=7j,m8cMskl;h')Ll;N"
-'3u1SA7oKb.Q(_"'2I=,;eG+jJ(m-sI'f/2&"'XD\1PWZ&blNYS7j,6Esi(5=VmLN!#+_oM2m(6aMb
-%OLeAG\c8Zg!Fb^7>!`:nt<=2#?,(q*F+bV*YJtZj/`5-h5'gQgMU!9L&^Dgnd$tripg0.lKFg
-HaK*Xfn<smTr(Y(p"I*S8k.Y5mn'guJk:X0S;.5Jk9m"cFPG0'S)^sU^N0LU490mherfW'sVmIb
-%WFWA?;Yfd\9YIfb-/sGg;Fl`W&/::G:sN`C*L8>1cF%NgYIPC(2afrc*6eH/c_N@nTmJdkU(
-?#V(Q`c8E`Ic^9lY9MB/dNdaHECa3u`!C39+(U?WWh<)n@43Qn0VsMD^b%g;.Lnc&3=fQj4iqBg+U
-.)@HfSipL)L+h_U)Qr6u\*NamCdXZ*Y*oolrk15:%Wk(aX4NB+r`R2k/I>TsB'kaXU"Jkg:rM'\8\G
-K5tWNPWsg6kgQVMbPZA2^Qo%GDf=/BLXtp3.Os;4<P?B^Il>FG`V!r"`"q&Pc!fSp6c<%UCl>nM
-W93f;:)*b5^r#Zb-Lqr^,UMOG=FHi?>M"O93fr!c;8o5S,tI-pJg3U&5)1iOFoT+*;,+ccKUiJ
-r!<ZFL>J2\hQGqQ(47"i_.`m4\.*o(hj.OXuOidNhU4#P!^'pMqJXlC/D#Mde+VYC5#KB%ABu*n&.
-i6<u+`I%t>-B)_QD/H?e1W'W22i2r.C@+!^'+$BnJ^7aPKfHQ%2%0PJWZ8iGAJCeHo)Sj^0s=F!`
-OE0hI&#M6X://eIp@kfd+2/"Ytu,\h'190m>)VWZ:_C(kY(_)T,1q,=/ChL:a!A/eok!D;+*C(Fp<
-^_d0(?mPr;Knr&0J%krdE)H:8Lu_V\^nXL9%GLXQ0c/_Y@<j/,aq$0e7$-aSJBnTD,XaL3F%k:'
-DX-npC0GMuin7F0E$\`/\)`g1_(6r6"m,dcZs%ti\,?9V9>UB0kN"Qu=Z^_5s7PjWciq0l-&cG
-df0^g%pZ?t6&*&00p@LE32O<o!:/I9GN9C2$`Na2=LaPu/epX"QOob%6TlPHVOb_Obb*(pSP/I
-T=2bnY*SPp8L%.#P5gm*\USN$jnifju)F@qslj'>hmZ/r-KIhnkdK2(-lFiU9#,FM!X#C@bof@LB>
-&2+FH2R#g"O7+JJkX,_.sUIdb9koll>AHI3j!E#lW;@K`>Qd$2W\"X()b?:@,HK("=U3WcHoUHi:
-p-;n6STBOigDScU!gEPM9?rOH:NcPLCRt3\*cFEG0WopZTAMKZmlsKHUnW(ef.fe$nIqWpRD+abm
-4,!!-V&Cr)&7">J7)`/7bU!=!5E9HBCpR2P!+gZH=Ph^Q%IaRO/SRTT_/TP'4LU8XGpjs>IG#0VY0
-QUUS)"jSeaI:T%NTL'mdQ7We@%6'"_4m:);U$-IU<Z1ctWCNu<:))NR=?$^92Tp7VD48c9GQ
-V\?bTb:R&!X2DWHF\5*"0=J#JIK3sLq0Fp2cD%/DeFf&1^kOqKNT*@u8dI&F:-6dc^qj\HLd2Lg74
-8UU9kJf+fl)tkW'8CS/dAohsWSXL?Lq!<r4UD$pobRa$im,qW`F8APN3/)YX+"U@mBQG!!2t'KsKc
-`$GQ5PfM/QQKZMkA%t7p-%SJ3dNaGI32oJW9^Yq;_Qb!d&$3.q!b>SnOOuT01K%)")jjPrM%%e0
-<k&>_pJWC:-CS^Rb`4sQ1a//$Y.Qo7m#'.6rPD\9%8`g:'X4dPdZ<`>5XGgNp&YZB"<dOY^f't.E
-Y"k&$:-cpn9,lBE#?r<pCM$C+aViMl4u#mnZRV_eAn1s.'h^^cmTOIk`H2W;um$P9bP5Z.`86HP*
-cU*.J4$Q^$K>-^rY%'\=eDbUQ-)HDIVpOM::VJWb)RbaR!m`Y)`qW%i>,c7<%?M"Tl!";4K`7%G!V
-!Q"CRkOc>4d`JmhiTYkf3ErduGZg_)u@9TK=XS%\?L_/dHO"p_9RLk!'%P#Q5@$D;?c3ZcF)8L8$
-Td^b..2F(d'uA0"/(OhS`W6(6&:kZ15oB*9+,_$c=%-B$`Yh^RbK+P//OXcW5%DK+MgM$VDZVJK,
-8Q=qj7pnDM:pWWKe.qYZE!'6-M_O4b1$$lNm$4$YE0NT968FBrC@\KY;bA-(RK9Pl\dDdE;$)>`f
-cB))lB)R>buG\pm\eDYj31osa<^(^$Jh7jeffA(r$,`=>`TE\L>tn*M1T8eaQN!W54J3jYf3!CG
-1&V-Yi6+dV76lk3+$R#g(5kYUp9a@t>-8JdOnl??ba:)mP,ENWJ:n8N)mhtVm)Cpadn`;%",lmM'1
-aj,5h6@C`.DsK%'TO;1(t)%*t&2)1U6"nDoTCkp);s'6<7\_7\5iEf=gN(r:;1TtG:om2uLGN,m9t
-nj8`-(t,^n)(MmA6+m>3p(sc;(s)^`:$jS_HN:>`0lRjYo&2/IZurV'Jha%.tXp4(scL'7aO$Tiq
-^eqA5g#&'tD5k5Y_`Y-+i2Z^"^!F%HJSMfAQ21\sh+ZKa#.keeU/huqnET8M2,5T9qZ;'gdmPj*B
-,#D/d-?Z!($eg6I7u*"sh%MCun7W=D'*@O-8PKuCtjXHAD&P<bnImJ%'.jkSYK4`^+bgc69Gl,
-:0+tTONi9s:9QY1t0!k44F-?ZI"#;GfPV_to<!bCe3AIks8Z2/@dlTCJ%*cTfE!B)+Nb@C)3J<&4
-sJl@+H"-FJ@<*9`:c<*)L&8eFY"sAN8$Ca;e5="h1ZUa;ao;(-8fRC1h/nnNWjl5%R#j_kZ*9o#1
-MOP#q1pRb;8W%joUAAp.6_e+mhE@i"5?M5h*BETJoC5n+aU,/P!Tl196B8_F6\E8QSVUO!DkWO/9&
-#'1HBR:3?e;1X@l_7naMs6Bau7_7Vma^kZ#b0C5hZm%7+KC&j`'e!GW!.%%FX`;rN($Z=-X=6
-3dLT#9\m19MIlR*ZsK,u^P/oT#a,0i9U4e+>4hZem2DNaf0L'8mG?sj-\KV5KTZ2eAs<KIGCIo'#
-T=0^ZsJJ=*@CI(s-.?lP_<6IGsUEYR8e5DPcFO*^'in#PZ9Qd6`25O):FJ\=u:!@X3FNVUe$X8kE?P
-UrL#&@9aF'gd282BlTWV@-e\-P@*%Uc(C+\PbA5=IIK#9HE@&++%UsVI74Y0:;enn(Ro(N5<f@*"
-V8HKAX^9PQ>h,ZIAOm"@:(n$>o$1_1_il/hdb5C1K#eI6&`,l>;hu?ZibOVWU.o?";Ci,0XHtp"O
-%YAR3kfWlMshJK8;;5>;j*.kI)rNT:LUPRXm;;SZ`HLt&+,@.<lbB2o$c6*4=uY,Xg5gCpHjhki@'
-\!2EJMr*H$Q<elHZ/&*ei*FSak:Tuq(6ckE),qBgR+4qH(-8E/Lij7r@/9(=f.Lfa'<i9.5j)6j
-UF-e%lK/VT<0lL,NEYegsoc$82`Z=d0qf`ut=!)UP,h,)d%%u/V+G'o#WY(7SE*#tZD.@WFgLc4.A8
-nJ#JhM:C=`mds-s*3/KAUu6-ZXF44h%879U%foW7F<s':0DC0(F:Tl_l,HhRPgpSW?sd<hYcF\Q@e
-`H*WU/U\GEI@&i;pUg5dsq+sI<Z!GV9=6p#lAi#J63N:=55s^V';h;aC!@=27&1/TNeh>1Q)i0qi
-K:3`$Y(JMQUZBgW:RpOr:L4nqm-\5dB)/VUA=Ke6ql3,=4XhgAK>>kcKsG6%@DVhlpL_su_pjIsCK
-\j4cLp4dIV#btrObD@kL3TPNR&bpCVhu=>Lt"=fpW$-5XbHP8KpXS=F5_rbD\E=NAuCof?%n^1P=4
-o,GF8JL)5ec9EQ^6?3Tt@BGBRrJu3,O1*Im\GqTm$qn(O15$6141Z'8IG+OsBRU3@Bt-%?dK#M3
-cn)'tJL#ARgj6c>aq'V7a$'X$bV0HR6=X0-@;3UfMOs<DX\4$"X<L4S7O83:PGu'bE"dW9^PM$`
-_$EleMcQr53gf0!U@cPTWo4EuOLYsac4-3%hjPFa5e44i\YS`J\3E!aRdr%t=R2@,G7HXOi7Z#;WQ1
-I<hVf?WSbr\3N&FY_4=`jS<s\KAQbOKVj^cOTGar(dOh*e:>;*RsEtdH2!VD)2k17JIbnS;'hi;f
-:P(`TXl)3=^@SE3LfjWUR<?s`?1K`81LE%\lm:F>$IGa?'<oOVAa*DqJ2rgbdp589Nl;1RUrCcJ#D"
-QVkaS:`4MpnKr>o:WEPLbRN=@s3`NlU0<n_)QTm,YGU#mD^>R4Ei(494<XKr&=LeERO,&Ha/n"DXW
-#fmqV/,Uh6!.'Y!E?)64S(R%S<FFY=!n$)Z-^JA2nCFh7(BgAeD2q69_n2&cTa*9CH`NC.)Y'VIt
-4"IV+.B^9%NTI,h=?eiu0I7Z),l:%VRn9tR;`Yj,Pt3CRnL0D:UV3"V)puN488GCUX?i<dRiTgO$
-CkHmF&_V"^6(Jd*S'pUL*a\D*@\)k"6@S%9Q2\m(`:S"mR,Vn1Wh,S5jqn'IEt9cKN`:dS&)bla
-1V;mc5S:>MHhQhn>M_\9bg<D-:$mc(kG^H:u#>Pl1)s1`p`^YB".*!a:7$c*=@Zaf,54:f5t+2Q_
-W_7V/4*%Aa0/&N>_d"a%\Dru^1W,_K`*>7>"66p39HX10`C'Dr)q!$?,^Mb`Ood$r+X)s6c>L9`u
-FJbHl9s%J&bfFa):@c*/hh,A%:<V`dEukgmQ1;K?>0haujU_KaPdYKC+V_Ru/RUd7$QcpGbWNGW
->g(;1c,+k/boG?Zr7f!a\u1ab^ANr>jKY)ELq_,%8Th"/kIn^%>=c9.05SHm@9lbsk:ci"U*0W!
-*cXjOg,d@DZ4I4N`O/^g"J_0mKU4Zh+55LTKte(mI1I+780j=T1c/j3/dCjX\Q=4SC!ea7;+?!5b7@
-Oo-+f)9C9*IH>LpIO+"33$)ZFgToNS+rZffbDL?(9N<T@nXfg"iLY*N.W,a"dgq35YeXj.4rBS(o$
-q3MW<s")eme\_I)%h-JLcS\d/+TA7,75on_9IGNc9l7dY."EL9bkd;NrM_"Z<i*-fORhR_CNA:p-hI
-IM_Sf0aTnj2R\iI2g,KG6`"07?#3ik@<7^+N0l<fE-c_EnJbVI'j,4iZjPjY^5#15:$#\`o=e^I
-hIQ4aC:ZTCj_"2JbS'cHMeo*=@BGh7*nLn?qGg-6tBt*,gK,@Tict%%!pj.^Vp'j69m-912YASsD
-qHBLSu;KsTQSq9''^.niEl^j=(T%$Ei\*`%H;N:))*.0.57PkNjjW8.)?>\f\Drkc0k'h==?O-'a>
-NXf:n:G-)b8OP1KLA7j<i)6KubJ"E*jl#nqB\(70$lA)I%\:<+V-^V*%QXP/bm@te<@`999q*'ki
-r=P4U$5=S*!2He"ogM1<rV+^qJr<)J%XnI9*b"PF"m;M=jkb"QIhDJUSbV*9k$ODBO#lkrI<1,q6Y
-8Yq#"W9:&7%ad;#eOE7flnN$s3pO:W>;#s4dIk,$l8DFPB?#-qOUm`@td<Mm\3JcPCh^tnI('G:u_
-Hbj,ea;`D4$\L_(:jB?:*=7)'gMLIEjOWL6\"2rr4I/biD_p%`Ohg*a3If97'3R/KPB?kfZRiA3`s
-sEZ)A@/%1\(@o@!I-?U)mbGV3FLiJSP5g0C@N,>*O(`R-+tT*.6?oJ%O\P4(L)'DhD:IG?BRA0
-6W</Die(\nfMt3a!9"?1O7:/Dd"_oLiq_DSF'WGjMj@+csBDXnYOY*tsPnSF'Bk?3;XTakU1sRl$\
-VY`m3%RfAp<I;5gYgPP=V\LbMb0q*rk<M;T2<4MN^*5PfNAe+GVWVGFh<\`Xm@S?XO@:o6
-\@*kYeH\:8L&(bY8(p%8o.rDf5n(/Z1r;OHd\^n:!-E.aRcu(3f<.hW+@6U6frV2>cg34>%<&9_
-O>O1h!o-0TL%i;#4\d9gj!5'sRtL3c1cF)u-nZd'NNV_dm0GdQ\<@B`GBb0s;Cn8%F@e*p)pO,tX
-7cm\q5pZO"LFn,*>2b:RHiZnsBr<8f.k,&$"1ZDkJsVePC!p:Y5R'*J:\__6EBDJWGTB.M<GERYWh
-F82Y"U.0<F6QA>IMssYWc!;_"p=@ME`/SnY@6W2N;6"rP426^6>"%6&ur`c9:.(tD&T<7PTfQF8\
-<&:u&lL35D"do!tD*KG13m1-"Sh(R3&d)DR`?m=R@htrPC/UL3.6(t(K/85>6JA^7L;DKT7bq;L
-p+BE?-mQ=1.rc+J@>2bU;/+l6_N-*_cGP/SmL1m*RgRQ;&:'*24L\W6EQ::3)B,f!WYnt3A4ss#_
-Q1G_D\1)74Qaj1"C;dY=>i+Vj\L/pRch5-AY/%hY&fbZYp`Y?B=O0l*9#!1SS*ONqK%NsaL"<J3QX
-6`3cnpSpuJbR6H(c8N@MHHLHGfd;q0,ESaAWODblQl+B_+VQhF*&_g"4ZkfG$-rQ)$+SIRMA",r+,
-GWoO?R0s;Z)Y.JkiUIO7eM)UlWUatf'9AGQK^`FB2G2ASDukOb6eY22Xi,Ua6dC=$e3S_N84bL*@2
-o+V&)1jt-rbemDYO%_!%>qtGiF6RD6*23$(i$#7PXm>'rUi4665!>AcN-,0E<8BFg%S'$V1!(K6
-4dO@an5/sTu(ls;j27s_2f1aRC_O+i>-9dpi1J<t)R:YfTpO?pFj^gd/Rg?i(G=Hi6!"^HE$,IH/
-LUm)URV;gOj4"NTGW8'KK,!:+U(5HhA2jMV&g=acp6+=Ut'fY0tnjScb!1UYW)L,7pkZ,A%NSP\U
-OQF<=rX58Blf63,g&r*WF'X7d-#;E_+hc#Opd(GjKa*-NN:lK@2rU^_$=E#1rO;l@o@kBu+k/1:(
--pph$K*T>",I)!icCD+<_?#d+:Q5V@Tf&.S\*3>B9J.Yb185Y="I1?Pm-!)<,)Pb0,-7*qq+_j6
-dea=oc3+9D=o\TEMuWjr21Rqi)SeTePQ8X*g9pE!gCf8,%t#<Fm_9/d(L@7\S)<.3&?:K`fU^>77
-?n*Ql+TJ-;VmF.!ChrMLcC!9nBEUKN(&r@Ip+p?0#(B\&m&V=so$;MEc!Wsk%"X2G/Z<!Fnjnne#
-6_6cdR?XVH.p"Wb.9?gdfae:o5+h?DJ;iF`!s5E:&qORRd#dEV"Q6*b+m`CSGdtab6KrH1`Q5UPiH
-De-ZVb\1'O@n(4f#Z"YmSJ7k!C!7.^cudE\.Xci=hh88XS7A/'sLF=gsS++6cPN59>KOJFV2sl9%O
-*NB0+HTKbT@)^etS,5Ud"*,UEXK_AL0r>nDP%,n&>'46:G$7l<K$-=_K7duS"Tl_jo;.M1ZbntD
-`h=o-8`sZ7J^lXW:G0\Z80nu(i'8!`<ZpDtE@,05#;f9OfGt30,ibD9S,``F`R-_d$`u*^s#*j,G
-NRCUWe-_%X,Y@@GM!X(<.W(;"bMgd$+p3c@FZ,()B8>`X\_>>)*\,K4Ks+Y7-$2cU-5uC-esj"'Nd(
-fZd"P9e<mjbY^WeK1m_bfqtDB":(#"M5d)U^\.>&!9PLH*a^i=MQ61+mXd*?q\NiEa)#U"cU4D`
-?.WaGj2&ORDdHN4+KJq1j*_Phf#e0lnKTkZ*YEcH%WV4s7='m&7IQ6I:AfS;QBI7_)*:O5\LTrBl_
-2*5dO@I;o/87$GYac55R!M3`<:fE#dKhG<ahJM._'MM92,S#Upj&mSl#Z1?';#*3!bW!0e%G2Zpt
-V3CH8H#G<:7iXB5c-R)C<QM6ofe11#\#rV(f'Re'B-SQbi5WPZ?d!f#!DI4(gAi%651;Q0TYLPf!!
-5u,M+lH??YbG=N-O7'RX?)W0LrJ.TM-OX9rn2'>=lc8dCIa,lf&JXFU`V"K==YoiPB&!=K7dC-JgV
-@3s1NEVNVje/\$Ic,c:i@i_i2T'TZMK+N?F=WD/V!$D7M@A\\c/9b\\m,bQ`(^pT\CC)aK6\LFho1
-<PHYC&m;(jDgAJ!f"XpbfU,%I@gM6*BONu(T-sj*Z)m-0_^r^jH#&X:MH4(N7"^8B<#P^?q<8.+
-ZAch%0<-3O8okh,Z?t!&/Ksr>2Qfe>NDS+Um!LP&%<5sQB4BGYY^RFiCG<H3H)^caZUE60Hc(C#QXs
-^Pa"$q<9_))XK*Vhq>%?S30$>Fns4Kh*q=K`;6+Zr"Xg6,8j4HRfYqrFVgf8ItAYKO"A"1(r.7DPP
-;tOT,2FtfdD;a&o!*f+RbppRBrd6AO&4AIj.;3SS5(-R'6sbMfXJmu5NM`"n:kh:hK-9DrTW06G,R
-8JIo,U+'A+H+XitNIVKk-D3mXJKZD$HFdhSoKY_V5j,bV@gV6!hW+2IhFuGhrW*)IpB6%\:'4+s:m8GIN@@,N=90Gk409W8A&a'$flEk6D-(cWNfN_Gu'?gJ.FfLL73%-,3uRGL*m6_%28i
-QkR3j5C"\kPZF+ce14gCB+GYWMj-R5U_=7B00htVM"Ofn6WR:(m#tmMc6)qdX;j$CE$3kW%31m$Siq
-T+G,\M/^+e<S%bTg%m0PQ"`'@:i8;9?J"":^'-lqF+EO'?B-SSJ.AP?Cg'!&nR=bhLJh)\oj$Yk:MB
-GQNJe1R<PM/=%FG)H"R@aD.(,a>PQg?.YWsKhgYPD@fpC-I?&.nTgaJ+V')oueDi*M(E7g'ql
-JqtuO:EbV=p8SB"Y894=DL(+V)@#)X3fG&(flAJ"ZhPbO!FB:iuS8`7gF8rK^rldTUc0gD1e7j1!=
-=Hq@LW.YXf0!m4iGr'Rpr6pPcZUdNlFC)"4_f0HR:^rd`&WZaY!_7-l^uQ.PqM-i=&d;r=4Fl+Pq
-'q3e5JVh86B"sb,39#JDo'8+6.=5p:NfA5<T\0Y5E.9UHSel!!:MC!n:;kCWX5jA;$UC6E>18aC>?
-l;RK&>YYh#Ta_,Y8d+'@"CU_uo*r_ajZoKWM&L%2-rC-*8d(5F5XABoZcL&J7RE&!0_=iPafIiK?p
-JOeV>0U$3C,^;$Uj9!^U\7PPm_hrW'eE/Tcm$N's=<e=.-^cCr(1^;(&,D-lKO<eqbXFJ'c:SF_`
-RmMXY?mpY3=9;F>KA.t+?pXpQ/obOW%3*OP2?I!>rBJHUgV,14EHb:Sjm7@T29;P&SsT)7jEVU69@
-CkEXAC35WoL731)b686mi!-c17@a&-mqMZ6.VXX'!@"XjQrIj1ohh.js#<H,ol<P(>>KQfa`b_cTM
-541'-Z1r\o^!kl0UMF8;&8C3mg$m+n?A7TM01eGV4AN0CBN3h#J<\VfJUUo;)YFq7/F1j84j#
-YjN,NQ^e/f>8gbE3YWJr.N(bUa86WZQ/#QdWq6iY'RdHKG/2I"1:i8DfL@I^F,'J.*/oBe1d=K-9:
-:`7;.iQF;hM_8ck)Q!g!tI0G&a;C<MS5`oR'(i'T./33OlH6#9Uqe(^RP\BJm:DELl,JSl"W5@@MEaBY2V(ePK/`ZWcm^;
-0O=pY0SP<t:T_iQ=+B!b/qg&=ae^;;m$aOT0pRRo"JA1R>foE.##MgF"QN,VO;J#BVZRp:"'hil9
-^F^LK!N#,-obD>jV(*,hFu\YQ-CaR<92#H"pT$\L+jnTa<^l.14dLXK_5.-qpIf'"MtEE"3g_He(+V
-W!!ATe,BHY*3HoV.Mb/Md3Su'=D%bE&1$72:lCWpr5=B$mher+"mC<#:j7Ui>.<-Z5%%RCK^l&fp/
-8iAcSYe4ML3`T?7XE.aLL>d*@AR%@aAJ&mB(PYV`"@!&h&J9pF?S9MC)+3J=@!bbJ^5U;"j<gsh7
-c4&.P1ud$0.Sj<lcsjQiBK_L9<kNel".Z*<>K!i6'";n:7IoBc;M7CCZI6D0bdB#u3D<>@T$qes,U>
-,X+kHfu#QlI\!!"LYS@(?#,K@e)1ZTcRTH&Ur(n<.m*%a->4\QV/51`&fQX+_U<5sW*63+e@K5cKZ
-DWJf%PV^FL\MnmR!ZlPH\$)L2t2cpetR$75m+fF=@4\LF\)HHDpblYY@j^H(bA(N77=!Uq87t!
-5h*;>N5SoZ.LdU.AVTgT5HmTorhEh)`qW4ejX)W*NT@u<=A2Hb7,+b^ce1&lW15IJo.7)1*o3W`
-RcB1;,Funq2UlIu*KX;&,6oofpRhV:aRY\pR-rR(edXmHC"HXIN"hm\''j54W?XBj$-?/!*"1
-f_B@hq%R&lhH\R5>cjocr-Xkhbh?JY%>\2A:f;r#iWLH%fpEbU>>uZ=Tq8#RKdok"cjg)4;M<Cl?)?
-:U`SAVd/6OR<U3pSJI&I\\uY,<^gKOe5HQ/p0Up._oQ=89)L7%,%&%\K#h8N=@WR9&?eg:Jrhms1
-0mpU"5f+3eh-NW`KX9&/5pTi"5*uJ-u3)O<eOB0/g;TLiZUT&h$J#Xn=S>f`PL9#ZmKr4G)ID"N
-L$/n%0)N=15!76;<2RC9k1cs8T22fKL!)&sf:^'D>S_R.d3*72RMq-$<Yqt80J;oHe"<kJ(`!.n0n
-=jRV'8cf826r#.:U@<JKh/s80J,o9a%:%gm0<r<?X4)VU2AkO!OSZ?+G\Qha="ZSgdK0U:T>_'i
-Kkn),*!63M;1aljKdOroL!->45`OSjF!Cs/\?X;j:-IM&=Tr`_M@-UmnkSKHNW'B\sDXB,A'aX+V
-4WK9Y<08d7.SP+eh6p0*DE:$&fYACupunC35B9SoWOjOoK()8h,(662!C)4<O?E(U<O7QBld6<G5iS
-8a(A8d2Fg?(kKa``n9H@bql=%0g-N4sf09Q"?h2k>8JHkeii<o,B`6\q:bd^a"h/IkNQKI,V$d&LX
-EFH$K6kRH?<c5)4B36_?mA"\B8N#R_pum/uBU/g8Scjc?-Kr1$BT>8iL'6`5EaW:j"Qjc`?5dCk'P
--'a&UopUp.kuAQ:_@JAF>`i(6iN>>EMCD@A@@G`&Rj3'`jNksh!$m%XJTkTgel;jWn`hSJ^RLStU
-@:"QlSmVg&RHc,ml;"HW%LUoVclWQu6Rbt!(8hNmW+pdOAF?$mGlDADn`WiNLk\Q9G":TDMJ1SQA'T
-ttk.L$BNbF`7`6M#3DNWcMJ)8ujlrDcuXr;+ga3a7pL:5%eG+@oZbA;(?Cp)"K=VPT.6=oXYBdF5TV
-Pie3dqipO?*;WBk0<::eSNgYm#)#2G@ihQ"oa.D,/5jNo"V"g$En4D2-qbIN%SJqgC-A!sBR=hUs
-9)!LD'hcO(Bk)8GPl=dWjDT:pOPAfskidh8DYs_AN_AX1_a'TLlq4i@2RkXp$'cJCq2$6DU36ep^
-AMDn#l?N5`Y6-3!e+-$(h'5pAOH_r9hnOc9ojLB;=Yq%BS!E)ueri(7VL%#krE*!;67f.,Dp@+s.
-Dq=^Qmg!^m#ApWQ?RCHo=Ggo9'.0%D\hbShXQ=Yn*&tnWt24c1gbL@IE"8#XEt1bVdbmam\aD6XM
-'Y<qQM;t>,CEd><bD^k6Q,^(;En;d5;$oSJ;@6uloufeYuC43,_cmo-Ypu7jdgd1ifKOo(P+a
-ejp78Sn\dK`^N=!ht.5BC0ao2d=.cU(IZs)O/oH-$a#:T2Xcj1uZecNUNY^<7%kAJ$Pm_9_/mnRD
-K*-D3!EX,Bk3m;elYdj--AP4cX5ig(6?%uIF@TJVVc`W$=nTO5ouCA,o^:'M?kS2F2qPZ-XLsL?$
-8_Jp!6tuJ;SJapiV'tFuO./:MP'>A9MB,nPZ1:QFN"6ItuoS-3!(O-M$mZ2>9=WpG6h7s9)XG5$c9
-pQkCC?Z=qAE#Ek5F2qAVkC**o6?hmKGQ33g-\;%OJTs\:peO"95C@iE:t*%pm6\ZVh=cJM>4Q4pht
-L^5C@^:MtmU:prANm%uGP`JmTU;A!?JCs)7WBI!LL6q2ft!O.(?dReb!nq:D*kFDA:S_Ac6#Ci@l-
-_:)eTDD'QqH'=!@5E1QV#!$KqM2'H?`JF=T\h`=qQI$tQ`bYDYPQ:26k^piG$>A>Zhl\gk?#$;?aY5
-n\,1BZqc^ZC2n=9jen+Wqq&H,kIg\bfR(rYqqo3e-c,^>Z;_ir%Gm6B>sdmZi!F*EG(Sa.EMo663
-F/Dr5'0ccuC^cM\!nI2C6.+40s6e,;5Tr@OM+35;sJc*:5I7MidTA'71g\n&#%q!opYLj%<gO7E+
-rWhE\a5DBuhgDBqr6ZR0BW7HkPX5t\0nObS/5oVja>.WIb3udkO/?Dn,EX^rt)SeO4NPsllg$3s&\
-mnBD2?S<G?+<IrG/_Vu$DEpZtuIrK$UNY^esr:cK^9%0qPQ@0f6"XdmRE459/cH`bU/MoD10p+YQH3
-KFYXEJYrDcP)$Oi,<mNh=iLJ^ZCY.KXtYFQcj!)$-_OI2P!Y,ZO,F$Bj6?O)W4NNGon8nE)nWur
-MWmGN;MQH5Y258YKdn2bM;ba1"gXNc6:<?t:;(MAiXW$/B\lYo=L:*VD-`FpjQ-0X%JTJ`DV%QV^9
-)Um?S.NL/7m-HNlU3934;k;LuLBROP;O@AJ87Y7n$+a&/kabB=DE-GBGQJX@?m/@=q/D+h**%hG
-`PL>EG+1*Bj--_'6XBDfmC*PDQta+da_nkSV;c6;0)lF)a3cd:pQhod?^9<q:-`PL<d'Fq/Z6M01J
-l$s0CkJ6Hu/sW^ugo0!f6A4&47lg;2+aPmB@RUV(lgYLG91_GJEDh*ETde31Vs>V?B"m2St<6a3V$%
-Ri+**u2Pl\^&BlK:GX@`Jps3%7TdA@j+AtlsC(=M_mcc7h,$#,">DY,72>MI&@ZEP*B0!6B+Z(oW:q
-F2$#L(q`)bD&\A,c2t@Zf"eG1o>#c<6.6LLpV9sUP:!nVW'qOnA"#nS'`4n0(6mPD`ckGdS#1.6jN/
-.mP.)s%t'QeYFdPTK936>)$Gp^e!I0e?Me:eu/:Xo>,jj8,8@o(J<@B>9:rQdI<HV!C?UE-42d"7g
-!rEPciPoF5\aiAM^PXX^X-:j;(pb`MbM.LE"W,mkjC;AKHZL!1E`*j'@(reRpH_#>^3F6#lM8j
-V^`8Kc;Nb:C(eD>D4pdPcQm;6P_GGR*@?keU&LRmMb1eIlo5Z00CUY%mG">cHMG@`DXUX8,FosD2<
-)"-r;jfLMQK4C73+lO9WE`Kd`G(iVRFhX&LhGD$)kgk'*Xe4Q(b/UMkZJe@i*,NDKG!oL'*WQGn.6
-TiL7.ZP<qq!mIGUEW<:T<A#5XC6s`1%Kck`A6t_F=oMTokP8:uTB+ssGE-4==s46J*o7H!2(HrMa
-FA<0oR=oV8ic`TOJ$)J3X.ncKbE=VeRiWD5hu2+FP/:&f9hL-GL31XNZn@8<!2NqikBUfXT&\Kt
-@fl`S;E9c4SDoHuI<>YRGs5QdfBD$HVK:-h='sSO??s2?hd`8k#kJ+`UJO(!('!`6mA,,5Z#VOSN
-0+bW`pZS-o0^0fd\cR#dA+Tu25&Wa'W4a3M!?Gl2^::6D#pS++G'$O%FM.`<3fV'&oH\.idP;'92
-4$!.(rM?INH+q9`3u+6O\I!3*70Z8;nErgeJ:QBJ@HqN"eV.4c&&V*lKasLSA`BLuDM?",N0A!"8
-n2f@h",M,ERc2+h'U*!acd#'MsCG-Jp1PQadEhL?;6fFRB"fU/si_gYLZ$\XN(p4gnUa1Yjck(qO*.
-@?ndm`K1b@6lfIZQl)6)4l)+)HI<%Zk"T@=#At`(L(2BInk28goBCm23t+?AQE3,6>kJ#;;4"$tT#T
-ip;2Q;PHFkM$Wc"1M;t-8Z3$KrZ8u@H^=d"68#Kq&OI*4PZ!4@OpQmujtt%TToJ<Qf_m"\N"9&F=g>
-'\.,!1'2g-k51Qk9gKq?-"sM2^$IIoja7qA*6i72tC"YS!#dtf4k'7*/j;>kbJ;rP$2i,;)3Q"t))
-o+^-$d\k`!`O">!R*HVZ+Nt*XK%^Bc/U$mO#J=E)4D71F,<16,oijD'r)1Q68nKCKODhAoAFhGTj0U
-p:o\\<a<:c8)":YkWYD7<<^jIO+;c)#GjG2G\sg!iea4$,5%nFJ.T6,8Ce\h=FZC;P+7%lPdZGCJ
-j%>#A(:/=H<1-_UihCE:LtkHgM7XrF8SWc"10r)63&.0;G`uu6:0&NAc,D*.'VPB$-Kn!_anPH
-/6of="*t;J<07>.2gW3Xkt`LEnXT;L^7i`fq!Xig%cEiAk@jkq'?C.+n'2:\-NheEek<h?Z
-PHk63&uh$P=<!!JD'!!/rC!C/A!6&;$D_JuhA6Zj.o,KGEe:2J_FeKk:D=puRU@h%tr03cMo)Ir\.d
-\*F!JW6u=2XhF8i,U6#YX0#@3"Ukm=o\R*_dA2qbFf2onXYXUZdR"qR:\>_E'4dUPuuM(RA.Cf_5
-+3_P?,&VRR.;"6&aOWMZ)k&pRs5F!TP;-"cXQ4(KI7,Mk"@uf\WW-Q$3O#,fKcA+h9p9CCKa(=f
-Wjp?ap;V_(.AH>8-4Y3#%<528pSEFQoA^,1g$!!GoOT`nc!*d5>Dh%hV)Sc>?$W$g=6emh25pRaI
-g;etenO^YU=Gp<chYTf,)^HU:G\ih:pkP)=X/)O)Te8JISpd(?<1E"FD!pmN)9!(U9Eli7-DS,`
-Pn+Ts5_<q60.1=uNhg"_nGV!s=j2<\N_n1PVI?26):8SER&/sF5qk;Z_'3Qbg:nY>cI?IgTF$&Y
-:'9ib0L=Q!PKODFaC34._1Z=3Iu,Ga+?3\!`XSF/o9AJ)qAt_"ed1n6BJc"i.ifDN3S\Sp0c;K!)%#
-h/eLG#:3$AN*pOcNS:hXX,5&9mmLh6,`#t3WUH:LZ2Pmo5"uQc?TGM'tc<a@*DeQ94*%%!!;A;!!
-&)tJem<MbQDP(<=:j(/!SsbZTS<.S%eBnKsI'@p/Y9hEMrihg%"fXd,oE$?eBE@'/),_oq%>->bP
-YnP\u/8&a(;md_`f'$o\JFn8uff&:d&Y'UDh&3Or0s_R!JaYpXO^pQ@ORL@UbBWQHIODHB_:'<9('C
-!>*7unnku,!nTFT!@8N&sVr#eW>=OKFmOS@QUg_AK#+hRWLFoWQBi,RM,&q''^At-b"X'6HQd,Hph
-@lYs?HKnS5r!+lW_`,Y^uJH@PD`>4^8:?dl-/Y-R3#eLgaBXJ^b-hAnEK_t^ZY;b#"^LkjkT9$\
-XSWj"7Wkm>:da,-aPDU9VNi!pc"&3BqZK:dQ5B&B5)EfQVn+)4.gnGKbGPJq*jDeOtk$%ar9g+I
-c1707bM_:Vr5)R-"k_nS#-;DA3hZVB4Xia?6_mc*YO)!5)&ks\a9!sEPg'_.Oq14m7O/V!!;XoE
-!>#r#YSu9A=rP5cdUtJ@B_H%UW0ZgpgEfh8L4"HD6Ym`k`Me`7"0N\9Q4n#&BZBC)pTTnMbqLm
-j7n#XNGBPK$8Q_=^NjT3j$;E.1W@=eDB$BU-%.OlMlck#,TtJt7U^WpYNPXHU/Ju\@jSs,ghTP?Z.
-4!R/5,W:%gJ$W&03Y-T'I7Z.,0K305tZmT9"+)nrpM#Dtp!M1?8kl^F:93:JV.5>7,$q!:G`0O:qL
-%b6`bIP"Bh3EF_d1-=TMq#O-9r05:r2)OYQ(#N5.`BUl;X.1m&GX0?(&d+U::f'$R0XAH/;:pe4oB)
-;kNkJhChmAQ61-;SD:,9qIK.(mX'\IE8YA._lTcj\Z*aW6*)Ybeo;5q!T/h?Z_ao5F9F/B6P>!<92c
-#(V@.#;XEGT`C5a,f5`C4';Wo,Y(Z(bd3LYpLLLeeZ*Il,aa9d:2,!<bXg"HGqU02!!o5(iBb,k/
-n&/M$,-kOd.D!ES`jDLYbed5-S-L>4MC8S&T#SW*fYGXXi.gE5VmO;Q,'L7o6l"_EVda':,1-.U
-^I@r9`Tc3p^s;Wi6*I,oXl`:IdSaZ@kW-K&kl1&<&LmOkV=c.1NN.19f8sl^CR(>:&i;*HE,=`NU)
-R`WdSYDr@H5mPa*FpsPf8%j=OF&HoIW14p_C.17::Yi@<ul@Yon*AXMnlA7'JLG/3H(/ce1:H&g/kg
-FM,LB,@P%kVa-Lam%/T9:,YhKmjV'ZiF*!\OuC@oMb\Auf?kGn>/#=)eIHRsrhWW:UJa_L1k?B?oW
-!KiZj9hPrae9Kt?-rP$(9"<RgIi@p3(8a42YA5(q\m<Zg*"W.aVPqW_&UWO/s9H^F/H':h&XLUU`i
-nZiQ_fs9H(\Y+-8bJJ,n$U_W3si#Z#'W@"b`R%6!h?7a_r58"hQ?*;sq;+p`Q1ToPcOj9$&%+)NAj0
-(f1Fb:rN##q$/%.2ir+h*LZQFu.SnAcY5^1I\3NN!k:=J,q!r2+OpT3$EUOb5eb?.^nNbt3F#Ws"^
-D&b=bp;S7FPAI@#>cg=-aS+:dsbTICFBk3:5g\=a1D5j""a48ZIP4103`*XSjMO&qLcMdUP(19M
-l%(m3cbTpDPV75W2@&BYG:!!,?X!!e%MM/&UcLP?tGW-&;(/uk\Z4ftWZC`.*KSf'JEDY2-l51^
-^/Y%QWXV@R%7IKadbsFG0ffT5`ksWQ8WmRM`GIAp,^$LJ/Ti6Var&_82S0=8=66b>1W$@oHL35F39D
-b$@,dm&VNpG'3cG/L=o0u?!53W,V$Jtb4ZXOqHGV(-re%s9+8i-DV4Bt9YlSoIWd5W=:T*/lBnmJ
-N5nM1/ScuMTUZ/l`^k,q@J2`(<Ac@05O"9sC@!":LYaXE#2a&Y'+<`GVb&&MD*4&.TmI`G58J@#f
-(^WJj\5GId<DieslI/Tk%BVK5%R0pc#38%\br#r1aMV?8+B,M%qe=7Q1&'0ei/1-$:(@ok;K=Fs'
--7oP7"sjBcrXj6XaDLMA79u-'n9.q2O4B=4:2@D!j;DXAq9eLa.$#^Y6C4!A2Qjo*i#At>Y)N**
-B'($qPhQ5Wq,5cq.X$/;(3k.<^("L%(8)c9CHGBU@_%h!!"DM.3ueZS/&"W/JV$(8F2'37YbC=_
-oR"@s#16Nk3qj2dK^N^De:70Lt3&5`Q;/T;#uECBj.Fjpo=.eR_(-BKB2;MF@V'W5FU*fA4^)9WR"C
-7KZ)B)U)17otM`l,$ofZ3jQqVdc3@V8@#.:PcQG4al*p9bpcp;8?pHfj:7"h/k<a9)t.f_<d1$%U'
-=+$$cI<9#jFPTE0ml&b'2;u4PFqDOKK2CK&P\Z7U(Q*Umah"I,iPjo\$pRI*?cRHB*IOCi<a8`?<
-ohi!<p_tGVm;42KMt\KD7T_3'2e8Fa7S4C0#Og(>roZ,so*0Da`)(/1YR1('H'/HgXS;k:LOP2U0,g
-;AL?eK)'`rrHfA1JX7Zq_7Z#KHDA:nPK3_9=JLauTkk$"MQdh49oginfg#-;$)r57,`SGNqNQ+6$S
-AM7)DNJeooE&r6W=DG`%`X,4f@:8e9P'ZF\-7T02NFF>rL67QSSW#tl':9gdGlU\C-GB/GW?lU+
-NKX*-^%UP5-\n3@YGGB(GYU#MYOq$Dk%Uf7'I-0.LSVGIC"?MR=+qtk-JKth_s,%5.J%'lY)-N2
-LGE;PiJ_2)6=\h4a!L7qTFSC5&`S@_s^_aPK(h%cZV;%EkTpf,Wc.QY)U*5a=FcEp0Qj$oWO3!cBJW
-UcsNEDI,f__#0-?J-MQ9cr'BeC'$C85DSR^9&3Ur0Ir_,?HQ%GWe3$)*&;h_a2/NLKpE,PI)(`HhB
-Tt2>>g):jTN$EWsB8ubf=sKd<03pH(0DYX@+g%9QV4biSSU(lg)?$&Y!M*BA)u;u,\U1/uq4CeiV%?
-ji32MG@V3mMT=OQig1hg8K;Ns3W-V=>QQ`!sdP(G#Qo*KF<p3oN7@_igVAKoG3jG`/Hn"p$X4k7`q
-SB49<%)uX-aHNqTk8/c9eBQ/GcQO\GN?'c*!MuX?,KHLIs3nZLUCUfe:B"K@c0V6(1Y56\QiOuK
-Ws/_\'Y$/`JRea!FSjU)kYe&qt>.(WH\#EMY?N0RRie`d.XH+4i8e?&>\:P;4'+`Zk5aJZZ?PS:
-gUWuGFq4(#FCEOVA=XLhG>%+mcAGlXZ\?k;,>CEqAK=Dke-Tc`qI@)T7CRWG\iY7pHJ6pH/g'*K
-Z(#sDHX3eDQ*so3,Q74qkppXBtHY:5C0B<@K3oCa1;(_UPOp)m?aJ_n<U&XF'oAHJ>gWh*&1)S:X
-nUWZE&26(=?d_<r/@S/9#GDB/R#Ce0$Hn3%mT>LLD_Ak#Br&_f#!P;fL_-B"4n8H1628i`?`Ome@S
-6<jZ=2Q"h`nVBM4C=CYhBmQK&lN)W4>Y#_D8faK`EYpO4Baq>JrX\aS3;@3rt,:WOK="Dh#4L</
-"KupuIbPZ:tgc<Qj-b)8Ba/(f'r!kKVB_^A.\XV3r*9GE"kKZ3ScM(U4F$Y=YTE_ub'`O%4Rpd'o?
-a$;bhVo)SGUXqe^/^bd(LOJr?9KlVpBs1d@DT44X8F(-dKC<B;:%&=6<G=X3\e2a.6)MI8UWI=4Oua
-ebrY%*F75ZC"@Ld\_<>4Bb?):nb%em3jYrIrkZM:aJ@f1$q8SPRm$MqEHGg&7Jq4_NF,F4haEf=d
-m2sZTX\_(2d3#pD_c`V(;q-DYgu;i"*D>4:e_Rpfh>Q$`*SoR8l/$ihgaU)h<!OBlee9#hqeCk^
-'3=.j,Es0i-kdcrXn+<(#Suuhp8%^(LT)<.56fcBV4>,JV$MrV>R4^LG7hF$?&7HD0SjSh1%gV2
-:$%sDjh>0brak1T=6;\Pk5K5\5%iq_CZg.pk8o-9?@h33QqVl:9uIOpiZKO2Qm'24%=Xr75+UtfU$
-A5GlFsOgrj3iOZqMd1/PWA5I^A=ram=K$lsA*+U/UB^b$$un(uEa.rmgFcjmKkCm:%7&Ss/M)l0eQJ
-n,D_D*n^BjhbCtmt7\b?PW*\)=bH^mfF`1*te&#.It5*nUDZ5)N"$70CuqAo"Q?I?GYl:Sb)kUo\p
->P+t'BMb&%3M4eioH!iRYZn1_Uh.cVL'5A2AGqksSK-%BkaK&SFjF8-ss0V="Q!u<CRD>1U34hljL+
--%j'JZ5HqHnI?_C`\bUJtp)f:iT8!.%L\i1500bUSj!4GofCN<+gn*?q".hNJL1fA53(W^_L=\
-@\0)5k+k5*+EOVM.GT!X`%=?"P&Jps+rtC1"hXP6k@NQ>@7j94oS)`YP"F^H#<Qe(HT,Pn<W!)Z
-P`:AMG%_k'%B#8`oOKe35`=Tuikr\SSth#_bPkZ'cm.V'M\A+U'2?8j7*aXL&tCVA<^Z<=92k'Iqc
-3#pC1L!#fb3*iijn0PY>59#L<bSb-ob.Wj^=?P73j%iONNgkSpM$0b*J)CDE*0bR-T.I??L_.A2EF
-uMaPG40S??cbJ'@5bqAj/e2m^k?.6:QW2^PGX6aTsDG)L:Cf'RGpN>8Y0SESHQ<#TiH".)m*Mk6g
-A:9`@XH_p7t*DTn+a@5)O"=,f%9a\rqd#OkE;6OWj4-ihbr8)64f;OIOr;f.G:,-HYG:j^JG$
-hs$2Z%pB2s80pZ;Z@qb!b^5"__F2C^7Reo0@qmd%rn>h5YJ42;$-"+!r9R2:uX694HATs<&2e2
-qSJ$R2>Y1H?_n;E=0N_'\^?R%.coP:45Fg#!=#AZ8p8aROp.!jV:4S@h9GbaToqZ<XA*TlnCGFH^
-S@_OO3NXE$;&N+O/(LZ,tSYr#r4p347OFiF&`N#:imElprR,&NaiG`kd3ek6suf=MF!&3(n8P!&On
-K/;bo3P<BV?`RV$Pc>o0=d9N'H<.4@h%KV9\u=2a&S:04jbG#jksBrks8e;qTbY?4_4Nt)=V&lc)F
-0)`QD<nYs6ukuY6;'6_YpZ%3WNK_Nk#m"OR,t<m@?n<a>%\SgiQc)&W(G8X#bi$(,@GRe_\5Nf*>9V
-<G8:F<>dt`c0N^MhfYINWP39bWF7dj2SMnO;QX"N*_f=W5^TOE+:q9Pl7d.l'M(VPrK6FrMuF(k
-';liYgeF,NB01e1K=W2'uXJI!A*!Yj<*S5%mkC20l7DgEeV*obNFQYQe<,FC'NUENOa9J0`\A<3
-)8os"B+fpGS5u%inS2M#AFW<r%V(=H52o^g>FmJ#M@1E9&_j3*>;?F#kUtPek.)p#N(5mL3/!rKhe)
-D#:)h/L#\t*kRB0*lI90NH%:^6<(l1JN;G%Ip)+ma>KHUIb^@U1/GHXD'3*32`9k*b=VYQ*i%IA
-W1`8KOL4@M1+`;?Enf.(hPI21lZ!O;8<Wl"ZOpGSce0GCmm64^=sh=gXdFN=:'r`$qo$<8bqK3Kj
->JS7@U@0dR991oC1?k*3f+Tu14KRZa65*Er9I@R(P+7CrFM*W+-%8'k9U9nD7&ZdKLaR9L&P^@t44?
-^LgGRI12/IaFL&;HRc"X>R64d"#(KWraQ6&\j@kCVh5)`h.VNPW.OXE>M9*Jt/+q7fn$"doY:.p\i
-Y5u9bSM6?;6T@R=Tq!=%5`,h6e3&ANdL_-eJdF`%,.h7"$pr<4#9fX!g0Q@d8an9F.I\Ok)i@OF;
-/q*W?j8#.mn"_-hLl3q&up4,E>(8(_(8a/;ag,K?I+cHu/huLOnb-jfUU+T"_``QTC`/u6!7P1P4,
-U2#IQUR%tX:Zj!h*;&D?)4VNfOPF:a$I-mlre2(hP$V3-cHe3?NE(5-3(Rplq(#U(TJ6V+U"TiJY
-?Z3EJ1TSacLosP7UL*m+3`tEp`>7!P."s&u%&(lbK>;LZ7Bin_:G+u3.1W`*4Gd7?ngP@k,;..qPa
-:l#C6j"`?.X>/)T%:nNF<e@UJ,G/;8tSP8Fd=C?k=$GZlFk*U'bUJ0c-PU*/:\l%Rr8.Q01V>2.n6r
-jg:#)PY,9uFPcVW!)e.$@SbML6W?;NWYD*,C!$de-\UCX$R&&(^'M88QK/mOZndM<8p_:JKTVV!?q)
-tuS._lZE)t""p'VO?:,Q<$VFEJ<k9SQbFN9doLWPMetT7"lBN4;14g13$jk/^4L2jW515ofA@TgU
-@nV&fIGDc>^0^W<AWF.a3+@7a&0RF"DQ5tIb^-B4/!SHrt')810%:LLnKqNYp!`1QQ'\"95d-;1
-!Po#&4>+s,*hm;.3fo3C3BDV-0fVNWYJo9#s\MlJ-3Nd&puBf0E@Gi79UYS:+G&NHI3AdA"(8cW
-V7A(=KH=#9^5^Je14tg11W-%5nL#!7j)iD4Q0>*bsRoj)jVhZ@,=G@LQnbW<Vk;=^sF&N9i.?ISpU
-6;k:KbRg\(Q7BJ2)V$g*SV-HTU0ACrMqCWG;BUO>n2N_%;<jSmA7?!<2^(-0JFK`BH`C'&-rJC)o
-Ub/WKnr;W,b=n*11;2;NOV^=%gL3/h"\!HGRerB_4LiU*X8ljtG?(tZ-ib'28g1:@"t`-gbEf%Di
-6+=(K,@l!,C!?ZB5q6s-3:;(%@1>es"s8*5b`B.qQ4!NYnb'fHUfFpfZ=1PXEqfeOA5l1bOK7dc4$D
-tO"Y.i8fY*$VDsEFZMep)6"rMUu@OTLd86Q7-;47THH+F:d5tNOoI!:g/m.;/8'd4DTU4mMXCS6
-3d_;UTJ>eVA;J'EA,32,:0o+W6dD9V3*KG41-`OfbYP0^_W5A1L+,#JX&$UKFcNFB76aN0S__FPAp
-TND1EbfbS\6U?F#a/X-6orZrfq^oA_@N%:3QpIi+Zn4hPX?DN\m&2YHmS"7\"Zru!*+#_?S>d.(OJg
-i/<KGMIMGK%ao<"u";3I@^G<n94jTMq%aLf+G-@c1KpD+qo^EK1h"gf#q"mOT:3hd"onmroV>9
-=#TVcZ_0FJL.mFrE.mfO=b?fcatIf*MDPXi12dT&Ric_T/rGE2^LljBQp6%gBf_7tS7;gJToU:I
-X5QV!%!9(?90!A"4f+*4=\_ZSBo@/?LR6D>rI$jU:CcT^AeX>JB;T3*i"#7>?63n_ADYnU<A43*9;V
-hMYq;&#<;S(V<(_$$%4YW2V&OQ^a/O_T<RA+_2n0'i#,$?bI:mCJ?lesfF6IhrXRHlGMrN>4/
-hfu+jI!$:*p\Z5'#7._U&YIfaacAMB?()+HC?R-3h^UU^,kM^S)6G4/S@c""F<Upele)FT\
-"<!D"qu1WP&3";'PC'nTg+lRS>q;m\=^hO8\1Z6&9ifiS4qa-l;TbFi&<b^SQ5Ntn_5Om0"<5K!
-YP6\g`XH@\$aCA5SN_$lgq&jS.YXVV:2##8:S8X0+/YQU,qgCF?8-B._#51,:pH@b_$H*!!nDZ6J<
-mYS`'B71ZI5491ZMTL0aree=8`+RB<LYr\7DO?\)2.H0!;`6FQqD5.RY3\P%l;Rm_63>S`41e$/4;
-C+8F2Ej-6E3I?4%coRQ%ncO!pD@kR>h>X"G$hc".0>s&-r9S%Nd\(#'7F(Zq\GaTZ#nN_jUJAY_L#i
-=tlZ,TLkr`d"jOeP;+Q)TDHd96l;@bIt>fdKA#-NpfbG+42mAY7D(Z9S)M5)jp-8o6Bl7&S-H1H(?
-oPW>I3S.0sm1'#2G5's.,_kfQW,!tST\tD4#aBjQs:*P&i0naJabW3VS=Z)jf6f@M1/FDIX@-PU"
-'bX96%mCqu?h<PQ4/Vn62uFZ:)d16Ac,ioRXa=ig3Y`98?GCf#i6Ta+a=,ksY-(^'k,,b#'X,SY_
-pUlNRH>/<%V_jV**r.7EMF2<*)Q6OPW^gdZG!jO1Z0LEIl$T3N4,_AmCJeY3d:q/u?ha+oE\X9`or1
-B2c(l.U7144XHCE;M6C_SMm-p0M2Ea-@s@912%spBL4o,1X#&A/i7^^57rj4NTAP`khUGCpgna
-_\;=3Y>EQ*/c;I_rT2efEg6;`f>_5(%(Y(X'Mbb70.ccRL'L@?Vn-o$CJ4K8rk+a?@1-ock3#Q
-1)_":^LjJ#5qh912,5tUbo>g^`'RA<NO(*^f#;5"6iI>@^KXA_oe"<4#&$-J4/aMCUUEU1U)T0<*jX
-%@0O3ui#O>;P7?C,crPc9.\f;Z"Y/T=6RKiE$pKoj1*\-FS"p398H^4H5"YOj!(@S.Ls?uZ`7V\
-U.IB'E<e/#jJ,rHL(d3BQ#J45u0'kp:=_WMW<Zd:?W75W#K`b""cjR?HK1XS;CbCLQ,lo5GJUfn65S
--Z&Rn:O&cj;3n.ZI)K#0\p/R<7E634h<l`1GDs4\5R6.o$95a3%;t`VD+!QlsCj3JFK52r+G1,6VD
-FjM95b;:Qh67<Jk0$51UPO)o,csF,sOg:W?Xn"HWMlOgtfr`-O.@QV)83MSR,mt_4YAF8uP`O0/Dpp
-8#<##pAYZ@&40pSsK6n:2PN=2bM\Z@!PQ2Pn7/t5L^,(mRHTSNtO1m057>!shL(\3gLG;Lm\/J
-rfs7fF.ak)F44&;u,EQ*C*=MO&aTdcnY=o`<MqaZUQdXAmKQ$e(7p%3dc4`gBr\K+lCZo>1929)VJ
-_eQl/E1t)J@`o8J,9i0Bb?'FWEL30JNFH$KEeZH4T12CK'Msi8SkKF2Ye($Vs-!SQ/E6RgJ)_'/)7
-"o?^K'd8)Y%<k-o%PInLm7L^UlNgCUURD<&Y1AQCU^&,f,\`?<8BtfE!5K*-#!BDZc@\S.Im4?jn@f
-!!?B$JP-,I3LSMW1YJK3<TQM6NC"7`O\tLTR6e"uq4SEWe@dl98l>VR^eQB,/Z(sYT*7ta/UgOtOO+
-j^<q;$Vd&u")K$<nK%$=Xa*obO4p57KZC7+8U7&`2+PmFf=_)'pmBX_Ip8ai<oESC"E75W\i8<u8
-*P6i*(_1"><r\3D\LMu?1d5QF(G:ua(\9Qt$`J56'Fh_1:W.Q.Ab-"_gcZCEe9o(kKe+'"`
-ZD5bk,ak<ebgu-*R?#3o,)<k77GSIfmBN+:s/UhZN3^";"iI'!Wrc)Cbfk?--+&Cs5$p<$:6_c
-K-<4i0>&cg"<;$G^I0C_bXW0B?tTYI:'IRf".QBDe*qt9;M6ds8)U3O*UJtE"d5EsN/cM`T_%!N
-%Bm)Y@s;i6=X:da\:nj3H-Pc5THfN*4L4LKOR\:Q2fb?qNEfDhoPoO)o#aNS;+7"-?pB#H1TWbG8W
-"C?If'a4pr2s(#`j1_i;j#ID$#S%UiiX"uU$E4XISleCK5leq%.\@BVCF<h8!5@&i>GSaG@Cr7\dA;
-i2pOJrBElb%1R*a!^&VWt/)o3dil3QZr\%U"3b'Kfj":<EXtX1*.U9d+@r;b8ju%rQ2.KB9@m)A
-Q2DsL^/E7d5@9,EjrYXPL.cYFP+r1<&MGh84(JOLA$/#V%S,S<5DVchj#.;V-9+HN6fRf4jKNP_P!
-HR9&%RC8OUaoj4u?d1Lhb(A/7*jAT-$5.0uL_`S<!eW%&p?00@.jn<#EUE8OB@:h,uYARY74_of
-@T(%&KQ'6daGo2UJn;`5Ae&BaAmo:@@cksRB(g''2IttlCZd$W;W^9$rb;bBCh@R/B'*Uc5&b-m@HQ
-upB5V6iAnVVp>Jct>BE!6hrb^h9Ep'lNB&7gs7VucBBBG3;idP%iM!0Z/FiE"!A_Bu=Nf1coNK^5uk
-jA0/jl^<sJr3Tl=Pf8(Bok42e(%B4d0;p46ofP3C2YkpDU.Nh#>,KBYjfBr6k-%Xj:JMSbsGl)pH
-=#+Ol.V._K?B)%+hOG<5WTk74M:SEcgeR,EPj+L9C6"qN#-hmFVeTOUl!@KKPN"oS-!&T6But52N
-*=ER-U/$%r7SKcFO6EPHB7l`P$h_?Pf^gNGXC;0.QA15CXR#;GCc9)p^<#Wf4);:7lgDQ):;:V1
-q!?#FCaMGM+JP>pC5;f0Co4aZI_Y4"_JMK8m.SusI`^qGfiS+NM>k!IB$K\>enk?8D2-X.b4a5hX!
-GQCj+1reOb&l3B;<#JO(&-D9duW:$gDPlafd7ngm;D?`D'i-JG`2!KrpJq8mlp>:@E+%oBu^$
-HDX4p@mGoP^W#DnbYEFoL?LU9$Dm'.ZrrI#GrGI'eDJ$<n!-c_#kWo@Nm3`0YIgIIr$1Nu_E5)d
-"cO01!$ukA2LY.NL-O+LM%<1bLEA&#FpD%4%W;jh(l&^mG8>1j'_/(9nZNl$G7q`(l!5SEPEW9i
-obedhRWB<po)+T*2+/!q9hME<dkJ0.:k5.<;U?o"QYpa")2V/ooi!njb$G?S:p$134NnEq_?\7l0`;
--h;13o1q>eIlVRO3c5*%`W3T/cGG4`g'UE=89"Mk(I1qdN:rF>$%(5=KZQ7W_EqoNsqga%(6D89D
-%*oY4"?`VO\C96AKUFRN%Jf1Yc!;0;h9oaauCbDB"26&pJJiOFU7Lk9c3Z#uCFg#%mVd4G?1lNMF
-oPT&fGp=-2$?p-2r.7pgFHATha=FqC&7,7X?*AG33=G.2+-^MS+kBKoj*G*lc_cZ+-KEd$>UG4.
-c6I1gm=:CjkpO@F3O*PrAH?ZQ>GIW-Y?5r!=E!`FiGQ32<%tP")I1XsnpLt?:+,+rHJbU:jF;i-B8
-Ll*Hh_bFE'GXm=NQas(p:>$3p$FmuN;9OU;)OM%9%^-R9,q2TVZGP@?t=J0pmP5+Nnq%o.g5EgBE
-S,"G'GkO!@HY!kP7Z(q3Rk&:R$-+TD@Z?#`#>R(mPD84cS:nq1kPupSE^2S;OeQH/G*<&"e/,T_=
-EllX,VXGD(kKY),E>#`u-J+HVNfSI**NN$t5(=1)G>X9e:+#q3!75IPpSS;pYSqtQe25_o4h/c/AXH
-PsiJ=Lt2SI$CH$8@?b&EO2t`X6Y)$*VO0f?/I`d>I\?HZ.1+\;U73R<pXOok*?DDlaAWrXKLVOFI
-.0pG+_m\!'j&,1LXH^jc,qZ%iF&Li6dfa?&0Dn&0L+b-fkgDT)H.Hr\*RCT@OtuX7pSZID=lmce
-SMtgAT@O%OhON98NI.E%3RV&9.a1FS(9dW5a?NV?1uYiJEWk-3s^uhY2R_i(upk)@#e_BI9N/.'VV
-CEX38sO+IkB"+oLJsA71Y*ch!VX5)2>h2b2l<2;YFTRRBYfdl,+ED17LsMF'6*J:?RDM@So\lc-I
-;g8##Q%r"8B)WC!VI$8a*7,d'ODFo!\EiCiH@eA<t37h!0eD_4@H4^:5DapE8H\HY7A%ku^:oKqR0
-cG8Y0WodbH(N"qNX%PkbsN#*PZ(G7R1,)hG^I$Xl;^`HKL$aa1r,)?Qlmgn$;G,r>4l^>GK22GYLp
-<S(q=o4.@3;!u<cJ,@!lRo&.Mp00gNHJ-/Nok^kk/E!KURf^3m0SK=+bTB#&eDYr92Si^ZI8?/0hho
-BXAEOjMRjC(TZ;BZPU,*8NJ&VO!u\spso&Ds0PBu%JmAc8+UF>+_bHiVP_V7e+Sn6W67@N4\&_3)
-V4Hc=We1f9NKl:mu/7C_=0gE#V\n=%32.E>9M!B;:?kPr1`cc,%Z(S7@r)iA=:d@E8EM4E?of">t
-a$pC<V2H(>eW#Fc;/8CAuq0YU9r,/M-NoIS*XNRE"6Jd&(Q>.MVOMuXU!a\$1G"Y$MQ'9ieODZC=s!
-(%`!;ApBB6XE8!!=,,!")(PtHca!IEn$as>(#dI4+ebW.F0eQ)>BiJ,b!5kN8!WYJf+TVVZU^l
-'&-5o8!2(J^&s=f^<E&TJ_,SYbW;>MeEY=u<:$poc%M*?;#Zd50.lNh5k-:FjS`VYeF-`ZqbZc(KBl
-%nQZ_%7e.kBnA'@tXM$^JH6;YWUN-'IA8.7>/B$JIC4Q/\''+7gjTa41#b'9DqeNa1uH<h;c2,T%8
-1&%U9K5FW$T=s=.oR^='85r%;kd@oAi%Bu58CNt!C9PH2%W5SFAN!.dPQY,92c?%N*R70@ri:".TN
-($@+LReKk+1l9.7D0^d:/KTnsaqLd\M-Z*Bc(0HuI%d29FQ\6EaY1O?2gVW=hrC;aM\?E(FSjC&Hd(
-9NtdO;c--/&8Ea&NE\AML8Y'?I-uCCas"/^+crW>J8H`*kK<EMg'ZVBC.rj/6tq_q0IGP`H%8,)1
-\Yg6"Lr4?sT)<LFk4A3oCKRG^"A1u'rN'ouAbjgCG\.WF,D`$15,h%TtF3G^S/3eV<AKT'qbSeQo
-Wiio:+mKr<#?9'J0ieBCp<i8SFi`39K\T'8Pn!BN=@6``U<>=Pd-Ec!1=4">)r:RMiq4;*aY7"5nu5
-Jmg,8Je4(^d\sPg_R8MdjE,g'7PG7?0moDX?)_,TPg.:C4hD(.++I&jgOpL=#W?"OOgi6%hQ.TZS
-VaR"?3lX?ORIP7f'9cA8_b6U^-sk>LWEH*E:m\bE0shTN'/aS"4?-Ye5gan,@NS;7C"<Q!l`/W#T(
-kY(_.7H#I9J8tc`J:-&?JEYM&XG.?LVEOKK39&;NUjD'cCNic2J3Q.S\GmLr7VPOBSTTH(,U:?DLe
-P%b^p((sZR.@JEos6*?*t)*!J(6u+!=$Y/lFb%8"#pC^<NV@3:hMf'iL'Bi2@Sn6gb9LA(3+\%%Q
-B$-EJJN,+,E1X(IXoo$mKX%K#!Tf_hb^WPC=h'(n);ZW4cD&3slSIj\3C_Mo.UJ4:E6^>e4lO"tT_
-&qNY'KEAtoDL+.&7Ys="J_<GTYntYr?o\Ip3"dlkr"Tnpun4.I*sH)aOf"g?ZY^LZ;I;"\M2I,h$K
-X/"i&1tk<9`oZj8q8717`k.q#H_VU/4A!YBqtJAjZ6$;b1H;*M?'^--rfp9)o!l\DU2eXOC!Be`%
-RMRb%:S=-!g%(0Wjp'=&N6i<6&df,WCrojl@gY^58TICnM2j'+AgdM$QX@^(8AlRJe12cVu;$95q"(
-5WK8j7<J?X!C:-!ts'4lB%p2!"EZh73k;<I1NIQ;9:%Qe4PasEbF3RS_aFj`Mj+<7G'p`tSNY-
-ld9f?3WR$:9Pa!<=eV:U)ogX$#^Q(66C40sC#k&Fg7Ni)X="%)5n%/>*!N@R$pifRtC@;h3aO0
-!mkWrU=<IDMbP9A?+lg>`ja_LpLu.SjGekLf_ar?XPj`'$C^+f"9aHm3V'c\$X&Pd;'m.V3)FW7`g
-/f.jA,UQMnH83Z`lr01cbTf;7E<*RsnE4fJ"LA_OTS2"#N;+JhOQlbAg`SpqLqn%obXf))114)
-p#^5+(lo=i\3\*U$a62T\:nj?qRtN:2EY)a`aCAgq1jRg0Qlt@VSp+?oP,)>$PK..T74g/4THm1KAk
-.F\7RUdHY/AZ`>CNtHmBDdZX8JhU2hU=<ZX8E\XNY`t:^Qs+\mS>RFHUhbQ#)7r-#q<^80uVYd7t
-?+<"p"uL!sZpsir$?:0saKOc)$"6-bBi3n880HgR\kBB@3;$T.^Y19P_<\DZm'qst64<CDFQQQ)
-Nl*BsUd_3ESq4XUT4$LH3Q/7I01Bi<f897W/N8VZ!!fq#<)M76eRWnd;m:k+Us*Q3Xuf5tEB(Ii
-5ZO3a&:cfuHtTgRSjE"@#"@g@B=NDjO"Em$u:qe-no(eP(,jDR#:c@mZWBj6P_!aW$YjnmJ7jE7o%
-<^)ZgpkqdUDP9\RAq&ki&M&dY39.@Z#q\+jl>;j15&;*OrMk#?YF`XC7(9s4+<)p/-A\_RYsk0)G
-ar"Oa5;c!)D6,U8?l3LrBme=I\f_Mo:a?G!)uag$q8WSM8h5M#EhOmZ-K;IeGaWL>K"iT1Bt6m5
-#tjK3S7J>22n(3#c$4J'9uYd+aIJ;fQ?.u!UK&_(SpF7(:QTGq?#``H@2j1-olA)R`UDX(Z)&n`K
-i:g4R?:#F6P*p>^9*dHU%@A/.TK>iL4LsD=lFk@mnD+6@#-qJ@:sq8oFsV`J2%qgM6?t\`.pfOc=
-+2a8Dj?-=e6?l^BK0mQSIWpHN/n\`:#(rS9\5c<e\M:l5QSh$\^5h*'OLCNu5VM#K`B4YFkq/9eK
-:#pN6$a3jq<40$:*_\W9+`=$sE!>nF(NFDpnIDlLrN!d-kuo`)-$!4OiW6o*CMZNE50o;TM.-ef\W
-69j$I"(gB:bq/:BR&"MLO2WlRF^I=k:YP*YXQe'hkUeJCTON.aKE)O="sq?)E-VJ&V#fa'mDP#KcJ
-8^Z*;Y;`i.9b`N&6a^?b1/lqHd%8hak<`)#Yf2NX#Y0A8tUhZj3Nq2Zfk#sLPLZkTKU#u-_oj&,me
-.I4I$t+Yg!=0)`"qeYH'VQ3L@'g/h0GL33;,A&<YN#L6enuZF%<!Bnc)r:FhK,BlM=<PDb/E?a.+R
-8<$t.eYai*h66KBF,)rn(CgcY'p-I&;b"pPd457FEt-"56@q$.UmgNj;>Vh(ba,(:ZE)IRc5J*(
-.8lR&<\9>T@m!*Up*:n$*6paQtRl$dQoNK_A29iu/JprM;^_n=aBoHS8+C+TSiA5F2aOqt*Y'97k
-bWpnst,SNH&"kTgJD(5OCCjp#'L;@"5IB4',QDq6A(EYpgrM%%CR0NY4+QeP94KImPX<?L=Y<
-3+e7/2:Q)Sq^Wd+V36QPl`,?Z0Q>B3b`3R+osI*-)i=Ci48:*"\#"fo;HRCNUZ;;$TEL-Gh/EOX*Vo
-.4.p@+`+eP#D=/gW>a*d$SK+3:Un4naSZXa:/QsEEZ5mLdW@)ne%Q/'#$\qbpY<3!HAmD5\O7Bnd%
-Nb&O<-,Td1(TjpEO!'1"&jAks:?dk!5E.<6^P(tGYNt>/,>#hq%Tr@$5nmin$:bSWj7_AO!>3b>.
-1E5YZ"gP=-6Q3O/<\Y>15.('eL6!W9oTk$0S4P&WXW@Y$tjsY&W\U9di=PU/)`J8;J.GU1cbW$!!2O
-<&u5L=XXC<$ZWX+0>>8umjk9#2`#Xn6LYLe'mp*-0XOYhWd\!>iQu/`7`aJDpehkQt&i#uV67!E
-p1.m4e*17PN@HZV<5RKPr+E&V25Al,p)"0K)(Wt/%h&EX=n)"^0c4fE%\,hNE#d3VunInrD1O1e$
-JG,.6+B*Y!PI,i2&LI,(Q`/+*WjjS1*Yg#+Op@.FhE"ZFk#.$Q;?Ju1-Km52'g)CC\0&:bhnM)`
-tB3>7Y;P,S7S\Jp=G3X"X^Z_n5;d#0_C0,-P3oQ_j+l6%l2)MUhZJ?*(rt$sX"<_^g!&-V!I7CIb6
-M%B>ZWuP6V^R%ADp,qd6=&%=\h(5jXU:+I!53JdXAM'r7"/Ud/l"#tC+U0N"8gEG3u3=S7p1npB
-dPq78+QnXd`,BYtrU<jk<g?,H$_Xl15XRtP".HB#si;_1`e4s$W\q0;M(\f'WaIJ2,g3^.E&)G'n
-270JiZnb<cs1"eVdQ5jOsf3UJP%<HKoNI8.SS54pF-F^n>B1L!jD;o@3j'sh'9G8KMD"b71Y^bB`#
-k8k@J=qtaTF%9,gIo@(H>LfoU_O39=mMOFL(9V6Z@/:S2#SB@+<IoKE'sJY-``Q6o>BN)7_Q-QK2N7
-d7<t?DnB1O_A6X,g;@hj/9Fus2Bhd\>pSoPSaG:<Keme;T2IOP6:%qkI8RuI*.+N&aiAi8cj^X)S*
-Xse6!J!>B4oBWBOpHFeq%M#KkU#FBZ0:P2P"QUc5QC2C6h:.Q>JRhEt+BlAl_&u(,%uI5@\k(Ap.
-#0mj$.$UM8C3IX6(,Mb'K:1a:)5EkODt6#2eAHT'&`@pPV?;\/GB6MI1,")%FV`MGCJQ*`;-
-K;E-eB3EV@"b2^r??1NN4?Etf^:G<'a\BQR-o+ehV5Y((HN2f^#FUG"2a;Go2g*_.Fr+_2o`2
-C(QYH.X#f!nC`"%D0;1u)V8bL0jAnS/T`piG;i$9@Ms0PIrX(MG8H6bQ`kY#2gZ@AGkJE=*8Vo'*a
-Xf#/V7%f26WW"*/HcI<X.\!\&P!hfMrO!r(f*QQppR"*4!9=uT$!(X6s/5BsZ"Ib5$WGR-fmWU!-
-Pu6%Q>(fWdsMt)+e^k.;bA7$'7b<<Jf!%677@Don,45Is<u+p\B1NEI\k%KXuo\)i*A@>&kOK6T\
-1\/g=5iI2UJ%)%Il/+;i,@YmJK&WFl&l37eNuf.)IMe9*u),LObt!RM-)QkfVOFlZ&/#0I9<8"n
-C1oab\T_D7I'4fV+4)kDYe-MqH@62PlC8Vi/(4NYS<OR)+JoIuLni);)KVfA(eiJErPO1<Gm=UU7U
-gQ-T?NmVA\\K?FOacVsOVnCc=UgPhq2fkLO-qeffWU4nF^d+5Lgfa-fITm%FbZ8PQ$HApR9u64A!O
-T;Nkl#WfcQ@P:HY%RQC2<NR=CRVK9rK)4IL,S),(rWSWt(DR!G*ffnGjg7?nN;.QML8=:a!Tpo2kS
-!dEJH'=Bb`AA"-?=EgTH'+Lnad!aqSQXYXRG"/,h4>MISltBN3U`Q-nX-kNSCbV:=o4Z`o:T7RTR$4
-'g'aRaWLW#^*Vof)3YA$R,G=lZU)GDNqA#X>';=+.U=q,mg*rg9/Y`njL_M_2NJ4-1c_%dMV-7%DqH
-9Zk?)ANQVHRc43cCmaEMhG\id+P$>(<G2K;R@VW#CGig2EmND5Z*EWLAmI\r3R,M5`MYWS4DQ3j#CX
-Z_;>K\%jG7JE=h6m$`oXI@&.g;g;kbH27XjJ3o@'.iN:hoY+"OVg?#LVl`WA<Y?Lh,RfBR<"0^
-G_YT!hOgC(8*$*d\FY$&`"96mfNa0I9SZ<JibRkM'o1U>amZPtj0gH2b3OE!T!P0IRne,#'muKF
-@9gsgJPBU>IGJ`TdOU4)_QsEOOVB?b3qHqg#YtK=>'?\-;RCerQmoNYT0i\JiN!>FE$KSkHo\bi5
-74/of<X1K=S\=82^>(u4=XDI4=Z8!)pQ#FQ+L8P0"cYqq8h7=QgXF&@/gX!VRdRRN^<qAW>Q
-;ImA%ioH6jq#H`b*<jhA@u^cWLNgOm8/ahbUj_>GdHk4$*&7j0_jiI!*%f%?6c,<G_E:-&HqhQb
-?,PG4_n9-kHfM`.7E%Ab``r2HgW@IJBuaIka..4kQ_E?D8uJMa?5$pgjdEcMoe)BGsSd>bB-.UWI
-narID!S;4sJ;&F\ibFH2fgptS^-d2G.bacl#gs=4MLprnE\"gqm*8f$j3ComcCF4Gh!`Q/o?QC:b
-W@E$h"B#7"41<Yd%(Qkh%.fdq8c`6`s!5=ih=U,LT>JdK?,fXC'<P&^t#Ee"&SLh$qb8@!.*dD,e
-2dM>N;G)@5dd)2-47L<A(Fpud%*P/g:h^c1Y#cTeNI'X2@,WC"Q^HfUZU)fgjH'Fk<1NbrpKt?%
-LE%MqVI7g7<$-h&!J(ZdcZafq#b!I@\SO-;*K6$<IC-gX4Y:X5.(5h49V&sH8FU*'?IhOM@9*;p.E
-"hVIsh4=H#h1a\5>K\&IeA=Z2^(8D8n'_IfR@rO7'>F>!-4sNk9GkSc@^k1XgdT`na/>?'X@i6Hh
-V-tL>8FOFN2#iM\#in`_V?=2h8$fd:Zi+pBo*_#5th;k%N,D0;3BPd1\cm(ou(c>a1ShK4iPNc?6k
-$o(e\D:LF6Z8PkBojR30WY3!_QEq-9G`%*gc47Q0Go-j5(*sSu:k&X0\,qkl/9WhS\b&QgB&tI""<
-F51/g?e5tP^4+nr^>n(PO<hNWEsN3*cpdS5sb*LgeO.'hZNEj@IS`<n@nA\rh-J0C/W_o:;`KI`
-pm2/b8m\o0%P^+#if+;q@R*hB,,Rs$uZ%%GLcQZl`0<>ncW*Dtap/gE,\IhduL&7J+?.?lqe>i9(`
-O3^$npYT9Cs+B1CLW\M6q-U2Vhg*^Y>O!;;qAr$#?VE0RWVYMmcX3*1It-=)AXj(qB(Xi5KWmHYK_
-PGf0;_&?+nbe_qj4hrZV@BJO&.T=>V'2$&(_)OH9T.hWo7$@W<fkH(N"qNX%;DbRQ'FMaX8s#TT.-.
-@!NeP1ark@540BV"".qhJkQ,8RtSA/F%dPThss;=u?M0,Dsq0&ZFc:5t`pkAr\l?EmY89rbL64amu
-7V:@+4>;`#"BnBHbZ$=K=T`VNXHgE*hXO^:f<&#!A<OKO_-lc"=8i,bDPp!7PoNNI"*r"!nsLI-)M
-*^MAi#k1o\U6DVVEo8.EEsQ.9X<<SN824)qp6j/7.n<C`^?8-^1P$Q/;5=c&M=QalQ\!oZM^K
-5GlKi6-(N>D^OUnbZVKoadOLdWB%I\lM:l.'s(p"H"\gY)CiZ<"S6QNkOqS/FoA(p?7E"iHEU.r
-fJni*MBpAVn/Dh970H;GG^93so"@"Or)$`O2CC^,$Y`pRL3D_0N"0O:.0#0NPoNms&%eN7(`iYb,'
-Xr$\>4b8rnllu":p_#\aKdVN*Q8M91?h"tr/W6s0%<ZBb-/1U(/$Ei4FskoXceMP8(JG_(rqh-qMd
-MQLLDVn_Z9#'7Ah$:33f(4AN6,mlaIQjSqBi1\Co::inQ&3umE$X5ml4W?*!YgL,9elRt'1cfDgh
-Rg?EB$N$Pm'TQe9*WA<)f,_:K>q&ARAM>2/Qu.<gAqc>ZUM(#WdrfjaCIep(`3h=;EcL@i<9hNBBiJ
-Pa`-(oX-='5"cV)Dc=%A6SHZ)%D-R`pD(@mOFtX*_:SBXNGLP^HrhU&OOC_OprYF.;=b7Z(MrSj
-*i#<i?7c1i16K;.!9ct*_?5Y\r7le"n=6G#)G=cdRPA0'*NR(ZH`j7`6GHF<F\?*J'^5?5J@Sq
-1?1A_<j'2;PGnhf.A=m'h<%XgEjBA7n)&s7h7!kB:q?4EiETSBA1i>RYPX($=V;.dCbji="'+TY
-j0XeVkUMR0.(dVkkr`cDIg6SYJDNgCHVs@M_kGmie9/$/g^\lHm7\;AIG:/;%0:=8Fg6,7gTN!IEZ
-:>+MJmgL1<&:$+$S74!tlQ/XRU.dQU'm"?iE";6=YTSX4!1?Wu&^4n#uUs"eaY%t/-J>u++Ti4VGl
-+=lK>l8eEff^mfIUASdq>Q9!d@is:%EJ1^s'aYZGKsL_Hj9,SnU(#V@>7KhYkah*XClcaIX3'lpu
-Oh'r.5aZ'rcBMK0%(;e/b!>C,)"@,Kb3T*"$3K=f-#sf9uh\b3u:hB2,BJB7Tlf3TcWV4//*9RhNP
-CBZcDSPr8=3LJt&<$55pC8<L$65eU`(21e5SlZoEh;iZ=B4(a=W@&-@AI"@TK6(df/?+(rre&Ab
->T"H.SO^\ee-c$SUA7(6k:d(V?^AT3RTS8K7UDScH:*W==!<=eV%rp_pa>@umEgJU)!;oLQK9''U
-"-BOqNS,mu)O,s=!m)osFt&OI)0h/PsA>GQMnle`/M'3:.F1d2=Shhuj*?'eLCk%1O)B&o_L`R7E
-BI&g\%C*Q3V3p*A!,r?;figog;R2.#%1+^Nj30j@uQS%BM(6_.4+>XPiu4rNj7I\ARkH^;=Zh>q!u
-qpgiAlp(-G,)UdCf3!!&1rB95Q2@@4A,KZE(`bh$G0!6"Vo6TASW`rdc&KJQrq8:/F7X@$Xj#`%p1K
-#>*Q5Nkd,LPG0/bBqV--Wu_;lkPS"pC<HSoAn'o4`E:)`=9Ljfo,H-.K#;P+eZFbG%3d!>XKaU8B
-IV'b&L\rYU^VdX4p6sNHV_`D%=uH<"A?N1&qXqSRZ!aaMJ;?#-c\t`8Zrkk$ga3S0`edAjN"#3
-J:oF-.01h7jbQ1J">o6L51-!=EI/WNA'&_p!2NRPIQ-0ZK`,1kE>!.9-XRKQ;5SVF4OI&n4rKM4olT
-feNsZ">GLiOf#7dVQbq.)_SJ*K$bqMo4OT:D5?dB-8,Zo>M>K.V=(Q2"2Jt`B#SsV'2!jKP0snn#XX
-;\$JUlDp?SgOP+K-0\gLQslN_ia8)$'WH$!=0qR.r*gCK$%2p4a`\4d%`S5ipAaL\i5oA6qJp
-FT)gSlW/h_mK#Y2dTl6dBH$bO9\5/),(4VY4>O.eoKsiJZ\l6Uj01FC1;NB5Jd?ZO&5Dqpq6\5:N
-0W%ETC>TdBJdh"gS?\dSWHFAid7gV&KJ0+:_bmT7O*e^%9G!`1DRp9D(qf_'qrPa.ISSQY<,OF&0$
-+El$0,Lg75?2Iab?TA`HT'%@apkq,S)=R5QpUi/SA:'*hRn,E(@n9?K2>JZYb=PYC4<P'M4FB/qn
-PoA?uq%EI+T\bMMU4H:11&n!b'?a>HF7-K%6UNC+/d<\;9kq+$F27s=cQ>Am)u#Cp79\:/sG
-Kn8Z"?rG1>6D<,0*BX*%IGeXF6UCE7,j27BjBqU\m'4a!rNcEP"HAhrWL3O*`Sa4*0q@r.^(ZI^G@>
-O"Fe."r\L2P/IR)ddH!D7R)umb?LNLN%,o^U\P(k1lGEU<n9S!RBsR(LC`D`NZf2jX-o)rH'^D>Cn
-imebns#CpbVs1rpr#2l!nKlEV#Z56_NR5M<FYDq>CkAG1t*+XY\@@'<@>37.^PL=>>>(0((XG!<??
-32L4nU_Gdi.hBo.FGl\SjFg4O9AI5'P2\k6dV#G:VU=4"Lu2<au0Q1I1DcFP)Pjdc4GF.R0r\Yi*_
-rE$+DNe,UmoSdDm8l:RF8\P;=%=ZNcFKdf6X&Jl5aNCoM/N>V>E8_&q>a9N:p0HR\<V^R"XF.33
-FV/+D%!_t/?kY<3VXn==46F)g&$r.gU/IQtu#NtLEb+.o3TF-ZP<n`'K@NV))*`HaLkIhkinf5j*q
-Ymhc4>2rlT"!/FY8QZ=GG=cJ^U9/!BC3CPT:oVja!:cY?BGnaQ,LEfWkBYtTE3?9c;TYI!p"2qI
-eK$"!&2<!T!h=4j1ms)%Dq7eTIr-sdprkI(ZIok5#)2nFmJ'3Iog-e0Ks1\+(^MEp9'CW*o=ms%^
-VhGZhV;Ap:sW/5/Q<MEF'>JNt1>^iTaqj7>L!'Yo)-5&$OU_nA&R,aiA:#m9KD9CaMnlb"J5Q_5,
-KH$^Snh,:U^m"CVZl_MK)SYPY^`4OaF88-Z+MQnY^tgDlln`C,sk9R5n#)(bT&cN.mg<Y6A-DrPTW
-8N/4"A#_V?cPVU(n%#s<m_ON?s'HBIs2aP<D(H^fee%Q+p'EhmOL`4dYCb@535f(N_X\.eEr'J=I(
-W9!4_t675C`()i847Pj_trQ7>X5@>8OTpU`&pYpKM9=5X_,36ki$>9MIpV77>p1_W4'P*)&c5:IU4
-C`4T/>6r$,a=%-@86prn#CfA;(:rPh+7KcSf+g+*mkW@O^R!BAsgH;KnGXMs,7Ylo@RRBWP5t7)R.n
-j_Jb\SVrDT<0)7^Ts6utiYE^oD36kjIX7!;&4Bh)ELa"1uE4F5&<ECrl8"=Kee8n.HGJF>pG,rf
-jEO0gGt:>Ma391VP^l:=I)Ap,aGbmEoS#f2D+I:)L9s+5jCH0@AjaX\aRG9=J;Zu\'hHE.7p;jJ*1"
-Y;HV$38`nHp(UmT986cld8DJF0$SgDPR+@>akWN1;!FIFEMsS>8A'&e'UqWuVoRSl8aN<Ge<S.GK
-upEoade40r0YOSDQAG58rT,VdA<79'JGC(b4O.Cokg1l'GL(!iRO#S7!Q\UhoW"Xm4NjH^?VXN>R
-SO0l_Y/A`%LXig_ubW./s'V%b%Z-7I$a\8AM*2(E,W(Nl+9LR)u"O5&9M9Ig"9SqHHd4Q8%baMZi5)
-Cj.)95<'1!8`V0";IGTLf8q=d3?GL$2eGm(*7_dS-1UbDa_@4Q/uu0$Z#p9SDBM9Z0R@WD6^>:/Uj_
-FQ6,,ap1&49Lu"`9%V@Q`#I+4Te*T-i@rGsOV5G!pD3.h!3pJV.&K,TZH\2An2A/J#/)P#Q8?ke
-0"'WT<JY3j6kZ\4j"9F;q!K=\tidE38rW%Pn"=1U1$@@<?aNl9Qcn9%Z<^8Er=52uKlC)>,mL)7'
-S/L`c+$@PlF8IFhPL!-d'C36cn'du4#Ukc#c-l$9^eO7/^$10P`41V9\;_K/5<'.`%^/QoK_c.4T`
-$;IF8iE$\AP(RglP(=VN$&4044)hO>-\N8CF#TV#YF.9!T!`^^"`@KBYM&7fldZ#Mbr;YN3/UuL"X
-m;Bq14jq5-S@#5%-.<:C\Qel'%RSUi^NN;NchU>1?%lHr.+J.!N0\!?YeD2t-)RNBnA^'6(PMb:
-g:*eKOI1p/<8iGRX,!'=F+uK2c)iPtJ85AAB.\`-:"%ZK%91l7\d!+dL35>>>nmAKOk"_gd+NQlXSp
-OH(*YO$&$i_tI/VPOOk,A3dnM=BW@lNQ+W,&gf,mkST*1HLR9Yed,MQqSTED!OdEoXY&ruk2'WVgE
-3CCp(en#P)NW<KBp<1Lf7dF/<0=5P%@abEWpI!jpk`*URb2b+X.;)JJrc@c?r^YTKr?F%Lac0.A-HX
-F"Y"g9/OM6-Em1YdKP-R<D1l"O3l^NeVK%5opUk'S(DI6=N-P-G`%o_.p:DJL9^JSYpEBalEC>MWr
-eA4l%i,GpEY`dWqs"<F_0,RY0_l@eQnEkomYWfVO2L^fsP5oc'oQ(XaroOX!Liu,k?_XffX2>'Y^R
-W)X"<Y$2dD=D_j(AWm>kBUHt>-4\O"b,2@`)S\+R#RclMQYSmZ<?QpaIU:T2'<m@aBX"8F#q"9_0
-luhPiR?)g/MjotT5.A^.=mV7Do:m,*Dn.8*3M".2!!?&o&P.&MF;S>+>rNZLu"NO/#'=J?'!giX
-A`QlaW2bboU^ZB2YkgQ0f%7M.HkUdKOL#:pm1T+bHZ+#<s?.=a`a=Cp86\:ti1;8!t)eT4e0QX&)
-:>l^p/XouKr*2\>Q$fHmA<rZdo7megD*B5l.`FIdPK_+f?-K8iIP@D_q8@<L@*EQ.W%K#6DnDK_
-6-dPjO)?14n$b:rP^P,-YGqinpUI>7IW6M9X1\g`.md'X9YdAIu<!f"#%i?EX-$=mSR>!*k:gF)G
-9bZ9k<geCNg26E-`YOuEo%&d$cn5f,qQDCaaBY#_@`BDGSePF)$!a&T>cmj*Q5<t$b$daqiou/hCB_
--TOHQXB,8-$h_Tq%mqd>E)iq!Oc9L@'4^=!QRt6sbNSmknd,X)dj2O85*DrB0.@gc@a_MlC9Zc)_
-W*fpj7YuPk""GQ4CenuR"dBX-,rqbY@N)R>cB\,6ls+#N09>j/UBV*^;4OQ=UUjuAhFhAp1h:3
-+A<pS7-;5"?Krl+eA6*5Nen/NCAt"0SAe&P;7P&/+C1ZY1k!!Ql^.;kCZZZlB,1G+p1e$Ds%UJjj
-%*JU.@".=@Q7(P/A!0mKdGp:?FH^k-fa$.B$l#@qQ9iBBCj\$)b$D9B^8BHDZchKA#,G%Z@r@-8
-mW@VuD<O0CkalU&24eCYEbMn;kT3e7F1.eHF\R,-f`=P2k\-X=l<OAmUniJd?f9DrWBu9P4^74
-A47-EEpl->sdk+LtiTeID4l:.6W:87"HVeN$(S;*NuZM&#;Rd+LelCOm<Nim+TVeSd`=lSRZ(9m(1T
-B^m./Mf%`Sp=h3Q):T91",CC%?&W&t\f0_W2b)A"S<kamr+#^oM^;$m9^2)$.llO+32T0Da_!IB
-(YkH*k2TY6F_<^pCi7I5#/';ocg6D6CmNFap<-EQb&&pHlRp*AB#/>=_!J5SSNa:Zg;71(Kd$l_
-0S!dIo?U&+01LmKsAso,j^l/28>PDAM/JDW3B+%IQ^MmPa:s6Q^3Kk&)7*mN1b5#4&SOn07;_mT/MV
-hWo(ij)5^sDW;f+p@`EJi9p=#DRs"i?M;9;qJU9HD_iI'54.egLlCpmE:?S,!*&DJPFOoE*=g^EXj
-n/#Ol@3n:E>>`s2%:$sha"<R2!@Y7Do1%IeiWE46AIj1(R.WFhieh7>LG6i2,'(DM1nJ;hohjcL#
-B>eBnFmZ;2o4@)0-6!nR!Bkk83W*H<GN?C)"<_,)jR4_UP05%+0L@Rj3H1lIo&hUqpFUFk0(TT
-,o+s1R-St?92"NX`F%8+ZG;f&J0QKB9F/Lt&nPGP#0lSi`*5QK14U5kG:I')gg(IN9l6hFGJoO
-gR6G=D.R7eD77(B$'h"<N<6++a-J*ERs%dbB:A#E!ocI$'-WBs<:qnEog`&*='#!L=7qnQ',,Og
-UM"_a>g_G7ouCBf30#H?KO#p*X3j2duDE@eN+7os\K*G@gJLB_HpiG(WWbDef!dC3J3Cp?-8cm+,
-?9Dg*"7pE+>J2feX_C\K3!pHNhF6(YQ4Kt'WupQ8e4Jbf%AG5'U4pYU01ms)JGTfE8^QLB4D7+3Fs)
-:8-e;q2a,B8-,!Ie7Y2KP*np-<*L9,8)A2Z.*0p\'oM<7;>im#m1uhn+^RT/asa.%^6$ht^W
-Fq1"7qpR<ri(1jf"/H/nCEOO\TBVYUqA+Tj#s#+@U`7*fGmSPmue=&CmQ6.KrA,XBV,(!<r#:XqP
-UB?a/aO>0S0ieK3tn\0=#p`/3A$q`hOd=1<Nh\,2N%qkprN\%2CN)0Oqq&RZcbKA?^W@q%l<23n
-ete$S>6Sai)gOAi:W9&b3IH=rC9PM>ad2d2B.560K^_HU/USQLW>?b:T,h8b_HdK:dQ>R+QdUeThm3
-D%7g3Q\KMYkNO4f21gO69ZIF)/Lf@bT8g\q`=rYODi#NC1kgO9CgrZC"r0BdkjaEcTrVu-Qfe8hl
-=iNrib_g&*&,jjF11oIh1=`kNMokhF;i)SA)o.0D5VEaeFW.J!\1TO2ZL?nEm-jPAl%2RV_%noE8
-O,9?34>%QLI>R1k'Iqc3#ooX0DOU#+!6P6JeC'P6;8SdaMJQlr2N12PKW'/)5E^T=Z)_tbL;npGr
-qVD-cW^i#'E8)Y@s/X4YE3mTMH'b+1So;km<+Q)6ZO'/J\C=VU'.^<WjfI5=(U%J(!J%=>$loo
-Ebes!%HebomrMtjQ*9r:rqP'i:+3\:(lRD^GiCkMq--$Q@ddE/7KE=VQc`,?G1`Q;K%C1VsHi*u
-!n'BG1m?YI^Z.A07o5e(%<5q6RRG8Q9qgbR(nG$6`2\Vb*jE(+p4uYESf&_#K4eCOeJ)0>qu/5"6
-:!coXX>V\!N<2piu#*_J-qF1=07+05!;piDpCo-")dO:1j'Z#C*_\=7+&(B;0hCOQ'O<XCL^;r>
-Jh':/G1sr)"oL,"Q&E7FJ#U0jq=Vn-<`0@&j7)NnT7nN`6#<(hFE^`Ho8sM"FhQ8OrTH)8J3S<,K
-Wi"R4$*sN1DCi&tG1Y&PIF0Da6"H\@fW*m)!C.n=1R(0MHT51r1j;_`&Io\V<p7WBhD1N;,>%\g3(
-0`a:)I5UuoGTnc&k&O)D8*;)\`N&Te&e\e3t)dd?JXQ85`E`#oqG/rC#18FU^o@eC@8cRZ`>G)3
-i(N>jKDQ(;DYf+k/3#qVAEELi!KkXrGQ2Po8eniR:<?1N"76e^J6V`nMQE"QHd)b_=3f\'@A3J\,e
-KG(f+*Dg/h":FkmjFeTTdcH-T.s`$=hgf!imAA)A*YrE8$f%J>9ZoQCIg@!FNoH4ZBRS;c/,rS<=
-e32P_p@i2@+MrT')5&29Oi?U`b\LIiJ9US(EPi\<&?'XOIDIJs$fb"OP);''.B;9X14eLcG%QU6H)C
-C04in;=gV;ur2$)_MVDPa8rHB+u*lIrdG@C"G-)9fF2T;J.4!r"Rm2J7>ZY)uB+eJ#s?IQ?#H`lJB
-mM5`7`6,JJ)D%e-*%(p,nJ@5a\8aVi*QIXi5:+A@HT)a+Eh(H#c#UJc3R@;Ck'+<+$"*e_oc6
-h.eb,JO?.\cjO(I#<SZcnbpDqS&h=mK/IGaf/f.WaCgC<q&W=sjnYKdS`fhjO/;+;T!,9^q=(km
-JELD\(#Y.*k^<RaP%Qt0i&;;98;Ab.>LiOOA0o1K,LdFq$,mcnOPSA_*;@5h.0ZBM(4sn=JIj4
-aL(M?A_^K"(@AGcs3%>k=aDh\uc4)B``ZE%=HOj!&VmUs+G;!fKd%EMLd;k%KOc`j,!$Tt`@VPKR
-k+DBMLq)HOg8;SqjQV;MlVj&Rm_sM(pP^MP45f@X,&50hiC@=K<1UZrW)/egua,F>%+q@#O%:?Ub=D
-0npObN=i0I`j(IWj&BuWituD;Z(2nFQP115!-g+p+r*:erVWr7ZD*i+k(Fo6)ehF)/1*99;(;bj.8
-h68LGhF`0_X^.l_sf-_jITp-eWH&m5B.A\SnPgZ^89!NgbUfrCcc\@2WEtl3H0B(+nWLXgABcco
-7!X7qnJKks'P)J8c8+^mGlQTPP-j0Nr3WLcGtlJ.$L(_@*<B&lEKS>N1E^N,1%3`<>;m>O0:=t=
-`i^E<n6C)o8W1cB6OKG-08h5fJXZrQ@>+e`IJjq`C)$TAENO1;td+IM&."lo-e4r7<3<_jI,_D-k)F
-VZh4X8;&OHS+R9$*Mr-`#gqPHp(38uY`^j_Z`:d_Ll9).P5R45k&&N=im%s"<F!m!3rq*.C9rZBVe
-J'\5t5Y)>?k&f"&&5!:(=>MiXgtGtoJe:=9h)F:\ie=_%(f#<k3^fe0;K2K@6jSJX7-*loe'Po8ad
-=je5NP,p4(F="$gNN@Z8kJKgs5p*:-(4U+tdof\$3Hkf"C6E$Q8\JId^I3attQBOn?<G1Pj/@8Bf<
-*EI:.qtiZVZ6dh-g)@CAs4a#.=,'.=k?.(daUt-=g)tQW*$h;17mC/nE=#A24`%Wuf0eb0cB+3h
-%?bl/M:FY\c"im#ZF@bEk?R2O9Wo2jIDneZH0b*,Mm8<9=?7%&DhN/F;:7U7>9--`KbpLcmZ(/f.j
-CdC+i$P'9&No88aQ0Zr2e0@,"I-WO4V#:Hhr3H#3:.NBajZ@bT$%M(kql`i2l`VTd2V""kSBWj`nI
-c$2BPk2fp&f00u$.`i-82/'*Y;RXL=hcqsFhBTgj=n<(,&4dYVZuF`d/MMBQ3He3$pqgQnm?=
-<R>6*?5,A-NO#IE!:"^nl,K5$&N_AH&SiC\/C?P@pt!!6G7K8sP%7Z_M,%K-5PuFPr$Fj#,W^0lmM
-lob.X1Bpf@p>c<DP_!Woqq*9bI:RL#9sQMC77SMCW^1!52>Ap>jC'POa.nU%qH??=5g/=$.=R<"A
-Mg-pRl*b(:W.g5!K3LVNXC**)H2VPcHcQ+OT__hML9C21d0b(eAfTtH//5`)n//Q::-Q$O-o=NX2S
-+.mlW0LV)5VE:*=Vh@2E+/'dWQ_Pg-qq#5`2=K'2+&ul&)3m(%q4fr^rSRQhJG$WbZ^H_XAkdY7
-p&qDJ>8%>0CuJ.\P,G541Ce6eDhp4+,.G,_'3lQEA:eRd2+<%>his!DM;TUFdjB84Elj1?9lt>e"0
-?Na/A7oI"k-.$L)@J*Am^75.'a8E'@24%1uemDWZ)`=d@f+"R&qhWCd-_#90c,-?-384?hZLbOH_
-tiTRB?WkaZj%nH(oK^NDHDba?89isK':)>B6@Xl2U7u9QR>jVX(UhH-/mp/H2Dg"n?)tTn.^&c
-Xk5s3s')u`BWPU^)\D_ZSX\u;Df6.lbll9*3B)F76G"JnIAYbB5qlmNf:<#%uI;<M?s'aQ8n8QY
->3mUZX7mgtSQHDQaFlK\R.PN,I(*0Xbf01Oi*:,d+JQfYNVREGF</Tj7XApkH+P5^f'lho5#HN%aR
-O#+&)>VDW=XM!6#f0&qZguN=NpPfC=%tG+)NiNZZ\Vt(ocMGQKB\P*h%'e3n"?7HhXO7kV!k<D=#
-A?ZLTIXhf$*sXX-!T&<;Lo;hrMm(DWP7^K;NrNB&j/h!#>.'ACEi;,cY!2P3rb24j=R2%:?(?k
-1^AE!6qtIDXuQ*SE:8#n'*!1Nro,pDUS#&XtFn10+ua:JDP6'qX*^mCmtP\\;d)o$3=&'"3Zb4Es
-)i@_;3:h'(chUjC0#-)SGm>c:DM"XLtHdN!.E=!2%1r%A&MY"4B;kg);Z?+0GS)57E@DO*/J@S.'/
-;?XB6t/hGX0QF>6,sEBt;D6u,h'_,0;ON7E=V^I3=g)6Ej>\,fH-NZ(D1R%0mORTI2>b3(U8T/
-nV%gbM&>c<))7*g;3;`9SJe+)3La5nY9W>b</)_nB4ENpIF2ZBe)tAAVEDfSPClY9@%\VAaOjt
-J7f,_-T*V&53dHM,lQ1'5+#3:-EUP!SocMTW+7RX1'o'9%3T%+L2S&EYTb''-Zoa+qbn?1+=BOd
-23#n*2?DpJ\<'9h%>f9,Vhe6E_.OSVAd::(U?_Okh#a-lUJqj!%VPnie:U@NXo4VJ9Q^Biuek:FD<
-Q*qFQ@aBm2FJ_rg-S:*$EgJ5\M'oTo-M!od\/.rKdj<-k`:'ZEYpCT.9DpPgZN17ia_(=$B.a
-k:InuXE_b*B8f/LagSEmPlu;'eQe.;*^d`F/*bq?<SQ"26_dQ&X,bpIFI-F.UVc6+2")O5@bPg1E;
-dib(.,msV0p6H28nTlB/>b3J1Xe?>1EA5B>;Uog1\4;*F#>b1>;UCri_ppV;bJpQ5a@O%1(-l81L2
-kZ8N0RaVGgbYP8c8u.l-F30T1W8QRP8ns,Da2cF+;i<OiWA$^AKE0UXYAD/BK#Gp%j9IW+m1i/d
-+@m61oan<F3p/8gHBVG4L<i&'A5Q"9g#cH4u:GI:Z"BXlTQ!65;WBtZi7>="Zf4P4nFXu;uJuQgpE:
-d5El%0e/jj)+!lE6?EH!ZkYf).mYuS1"2X;ZdhGX!Bi7s5h&FooB8M^3H2gitDnYe&+:gD)&Be6<
-#$)e,GPqFm,05.#h\oQ<>sJOae78<efr'R<8Kk=7@m8CW&P1nR;qG;7U*82Ql-oM%P,SN`:79(ka
-1q,u^O\E.09/JX`e>Z%SX%ZL1:,JkCPi#,th*c<#8i63!'NH5f1ja@0P.bWEGmqCr0HA*=eQ*3Zts
-2;jrF$X4UFPSouce)cB6p;=uM=WBjFI0iOec;cPPNe?r6j.o_co9%?+iF\PkY2c<XO;AEV>%*qt>=
-&h+b<Kqo4<Hh=uG?6Y;<E-A)<Cp:-B3/)a=LD>>FoCgGu#0'=>aSlC`-AuNCYi1;3>g'1,L76'iC.
-boZ9BsocWnW03i3>iG-Ve^n(9IpC4CPP*XnQ-,qga^/E5?FB$'2>LT:p9im?e,A>(#`P#cX6@e?a
-9.('@r&$!l*%@?pk%(&MD3o3W7^@!3,k8OHt;eQnIK?M27$'_,He).SsOAG-C;e`g9oTTpG#@_.F
-U'a*d4(-34@A4cO<^ULD,A.bh+r503<^`cB'53\\,PHCkp$$+TF_MUW>mqBQ;q5@okG6UBJtcUG+i
-U#RpH.jC0%ZTp2t.O^MHr@OjVcp<d:!95,0d@eSDJmE7Pqs/M6?-O27XKF&2d$,;0<d$<kKb:n
-ljWWE?ZEC-)`^nQ5j>-&D73^pJWB63I9B!WXVM$&",.3G6<(DSebZ"8rEeT=jS?5Cq((:YY,<8J
-QE0cZNf1U8h<GPXmE41gNf,8SCLtG*>G>nFUIfVfN*?EXFG7"GjYC'@js*r3EWM=V-4Ia^*1S8Eh
-K7Os`F2gN=<JHe3F.QHMq\TBdJE7\rSpW%E0pN2oFuRrkKroci`G\'PDjFlpj&-J?"_Q?b=dPJ#
-"g0\-Z`As+c2_Cjr5'J>ClPh7!@Em2sGpiF+42P+a"/^0Qhl!.P94^BQs_$iR`^,"sLq!KE1/%U-,
-l`$tgc"KU=Mpe"iEA7O807!N`n3-U.fC/fG$+kVB)pjR$-9#%,PIZ(e\dKs*-I"2c\U^fE#3n5
-hBH_M'?5`(^Yee+`cKp)9C_3"L(Qu/fHP'DnBfRo*KoMheCL:FdKpt\e,Y$P4sN:Z`AquAUmu81
-NAuWO@S_T#l#7K)OHMPb6XW/&-kJZ<MA0WT2NgEOiJ6&ELiI?o70eQlYT(OjLSPiAi:a-01a1%W?X
-b95R,sCg+d;Y:q8NI3;+N+@?4O3+o(eqfl`WA:Q%4NNHjcLq#-;"GE)E8Qam3c)3:'Y(RDU-QPkL;
-p.LcuOdF_fOSQ/IA1*N8,CVsDGZSaOa%Fs.h44:fJDs.\H!?2Pdu@LCJJS'9=;HW-opjlQ+=;f\WN
-@aV3ZCTQPf%)4d@EVkD`MR5t#2RJDN)k`W;Q^SMT3Kp2+-_S$?Tm?*mRLu"!iM(VJMq8Q7)Aem=n
-Qp>I'B3.hK^Mk9A#!32R3GY'fla0<)NoA8K`Wk23biQ5J5P&m)/$7@SWP$)6+@UO$XR)CqF_Vl#j
-mWHhpOg*<S#WM=`KQT9ttqQ6$OX-WTHU"TO<RN\^\-VkV<X;XNuGlO<Q9q1kRP'B)4RTN3C0;"P=TN
-WRp=l#sBE9)QR2EjY!.?E#+8t4JH@YBW.h#c/$D"SX4nYp3q8Nj,G3XJYBmCE(%\a-n$raTj'IN
-qXq)),I,utWZ+HHRQ8>-(N^GGImCQRmF1L/#>"3-G&N>g,#@*B<rK=X1)j=R!#9Ks+0Zoa&Pqa\
-/cO1AJ^/qodp>=5p49sT*r0\Rp)m?T;\#ZnC32\U4+k1la0OD\,s(M&qEM?q5p.(A#oN=WC3P/
-Ur!H-8WdXRd;92\%XpU^`,AJEu;P$,/LG^q8"*HQg41&%W\blW?r#<9''>+-MG.%bquag*V7bR
-a_J(@qochR0spgd`&p3#>Yi05<`uu6ZMT^$HqUab?,g))S#!ASHZ;Mb;a&*'<W"5_S28!OF2e'6`>
-iU3gc`S\<O4e.`Vc(FI%S4pT>Q%l_jmjO>U.C<?-@T@bIkI0r*.$Cc,cEg\bjRi4KH?3TuamqaSE>2
-489>.$-0S*Y+,+s7I27_$PqL7cl8n08L#&"3RI;CcoaP?*=^@9'@HapdG52XO`f'B(!uY_dTnTUI5B
-6`/'r-dN'jbSH%)%-du?Ye/^KrSPdk,%FcCgdQC+Oe@jJ9@DX5eQk7Ij'&N=4EdXd63-1I-=ScH
-%V<o^G_=@V<Q',*&9Ye0B2BKipnasp"B;Ig3p0YqO0($/</*gKgr.*PWp!ZeXB5h&XJh?-D#,MX<
-ihEAR+SYP$>\)+gChL4kJ^%pNUe)*h*gg.EFhdM@gYNt,h`m>*Wb3U*St*7iZe'JTaBB>af\p7B6
-,&$R4^fT)F'ti5\'QKhF$?,-0.HEjCH%YhGuCi0BKoJjk`0VSkqZN:-u5jJ3&J*b".o60:@Pk<=IY
-SpBLjGNArZjuuB$*ae.qIHKCCkoQ\a*a.W3Xm(;6kii8a>lE^>U#qqrkMEE/5+FrO7F'C7cPkpco0-
-d(nlFi69LX6p7-X-2i(O:0mf^i%53MAjmV(%n,E@T^@Ucgj6kdsnK.r(,ffCcJ5-%n/i&.?Q8I+$
-1e*>o04Pl-&:p,an+C!o:IR!3m^QM#Yn_knNR554_\-g\h<10a:+8PEhf8+llCpE&l!?;B1IJ85
-@pV2:SItd4KD>J'q&bUl5FM=sSbZWdq7i^#s/#S,WVBgnqVS4JIdgshEAATcj#ZCfK*a0M6>F9^CE
-Lu?5M,kKec#O$rZBtq5O&/smJ^J_rkJ((s7@E?`0(`:"G+Bt&9q.m)$u&7iR&Kq:*14-7A>ohe7Jp9
-BsXH#\%CJR-$?cSnp*p':>TWgLEhAo`,bmI9'6hde"0,!OM0iL)&3L06_dLm'M;@HQV"&Ql.$\h:8(
-Xd<GN=qeQTLdY1Dpi)28:A,C>P^2WX=`'GIV@tDSg&GlR@(gb`Tm&A^L(prbSC-_J\kjbfUOQI&
-WF\=EZ"_?4"6<7jRUuo`c!N$c"FANr>(/Mn;Vno1PV1GGhocFrL=F4nP(m.T2)`piZh/BclrYGf
-r^uKD/r*DlHQ-JCE/fL^Se"=kLo=EbLa)A0;m<?15rtgI4i:Cpa2_L.bN&3kINJNUBSk^r;PTG`k
-0\Uoq1Q'!gg\l1^O7LE't':_!k;B#!q``,6pP3KI7-oYf%t"6L`bd%RaX6Oq%S"A'1nYs_A&7*q-n
-s$cI"@eE2&S7NU.n*?Ua)T%C*CmC<Ij%>1,_I;^E\rt*8THq_,tZNqT.*AfUh5.-~>
-%%EndData
-end restore showpage
-%%Trailer
-%%EOF

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/interface/toolbox.sgml Deleted

@@ -1,48 +0,0 @@
-
-
-<?xml version="1.0" encoding="utf-8"?>
-<sect1 id="toolbox">
-<title>The toolbox</title>
-<para>
-apsldkfjañsdlfads ñlaskdfjñald skfañdkl fjañsdklfj añdslvf kjadsñfkjadñfjkaflñjak añ kfjañ fñakjd fañ
-a dfñladjf añdlkfj añlkf añldkf adlkf ajdñlf adñflkj dsñalj kfañldkf asjdñfkl asdñf akj
-añ kfd ñaj kasñj kds ñjk sñljks añljskañ kñasjksdañ jk dfñljk
-</para>
- <figure id="toolboximg">
- <title>Toolbox</title>
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="toolbox" format="EPS" scale="50">
- </imageobject>
- </mediaobject>
- </screenshot>
- </figure>
-<para>
-asdf a dsf dsfa sdf adf adfadf ad f adsfasd fa sdf asd f asdf asdf asf adsf asdf asd fa
- adsf asdf asd f asdf a dfa sdf as fasdf asdf adf ad faf f asdf af asd fa sf asdf adf adf 
- a dsf a dfa sdf ad fa df asdf asdf asd f af
-</para>
-<para>
-<table>
-<title></title>
-<tgroup cols="4" align="center">
-<tbody>
-<row>
-<entry >New</entry>
-<entry >Open</entry>
-<entry >Save</entry>
-<entry >Save As</entry>
-</row>
-<row>
-<entry >Save All</entry>
-<entry >Undo</entry>
-<entry >Redo</entry>
-<entry >About Synfig Studio</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-</para>
-</sect1>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/interface/tooloptions.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/introduction Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/introduction/introduction.sgml Deleted

@@ -1,52 +0,0 @@
-
-
-<chapter id="introduction">
- 
- <title><acronym>Introduction</acronym></title>
- <para>Synfig, like most every other competent graphics program, breaks down 
- individual elements of a Canvas into Layers. However, it differs from other 
- programs in two major ways:</para>
- <orderedlist>
- <listitem>
- <para>An individual layer in Synfig usually represents a single "Primitive". 
- ie: A single region, an outline of a region, an imported JPEG, etc... This
- allows you to have a great deal of flexibility and control. It is not
- uncommon for a composition to have hundreds of layers(organized into a 
- hierarchy for artist sanity of course).</para>
- </listitem>
- <listitem>
- <para>A layer can not only composite information on top of the image below it,
- but also distort and/or modify it in some other way. In this sense, Synfig 
- Layers act much like filters do in Adobe Photoshop or the GIMP. For example, 
- we have a Blur Layer, Radial Blur Layer, Spherical Distortion Layer, 
- color-correct layer, bevel layer, etc... </para>
- </listitem>
- </orderedlist>
-
- <para>Each layer has a set of parameters which determine how it behaves. When 
- you click on a layer (either in the canvas window, or in the Layer Dialog), 
- you will see its parameters in the Params Dialog.</para>
-
- <para>Synfig Studio has an autorecover feature. If it crashes, even if the 
- current file has not been saved, it will not lose more than 5 minutes of work. 
- At restart it will automatically prompt the user to recover the unsaved changes. 
- Unfortunately history isn't recovered yet. That feature comes later.</para>
-
- <para>One thing you may notice is that Synfig Studio is SLOW, making it
- practically unusable on hardware that is over 3 years old. The biggest reason
- for this is that all of the color calculations are done in floating point 
- because Synfig Studio was built from the ground up with High-Dynamic-Range 
- Imaging in mind. HOWEVER, this will not be the case forever.</para>
-
- <para>darco has some fairly major re-implementations and optimizations that 
- he plans to implement that should quite dramatically improve the performance 
- of Synfig on all platforms. The goal is not a 200% speed increase, it is at 
- least a 2000% speed increase. With the optimizations that are planned to be
- implemented, we will be able to pipeline operations in such a way that this
- performance improvement can be realized. It should also pave the way to hardware
- acceleration using today's powerful graphics processors, which should yield 
- further performance improvements measurable in orders of magnitude.</para>
-</chapter>
-
-
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/steps Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/steps/done Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/steps/firststeps.sgml Deleted

@@ -1,69 +0,0 @@
- 
- 
-<chapter id="firststeps"> 
-<title>First Steps</title> 
-<para> Lets create something
-so that we can tweak with it. Now that you have a new composition open
-and the properties dialog is out of the way, go over to the toolbox and
-click on the circle tool(If you don't know which one it is, just mouse
-over them until you find the one with the tooltip that says "circle").</para>
-
-<para>The second you click on the circle tool, you should notice that the tool
-options tab changed. But we'll get to that later.
-
- <footnote><para>Some laptop users might experience trouble where click-drag on
- the canvas when using the circle tool doesn't seem to do anything
- or produce insanely huge circles. The problem is that Synfig has
- detected the touchpad and enabled that device (incorrectly!) To fix
- this: click File->Input devices... In the resulting dialog window,
- select 'Disabled' for your touchpad device. After this change,
- your external mouse and the touchpad will work as expected.</para></footnote>
-</para>
- <para>With the circle tool selected, you can now create circles in the
- canvas window. This pretty much works exactly as you might expect
- it to. Go ahead and create two (or more, if you fancy) circles. If
- by accident you just clicked on the canvas instead of clicking and
- dragging(with mouse button pressed) to draw the circle, you end up
- creating a circle with 0 radius and it is effectively invisible! No
- need to worry, you can easily fix this. In the Params dialog, you
- can change the parameters of the selected object. If you just made
- a 0 radius circle, it should be the current selected object. you can
- change its radius to some value other than 0, say 10, and manipulate
- it to your liking with the canvas ducks later.</para>
-
- <para>Now go back to the toolbox and click on the normal tool (the blue
- circle with the arrow on it). After you do this, click on one of your
- circles. You will then see a bounding box(which is kinda useless
- at this point in time, but I digress), a green dot at the center,
- and a cyan dot on the radius. Those dots are called ducks. If you
- want to modify the circle, grab a duck and drag it around. Easy!</para>
-
- <para>So you can select a layer by clicking on it. If you want to select
- more than one layer, hold down CONTROL while you are clicking--this
- works in both the canvas window and the layer tab. Try it!</para>
-
- <para>You can also select multiple ducks. You can do this in several
- ways. First, you can hold down CONTROL and individually click the
- ducks that you want selected, but this can be tedious. However, there
- is a much faster method--just create a selection box by clicking the
- mouse and dragging it over the area of ducks that you want selected.<para>
-
- <para>Go ahead and select two circles, and select all of their ducks. With
- several ducks selected, moving one duck will move all of the
- ducks. This behavior is dependent on the normal tool. Thus, a
- more descriptive name for this tool might have been the "move" or
- "translate" tool.</para>
-
- <para>The Rotate and Scale tools work much like the Normal tool, except in
- the case where you have multiple ducks selected. It is much easier
- to just try it than read about it. Select a few circles, select all
- of their ducks, and try using the rotate and scale tools.</para>
-
- <para>Note that, unlike the normal tool, the other duck manipulation tools
- DO have options associated with them. If a particular tool isn't
- doing what you want, take a look in the tool options tab to see if
- it is set up like you want it.</para>
-&linking.sgml; 
-&steplayers.sgml; 
-&shapes.sgml; 
-</chapter>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/steps/layers Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/steps/layers/combining.sgml Deleted

@@ -1,32 +0,0 @@
-
-
-<sect2 id="combining">
-<title>Combining</title>
-<para>Now there are two ways to proceed. In the first way, pick the gradient 
-tool from the Synfig Toolbox, and click into the canvas once. You should note
-that another layer was added in the Layers Dialog called 'Gradient'. This is 
-nothing special. If you see no gradient but just a plain color, pick the normal
-tool, click into the canvas to activate the gradient's ducks. You need to grab 
-the one you see and move it a bit until a gradient appears.</para>
-
-<para>You now have a gradient but it is not what you wanted: It spreads the 
-whole canvas and the goal was to have a gradient on the rectangle. Let's fix 
-this now.</para>
-
-<para>Select the gradient and the rectangle layer in the Layers Dialog. They 
-should appear with a blue background now. Then, context-click (ie. right-click 
-on Windows and Linux) and select 'Encapsulate' from the menu. The view of your 
-layer tab should change now, showing a small box called 'Inline Canvas' with an
-arrow in front. If you click the arrow, it will unfold and show your previous 
-two layers; the gradient and the rectangle.</para>
-
-<para>You can treat this layer like any other layer -- move it around, 
-duplicate it, copy and paste it. You'll notice an arrow next to the icon of the
-box. By clicking on this arrow, you can expand the inline canvas to see its 
-contents.</para>
-
-<para>If you want to change the name of it to something more descriptive, just 
-select the layer in the layer tab and click on its label. Then you just edit it
-in place. You can do this for ANY layer, and are strongly encouraged to do so. 
-</para>
-</sect2>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/steps/layers/done Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/steps/layers/layers.sgml Deleted

@@ -1,37 +0,0 @@
- 
- 
-<sect1 id="steplayers">
-<title>Layers</title> 
-<para> In the previous tutorial, you made a
-first simple animation by changing the attributes of primitive objects
-such as its position, color, and size. These simple types, however, are
-seldomly sufficient to create advanced characters and objects. To do so,
-Synfig uses Layers. They are similar to layers known from other drawing
-application such as the GIMP, for instance.</para>
-
-<para>However, Synfig is different to simple layers in at least two 
-respects:</para>
-<orderedlist>
- <listitem>
- <para>You can organize layers into hierarchical groups.</para>
- </listitem>
- <listitem>
- <para>You can use upper layers to change the behaviour (or look)
- or underlying layers.</para>
- </listitem>
-</orderedlist>
-
-<para>Doing so is quite easy. Let's look at a simple example.</para>
-
-<orderedlist>
- <listitem>
- <para>Create a new file with 0 duration. There's no need to bother
-	 with a timeline at this point.</para> 
- </listitem>
- <listitem>
- <para>Create a simple rectangle.</para>
- </listitem>
-</orderedlist>
-&using.sgml; 
-&combining.sgml; 
-</sect1>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/steps/layers/using.sgml Deleted

@@ -1,57 +0,0 @@
- 
- 
-<sect2 id="using">
-<title>Using</title> 
-<para> However, there is still a problem: The gradient still covers the whole 
-canvas although we wanted it to be restricted on the rectangle. To do so, 
-activate the gradient layer in the Layer tab. Now go to the Params Dialog (by 
-default a tab in the Params-Children-Keyframes window), and search the attribute
-called 'Blend Method'. Double-click the entry and select 'Onto' from the
-appearing drop-down menu.</para>
-
-<para>The gradient should now be restricted to the rectangle. Congratulations!
-You just made your first interacting layers with Synfig.</para>
-
-<para>If only for the additional organization, encapsulating layers into inline
-canvases dramatically improves the ease of use of Synfig Studio. But
-lots of programs can do this. The concept of scope as just demonstrated
-sets Synfig apart from other programs with layer hierarchies.</para>
-<para>
-<footnote><para>The following remarks seem to be outdated already! A blur 
-defaults to 'Straight' here (using SVN 110). --Claus 06:45, 11 Jan 2006 (PST)
-</para></footnote>
-
- <footnote><para>It defaulted to composite for me, as described (using 
- SVN 147) Matumio 07:56, 12 Mar 2006 (PST)</para></footnote>
-
- However, a layer can only modify the data that it gets from directly
- below it. In other words, if you were to throw a Blur Layer at
- the top of the objects inside the inline canvas we just created,
- it would just blur them -- anything under it would not be blurred!</para>
-
- <para>Lets try it. Add a few circles under the inline canvas we just
- created. Expand the inline canvas to show its contents, and select
- the top layer inside of it (should be the "Outline" layer). This
- is where we want to insert the blur. Right click on the selected
- layer and a popup menu will appear. The first item in that popup
- is "New Layer". Inside of the "New Layer" menu, you'll see several
- categories of layers you could create, but what we want is a blur,
- so goto the Blur category and select the "Blur" layer. (so that
- would be "New Layer->Blurs->Blur")</para>
-
- <para> Well, it blurred... but something is not quite right--the inside edge
- of the outline is now all soft, but it still kinda looks like there is
- a hard edge on the outside. It is doing this because the blend method
- of the blur defaulted to "Composite" (you can change the default
- blend method for new layers from the New Layer Defaults section of
- the Toolbox). What we want is a blend method of "Straight". Just
- select the blur layer, and change the Blend Method to "Straight"
- in the Params Dialog.</para>
-
- <para>(NOTE: I will probably change the way that default blend methods are
- handled in the future--as the way it is currently handled seems to
- only create hassles like this)</para>
-
- <para>Ok, now we have all of the contents of the inline canvas blurred,
- but everything under it is sharp!</para> 
-</sect2>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/steps/linking.sgml Deleted

@@ -1,53 +0,0 @@
- 
- 
-<sect1 id="linking">
-<title>Linking</title> 
-<para>Now lets try linking. Lets say we always
-want these two circles to be the same size. Select two circles, and then
-select both of their Radius ducks(the cyan dot). Then right click on
-either duck and a menu will pop up. Click on "Link". Boom. The parameters
-are linked together. You can prove it to yourself by selecting just one
-of the circles and changing its radius--the other one will change as
-well. Neat stuff, eh?</para>
-
-<para>Linking is a fundamental concept in Synfig. You can create links not only
-between ducks, but also between parameters as well by selecting multiple
-layers, right clicking on the parameter in the param tab, and selecting
-"Link".</para>
-
-<para>DIGRESSION: This is how outlines are attached to their regions-but
-I'm getting ahead of myself. At the moment, the fundamental power and
-flexibility of linking in Synfig Core is beyond what Synfig Studio
-currently allows for. This will change in the future. Anyway, back
-on track...</para>
-
-<para>Lets say you want one of the circles to be a different color. If you look
-in the toolbox below the tools, you'll see the foreground/background
-color selector, the outline width selector, and some other stuff like
-the default blend method and gradient. The foreground/background color
-widget works exactly as you might expect--you can click on the foreground
-color, and a modest color chooser will appear. Now to can change the
-color pretty easily.</para>
-
-<para>But sometimes you just want to click on a color and go. This is where
-the palette editor tab comes in. It's functionality isn't quite 100% yet
-(ie: saving and loading custom palettes hasn't been implemented yet),
-but the default palette is pretty decent. Click on the Palette editor tab
-and have a look--it's the one with the palette-ish looking icon. Clicking
-on colors in here will immediately change the default foreground color.</para>
-
-<para>That's all great, but we still haven't changed the color of the
-circle. There are two ways to do this. The first way is that you select
-the circle layer you want to modify, goto the params tab and double click
-on the color parameter--a color selector dialog shows up and you just
-tweak away. But lets say you already got the color you wanted selected as
-the default foreground color. Easy. Just click on the "Fill tool" from the
-toolbox, and then click on the circle in the canvas window. Boom. Circle
-changes color. This works with more than just circles, but we'll get to
-that in a sec.</para>
-
-<para>Try playing around with the circles for a bit. Muck around with the
-parameters, and see what happens. To get you started, play around with
-feather a bit. 
-</para> 
-</sect1>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/steps/shapes.sgml Deleted

@@ -1,82 +0,0 @@
-
-
-<sect1 id="shapes">
- <title>Shapes</title>
- <para> Basic primitives such as circles or
-rectangles are all great, but they are pretty much geometrically
-inflexible. What about shapes? To do this, we use the bline tool.</para>
- <para>In Synfig, the construct for describing shapes is called a Bline. This
-is roughly analogous to a "path" in other programs, except that it is
-strictly a hermite spline.</para>
- <para>When you click on the bline tool, you will see that the ducks from
-your currently selected layer (if there was one) will disappear, but
-the layer(s) will still remain selected in the Layers Dialog. This is
-normal. Anything you create in the bline tool will be inserted above the
-currently selected layer. Keep in mind that if you want to insert a shape
-somewhere, you should select where you want to insert it before you go
-into the Bline tool-changing the selection afterward will automatically
-swap you back to the normal tool.</para>
- <para>If you take a look at the tool options dialog, you'll notice that the
-first things you see are three checkboxes. Make sure that only "Fill"
-AND "Outline" are checked.</para>
- <para>First, go ahead and click on the "R" button in the lower left corner of
-the FG/BG color widget in the toolbox. This will reset us back to black
-and white. Also, go ahead and set the default line width (right next to
-the FG/BG widget) to something nice and thick -- 10pt should do the 
-trick.</para>
- <para>Clicking with your mouse in the canvas will place vertices. While you are
-placing a vertex, you can drag out its tangent by dragging the mouse. Do
-this over and over, and you construct a Bline.</para>
- <para>Keep in mind, however, that during this construction, there is nothing
-stopping you from just moving it if you don't like where you placed
-a vertex or a tangent. Honest! If you want to remove a vertex, right
-click on it and delete it. Want to split the tangents? Right click on
-the tangent and hit "split tangents". Want to loop the bline? right
-click on the first vertex and select "loop".</para>
- <para>So I assume you got your first Bline laid out like you want it. That's
-great. But we are still in construction mode -- the layers haven't been
-created yet. There are two ways to create the layers:</para>
- <orderedlist>
- <listitem>
- <para>just switch to another tool, or</para>
- </listitem>
- <listitem>
- <para>press the "create" button at the bottom of the tool options tab
- (it's the icon that looks like a gear).</para>
- </listitem>
- </orderedlist>
- <para> For now, just go ahead and click on the normal tool because we
- are done with the bline tool.</para>
- <para>// Insert Figure about here</para>
- <para>Ok, we now have a nice pretty white region with a thick black
- outline. Notice that there are two layers that we have created--the
- Outline and the Region. Despite the fact that they are two separate
- layers, their vertices parameter has already been linked--so you
- can select either one and move its ducks around and the other one
- will also change.</para>
- <para>If you want to manipulate the vertices after you have created
- the layers, it is very easy to do so. Just click on one of the
- layers and have at it. If you want to remove a vertex, right
- click on it and hit "Remove Item (smart)". Want to insert a point
- somewhere? Right click on the segment where you want to insert
- something and his "Insert item (smart)".</para>
- <para>NOTE: The only major difference between this normal editing mode
- and the construction mode is in how you split the tangents--in
- construction mode you right click on the tangent itself. In normal
- duck editing mode, you must right click on the vertex that the
- tangents are attached to. This could be considered a usability bug,
- and it will be resolved at some point.</para>
- <para>This may appear to be leading to a mess of layers. And yes, if
- you aren't using the software properly, that is exactly what you
- will get. But there is a way to make this more sane: Just study
- the previous tutorial</para>
- <para>One quick thing to mention before I finish up. You can change the
- width of an outline at each vertex. You do this by selecting the
- outline layer (NOTE: you must select the Outline Layer, the Region
- Layer has no width data) and tweaking with the width ducks. By
- default, these are masked. To show them, press Alt-5. Repeat to
- hide them again. You can also see other things to mask via the
- Canvas Menu Caret &gt; View Menu &gt; Mask Ducks Menu.</para>
- <para>That should give you enough of a grasp of the software to be able
- to figure out more stuff on your own.</para>
-</sect1>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/synfig-studio.sgml Deleted

@@ -1,64 +0,0 @@
-
-
-
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" 
- 
-
-<!ENTITY index.sgml SYSTEM "index.sgml">
-<!ENTITY introduction.sgml SYSTEM "##PATHLANG##/introduction/introduction.sgml">
-
-<!ENTITY interface.sgml SYSTEM "##PATHLANG##/interface/interface.sgml">
-<!ENTITY toolbox.sgml SYSTEM "##PATHLANG##/interface/toolbox.sgml">
-<!ENTITY layers.sgml SYSTEM "##PATHLANG##/interface/layers.sgml">
-<!ENTITY params.sgml SYSTEM "##PATHLANG##/interface/params.sgml">
-<!ENTITY tooloptions.sgml SYSTEM "##PATHLANG##/interface/tooloptions.sgml">
-<!ENTITY navigator.sgml SYSTEM "##PATHLANG##/interface/navigator.sgml">
-<!ENTITY history.sgml SYSTEM "##PATHLANG##/interface/history.sgml">
-
-<!ENTITY firststeps.sgml SYSTEM "##PATHLANG##/steps/firststeps.sgml">
-<!ENTITY linking.sgml SYSTEM "##PATHLANG##/steps/linking.sgml">
-<!ENTITY shapes.sgml SYSTEM "##PATHLANG##/steps/shapes.sgml">
-
-
-<!ENTITY steplayers.sgml SYSTEM "##PATHLANG##/steps/layers/layers.sgml">
-<!ENTITY combining.sgml SYSTEM "##PATHLANG##/steps/layers/combining.sgml">
-<!ENTITY using.sgml SYSTEM "##PATHLANG##/steps/layers/using.sgml">
-
-<!ENTITY apendices.sgml SYSTEM "##PATHLANG##/appendix/apendices.sgml">
->
-<book lang="en" id="gettingstarted">
- <bookinfo>
- <date>28 Aug 2006</date>
- <title><acronym>Synfig Studio</acronym>
- </title>
- <subtitle>Getting Started</subtitle>
- <releaseinfo>Initial Release</releaseinfo>
- <authorgroup>
- <author>
-	<firstname>Miguel</firstname>
-	<surname>Gea Milvaques</surname>
- </author>
- <author>
- 	<firstname>et Alt.</firstname>
- </author>
- </authorgroup>
- <address>synfig@miguelgea.com</address>
- <legalnotice>
- <para>Released with GFDL license</para>
- </legalnotice>
- <revhistory>
- <revision>
-	<revnumber>0.1</revnumber>
-	<date>2006-8-28</date>
-	<authorinitials>mgm</authorinitials>
-	<revremark>Document start</revremark>
- </revision>
- </revhistory>
- </bookinfo>
-&introduction.sgml;
-&interface.sgml;
-&firststeps.sgml;
-&apendices.sgml;
-&index.sgml;
-</book>
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/tips Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/tips/bitmap.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/tips/closebline.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/tips/dock.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/tips/filloutline.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/tips/gradient_object.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/ca/tips/layer.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/animation Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/animation/conclusion.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/animation/introduction.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/animation/keyframe.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/animation/movement.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/animation/rendering.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/animation/timeline.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/animation/workspace.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/appendix Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/appendix/apendices.sgml Deleted

@@ -1,46 +0,0 @@
-<appendix id="archivo-hola">
- <title>El archivo <filename>hola.txt</filename></title>
- <para>Por motivos de referencia incluímos el contenido del
- archivo <filename>hola.txt</filename></para>
- 
- <informalexample>
-<programlisting>
-Hola Mundo
-</programlisting>
- </informalexample>
-</appendix>
-
-<appendix id="faq">
- <title>Preguntas Frecuentes</title>
- <qandaset defaultlabel="number">
- <qandaentry>
- <question>
- <para>¿Qué es <acronym>DocBook</acronym>?</para>
- </question>
- <answer>
- <para>Es un lenguaje de marcado útil para escribir
- documentación técnica.</para>
- </answer>
- </qandaentry>
- </qandaset>
-</appendix>
-<glossary>
- <glossentry id="doc">
- <glossterm><acronym>DocBook</acronym></glossterm>
- <glossdef>
- <para>Lenguaje de marcado definido en
- <acronym>SGML</acronym>que permite escribir documentación
- técnica</para>
- </glossdef>
- </glossentry>
- <glossentry>
- <glossterm>emacs</glossterm>
- <glossdef>
- <para>Editor de amplio uso en <acronym>unix</acronym>. Su
- nombre proviene de Editor MACroS (Macros de Edición). </para>
- </glossdef>
- </glossentry>
-</glossary>
-
-
-
\ No newline at end of file

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/appendix/glossary.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/appendix/keyboard.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/installation Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/installation/installation.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/interface Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/interface/history.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/interface/interface.sgml Deleted

@@ -1,76 +0,0 @@
-
-
-
-<chapter id="interface">
-<title>The user Interface</title>
-<para>When you start Synfig Studio, it will display a splash graphic and boot 
-itself up. After it finishes loading, you should see three windows. The window 
-in the upper left is the toolbox. This is where you can open files, change tools, 
-etc. You'll notice that most of the buttons are greyed out--because there is no 
-file open yet.</para>
-
-<para>The other two windows (one on the bottom, and one to the right) are 
-customizable dock dialogs. You can rearrange the contents of these however 
-you wish by simply dragging the tab to where you want it. You can even create a 
-new dock dialog by dragging a tab out of the dock dialog it was inside of.</para>
-
-<para>If you ever accidentally close a dock tabs (by dragging it out of the dock 
-dialog, and closing the new dock dialog that gets created), no worries. Simply 
-goto the toolbox and goto "File->Dialogs", and then click on the name of the 
-dialog you need.</para>
-
-<para>There are a lot of dock tabs. If you have no idea what a dock tab does, 
-simply hold your mouse over its icon and a tooltip will pop up describing the 
-name of the tab.<para>
-
-Here are some of the more important ones:
-<itemizedlist>
- <listitem>
- <para>Layers Dialog (<xref linkend="layers"/>) - This tab shows you the layer 
- hierarchy for the currently selected canvas. It also allows you to manipulate 
- these layers.</para>
- </listitem>
- <listitem>
- <para>Params Dialog (<xref linkend="params"/>)- This tab will show you the 
- parameters of the currently selected layer, (OR, if multiple layers are 
- selected, it shows you only the parameters that the selected layers have 
- in common)</para>
- </listitem>
- <listitem>
- <para>Tool Options Dialog (<xref linkend="tooloptions"/>) - Shows you any 
- options specific to the currently selected tool</para>
- </listitem>
- <listitem>
- <para>Navigator (<xref linkend="navigator"/>) - Shows you a thumbnail of what the currently selected Canvas
- looks like. You can also zoom in and move the focus around with this tab.</para>
- </listitem>
- <listitem>
- <para>History Dialog (<xref linkend="history"/>- Shows you the history stack for the current composition. 
- You can also edit the actions in history.</para>
- </listitem>
-</itemizedlist>
-
-<para>If you click the "new composition" button in the toolbox, a new composition 
-will be opened and the canvas properties dialog will appear.</para>
-
-<para>The canvas properties dialog is a mess, I know. I'll have it re-designed into 
-something much more comprehendible in the next few days. For now, ignore the 
-"Image Area" and "Locks and Links" sections.</para>
-
-<para>If you click OK, the canvas properties dialog will disappear and you will see 
-the Canvas window. This window represents the Root Canvas, not that that means much 
-to you at the moment, but that's OK--I'm just trying to show you around.</para>
-
-<para>In the upper left corner of the Canvas Window, you'll see a button with a 
-caret If you click on this button, the canvas window menu will pop up. (As an aside, 
-if you right click in the canvas area and there is not a layer under the mouse 
-position, this menu will also appear) So now you know where the menu is in the Canvas 
-Window. Good. Everything else should be pretty self-explanatory in the Canvas Window. 
-(Explanations on the menu stuff is to come in a sec)</para>
-&toolbox.sgml;
-&layers.sgml;
-&params.sgml;
-&tooloptions.sgml;
-&navigator.sgml;
-&history.sgml;
-</chapter>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/interface/layers.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/interface/navigator.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/interface/params.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/interface/toolbox.eps Deleted

@@ -1,806 +0,0 @@
-%!PS-Adobe-3.0 EPSF-3.0
-%%Pages: 1
-%%BoundingBox: 0 0 138 432
-%%DocumentData: Clean7Bit
-%%LanguageLevel: 2
-%%EndComments
-%%Page: 1 1
-save 9 dict begin
-{/T currentfile/ASCII85Decode filter def/DeviceRGB setcolorspace
-/F T/LZWDecode filter def
-<</ImageType 1/Width 138/Height 432/BitsPerComponent
-8/ImageMatrix1 0 0 -1 0 432/Decode
-0 1 0 1 0 1/DataSource F>> image
- F closefile T closefile}
-%%BeginData:;
-exec
-J,gg3$1l+:uBJ0Sid)%VG>@F6KV:+3>73bZSgh&PgO%<cd3<YL6-'V!_;JB=>:Z%6AeR/R(2Z
-""7*pggFRFK<T29283W0_I7\WcE<17ABSP,m0C)&dp<hi`r<uXgj_hb8YZGWuq\>F=B;\/\'6mLs`
-f=6WmPbN=f'.ChhJUrG`U<\Q^gAcsr#Q(LLVmS?\@b9e'og:EnlY7U7k9eHAoej&'cn**a-a4I3t"
-LSC?_F)SK1\;m4bg2;9(#jI09,DDqB_k3m`0i,<j%Htb"WK7K.'B9u\j3HfYqHY/?6`dE*)`;;B3
-2"_ms'4$56$tgk43fr?Ctl*h<Xh4INLe@fAlW%IQlY\NonQjWpfOIlaY5,&:q28E3r%KYZr+O6-tQ6
-$,Q,0PWY+ZJ:M,&D2XkOH>\W&O__V9+f+i9MlPCnSD2A7?Mt/(rh\kD&L@`XDo9$;=&?G_MuXf8Je
-ZPMt^?9T^XBnnaR=8W\#t"\;#FIik.1`J#>1>KPqbS'!D.1eor;CIQ9ThJrj7PI^eNFGho0'&%l
-T<CUbj@Ph'AWOMckGLE5L=K#t*(h9aaD;'P/"KdM.)B+\75',e2:p4tD)<:)J;e!1(o0"3(Y9a+;
-?Z65bI6kgSA<OI6d=Orak>r.LM;!Lr76g8r(QaP45&;VOWUcamLX_1j@G&<LWfp7>_B\JcCX_Cs,Tj
-24NkF(afg_UE0E84KrZ#a1d^!h&Y=)HW7h0,pBE*\^%HJ(,tNCu.^<Dk$59SG)$JtVN"bOsm&DBSU
-!mVW<Pb<Qd?@`3XH446_J>u'C,,j+GA/IcHOl4E.>%8K63UV=NLV:E?*9Vc<P%7^eD49W*VKHe2pAg
-F1N+#7j*95k'uU*^3-8dR2/MAQ`T^QQQ$XAXqu\DO6mZ>#pk;T^RUTqEU"+\mt&WMEMcq_3CK
-*$l&!+K>*l8"Wt5h!C*?i\naJc@@$^7'/SiO5g!=VtA.XmLOmOCTGOICN#7?p<t3F?SF/nNkG+
-0>`9oQ."m-02=\%S3F@!nTP3Wa7;?a3*uNc4/-@>k_IRpR.Vl#!&MuMkf&k09>09r`=p\D%4#L;
-CpdY%J)/mKN!)52X'Aqk?p@8cT^\+?Z(-_#*d&@)2t"!:%YB7-L_Em*!#J'g1s6'#'8,H1h!9>DY
-TS+%b(gRYk*&Y9WPSh=%P\P$>=MOUAbF.So87L,EXeCt@*%LOA)'5(iHkO\A&qd3EML+S<qf#?Te
-Bu&AgChemJ&0J$8tT&,6G3TL1qpCjH<hUd5>r_qp5(Tm=Ie1$K62'28CH*ir\nD5tIM^#ST4NF!.h
-CID@+j<_?\+nQ=ZhPfmJhd"WZJrC&-E>7'St_\%RcEANrtmdLnVL%fUuXeTOD<'GhES%><H.8^.&K
--L,5Ll@h?MAmN'-&1rf+F%q6qV/9e`M"VA@P,8apfk(_:&BX/DP'K(Z.#e3AeYm<Xm:;=hol=E(XBQ
-1g+8hlnpNNc:c+VZ4p6(IFT6opH'Jjp7G*@(f-`fa4t=rkYq/_V1FJ.h+g951pi-9C'%__,="R>!@9
-`5m^LfgeKYrhH5#u?H;mm_go^a;a1ODW&I0jmm$>e"VcTh%lfH3cOILiF0&UcaTMqCbnEI;c/MEf
-3J01PHgFtk+3$E<5/`3c7D"'BE\E1.X#m$FJUN&8?%1=<rQ"U6+a.3M*%K2>%^$Q6431kC%J0`O
-CTL;d%oe*O?s>KbUj&;?T0-Uq0TJTN7#.67q\XLWXb>eLUr*'.IC=MFU`<>>)j//9hVIn4`X8ps#Up
-Rmar(0o;i));_"NE&RM/;F9H_$bSp+lls`TfbEQaC,^I,YD0S&Rd3uGmGRr`7>7f7:,S%UfVkKq
-Sf##J/cSE\aIo@@T49b4MO7XoPk51so@W"NbL"#*K<i^"'W\\PJK9oYUSK-3`'n4@kq_`";oq8Zj
-1=AFgE4B1PV2:N3h:;CQY%=E#SQ3>WUh*`8;_?n=o=:XQ/&QYhnj9M*rd.G!0)m5bMuj#J63<7k-NY
-$9$t<mg/1#rd`3A+5,51m?bN9rKN@26Dnk'.L3-Qq#=q)Y"E\bF.%P@5)&;#3</cf=KrBY;f'khXg
-Zf:N'u-hOCDGD>WH>Cfd'lc9&6;to$h/+N/f,0*4rbSr*?Gj1Mh_KKN?ACeCd)0,N2!BoT*odTIF
-Q%boXf4"j%_H'auV?<jePCSfj_2mU*"psk"j?>7Y%XA2!,!5jADBjgIu>)+h#3V0W_&#Wf$$f'aGfP
-hu=%VhQsVJtN1b0KoBLW>?mj-ju)p5>CkdntX2hr?1AV419<'2cC6-)oBE?>qRl\VUK/1dkhE*3T\
-_Cn@M-Oh6eC"dm7\2:@Fd24r6NdVkAfG4tF>.r*n<`Za2E9(CEj@:tefA,>`ttL'eE#FgX-X$pK/
-.Yh=a^REKcR;H+*.:5d^6o3m#AldrK`eX(Jln(f\"+_EjiHZMBof39dG^n<@k!g:J1Ca`$oohf-c1
-A;Bu)hJ,&GSYhF0F0q@Zr=+"\G+a^KL<K)5GTM7QA\\@4EJ_+ZZaakaG2piYMh3)6*:09spFfQjCM
-j.:nJXj)fI,F"T2:37.!OOS7%^IR2&P-RB:4Q5OdFZ^V'LRMN;3=EH0@bQOT1'sbl?/e0ca"mkB47
-.AXRX*T`2e`f9UUBfug"Z7ujZ=F=1:HV#`V*V.Q?XU;l4uQ):hY7lTYr+10L?3M:cZ$A<:+V=*Ot@$
-;Sr?,CsADgjDC=hd*Q51"-A*GNR#\#EoPtsDb&o;/sb1>PL3e,=ims5TkH:AUkOoM\9,Z:`dXu/m(X
-e+r?mg#'edg>mq)!"hJBMn6cq5Z;#S:=YOu5APPbW>$pj'5A)<ETDHKjrU8_#B&ua#D=I6U0BmGjX
-,DGafhTon#RI,>$h@*Upk5R5rI=;7J)B,_B>bC>)ZTU3:HLWDL*"j<2")LpkuHV6jfuuo`?VQ\kjM
-/n0J.p#m2>1P2X'o6!?OH`X\Z)9FRr9MG"j?N9Kl_<)O6LJ7iJ9`WN_4%P>5E+K2c$O4O8"qY\TN\
-&9@Ig7I6#I#cZMK\?i_$P#Kn^*FYK&HcKlAIDrugV7d'0EEZO630$a@/Kj9kEGEokZ$ZO?!YgEjJ
-cOE_"%*b4_m<WgRK^aqpFcb8dnCJ1)gCJ8n%'=uR/ZNQC8C%;4ETW#L8<",+oae;F&TJg%OWP1?+VJ
-b`2^>VlYfRP50b\O'<sD.d5^76aU0`kr8Y*_0,kW\;&+(H'sUaRd9.4SAJR"7((kC!EGlVt<;D9+q
-Z)jnl`^q_Eu8n:(pS3#nVFG_7i.4_Jg#lE!m<kOVlK0)R67nY<\XW&JF3)R=In\-u&`=uge(su%
-kn^/%*eJ&VK*AQ:hESVZji?!!r*jOfJdHM_BocGpa*teGnEW7,d!?cCd+L1EC"$%JWcN5dT+g<mKdM
-X5!,pG)n+qcIOE\AWB0dCr,I0*Mni7s.4X;dS,ZU);Ge^F;^Cp6-*gZ"nlI.n>p`HX,!ltK/23H*
-cR3aU-`Ul.dWm52Kd\^5-k_LfEfVWSOXY=9.C,-dnsLs?SLQCo.WVX@;R%^WZRYOR/$c9o!^/*e!
-'t-h;;q#o4On@kC"(/X"pAEoAUUj"9i`0!a^oo&hYm4VB-067"EZN2_C"YHP0Ja"ho*mE1$Sc70
-p<>,ZQV'p,r*jt1,CF6!PB</N@,0$/I@h!cFGNj6S:/b/kAALdnCd';(e&*/Q5FtZWf3L@l6R01p^
-Lo0kL!o/@=o2R@$REqM?>(H(W%2Nr2@dpY3lG;bXp3A3`du7lpRl9l+0p@;Ee#>;?GrbHS4*-lHF,
-;hS#r=@r/EVpJo*Mk;a"'3toRo'A5<C__&2l34%p6o9VZ4krBE</bA-iZgTtsX$BV?AeUq)PPI7<
-PsH()5ng.ToFjO=k<2a25h#B`PT_Nj$6Qs585>'1Yk:f"$O!f5;X$,F3-5%3A!%P3>:dKe)`u^1I4
-s'4>"";hjAOQ-r7MFBAoLh-lk=,!G82KX&o=VX)b4s>7oUp/<#&!S5=;fU85ogWY.7)fTh<fr8
-Mk3ToVjhBF%d9n0N:t5e6+Hr7$6299`jW<4+r4QV*LM:)"jH'<4R86dP:6BUFQ61Qf2'o25?-Z
-,'DYJT#>N_P7eD*d</486b>)%*:iu)%Pq,7&$Vqp;m\hBoZo>"c6)Wg9/L?^e6PkWI8q"$9,1H,Pn
-d;?V,fHJ89ET^'b+19'iHi'<qRb32.'>U.oR0;;q5SaoncaGT?C/<`N4(96T(V,t'g<css6'S.kO
-6Uc(D3u)8eSLO."'LnPAeg^r+<b#J,?E<J>a1(I1Po2`T3/MW=EO^L'k^cNh`A0n!Y\@8FRra;j&I
-t9=;9Y!KfkKX&uc8?8XB@p(:^K)dN(U?o;4q<53m0f)d/1Y#&M(%kV8lX6l:>rhPQ,R+<;e8^F@
-Q%"n<H350js\!Ab;a.G&_-&B4_onB6HpZFjk!S6XM`kB(g(L<Zu)+KkE;fB3':g<b#2hQY#lU@+M#
-dG("-A2a"K:9f+S+YJZ7AQb;qCpqT"Q@EK^d:jAsC"Ahl26CTdV.oY^D0Bu6G3qK%h-cOSD&1*(p;
-_%d_e?JUBpF6_G!g-@$ZT42<AtLqf&p_tVfDFfE-C&XQ*W)Cq!knD3ee_2\I/*6#;h:BfAD$e?2t
-=_-nU@hnZZp*G\'5a(CA@F:8G&(HoB6=mVFa%VBf5Yrb8RL(JD)YU@f,JU/GAgQ6Gnt1>pPX'YBmM
-_%BD7%)Q;)GP+aLOmHIe(!mbZ<+Zsp.9bk8tQ?@NF;0NglAQN;eel-\!omPGN%W.jA+qOeU-isCU$
-Qu7?+g$%!_gE81Dg0`Z(PdNbMdX#8ITHFY@,eC,o7(uJ)S*f>C\!I<0+&4#u>!YPS80FV@+$UN&
-XG4gDff6Q")GW6(QpfE1dTnR_/Ki\5.f<L'T>CIBnLA2:!\6jHIG@+CA$ngJ\9iqdt+/8F@K\m(L
-N#d<HhMB)o2djVbDW7XI&\^$tb#!@+#I.SV6a0>kk":QtMAFds-$>N;1SQiOs*`5K0k#skX2@@S>&
-98%i&%:I<fGh%@(@?*4n#sau?_6+ZlGb4\OMI-5!9?OiII<QN-NTq3*D)@-'NT$NS&*3=K?Za-^6
-TAG1f$4)*`nCf9CKOPo,F,eitfiToI^"P$'AuQHtmV_gU1*MBGe#!)f&4HTDaO^Xa_+@lVp<K*>1L
-,i+qq(adSX2@9R^(!q19GlH\GSjR/)r'32qacS<UJ7);2Ec!(30B6&BlDQMFIM\<WJm.@.MYPaLF
-#f@cBKT6f1cT%Q,hGgi:0M(^eHM"X,j)?HJ_X*7^=NVDIXR9-)KF+8J9D#%k?)+C:r':#".H?qN=Fk
-)K'oqJn@QMJFo)BkYRiM:c_T,CdtqE:Dg3MRK-UNr))DdQQ@AK1V"m"H>SPKa_R0PQ88E)GpeoH
-)l6^aN-^hE)C:?1H&S/?"?<lO3VB@3>G)msPBrLhR\,o`eZ!iWOPg*ZSRY';td*WS)9BKqKu8/U
-%-V-:p@)S)nNSYb$(Q$Ql>qIQi*M6>RST)+SOgBFhXf;8?\Y^43cG`?Lf;HSeX88T5g-pSHTmg+cK
-;Vk6qVW@P^)OnJRoh2,gB"?9n#b=VTlu'm)_JCR>U0%Zl-u>!K>Sk:QkT.QN3kDq7E$I*IbfeYPP`
-<g?k(#'<>=XY<)K2c,JQ+D:NTDMitS!fo'$^mDiCU_WqHLnA0rM^^1Z26Ieg)HBIh6r`VUgRX9J7
-94d1_Z@FV-=P:>FDe.`P3@YXZq6R=W'+i"MUCXkM$d)a/ik7>,'$UNWHc<_r_nTG$^RQair$T&0
-c*(A(YhVCY>V!QO5J+LbF.pX,*&4X"1#R@_qN/MN)\X(W7;+_#)b*'(rBAGd%a'85OghFgaKu^
-i_Q@*,ZqcCb,K?&A-_miL`qNK&AHcS8lQ5iWA37Ykb&'J*qUm:o%>bT"1ouih+bT(!/>fEpPaiPJ@b
-FH8hgp;k4"3l4uMB'IW43u!\@EdNOa^!H:^a-Lm@O7?c9.P-*9kchFj-BQd%&.p>m&=If7P&7F-,
->S?^E;7F#0t`XRUgi^;RF&W%d/?&Tr/K(Z$dG(edp4?NrC,667<`#4e"'@`I9Y2a@F3hKantDOm
-8!G1Y@,(eU7,C>ZoW`K@tTAb.G?ce,@B/CY,+eeN>#/IAb1V:'tcb6BuI:LnM?.Ri4e"*c!h9joH
-e(WX0gc\0^S9XZePH?cFqid*UhXogYTX:bl+a$4gX#dqqqALc(4+RI@\<i0Ah1Bh#/PU*U2P>%G-
-%Ji#R4Sh\uj9@UXXhjrffrZTb)3T0kli4_S:4q$Gbj5W<Pj^)6Ikue9/`H\;jZZ,gSgif.#G1lET
-S,HSc7(Y_</6\k5KSggILI6OlG5_i1=#t*Pr`OS!^mcia?k?Dlr"TBUg2krpK\hFlt$\*H4Zjo&u
-Z^0g6@OmLqul$dR8?9d^=NU)$Llb60I?L?p)'@PS@lFTLM?N'(0!UAPAdsf^1^*Dqc"6Ohm%2,br^
-G+jlenYllQW!^?P3;ga3ZgE/<@hXfbL$1kn$o"M<shOj0Vs7K_&n_YSa+!pFtCB5SkanL3?MEX2
-p):c5(Vb7ihg>+tL%mlhp`GLjIujB>OnjKlq7i-hs-`^*SbbRMqL>XD?a9IBZhj^0qnK=s0qnj^&2
-6Rr-uuh^X;lWF0\^TTt:!shr24tjo,5BrfZHs6d6%KAZX+:L\NWfQ:_-mn"<#QV\L;Mos(kNQk
-DD^&Z$;d&3>.@lj3eeJNXZki7O$7U</Oa&Q:p4XGgr:scXRGT".?sds#ldm,>^jN/W>?DRcr7Y4XQR
-iVc'N/g5S:m<N9'aB"Ap"'f)I.b1!tNj3-"=_eb`m/k$kZruf4CR)WYC6I<jeqBll$^9Qkr38ib%
-Wc)cKDD,r*@V.CL3t7S<cr"Q-3b1)48*"%:/<ZhX0Db6eSC%IR8hL?K*Yhkq*L=l0`n"Y,><UR+
-27:ciij2e#k7Knp7@W0:*oARkB!9nkM+mhc0=irI940rV:=$\c&LMnS*;oj$mm3o1\jj/:&?AF
-$jo_S@rN>=9an+u9DSr(<kTW4GIARqYr`4e,K/.&-KNJ^CN.O#!&n,fZ,f;9??D7Yku`B68,\b"
-hO3!!qJ4.idIemLp)#Yq^VcfK(CLS9LUqbFij1&L>+SamG`+NSRkJH7o+8g$9X/K<X1N+2"Hk+2(
-=XXVDtiU8=hn\^ob7^n0htHOFkTr51A9'3p/*%;i_B)pAoD,sGH4Gtr?e*M3&JGe>US.'tmm
-"AQh#efkPZphaGt@l83W96N;Gk\I-A2?nV`5A\B4k&F2ebb_+VrB`E>i6<Gc(aeoVX<>1WA+D\`h*
-4$\B/P(T-IdZn*N@TCs\Me,nqPr3/US5D!c?)KP44n_)ZWUHI7<<A"f*a@=*<ji@(mAP:`_h7
-u9QXl(UdT!mAhmi=dF#D=4aNk5EMpk?;p4odFEq&VV*I:)ScE\:M;.R`M<KA`-qhgs<Sbb3kFp
-H3FN9%G%@McMi%2iLa>2.;'t\UIVJ?<HFCC<kH5I@9,Mq9OiZpi_:GBGqqGKOREXa,K+\S=,E\Qgj=
-2jB73DP2dF7;_dE:ZPmnD@gJ;5KE+:T71k@,RB5G;FQjW2pWJJD<4+kdOQfqL9p6I73K,Bp,*8$7M*
-d;u.<)pa%E*76<t$AU/83JMaZM\:*=5XYo\dekaQZ2BHUh=;$N,X2ph22na:CDcPA0>n4,G("9l
-c?=6R9odhfL&JXV4h85db(COO+RDCE@Nd*C:kBD60Fm(qAtuqk'I$9WYC-f87Et6<=S*(Id_"i-/
-CCDpgY<5<HRr`G%_<rcfFq>Ng$mJ;9c0D56-,b>d*kb\M.3)Kf$0EqN-S.\.b?Ai6,3QS7GFmV$YV
-$A^0$o4P)MNGfP!>lkS"Lbh`-7)?j;PpLCJP/ZeI,5b/R'of%q5)nXYMI)@4SL90$Vd*fKfe*URQH
-\!JCbF*$YS/L(JqL)adHr'8+r>'ge3+3i4bEil!*qO^NIRVc;MXg)1F&fQ!$eK*^Gr8mq_\,(uXn1<
-2A$&OK<,$/m9o`A!MriefoiJ^5G`nD4gF0Q.83%3c#GOqE=M7L(X4*lO_S(r6J)KqTA/(p$l!0obhD
-!PJbBS=GK>qdUVZkS-@EsPXU0niH"*5^oCQ;Z,G#<?\!um=)+HQ^6;*=qK1XZ@<oFQZuU)'@,>)!
-+0;G((T"l8-iDN2V`UA/^ASLe90A))4<U!F&L.SgRenVW:aShli-:^gcs0p-ap3%!_5LC#XuLH)IU:
-1W7OZ?NtELe?W>aZ.`<(70/0P.hOq<`)3JF9/01FC9>&ooKd<B,BC,1mE>;EDWC3q%blTP??ha
-Fg_,;h^)Fi35)@%%%>M7a)UOA0LH9$JND`Rj_8J(Wd)Iem/-68(N&??OjrD=$V$/""+Z<a7Ds*r=4`
-fI"/(m?&k634Pb_?=EP*@21j4u`SjJH`b<fu0KTP1K?%\8c.%hu#9cV\b$)W*sbaTFY"A_:o#<
-9Gra"Q>ac4CoQ@?_d?5_\Wce7-t3e.UQuf3MBOu?%HCc'#<@DGkYrJc4#SAVC5T,RidesXpTcW9D:-
-k6(rnp'9ka6%:QuBDAmDG3iIZ!&'`Lg#XDluTMd\HM*S-F0ppe6KRZ@HY%T<9(.'8icg$m$"e
->ALjC;h?o8GA);OqQVUco8-cjLmqmH^pSXPJeSb&_/Y77'R#Kkf(l"eu`7aCKuiObnk;bFuS7R>U'E
-R2At!!B0n-j*:SbV"b<CY$EE7X3`6t+u-p$B-0^j\;`6(e.bN"\!ANWiFW!HpP@`J=E>o^Y$WHXZ
-L0-6d4XJ6gUE)iW"uoo>2Hr87(@M5;PZoE=R-uZrjD/h(`I8`R9Kfj(k%iK,cQZeO?i>CW"E?=4Z1
-Q@oLO^_F(.ef&$2J24&S&VmVc*Ln.9Q*4aO7!+YuALu'L.A`:^u#9W/X%AIkYLs^1mq;5"H%0@
-:>?MR3T@a\,GCjpl7\d(O\D$kGRhZB@KII=C#W88:blfVMTStUbB>^<&^6dSG`6;&;F4&#Po301/J
-h*_$9c,(ak04c<(Q_EFauR^k63n_@.mae-H6C2fJe10Q6&7?%,1K$dP7_As+mB0HSM7r/6kA!N_
-LF:1r\/qi/b(.(rG#si;X\&RugU,,r,3!EK<n%=8:n9`,Ku+mR$Z-gPIdTb1Y@9<ge1B9dZHLAWG
-$kqK,MDaK9O@\pEJR-@akPqkM+Y+U.r08fXCW\AkrU-@&eCeM32o_%.\gmutuoUZo=ka$anC$>8
-,ljPaC`:d+Pj;U"Xm1s$gf`g.eSZ@c0nXM9)kWUorJciQH;qCI2oLm$u:SS0GV(TS-'\'`,rIigp9
-pf*.HeW`@._uJoFR`?N0sm-\CgD$rGWp*0`SY27%::.#O5/\I*U&jbp$"=9s'$3#1LJhqLZ-VUEr
-dSji(aX0j>KU.>J>p;>4TsEXuV7JmY"DfFmQ>)34m6((aa?"V,$,?i+i_1=A(gXE!@6ab^p9GOIVq
-KI=6l(o0f3"pE`,Vk.b%3OP:XVdSJM./jSd(H"0SRlP;cAI4<,m7PNgqO"lqlnk>qCH4@!=g(d_
-KSI&r2))JUt^jJ\gci0GqSJj<EZ3%P9L>QP5I'S/dj!=NE$IFIcg)<=a#.+/_qte&(!!oXf94E
-$DlOhQ2X_/#4ME,DW`VmM$9^7`J3)u:_^T>/9./uZFr/)E843On%O(oti2a;=om(kG'9-Zf9HZLX
-%nahEu\SN3JUX:t%XXmtb2;r8cilA<G+$UE+'AN*o>%fHI?B.V_Kr`D*HMkYoq'cElZA^J#!/m^.?
-A7lLVeX##E'bt7<k"#RL"&H-4@2G06UXmA"gCn1j*\!82M2sffD;Vah#BbEi?W4kO%+n6WdaN.u:
-7Uktm3/6!=^HbFJ4!DFE?K3Z@dR6o(FKV1Ucj%Z:9S@pUK5s-=#lW?O,?@W"W!!@n*b&SjD@6OLO`b
-9(s6^:)fWI%J_o&N;oD:80i4dZINMF'k_qXO;o9k\).DGH13sZkoT_D0)sPDMS6-_W._1dJ+hJHo
-GX_flS%m;_!=O:iE$g/Ms?qYXlsQ&jFbN1KE\;e83DXJ?tk=.B1Rp;Kkl`;Hc6(dtG"hN$-J7Uhn
-'JF>C^J#'3lfn0LNi;CYirTqdjZFI5+:Q_JkqW,&<=U6gL76Nl<U!C.L*_;Q6,H+LA/Y"X45d2GUpT
-/D:!"k6EPa?hpsF/M\ZRQMFVWokZXDoH2uJRkCdP%lRb9Yg:)\VS,>j6a+>Bud<NM?1;kZgeXtN2NJ
-_/qLTtW3)R<,t!7m`KXM.fmh$T1aOcLH8oekXm=Teud_aaHVM)Crf:tahM+aL'*r#W6*7to;^-s
-/X&O=<D/aHFeX0^#0QYGL`C#bd`<;D.?roc>9*M7WK<nTR^'u8ctOp26>X;jPL)^i(ah@YnW`3
-i'IS=gT_:u!?`)oJFpkr>nA!k-Nqs``7BZ&?HGH)"dIDC,uKj4h0L<0:\t:/G)M\N_^Q3:Eud^bal
-lBYK!C&7@_i0KC$cLDTbk#KV1\$_Q1Km_TRcdbG%_6=j=eoSith9?8O)gLr^nYsJ$2-c4?Yls%6H.
-ePE!5o=?m#E5?F((R1E@+7"#&%H088d.L)\1BPC'e*56D`ZK%,tkirCW0^X)b%cg:\TC__UPFan
-h"u%ofPWj`@7P564W)uYRn5?mN<hJSV^sGu4A<&=Y/HCYJe0E:#Z?<u9a,@qc?r^uqkhcc$7Q++-L
-&e$oNY4*#mu+dNmItSCu/c>(hA!uO)I=@#:gscbf"J@X%%7>fA0rRc-u@WkUn1>'kW+=5._,.D
-.Fg/#rB8;J;gfb3**lAHDbH"p#oEDXsV_JiOG;bL:*t\hhl"#unS;Tf"f&CWrKf$io2o2kr&2(g>
-"n4bVp*uD3T4_%McI5edWL0TL-pe&53LhK@,!nX$fOlAG9L#?p/O`H3"W^%f2K(%0;p/ubFo+/?
-AdIQ"=/AJ+b`ObFXWL/Z.L?)$AX8T8kr)92Tk%)NEI:h=p*J59heF.>j8E!)pN\$;E.^/coB.Q.>:_
-eKs4n''6o5sH3L;IV%jucns27/;%%Zak\M,tUo1kg5jJfGZ;?d2>a4`M3<8M<r2P.,^EZ.qW=m
-_h8RFc6CHG2gL$_r<NEDb=2,9f58$XKXOW'tdLh'6JAb!fI:`Y(`&m"tg?ZYclb^HcK`ogq"L(%b
-b9hma!.p:a-%nFYE\l1/^Y3E8>(rHi/VVUq<EC^F!iR\S+CTujciTG^4I^k0OI@YRnjkf!`E$MeKk
-?+:KQ`kc@frd<5R@#V&B(>%kk/fFjWL0NR^;YuLZ258&>UnM)CMVZ2SXgb^-b?)(,#ua8`IC=iJ
-0bA%_"DTl8nuB-:*?)dh"8G<b"sh882hu3eQ&9+Xlr&\,.4-g+C0<JuG,lS5c_."Q`gY"jY^#$)
-?!KFRYW<BQ2:!<9KBP%`XnU^oJ)?VSW\WP,:b>P;.::MZ!`XBlF0qjiWDME%?1ieV"lidDX-&+1JV
-Y@(Qr=1Tie8jT!gAhcD8I@p,_?^'gd9gQCM,@ZHe+`Pffe+qX(XReOMhihY%&BSZ#OK?JEOI"D,9!
-?#s6C^g%Je@*QSj<MHgGnD&/6KOr81Uc;`kE8K^GS'@<Cjl)ranD*qe4hUlk_U+9MjKV0,@b__R6q
-sWUcCU(*/.IeboI5t!oe)#;i)>Z^i(=?$6G1oj/NT!ZGtqCA&En?$K\eN`YHSm%pE$iglQJX3?='L
-*^QTK53:GkXo6c%lWoTK:GN==>d^!UgG))3Ck:pkVsR2Q1:^"YLJ=IGLYf2.RI\*POlGrY=<2Ks//
-N@$i)=:('O<QM1Fi9e>@fi-"1&V?:(K@ih+7GSJT"m'%7)qHCAN#nmJ@>*bGk$DW$Qq@FFp2YZk3
-d,!rF"dlf@Qm?.%1ChR`o9s=9pfM@ou60Gu\F(>bqLOZZ)W\Hr+Iom8Km0kLmSAIXYr&&^Jrr22Zo%
-a81pfZP=N0?K/bV=A,QcbF@%Rh-J=bZ=h(foZ^WHmu?0.5o3U$)<Jl\#-$t8Mo!-Id?:It.H3s
-n+L<<3,j@GbPdDLSB21j@CVEt;+K5Whf>K=fJf;98tkk/5I:ZW'VAi<QfjqK=Rok9Wmk_:Hk%8GuB$
-'E@U;i$0qq_\a_*AtAlRTI14:(7JZYNAWcY#LMe`>d\$=$WhKcT!JG!SiQ=cLQ"=>U+)g1HE1eJ&
-Tapo/$ShY%&`4Bh@Cdk&_R18"rKO/Y=lctk7*j4;tYNug94(WWdIaCNp.;tBD$JGU(=MS$s0?bXMc
-DSCB"R+>cB:m&Z+k#6!f9/=TrNJl5p+:(t6dKRskOCED?&@DLgUrU'c(^Y=?lBIRXINeWOPGprL
-^<>@9r7R)YSNoq<#0f2Haq3Ac#''2W5Ya&T;Ok2g/Z*?&<q^HTq!Ug;DdN9&I>U6kp4tUYlbj<M\P6
-nbRr90OD\WI_IfAgbhsaA(D^FSs;l9$P!t>+UDt^>t`pgN!Uue&2TF.&W)87B:;='-jLB)*pW8aT
-r7s4nQ&BRQNc5plrYE@BqGFqIfot`U>qR5\$l$LY9/Fq*eeMSn#%<_>_)oDmPh69"rC9<m(UhQ=bL
-sS"Wi"rkDUE02Q9eo&_WCI_kU\#kI9@o'XA9#;:-g1@ng*Eur2=M3N&"cdP;1F&t9k0/N)^2KL6-6!
-lA+mm$EY0_6YOENg_LFr+12"UH(Eu.8e=#9I25k@cCFDf*)lp)>93HE_DoG9u=G>E=1:iu.poA<(.
-T+#b9#+T/TOg+L?V=.T2sb-BCbJ*InHCfCae6o7'5ET3_*(=!;8tol\UI=Y.(dLTDjL::a\!<M
-mi3YJW-:u>u=QY?)jCX.uTFq`$je&qAIU%9(-Fe+faG/JJ6F*6qoFl-R!s$,jo@?e5qjbI5c^KL:aG
-5'%*o3YUDmp:2IWcN$P.t""P1'%W6^TWOC7c((DT@KSl0N>FG=RF5Np:kMM<o_PGi$<ga,Ke*(8tX
-;GH(*=,6S>MKoYICd41GDhn++N-S3RGk#>(@(LBB(rKkGe76YFG?+Mg:)Gpt)27J!YH$N,-b&%f
-`,G?_dGcQhb9gHC(UVB8ZH(T6fCTGonJ2QUfYXW+TZ)g*NlM\Q<kXFjIMn?akBC\9jjVq`?a"
-+1!A.\pKdQqsV7Gs1S=@Gpm=;NrQch8&0KG_0f%uHsaC1ZSmm=_u+_tI':Qf\&J8qB+`aJieaKi=2X
-o"d3rYTW%ZSI5LY$Vdf!P&I:q)YDqI?2R&PI02D+GMIV-h#2`ZIG`q0-eXNpg5_fPrR^(Xn)OBHj
-F1I\IA,?mY\/Ddl$cFnIV7IJ*/@iYslu>*8>%Rqbj$nG`a`IkUAB5OnbLo7'j6IpE-TkoKe:q1!V
-^s0)7u\,(STX46V5LcK4qgh$UE*,LL'aBCZ@Bd7`7NiG#_d;d+_l_5QNCDn8<d.B,EPK-;J8IE3?
-*rMj_a.,(ihSUbf;C4`4B/7Q:BYHkC!85bV%gP^4>sNCp!El."F@18R+(:T?8JQ"%.&Y#>F.$%P
-?F!"eb_c^_`b<ZD"cV;^6`W8bU-7,M$b^/*G+PAEZCVaF5G*'o'_;EO`Z)7j4):RdTY<O.
-):D7,bSASuubT@IqRXH6T9rcXp"J5VZ!3`6AnBZ.m_<>EhJ@DJ^%TK\,gT)(_s9Q'CD$H'q@@'
-%n289s6@B>FidbbMdAFrs+=uj77JChL!fi0A:>fRbLOQUZM+DI;`:@URf0emJJdOZiL0B:W#6e4jN?
-u!C9OdcLik%@ef480!0(674kImjA@O#^aJ0r&kV/L_N1.6h)^!%n+fE;\6kZA472$nJ"&!2N00Ar>
-X(A20PSXB?F\;=mX"aHABB(J&O=r7SDjr-8iE&eosEa73tI&^$9L@k,JR"@jfZ0AJE79+q/d/BG-0
-?S5!WSDQ-Bll4ag\uWb!loK+'kaQ<S@?'oF2*;:iml\5Z#rrt/*b'cTKb@pBHk5On+G78UAA%n9
-E<%5UOC1ur.Ad"d"f-aV=85tt"2*Fa^1jrq#e^^BI8C3VpphpQaO\%%F`hOu<,R7>U/pTM*t@gV
-1(;58UMmJ-M,^Dbnp.8OZjjJ`fkX2Z3Sp>F,N4E7\/K:sQ:4S2"?m2^Rt>^$<6DdP?GdraI`/am-
-*FlJ1%h"VW9K\_\'n,&L*W(Vdo+B;Th=_SsHK-sp%u+M;FuO=!=EVq_@'W:Ra3M=Z\jj1"u1R(Vg
-GMB"=LKRT);uELUTdc9Hhhn\'IHhD1+:5\W40q7E2#(<%V3VCRpl?X'2-Ks*akGKO#G,_CsRU4+?
-B=b6uYA6hg?'m!!rg0<m\K8Xga9;'B,SN0rSFU0'T`KVRBi(@^EJCQ!3uop7^ua&i#t&#kodhk5:
-e#an!q'2p1Q9V8LDrR?ok,%VfS<cLX0u2:cl?+%=Lt?(Y/_Fa;OdU\-co4kk,S#@#o(IJ6%aEuftP
-Aa"N2q<0p+$8MX`pp3I!s/b8#R:EnH<V0!(P1Fb4hm2)BWD:1Pe-d%q3MW#$?O;f?^^&9o#Et2NW-
-=q>'06fquN>r;GO=K+O*WGdMTq8tHG#J1q`<NT%<B#@%:E&l"SQnnT\o=7j,m8cMskl;h')Ll;N"
-'3u1SA7oKb.Q(_"'2I=,;eG+jJ(m-sI'f/2&"'XD\1PWZ&blNYS7j,6Esi(5=VmLN!#+_oM2m(6aMb
-%OLeAG\c8Zg!Fb^7>!`:nt<=2#?,(q*F+bV*YJtZj/`5-h5'gQgMU!9L&^Dgnd$tripg0.lKFg
-HaK*Xfn<smTr(Y(p"I*S8k.Y5mn'guJk:X0S;.5Jk9m"cFPG0'S)^sU^N0LU490mherfW'sVmIb
-%WFWA?;Yfd\9YIfb-/sGg;Fl`W&/::G:sN`C*L8>1cF%NgYIPC(2afrc*6eH/c_N@nTmJdkU(
-?#V(Q`c8E`Ic^9lY9MB/dNdaHECa3u`!C39+(U?WWh<)n@43Qn0VsMD^b%g;.Lnc&3=fQj4iqBg+U
-.)@HfSipL)L+h_U)Qr6u\*NamCdXZ*Y*oolrk15:%Wk(aX4NB+r`R2k/I>TsB'kaXU"Jkg:rM'\8\G
-K5tWNPWsg6kgQVMbPZA2^Qo%GDf=/BLXtp3.Os;4<P?B^Il>FG`V!r"`"q&Pc!fSp6c<%UCl>nM
-W93f;:)*b5^r#Zb-Lqr^,UMOG=FHi?>M"O93fr!c;8o5S,tI-pJg3U&5)1iOFoT+*;,+ccKUiJ
-r!<ZFL>J2\hQGqQ(47"i_.`m4\.*o(hj.OXuOidNhU4#P!^'pMqJXlC/D#Mde+VYC5#KB%ABu*n&.
-i6<u+`I%t>-B)_QD/H?e1W'W22i2r.C@+!^'+$BnJ^7aPKfHQ%2%0PJWZ8iGAJCeHo)Sj^0s=F!`
-OE0hI&#M6X://eIp@kfd+2/"Ytu,\h'190m>)VWZ:_C(kY(_)T,1q,=/ChL:a!A/eok!D;+*C(Fp<
-^_d0(?mPr;Knr&0J%krdE)H:8Lu_V\^nXL9%GLXQ0c/_Y@<j/,aq$0e7$-aSJBnTD,XaL3F%k:'
-DX-npC0GMuin7F0E$\`/\)`g1_(6r6"m,dcZs%ti\,?9V9>UB0kN"Qu=Z^_5s7PjWciq0l-&cG
-df0^g%pZ?t6&*&00p@LE32O<o!:/I9GN9C2$`Na2=LaPu/epX"QOob%6TlPHVOb_Obb*(pSP/I
-T=2bnY*SPp8L%.#P5gm*\USN$jnifju)F@qslj'>hmZ/r-KIhnkdK2(-lFiU9#,FM!X#C@bof@LB>
-&2+FH2R#g"O7+JJkX,_.sUIdb9koll>AHI3j!E#lW;@K`>Qd$2W\"X()b?:@,HK("=U3WcHoUHi:
-p-;n6STBOigDScU!gEPM9?rOH:NcPLCRt3\*cFEG0WopZTAMKZmlsKHUnW(ef.fe$nIqWpRD+abm
-4,!!-V&Cr)&7">J7)`/7bU!=!5E9HBCpR2P!+gZH=Ph^Q%IaRO/SRTT_/TP'4LU8XGpjs>IG#0VY0
-QUUS)"jSeaI:T%NTL'mdQ7We@%6'"_4m:);U$-IU<Z1ctWCNu<:))NR=?$^92Tp7VD48c9GQ
-V\?bTb:R&!X2DWHF\5*"0=J#JIK3sLq0Fp2cD%/DeFf&1^kOqKNT*@u8dI&F:-6dc^qj\HLd2Lg74
-8UU9kJf+fl)tkW'8CS/dAohsWSXL?Lq!<r4UD$pobRa$im,qW`F8APN3/)YX+"U@mBQG!!2t'KsKc
-`$GQ5PfM/QQKZMkA%t7p-%SJ3dNaGI32oJW9^Yq;_Qb!d&$3.q!b>SnOOuT01K%)")jjPrM%%e0
-<k&>_pJWC:-CS^Rb`4sQ1a//$Y.Qo7m#'.6rPD\9%8`g:'X4dPdZ<`>5XGgNp&YZB"<dOY^f't.E
-Y"k&$:-cpn9,lBE#?r<pCM$C+aViMl4u#mnZRV_eAn1s.'h^^cmTOIk`H2W;um$P9bP5Z.`86HP*
-cU*.J4$Q^$K>-^rY%'\=eDbUQ-)HDIVpOM::VJWb)RbaR!m`Y)`qW%i>,c7<%?M"Tl!";4K`7%G!V
-!Q"CRkOc>4d`JmhiTYkf3ErduGZg_)u@9TK=XS%\?L_/dHO"p_9RLk!'%P#Q5@$D;?c3ZcF)8L8$
-Td^b..2F(d'uA0"/(OhS`W6(6&:kZ15oB*9+,_$c=%-B$`Yh^RbK+P//OXcW5%DK+MgM$VDZVJK,
-8Q=qj7pnDM:pWWKe.qYZE!'6-M_O4b1$$lNm$4$YE0NT968FBrC@\KY;bA-(RK9Pl\dDdE;$)>`f
-cB))lB)R>buG\pm\eDYj31osa<^(^$Jh7jeffA(r$,`=>`TE\L>tn*M1T8eaQN!W54J3jYf3!CG
-1&V-Yi6+dV76lk3+$R#g(5kYUp9a@t>-8JdOnl??ba:)mP,ENWJ:n8N)mhtVm)Cpadn`;%",lmM'1
-aj,5h6@C`.DsK%'TO;1(t)%*t&2)1U6"nDoTCkp);s'6<7\_7\5iEf=gN(r:;1TtG:om2uLGN,m9t
-nj8`-(t,^n)(MmA6+m>3p(sc;(s)^`:$jS_HN:>`0lRjYo&2/IZurV'Jha%.tXp4(scL'7aO$Tiq
-^eqA5g#&'tD5k5Y_`Y-+i2Z^"^!F%HJSMfAQ21\sh+ZKa#.keeU/huqnET8M2,5T9qZ;'gdmPj*B
-,#D/d-?Z!($eg6I7u*"sh%MCun7W=D'*@O-8PKuCtjXHAD&P<bnImJ%'.jkSYK4`^+bgc69Gl,
-:0+tTONi9s:9QY1t0!k44F-?ZI"#;GfPV_to<!bCe3AIks8Z2/@dlTCJ%*cTfE!B)+Nb@C)3J<&4
-sJl@+H"-FJ@<*9`:c<*)L&8eFY"sAN8$Ca;e5="h1ZUa;ao;(-8fRC1h/nnNWjl5%R#j_kZ*9o#1
-MOP#q1pRb;8W%joUAAp.6_e+mhE@i"5?M5h*BETJoC5n+aU,/P!Tl196B8_F6\E8QSVUO!DkWO/9&
-#'1HBR:3?e;1X@l_7naMs6Bau7_7Vma^kZ#b0C5hZm%7+KC&j`'e!GW!.%%FX`;rN($Z=-X=6
-3dLT#9\m19MIlR*ZsK,u^P/oT#a,0i9U4e+>4hZem2DNaf0L'8mG?sj-\KV5KTZ2eAs<KIGCIo'#
-T=0^ZsJJ=*@CI(s-.?lP_<6IGsUEYR8e5DPcFO*^'in#PZ9Qd6`25O):FJ\=u:!@X3FNVUe$X8kE?P
-UrL#&@9aF'gd282BlTWV@-e\-P@*%Uc(C+\PbA5=IIK#9HE@&++%UsVI74Y0:;enn(Ro(N5<f@*"
-V8HKAX^9PQ>h,ZIAOm"@:(n$>o$1_1_il/hdb5C1K#eI6&`,l>;hu?ZibOVWU.o?";Ci,0XHtp"O
-%YAR3kfWlMshJK8;;5>;j*.kI)rNT:LUPRXm;;SZ`HLt&+,@.<lbB2o$c6*4=uY,Xg5gCpHjhki@'
-\!2EJMr*H$Q<elHZ/&*ei*FSak:Tuq(6ckE),qBgR+4qH(-8E/Lij7r@/9(=f.Lfa'<i9.5j)6j
-UF-e%lK/VT<0lL,NEYegsoc$82`Z=d0qf`ut=!)UP,h,)d%%u/V+G'o#WY(7SE*#tZD.@WFgLc4.A8
-nJ#JhM:C=`mds-s*3/KAUu6-ZXF44h%879U%foW7F<s':0DC0(F:Tl_l,HhRPgpSW?sd<hYcF\Q@e
-`H*WU/U\GEI@&i;pUg5dsq+sI<Z!GV9=6p#lAi#J63N:=55s^V';h;aC!@=27&1/TNeh>1Q)i0qi
-K:3`$Y(JMQUZBgW:RpOr:L4nqm-\5dB)/VUA=Ke6ql3,=4XhgAK>>kcKsG6%@DVhlpL_su_pjIsCK
-\j4cLp4dIV#btrObD@kL3TPNR&bpCVhu=>Lt"=fpW$-5XbHP8KpXS=F5_rbD\E=NAuCof?%n^1P=4
-o,GF8JL)5ec9EQ^6?3Tt@BGBRrJu3,O1*Im\GqTm$qn(O15$6141Z'8IG+OsBRU3@Bt-%?dK#M3
-cn)'tJL#ARgj6c>aq'V7a$'X$bV0HR6=X0-@;3UfMOs<DX\4$"X<L4S7O83:PGu'bE"dW9^PM$`
-_$EleMcQr53gf0!U@cPTWo4EuOLYsac4-3%hjPFa5e44i\YS`J\3E!aRdr%t=R2@,G7HXOi7Z#;WQ1
-I<hVf?WSbr\3N&FY_4=`jS<s\KAQbOKVj^cOTGar(dOh*e:>;*RsEtdH2!VD)2k17JIbnS;'hi;f
-:P(`TXl)3=^@SE3LfjWUR<?s`?1K`81LE%\lm:F>$IGa?'<oOVAa*DqJ2rgbdp589Nl;1RUrCcJ#D"
-QVkaS:`4MpnKr>o:WEPLbRN=@s3`NlU0<n_)QTm,YGU#mD^>R4Ei(494<XKr&=LeERO,&Ha/n"DXW
-#fmqV/,Uh6!.'Y!E?)64S(R%S<FFY=!n$)Z-^JA2nCFh7(BgAeD2q69_n2&cTa*9CH`NC.)Y'VIt
-4"IV+.B^9%NTI,h=?eiu0I7Z),l:%VRn9tR;`Yj,Pt3CRnL0D:UV3"V)puN488GCUX?i<dRiTgO$
-CkHmF&_V"^6(Jd*S'pUL*a\D*@\)k"6@S%9Q2\m(`:S"mR,Vn1Wh,S5jqn'IEt9cKN`:dS&)bla
-1V;mc5S:>MHhQhn>M_\9bg<D-:$mc(kG^H:u#>Pl1)s1`p`^YB".*!a:7$c*=@Zaf,54:f5t+2Q_
-W_7V/4*%Aa0/&N>_d"a%\Dru^1W,_K`*>7>"66p39HX10`C'Dr)q!$?,^Mb`Ood$r+X)s6c>L9`u
-FJbHl9s%J&bfFa):@c*/hh,A%:<V`dEukgmQ1;K?>0haujU_KaPdYKC+V_Ru/RUd7$QcpGbWNGW
->g(;1c,+k/boG?Zr7f!a\u1ab^ANr>jKY)ELq_,%8Th"/kIn^%>=c9.05SHm@9lbsk:ci"U*0W!
-*cXjOg,d@DZ4I4N`O/^g"J_0mKU4Zh+55LTKte(mI1I+780j=T1c/j3/dCjX\Q=4SC!ea7;+?!5b7@
-Oo-+f)9C9*IH>LpIO+"33$)ZFgToNS+rZffbDL?(9N<T@nXfg"iLY*N.W,a"dgq35YeXj.4rBS(o$
-q3MW<s")eme\_I)%h-JLcS\d/+TA7,75on_9IGNc9l7dY."EL9bkd;NrM_"Z<i*-fORhR_CNA:p-hI
-IM_Sf0aTnj2R\iI2g,KG6`"07?#3ik@<7^+N0l<fE-c_EnJbVI'j,4iZjPjY^5#15:$#\`o=e^I
-hIQ4aC:ZTCj_"2JbS'cHMeo*=@BGh7*nLn?qGg-6tBt*,gK,@Tict%%!pj.^Vp'j69m-912YASsD
-qHBLSu;KsTQSq9''^.niEl^j=(T%$Ei\*`%H;N:))*.0.57PkNjjW8.)?>\f\Drkc0k'h==?O-'a>
-NXf:n:G-)b8OP1KLA7j<i)6KubJ"E*jl#nqB\(70$lA)I%\:<+V-^V*%QXP/bm@te<@`999q*'ki
-r=P4U$5=S*!2He"ogM1<rV+^qJr<)J%XnI9*b"PF"m;M=jkb"QIhDJUSbV*9k$ODBO#lkrI<1,q6Y
-8Yq#"W9:&7%ad;#eOE7flnN$s3pO:W>;#s4dIk,$l8DFPB?#-qOUm`@td<Mm\3JcPCh^tnI('G:u_
-Hbj,ea;`D4$\L_(:jB?:*=7)'gMLIEjOWL6\"2rr4I/biD_p%`Ohg*a3If97'3R/KPB?kfZRiA3`s
-sEZ)A@/%1\(@o@!I-?U)mbGV3FLiJSP5g0C@N,>*O(`R-+tT*.6?oJ%O\P4(L)'DhD:IG?BRA0
-6W</Die(\nfMt3a!9"?1O7:/Dd"_oLiq_DSF'WGjMj@+csBDXnYOY*tsPnSF'Bk?3;XTakU1sRl$\
-VY`m3%RfAp<I;5gYgPP=V\LbMb0q*rk<M;T2<4MN^*5PfNAe+GVWVGFh<\`Xm@S?XO@:o6
-\@*kYeH\:8L&(bY8(p%8o.rDf5n(/Z1r;OHd\^n:!-E.aRcu(3f<.hW+@6U6frV2>cg34>%<&9_
-O>O1h!o-0TL%i;#4\d9gj!5'sRtL3c1cF)u-nZd'NNV_dm0GdQ\<@B`GBb0s;Cn8%F@e*p)pO,tX
-7cm\q5pZO"LFn,*>2b:RHiZnsBr<8f.k,&$"1ZDkJsVePC!p:Y5R'*J:\__6EBDJWGTB.M<GERYWh
-F82Y"U.0<F6QA>IMssYWc!;_"p=@ME`/SnY@6W2N;6"rP426^6>"%6&ur`c9:.(tD&T<7PTfQF8\
-<&:u&lL35D"do!tD*KG13m1-"Sh(R3&d)DR`?m=R@htrPC/UL3.6(t(K/85>6JA^7L;DKT7bq;L
-p+BE?-mQ=1.rc+J@>2bU;/+l6_N-*_cGP/SmL1m*RgRQ;&:'*24L\W6EQ::3)B,f!WYnt3A4ss#_
-Q1G_D\1)74Qaj1"C;dY=>i+Vj\L/pRch5-AY/%hY&fbZYp`Y?B=O0l*9#!1SS*ONqK%NsaL"<J3QX
-6`3cnpSpuJbR6H(c8N@MHHLHGfd;q0,ESaAWODblQl+B_+VQhF*&_g"4ZkfG$-rQ)$+SIRMA",r+,
-GWoO?R0s;Z)Y.JkiUIO7eM)UlWUatf'9AGQK^`FB2G2ASDukOb6eY22Xi,Ua6dC=$e3S_N84bL*@2
-o+V&)1jt-rbemDYO%_!%>qtGiF6RD6*23$(i$#7PXm>'rUi4665!>AcN-,0E<8BFg%S'$V1!(K6
-4dO@an5/sTu(ls;j27s_2f1aRC_O+i>-9dpi1J<t)R:YfTpO?pFj^gd/Rg?i(G=Hi6!"^HE$,IH/
-LUm)URV;gOj4"NTGW8'KK,!:+U(5HhA2jMV&g=acp6+=Ut'fY0tnjScb!1UYW)L,7pkZ,A%NSP\U
-OQF<=rX58Blf63,g&r*WF'X7d-#;E_+hc#Opd(GjKa*-NN:lK@2rU^_$=E#1rO;l@o@kBu+k/1:(
--pph$K*T>",I)!icCD+<_?#d+:Q5V@Tf&.S\*3>B9J.Yb185Y="I1?Pm-!)<,)Pb0,-7*qq+_j6
-dea=oc3+9D=o\TEMuWjr21Rqi)SeTePQ8X*g9pE!gCf8,%t#<Fm_9/d(L@7\S)<.3&?:K`fU^>77
-?n*Ql+TJ-;VmF.!ChrMLcC!9nBEUKN(&r@Ip+p?0#(B\&m&V=so$;MEc!Wsk%"X2G/Z<!Fnjnne#
-6_6cdR?XVH.p"Wb.9?gdfae:o5+h?DJ;iF`!s5E:&qORRd#dEV"Q6*b+m`CSGdtab6KrH1`Q5UPiH
-De-ZVb\1'O@n(4f#Z"YmSJ7k!C!7.^cudE\.Xci=hh88XS7A/'sLF=gsS++6cPN59>KOJFV2sl9%O
-*NB0+HTKbT@)^etS,5Ud"*,UEXK_AL0r>nDP%,n&>'46:G$7l<K$-=_K7duS"Tl_jo;.M1ZbntD
-`h=o-8`sZ7J^lXW:G0\Z80nu(i'8!`<ZpDtE@,05#;f9OfGt30,ibD9S,``F`R-_d$`u*^s#*j,G
-NRCUWe-_%X,Y@@GM!X(<.W(;"bMgd$+p3c@FZ,()B8>`X\_>>)*\,K4Ks+Y7-$2cU-5uC-esj"'Nd(
-fZd"P9e<mjbY^WeK1m_bfqtDB":(#"M5d)U^\.>&!9PLH*a^i=MQ61+mXd*?q\NiEa)#U"cU4D`
-?.WaGj2&ORDdHN4+KJq1j*_Phf#e0lnKTkZ*YEcH%WV4s7='m&7IQ6I:AfS;QBI7_)*:O5\LTrBl_
-2*5dO@I;o/87$GYac55R!M3`<:fE#dKhG<ahJM._'MM92,S#Upj&mSl#Z1?';#*3!bW!0e%G2Zpt
-V3CH8H#G<:7iXB5c-R)C<QM6ofe11#\#rV(f'Re'B-SQbi5WPZ?d!f#!DI4(gAi%651;Q0TYLPf!!
-5u,M+lH??YbG=N-O7'RX?)W0LrJ.TM-OX9rn2'>=lc8dCIa,lf&JXFU`V"K==YoiPB&!=K7dC-JgV
-@3s1NEVNVje/\$Ic,c:i@i_i2T'TZMK+N?F=WD/V!$D7M@A\\c/9b\\m,bQ`(^pT\CC)aK6\LFho1
-<PHYC&m;(jDgAJ!f"XpbfU,%I@gM6*BONu(T-sj*Z)m-0_^r^jH#&X:MH4(N7"^8B<#P^?q<8.+
-ZAch%0<-3O8okh,Z?t!&/Ksr>2Qfe>NDS+Um!LP&%<5sQB4BGYY^RFiCG<H3H)^caZUE60Hc(C#QXs
-^Pa"$q<9_))XK*Vhq>%?S30$>Fns4Kh*q=K`;6+Zr"Xg6,8j4HRfYqrFVgf8ItAYKO"A"1(r.7DPP
-;tOT,2FtfdD;a&o!*f+RbppRBrd6AO&4AIj.;3SS5(-R'6sbMfXJmu5NM`"n:kh:hK-9DrTW06G,R
-8JIo,U+'A+H+XitNIVKk-D3mXJKZD$HFdhSoKY_V5j,bV@gV6!hW+2IhFuGhrW*)IpB6%\:'4+s:m8GIN@@,N=90Gk409W8A&a'$flEk6D-(cWNfN_Gu'?gJ.FfLL73%-,3uRGL*m6_%28i
-QkR3j5C"\kPZF+ce14gCB+GYWMj-R5U_=7B00htVM"Ofn6WR:(m#tmMc6)qdX;j$CE$3kW%31m$Siq
-T+G,\M/^+e<S%bTg%m0PQ"`'@:i8;9?J"":^'-lqF+EO'?B-SSJ.AP?Cg'!&nR=bhLJh)\oj$Yk:MB
-GQNJe1R<PM/=%FG)H"R@aD.(,a>PQg?.YWsKhgYPD@fpC-I?&.nTgaJ+V')oueDi*M(E7g'ql
-JqtuO:EbV=p8SB"Y894=DL(+V)@#)X3fG&(flAJ"ZhPbO!FB:iuS8`7gF8rK^rldTUc0gD1e7j1!=
-=Hq@LW.YXf0!m4iGr'Rpr6pPcZUdNlFC)"4_f0HR:^rd`&WZaY!_7-l^uQ.PqM-i=&d;r=4Fl+Pq
-'q3e5JVh86B"sb,39#JDo'8+6.=5p:NfA5<T\0Y5E.9UHSel!!:MC!n:;kCWX5jA;$UC6E>18aC>?
-l;RK&>YYh#Ta_,Y8d+'@"CU_uo*r_ajZoKWM&L%2-rC-*8d(5F5XABoZcL&J7RE&!0_=iPafIiK?p
-JOeV>0U$3C,^;$Uj9!^U\7PPm_hrW'eE/Tcm$N's=<e=.-^cCr(1^;(&,D-lKO<eqbXFJ'c:SF_`
-RmMXY?mpY3=9;F>KA.t+?pXpQ/obOW%3*OP2?I!>rBJHUgV,14EHb:Sjm7@T29;P&SsT)7jEVU69@
-CkEXAC35WoL731)b686mi!-c17@a&-mqMZ6.VXX'!@"XjQrIj1ohh.js#<H,ol<P(>>KQfa`b_cTM
-541'-Z1r\o^!kl0UMF8;&8C3mg$m+n?A7TM01eGV4AN0CBN3h#J<\VfJUUo;)YFq7/F1j84j#
-YjN,NQ^e/f>8gbE3YWJr.N(bUa86WZQ/#QdWq6iY'RdHKG/2I"1:i8DfL@I^F,'J.*/oBe1d=K-9:
-:`7;.iQF;hM_8ck)Q!g!tI0G&a;C<MS5`oR'(i'T./33OlH6#9Uqe(^RP\BJm:DELl,JSl"W5@@MEaBY2V(ePK/`ZWcm^;
-0O=pY0SP<t:T_iQ=+B!b/qg&=ae^;;m$aOT0pRRo"JA1R>foE.##MgF"QN,VO;J#BVZRp:"'hil9
-^F^LK!N#,-obD>jV(*,hFu\YQ-CaR<92#H"pT$\L+jnTa<^l.14dLXK_5.-qpIf'"MtEE"3g_He(+V
-W!!ATe,BHY*3HoV.Mb/Md3Su'=D%bE&1$72:lCWpr5=B$mher+"mC<#:j7Ui>.<-Z5%%RCK^l&fp/
-8iAcSYe4ML3`T?7XE.aLL>d*@AR%@aAJ&mB(PYV`"@!&h&J9pF?S9MC)+3J=@!bbJ^5U;"j<gsh7
-c4&.P1ud$0.Sj<lcsjQiBK_L9<kNel".Z*<>K!i6'";n:7IoBc;M7CCZI6D0bdB#u3D<>@T$qes,U>
-,X+kHfu#QlI\!!"LYS@(?#,K@e)1ZTcRTH&Ur(n<.m*%a->4\QV/51`&fQX+_U<5sW*63+e@K5cKZ
-DWJf%PV^FL\MnmR!ZlPH\$)L2t2cpetR$75m+fF=@4\LF\)HHDpblYY@j^H(bA(N77=!Uq87t!
-5h*;>N5SoZ.LdU.AVTgT5HmTorhEh)`qW4ejX)W*NT@u<=A2Hb7,+b^ce1&lW15IJo.7)1*o3W`
-RcB1;,Funq2UlIu*KX;&,6oofpRhV:aRY\pR-rR(edXmHC"HXIN"hm\''j54W?XBj$-?/!*"1
-f_B@hq%R&lhH\R5>cjocr-Xkhbh?JY%>\2A:f;r#iWLH%fpEbU>>uZ=Tq8#RKdok"cjg)4;M<Cl?)?
-:U`SAVd/6OR<U3pSJI&I\\uY,<^gKOe5HQ/p0Up._oQ=89)L7%,%&%\K#h8N=@WR9&?eg:Jrhms1
-0mpU"5f+3eh-NW`KX9&/5pTi"5*uJ-u3)O<eOB0/g;TLiZUT&h$J#Xn=S>f`PL9#ZmKr4G)ID"N
-L$/n%0)N=15!76;<2RC9k1cs8T22fKL!)&sf:^'D>S_R.d3*72RMq-$<Yqt80J;oHe"<kJ(`!.n0n
-=jRV'8cf826r#.:U@<JKh/s80J,o9a%:%gm0<r<?X4)VU2AkO!OSZ?+G\Qha="ZSgdK0U:T>_'i
-Kkn),*!63M;1aljKdOroL!->45`OSjF!Cs/\?X;j:-IM&=Tr`_M@-UmnkSKHNW'B\sDXB,A'aX+V
-4WK9Y<08d7.SP+eh6p0*DE:$&fYACupunC35B9SoWOjOoK()8h,(662!C)4<O?E(U<O7QBld6<G5iS
-8a(A8d2Fg?(kKa``n9H@bql=%0g-N4sf09Q"?h2k>8JHkeii<o,B`6\q:bd^a"h/IkNQKI,V$d&LX
-EFH$K6kRH?<c5)4B36_?mA"\B8N#R_pum/uBU/g8Scjc?-Kr1$BT>8iL'6`5EaW:j"Qjc`?5dCk'P
--'a&UopUp.kuAQ:_@JAF>`i(6iN>>EMCD@A@@G`&Rj3'`jNksh!$m%XJTkTgel;jWn`hSJ^RLStU
-@:"QlSmVg&RHc,ml;"HW%LUoVclWQu6Rbt!(8hNmW+pdOAF?$mGlDADn`WiNLk\Q9G":TDMJ1SQA'T
-ttk.L$BNbF`7`6M#3DNWcMJ)8ujlrDcuXr;+ga3a7pL:5%eG+@oZbA;(?Cp)"K=VPT.6=oXYBdF5TV
-Pie3dqipO?*;WBk0<::eSNgYm#)#2G@ihQ"oa.D,/5jNo"V"g$En4D2-qbIN%SJqgC-A!sBR=hUs
-9)!LD'hcO(Bk)8GPl=dWjDT:pOPAfskidh8DYs_AN_AX1_a'TLlq4i@2RkXp$'cJCq2$6DU36ep^
-AMDn#l?N5`Y6-3!e+-$(h'5pAOH_r9hnOc9ojLB;=Yq%BS!E)ueri(7VL%#krE*!;67f.,Dp@+s.
-Dq=^Qmg!^m#ApWQ?RCHo=Ggo9'.0%D\hbShXQ=Yn*&tnWt24c1gbL@IE"8#XEt1bVdbmam\aD6XM
-'Y<qQM;t>,CEd><bD^k6Q,^(;En;d5;$oSJ;@6uloufeYuC43,_cmo-Ypu7jdgd1ifKOo(P+a
-ejp78Sn\dK`^N=!ht.5BC0ao2d=.cU(IZs)O/oH-$a#:T2Xcj1uZecNUNY^<7%kAJ$Pm_9_/mnRD
-K*-D3!EX,Bk3m;elYdj--AP4cX5ig(6?%uIF@TJVVc`W$=nTO5ouCA,o^:'M?kS2F2qPZ-XLsL?$
-8_Jp!6tuJ;SJapiV'tFuO./:MP'>A9MB,nPZ1:QFN"6ItuoS-3!(O-M$mZ2>9=WpG6h7s9)XG5$c9
-pQkCC?Z=qAE#Ek5F2qAVkC**o6?hmKGQ33g-\;%OJTs\:peO"95C@iE:t*%pm6\ZVh=cJM>4Q4pht
-L^5C@^:MtmU:prANm%uGP`JmTU;A!?JCs)7WBI!LL6q2ft!O.(?dReb!nq:D*kFDA:S_Ac6#Ci@l-
-_:)eTDD'QqH'=!@5E1QV#!$KqM2'H?`JF=T\h`=qQI$tQ`bYDYPQ:26k^piG$>A>Zhl\gk?#$;?aY5
-n\,1BZqc^ZC2n=9jen+Wqq&H,kIg\bfR(rYqqo3e-c,^>Z;_ir%Gm6B>sdmZi!F*EG(Sa.EMo663
-F/Dr5'0ccuC^cM\!nI2C6.+40s6e,;5Tr@OM+35;sJc*:5I7MidTA'71g\n&#%q!opYLj%<gO7E+
-rWhE\a5DBuhgDBqr6ZR0BW7HkPX5t\0nObS/5oVja>.WIb3udkO/?Dn,EX^rt)SeO4NPsllg$3s&\
-mnBD2?S<G?+<IrG/_Vu$DEpZtuIrK$UNY^esr:cK^9%0qPQ@0f6"XdmRE459/cH`bU/MoD10p+YQH3
-KFYXEJYrDcP)$Oi,<mNh=iLJ^ZCY.KXtYFQcj!)$-_OI2P!Y,ZO,F$Bj6?O)W4NNGon8nE)nWur
-MWmGN;MQH5Y258YKdn2bM;ba1"gXNc6:<?t:;(MAiXW$/B\lYo=L:*VD-`FpjQ-0X%JTJ`DV%QV^9
-)Um?S.NL/7m-HNlU3934;k;LuLBROP;O@AJ87Y7n$+a&/kabB=DE-GBGQJX@?m/@=q/D+h**%hG
-`PL>EG+1*Bj--_'6XBDfmC*PDQta+da_nkSV;c6;0)lF)a3cd:pQhod?^9<q:-`PL<d'Fq/Z6M01J
-l$s0CkJ6Hu/sW^ugo0!f6A4&47lg;2+aPmB@RUV(lgYLG91_GJEDh*ETde31Vs>V?B"m2St<6a3V$%
-Ri+**u2Pl\^&BlK:GX@`Jps3%7TdA@j+AtlsC(=M_mcc7h,$#,">DY,72>MI&@ZEP*B0!6B+Z(oW:q
-F2$#L(q`)bD&\A,c2t@Zf"eG1o>#c<6.6LLpV9sUP:!nVW'qOnA"#nS'`4n0(6mPD`ckGdS#1.6jN/
-.mP.)s%t'QeYFdPTK936>)$Gp^e!I0e?Me:eu/:Xo>,jj8,8@o(J<@B>9:rQdI<HV!C?UE-42d"7g
-!rEPciPoF5\aiAM^PXX^X-:j;(pb`MbM.LE"W,mkjC;AKHZL!1E`*j'@(reRpH_#>^3F6#lM8j
-V^`8Kc;Nb:C(eD>D4pdPcQm;6P_GGR*@?keU&LRmMb1eIlo5Z00CUY%mG">cHMG@`DXUX8,FosD2<
-)"-r;jfLMQK4C73+lO9WE`Kd`G(iVRFhX&LhGD$)kgk'*Xe4Q(b/UMkZJe@i*,NDKG!oL'*WQGn.6
-TiL7.ZP<qq!mIGUEW<:T<A#5XC6s`1%Kck`A6t_F=oMTokP8:uTB+ssGE-4==s46J*o7H!2(HrMa
-FA<0oR=oV8ic`TOJ$)J3X.ncKbE=VeRiWD5hu2+FP/:&f9hL-GL31XNZn@8<!2NqikBUfXT&\Kt
-@fl`S;E9c4SDoHuI<>YRGs5QdfBD$HVK:-h='sSO??s2?hd`8k#kJ+`UJO(!('!`6mA,,5Z#VOSN
-0+bW`pZS-o0^0fd\cR#dA+Tu25&Wa'W4a3M!?Gl2^::6D#pS++G'$O%FM.`<3fV'&oH\.idP;'92
-4$!.(rM?INH+q9`3u+6O\I!3*70Z8;nErgeJ:QBJ@HqN"eV.4c&&V*lKasLSA`BLuDM?",N0A!"8
-n2f@h",M,ERc2+h'U*!acd#'MsCG-Jp1PQadEhL?;6fFRB"fU/si_gYLZ$\XN(p4gnUa1Yjck(qO*.
-@?ndm`K1b@6lfIZQl)6)4l)+)HI<%Zk"T@=#At`(L(2BInk28goBCm23t+?AQE3,6>kJ#;;4"$tT#T
-ip;2Q;PHFkM$Wc"1M;t-8Z3$KrZ8u@H^=d"68#Kq&OI*4PZ!4@OpQmujtt%TToJ<Qf_m"\N"9&F=g>
-'\.,!1'2g-k51Qk9gKq?-"sM2^$IIoja7qA*6i72tC"YS!#dtf4k'7*/j;>kbJ;rP$2i,;)3Q"t))
-o+^-$d\k`!`O">!R*HVZ+Nt*XK%^Bc/U$mO#J=E)4D71F,<16,oijD'r)1Q68nKCKODhAoAFhGTj0U
-p:o\\<a<:c8)":YkWYD7<<^jIO+;c)#GjG2G\sg!iea4$,5%nFJ.T6,8Ce\h=FZC;P+7%lPdZGCJ
-j%>#A(:/=H<1-_UihCE:LtkHgM7XrF8SWc"10r)63&.0;G`uu6:0&NAc,D*.'VPB$-Kn!_anPH
-/6of="*t;J<07>.2gW3Xkt`LEnXT;L^7i`fq!Xig%cEiAk@jkq'?C.+n'2:\-NheEek<h?Z
-PHk63&uh$P=<!!JD'!!/rC!C/A!6&;$D_JuhA6Zj.o,KGEe:2J_FeKk:D=puRU@h%tr03cMo)Ir\.d
-\*F!JW6u=2XhF8i,U6#YX0#@3"Ukm=o\R*_dA2qbFf2onXYXUZdR"qR:\>_E'4dUPuuM(RA.Cf_5
-+3_P?,&VRR.;"6&aOWMZ)k&pRs5F!TP;-"cXQ4(KI7,Mk"@uf\WW-Q$3O#,fKcA+h9p9CCKa(=f
-Wjp?ap;V_(.AH>8-4Y3#%<528pSEFQoA^,1g$!!GoOT`nc!*d5>Dh%hV)Sc>?$W$g=6emh25pRaI
-g;etenO^YU=Gp<chYTf,)^HU:G\ih:pkP)=X/)O)Te8JISpd(?<1E"FD!pmN)9!(U9Eli7-DS,`
-Pn+Ts5_<q60.1=uNhg"_nGV!s=j2<\N_n1PVI?26):8SER&/sF5qk;Z_'3Qbg:nY>cI?IgTF$&Y
-:'9ib0L=Q!PKODFaC34._1Z=3Iu,Ga+?3\!`XSF/o9AJ)qAt_"ed1n6BJc"i.ifDN3S\Sp0c;K!)%#
-h/eLG#:3$AN*pOcNS:hXX,5&9mmLh6,`#t3WUH:LZ2Pmo5"uQc?TGM'tc<a@*DeQ94*%%!!;A;!!
-&)tJem<MbQDP(<=:j(/!SsbZTS<.S%eBnKsI'@p/Y9hEMrihg%"fXd,oE$?eBE@'/),_oq%>->bP
-YnP\u/8&a(;md_`f'$o\JFn8uff&:d&Y'UDh&3Or0s_R!JaYpXO^pQ@ORL@UbBWQHIODHB_:'<9('C
-!>*7unnku,!nTFT!@8N&sVr#eW>=OKFmOS@QUg_AK#+hRWLFoWQBi,RM,&q''^At-b"X'6HQd,Hph
-@lYs?HKnS5r!+lW_`,Y^uJH@PD`>4^8:?dl-/Y-R3#eLgaBXJ^b-hAnEK_t^ZY;b#"^LkjkT9$\
-XSWj"7Wkm>:da,-aPDU9VNi!pc"&3BqZK:dQ5B&B5)EfQVn+)4.gnGKbGPJq*jDeOtk$%ar9g+I
-c1707bM_:Vr5)R-"k_nS#-;DA3hZVB4Xia?6_mc*YO)!5)&ks\a9!sEPg'_.Oq14m7O/V!!;XoE
-!>#r#YSu9A=rP5cdUtJ@B_H%UW0ZgpgEfh8L4"HD6Ym`k`Me`7"0N\9Q4n#&BZBC)pTTnMbqLm
-j7n#XNGBPK$8Q_=^NjT3j$;E.1W@=eDB$BU-%.OlMlck#,TtJt7U^WpYNPXHU/Ju\@jSs,ghTP?Z.
-4!R/5,W:%gJ$W&03Y-T'I7Z.,0K305tZmT9"+)nrpM#Dtp!M1?8kl^F:93:JV.5>7,$q!:G`0O:qL
-%b6`bIP"Bh3EF_d1-=TMq#O-9r05:r2)OYQ(#N5.`BUl;X.1m&GX0?(&d+U::f'$R0XAH/;:pe4oB)
-;kNkJhChmAQ61-;SD:,9qIK.(mX'\IE8YA._lTcj\Z*aW6*)Ybeo;5q!T/h?Z_ao5F9F/B6P>!<92c
-#(V@.#;XEGT`C5a,f5`C4';Wo,Y(Z(bd3LYpLLLeeZ*Il,aa9d:2,!<bXg"HGqU02!!o5(iBb,k/
-n&/M$,-kOd.D!ES`jDLYbed5-S-L>4MC8S&T#SW*fYGXXi.gE5VmO;Q,'L7o6l"_EVda':,1-.U
-^I@r9`Tc3p^s;Wi6*I,oXl`:IdSaZ@kW-K&kl1&<&LmOkV=c.1NN.19f8sl^CR(>:&i;*HE,=`NU)
-R`WdSYDr@H5mPa*FpsPf8%j=OF&HoIW14p_C.17::Yi@<ul@Yon*AXMnlA7'JLG/3H(/ce1:H&g/kg
-FM,LB,@P%kVa-Lam%/T9:,YhKmjV'ZiF*!\OuC@oMb\Auf?kGn>/#=)eIHRsrhWW:UJa_L1k?B?oW
-!KiZj9hPrae9Kt?-rP$(9"<RgIi@p3(8a42YA5(q\m<Zg*"W.aVPqW_&UWO/s9H^F/H':h&XLUU`i
-nZiQ_fs9H(\Y+-8bJJ,n$U_W3si#Z#'W@"b`R%6!h?7a_r58"hQ?*;sq;+p`Q1ToPcOj9$&%+)NAj0
-(f1Fb:rN##q$/%.2ir+h*LZQFu.SnAcY5^1I\3NN!k:=J,q!r2+OpT3$EUOb5eb?.^nNbt3F#Ws"^
-D&b=bp;S7FPAI@#>cg=-aS+:dsbTICFBk3:5g\=a1D5j""a48ZIP4103`*XSjMO&qLcMdUP(19M
-l%(m3cbTpDPV75W2@&BYG:!!,?X!!e%MM/&UcLP?tGW-&;(/uk\Z4ftWZC`.*KSf'JEDY2-l51^
-^/Y%QWXV@R%7IKadbsFG0ffT5`ksWQ8WmRM`GIAp,^$LJ/Ti6Var&_82S0=8=66b>1W$@oHL35F39D
-b$@,dm&VNpG'3cG/L=o0u?!53W,V$Jtb4ZXOqHGV(-re%s9+8i-DV4Bt9YlSoIWd5W=:T*/lBnmJ
-N5nM1/ScuMTUZ/l`^k,q@J2`(<Ac@05O"9sC@!":LYaXE#2a&Y'+<`GVb&&MD*4&.TmI`G58J@#f
-(^WJj\5GId<DieslI/Tk%BVK5%R0pc#38%\br#r1aMV?8+B,M%qe=7Q1&'0ei/1-$:(@ok;K=Fs'
--7oP7"sjBcrXj6XaDLMA79u-'n9.q2O4B=4:2@D!j;DXAq9eLa.$#^Y6C4!A2Qjo*i#At>Y)N**
-B'($qPhQ5Wq,5cq.X$/;(3k.<^("L%(8)c9CHGBU@_%h!!"DM.3ueZS/&"W/JV$(8F2'37YbC=_
-oR"@s#16Nk3qj2dK^N^De:70Lt3&5`Q;/T;#uECBj.Fjpo=.eR_(-BKB2;MF@V'W5FU*fA4^)9WR"C
-7KZ)B)U)17otM`l,$ofZ3jQqVdc3@V8@#.:PcQG4al*p9bpcp;8?pHfj:7"h/k<a9)t.f_<d1$%U'
-=+$$cI<9#jFPTE0ml&b'2;u4PFqDOKK2CK&P\Z7U(Q*Umah"I,iPjo\$pRI*?cRHB*IOCi<a8`?<
-ohi!<p_tGVm;42KMt\KD7T_3'2e8Fa7S4C0#Og(>roZ,so*0Da`)(/1YR1('H'/HgXS;k:LOP2U0,g
-;AL?eK)'`rrHfA1JX7Zq_7Z#KHDA:nPK3_9=JLauTkk$"MQdh49oginfg#-;$)r57,`SGNqNQ+6$S
-AM7)DNJeooE&r6W=DG`%`X,4f@:8e9P'ZF\-7T02NFF>rL67QSSW#tl':9gdGlU\C-GB/GW?lU+
-NKX*-^%UP5-\n3@YGGB(GYU#MYOq$Dk%Uf7'I-0.LSVGIC"?MR=+qtk-JKth_s,%5.J%'lY)-N2
-LGE;PiJ_2)6=\h4a!L7qTFSC5&`S@_s^_aPK(h%cZV;%EkTpf,Wc.QY)U*5a=FcEp0Qj$oWO3!cBJW
-UcsNEDI,f__#0-?J-MQ9cr'BeC'$C85DSR^9&3Ur0Ir_,?HQ%GWe3$)*&;h_a2/NLKpE,PI)(`HhB
-Tt2>>g):jTN$EWsB8ubf=sKd<03pH(0DYX@+g%9QV4biSSU(lg)?$&Y!M*BA)u;u,\U1/uq4CeiV%?
-ji32MG@V3mMT=OQig1hg8K;Ns3W-V=>QQ`!sdP(G#Qo*KF<p3oN7@_igVAKoG3jG`/Hn"p$X4k7`q
-SB49<%)uX-aHNqTk8/c9eBQ/GcQO\GN?'c*!MuX?,KHLIs3nZLUCUfe:B"K@c0V6(1Y56\QiOuK
-Ws/_\'Y$/`JRea!FSjU)kYe&qt>.(WH\#EMY?N0RRie`d.XH+4i8e?&>\:P;4'+`Zk5aJZZ?PS:
-gUWuGFq4(#FCEOVA=XLhG>%+mcAGlXZ\?k;,>CEqAK=Dke-Tc`qI@)T7CRWG\iY7pHJ6pH/g'*K
-Z(#sDHX3eDQ*so3,Q74qkppXBtHY:5C0B<@K3oCa1;(_UPOp)m?aJ_n<U&XF'oAHJ>gWh*&1)S:X
-nUWZE&26(=?d_<r/@S/9#GDB/R#Ce0$Hn3%mT>LLD_Ak#Br&_f#!P;fL_-B"4n8H1628i`?`Ome@S
-6<jZ=2Q"h`nVBM4C=CYhBmQK&lN)W4>Y#_D8faK`EYpO4Baq>JrX\aS3;@3rt,:WOK="Dh#4L</
-"KupuIbPZ:tgc<Qj-b)8Ba/(f'r!kKVB_^A.\XV3r*9GE"kKZ3ScM(U4F$Y=YTE_ub'`O%4Rpd'o?
-a$;bhVo)SGUXqe^/^bd(LOJr?9KlVpBs1d@DT44X8F(-dKC<B;:%&=6<G=X3\e2a.6)MI8UWI=4Oua
-ebrY%*F75ZC"@Ld\_<>4Bb?):nb%em3jYrIrkZM:aJ@f1$q8SPRm$MqEHGg&7Jq4_NF,F4haEf=d
-m2sZTX\_(2d3#pD_c`V(;q-DYgu;i"*D>4:e_Rpfh>Q$`*SoR8l/$ihgaU)h<!OBlee9#hqeCk^
-'3=.j,Es0i-kdcrXn+<(#Suuhp8%^(LT)<.56fcBV4>,JV$MrV>R4^LG7hF$?&7HD0SjSh1%gV2
-:$%sDjh>0brak1T=6;\Pk5K5\5%iq_CZg.pk8o-9?@h33QqVl:9uIOpiZKO2Qm'24%=Xr75+UtfU$
-A5GlFsOgrj3iOZqMd1/PWA5I^A=ram=K$lsA*+U/UB^b$$un(uEa.rmgFcjmKkCm:%7&Ss/M)l0eQJ
-n,D_D*n^BjhbCtmt7\b?PW*\)=bH^mfF`1*te&#.It5*nUDZ5)N"$70CuqAo"Q?I?GYl:Sb)kUo\p
->P+t'BMb&%3M4eioH!iRYZn1_Uh.cVL'5A2AGqksSK-%BkaK&SFjF8-ss0V="Q!u<CRD>1U34hljL+
--%j'JZ5HqHnI?_C`\bUJtp)f:iT8!.%L\i1500bUSj!4GofCN<+gn*?q".hNJL1fA53(W^_L=\
-@\0)5k+k5*+EOVM.GT!X`%=?"P&Jps+rtC1"hXP6k@NQ>@7j94oS)`YP"F^H#<Qe(HT,Pn<W!)Z
-P`:AMG%_k'%B#8`oOKe35`=Tuikr\SSth#_bPkZ'cm.V'M\A+U'2?8j7*aXL&tCVA<^Z<=92k'Iqc
-3#pC1L!#fb3*iijn0PY>59#L<bSb-ob.Wj^=?P73j%iONNgkSpM$0b*J)CDE*0bR-T.I??L_.A2EF
-uMaPG40S??cbJ'@5bqAj/e2m^k?.6:QW2^PGX6aTsDG)L:Cf'RGpN>8Y0SESHQ<#TiH".)m*Mk6g
-A:9`@XH_p7t*DTn+a@5)O"=,f%9a\rqd#OkE;6OWj4-ihbr8)64f;OIOr;f.G:,-HYG:j^JG$
-hs$2Z%pB2s80pZ;Z@qb!b^5"__F2C^7Reo0@qmd%rn>h5YJ42;$-"+!r9R2:uX694HATs<&2e2
-qSJ$R2>Y1H?_n;E=0N_'\^?R%.coP:45Fg#!=#AZ8p8aROp.!jV:4S@h9GbaToqZ<XA*TlnCGFH^
-S@_OO3NXE$;&N+O/(LZ,tSYr#r4p347OFiF&`N#:imElprR,&NaiG`kd3ek6suf=MF!&3(n8P!&On
-K/;bo3P<BV?`RV$Pc>o0=d9N'H<.4@h%KV9\u=2a&S:04jbG#jksBrks8e;qTbY?4_4Nt)=V&lc)F
-0)`QD<nYs6ukuY6;'6_YpZ%3WNK_Nk#m"OR,t<m@?n<a>%\SgiQc)&W(G8X#bi$(,@GRe_\5Nf*>9V
-<G8:F<>dt`c0N^MhfYINWP39bWF7dj2SMnO;QX"N*_f=W5^TOE+:q9Pl7d.l'M(VPrK6FrMuF(k
-';liYgeF,NB01e1K=W2'uXJI!A*!Yj<*S5%mkC20l7DgEeV*obNFQYQe<,FC'NUENOa9J0`\A<3
-)8os"B+fpGS5u%inS2M#AFW<r%V(=H52o^g>FmJ#M@1E9&_j3*>;?F#kUtPek.)p#N(5mL3/!rKhe)
-D#:)h/L#\t*kRB0*lI90NH%:^6<(l1JN;G%Ip)+ma>KHUIb^@U1/GHXD'3*32`9k*b=VYQ*i%IA
-W1`8KOL4@M1+`;?Enf.(hPI21lZ!O;8<Wl"ZOpGSce0GCmm64^=sh=gXdFN=:'r`$qo$<8bqK3Kj
->JS7@U@0dR991oC1?k*3f+Tu14KRZa65*Er9I@R(P+7CrFM*W+-%8'k9U9nD7&ZdKLaR9L&P^@t44?
-^LgGRI12/IaFL&;HRc"X>R64d"#(KWraQ6&\j@kCVh5)`h.VNPW.OXE>M9*Jt/+q7fn$"doY:.p\i
-Y5u9bSM6?;6T@R=Tq!=%5`,h6e3&ANdL_-eJdF`%,.h7"$pr<4#9fX!g0Q@d8an9F.I\Ok)i@OF;
-/q*W?j8#.mn"_-hLl3q&up4,E>(8(_(8a/;ag,K?I+cHu/huLOnb-jfUU+T"_``QTC`/u6!7P1P4,
-U2#IQUR%tX:Zj!h*;&D?)4VNfOPF:a$I-mlre2(hP$V3-cHe3?NE(5-3(Rplq(#U(TJ6V+U"TiJY
-?Z3EJ1TSacLosP7UL*m+3`tEp`>7!P."s&u%&(lbK>;LZ7Bin_:G+u3.1W`*4Gd7?ngP@k,;..qPa
-:l#C6j"`?.X>/)T%:nNF<e@UJ,G/;8tSP8Fd=C?k=$GZlFk*U'bUJ0c-PU*/:\l%Rr8.Q01V>2.n6r
-jg:#)PY,9uFPcVW!)e.$@SbML6W?;NWYD*,C!$de-\UCX$R&&(^'M88QK/mOZndM<8p_:JKTVV!?q)
-tuS._lZE)t""p'VO?:,Q<$VFEJ<k9SQbFN9doLWPMetT7"lBN4;14g13$jk/^4L2jW515ofA@TgU
-@nV&fIGDc>^0^W<AWF.a3+@7a&0RF"DQ5tIb^-B4/!SHrt')810%:LLnKqNYp!`1QQ'\"95d-;1
-!Po#&4>+s,*hm;.3fo3C3BDV-0fVNWYJo9#s\MlJ-3Nd&puBf0E@Gi79UYS:+G&NHI3AdA"(8cW
-V7A(=KH=#9^5^Je14tg11W-%5nL#!7j)iD4Q0>*bsRoj)jVhZ@,=G@LQnbW<Vk;=^sF&N9i.?ISpU
-6;k:KbRg\(Q7BJ2)V$g*SV-HTU0ACrMqCWG;BUO>n2N_%;<jSmA7?!<2^(-0JFK`BH`C'&-rJC)o
-Ub/WKnr;W,b=n*11;2;NOV^=%gL3/h"\!HGRerB_4LiU*X8ljtG?(tZ-ib'28g1:@"t`-gbEf%Di
-6+=(K,@l!,C!?ZB5q6s-3:;(%@1>es"s8*5b`B.qQ4!NYnb'fHUfFpfZ=1PXEqfeOA5l1bOK7dc4$D
-tO"Y.i8fY*$VDsEFZMep)6"rMUu@OTLd86Q7-;47THH+F:d5tNOoI!:g/m.;/8'd4DTU4mMXCS6
-3d_;UTJ>eVA;J'EA,32,:0o+W6dD9V3*KG41-`OfbYP0^_W5A1L+,#JX&$UKFcNFB76aN0S__FPAp
-TND1EbfbS\6U?F#a/X-6orZrfq^oA_@N%:3QpIi+Zn4hPX?DN\m&2YHmS"7\"Zru!*+#_?S>d.(OJg
-i/<KGMIMGK%ao<"u";3I@^G<n94jTMq%aLf+G-@c1KpD+qo^EK1h"gf#q"mOT:3hd"onmroV>9
-=#TVcZ_0FJL.mFrE.mfO=b?fcatIf*MDPXi12dT&Ric_T/rGE2^LljBQp6%gBf_7tS7;gJToU:I
-X5QV!%!9(?90!A"4f+*4=\_ZSBo@/?LR6D>rI$jU:CcT^AeX>JB;T3*i"#7>?63n_ADYnU<A43*9;V
-hMYq;&#<;S(V<(_$$%4YW2V&OQ^a/O_T<RA+_2n0'i#,$?bI:mCJ?lesfF6IhrXRHlGMrN>4/
-hfu+jI!$:*p\Z5'#7._U&YIfaacAMB?()+HC?R-3h^UU^,kM^S)6G4/S@c""F<Upele)FT\
-"<!D"qu1WP&3";'PC'nTg+lRS>q;m\=^hO8\1Z6&9ifiS4qa-l;TbFi&<b^SQ5Ntn_5Om0"<5K!
-YP6\g`XH@\$aCA5SN_$lgq&jS.YXVV:2##8:S8X0+/YQU,qgCF?8-B._#51,:pH@b_$H*!!nDZ6J<
-mYS`'B71ZI5491ZMTL0aree=8`+RB<LYr\7DO?\)2.H0!;`6FQqD5.RY3\P%l;Rm_63>S`41e$/4;
-C+8F2Ej-6E3I?4%coRQ%ncO!pD@kR>h>X"G$hc".0>s&-r9S%Nd\(#'7F(Zq\GaTZ#nN_jUJAY_L#i
-=tlZ,TLkr`d"jOeP;+Q)TDHd96l;@bIt>fdKA#-NpfbG+42mAY7D(Z9S)M5)jp-8o6Bl7&S-H1H(?
-oPW>I3S.0sm1'#2G5's.,_kfQW,!tST\tD4#aBjQs:*P&i0naJabW3VS=Z)jf6f@M1/FDIX@-PU"
-'bX96%mCqu?h<PQ4/Vn62uFZ:)d16Ac,ioRXa=ig3Y`98?GCf#i6Ta+a=,ksY-(^'k,,b#'X,SY_
-pUlNRH>/<%V_jV**r.7EMF2<*)Q6OPW^gdZG!jO1Z0LEIl$T3N4,_AmCJeY3d:q/u?ha+oE\X9`or1
-B2c(l.U7144XHCE;M6C_SMm-p0M2Ea-@s@912%spBL4o,1X#&A/i7^^57rj4NTAP`khUGCpgna
-_\;=3Y>EQ*/c;I_rT2efEg6;`f>_5(%(Y(X'Mbb70.ccRL'L@?Vn-o$CJ4K8rk+a?@1-ock3#Q
-1)_":^LjJ#5qh912,5tUbo>g^`'RA<NO(*^f#;5"6iI>@^KXA_oe"<4#&$-J4/aMCUUEU1U)T0<*jX
-%@0O3ui#O>;P7?C,crPc9.\f;Z"Y/T=6RKiE$pKoj1*\-FS"p398H^4H5"YOj!(@S.Ls?uZ`7V\
-U.IB'E<e/#jJ,rHL(d3BQ#J45u0'kp:=_WMW<Zd:?W75W#K`b""cjR?HK1XS;CbCLQ,lo5GJUfn65S
--Z&Rn:O&cj;3n.ZI)K#0\p/R<7E634h<l`1GDs4\5R6.o$95a3%;t`VD+!QlsCj3JFK52r+G1,6VD
-FjM95b;:Qh67<Jk0$51UPO)o,csF,sOg:W?Xn"HWMlOgtfr`-O.@QV)83MSR,mt_4YAF8uP`O0/Dpp
-8#<##pAYZ@&40pSsK6n:2PN=2bM\Z@!PQ2Pn7/t5L^,(mRHTSNtO1m057>!shL(\3gLG;Lm\/J
-rfs7fF.ak)F44&;u,EQ*C*=MO&aTdcnY=o`<MqaZUQdXAmKQ$e(7p%3dc4`gBr\K+lCZo>1929)VJ
-_eQl/E1t)J@`o8J,9i0Bb?'FWEL30JNFH$KEeZH4T12CK'Msi8SkKF2Ye($Vs-!SQ/E6RgJ)_'/)7
-"o?^K'd8)Y%<k-o%PInLm7L^UlNgCUURD<&Y1AQCU^&,f,\`?<8BtfE!5K*-#!BDZc@\S.Im4?jn@f
-!!?B$JP-,I3LSMW1YJK3<TQM6NC"7`O\tLTR6e"uq4SEWe@dl98l>VR^eQB,/Z(sYT*7ta/UgOtOO+
-j^<q;$Vd&u")K$<nK%$=Xa*obO4p57KZC7+8U7&`2+PmFf=_)'pmBX_Ip8ai<oESC"E75W\i8<u8
-*P6i*(_1"><r\3D\LMu?1d5QF(G:ua(\9Qt$`J56'Fh_1:W.Q.Ab-"_gcZCEe9o(kKe+'"`
-ZD5bk,ak<ebgu-*R?#3o,)<k77GSIfmBN+:s/UhZN3^";"iI'!Wrc)Cbfk?--+&Cs5$p<$:6_c
-K-<4i0>&cg"<;$G^I0C_bXW0B?tTYI:'IRf".QBDe*qt9;M6ds8)U3O*UJtE"d5EsN/cM`T_%!N
-%Bm)Y@s;i6=X:da\:nj3H-Pc5THfN*4L4LKOR\:Q2fb?qNEfDhoPoO)o#aNS;+7"-?pB#H1TWbG8W
-"C?If'a4pr2s(#`j1_i;j#ID$#S%UiiX"uU$E4XISleCK5leq%.\@BVCF<h8!5@&i>GSaG@Cr7\dA;
-i2pOJrBElb%1R*a!^&VWt/)o3dil3QZr\%U"3b'Kfj":<EXtX1*.U9d+@r;b8ju%rQ2.KB9@m)A
-Q2DsL^/E7d5@9,EjrYXPL.cYFP+r1<&MGh84(JOLA$/#V%S,S<5DVchj#.;V-9+HN6fRf4jKNP_P!
-HR9&%RC8OUaoj4u?d1Lhb(A/7*jAT-$5.0uL_`S<!eW%&p?00@.jn<#EUE8OB@:h,uYARY74_of
-@T(%&KQ'6daGo2UJn;`5Ae&BaAmo:@@cksRB(g''2IttlCZd$W;W^9$rb;bBCh@R/B'*Uc5&b-m@HQ
-upB5V6iAnVVp>Jct>BE!6hrb^h9Ep'lNB&7gs7VucBBBG3;idP%iM!0Z/FiE"!A_Bu=Nf1coNK^5uk
-jA0/jl^<sJr3Tl=Pf8(Bok42e(%B4d0;p46ofP3C2YkpDU.Nh#>,KBYjfBr6k-%Xj:JMSbsGl)pH
-=#+Ol.V._K?B)%+hOG<5WTk74M:SEcgeR,EPj+L9C6"qN#-hmFVeTOUl!@KKPN"oS-!&T6But52N
-*=ER-U/$%r7SKcFO6EPHB7l`P$h_?Pf^gNGXC;0.QA15CXR#;GCc9)p^<#Wf4);:7lgDQ):;:V1
-q!?#FCaMGM+JP>pC5;f0Co4aZI_Y4"_JMK8m.SusI`^qGfiS+NM>k!IB$K\>enk?8D2-X.b4a5hX!
-GQCj+1reOb&l3B;<#JO(&-D9duW:$gDPlafd7ngm;D?`D'i-JG`2!KrpJq8mlp>:@E+%oBu^$
-HDX4p@mGoP^W#DnbYEFoL?LU9$Dm'.ZrrI#GrGI'eDJ$<n!-c_#kWo@Nm3`0YIgIIr$1Nu_E5)d
-"cO01!$ukA2LY.NL-O+LM%<1bLEA&#FpD%4%W;jh(l&^mG8>1j'_/(9nZNl$G7q`(l!5SEPEW9i
-obedhRWB<po)+T*2+/!q9hME<dkJ0.:k5.<;U?o"QYpa")2V/ooi!njb$G?S:p$134NnEq_?\7l0`;
--h;13o1q>eIlVRO3c5*%`W3T/cGG4`g'UE=89"Mk(I1qdN:rF>$%(5=KZQ7W_EqoNsqga%(6D89D
-%*oY4"?`VO\C96AKUFRN%Jf1Yc!;0;h9oaauCbDB"26&pJJiOFU7Lk9c3Z#uCFg#%mVd4G?1lNMF
-oPT&fGp=-2$?p-2r.7pgFHATha=FqC&7,7X?*AG33=G.2+-^MS+kBKoj*G*lc_cZ+-KEd$>UG4.
-c6I1gm=:CjkpO@F3O*PrAH?ZQ>GIW-Y?5r!=E!`FiGQ32<%tP")I1XsnpLt?:+,+rHJbU:jF;i-B8
-Ll*Hh_bFE'GXm=NQas(p:>$3p$FmuN;9OU;)OM%9%^-R9,q2TVZGP@?t=J0pmP5+Nnq%o.g5EgBE
-S,"G'GkO!@HY!kP7Z(q3Rk&:R$-+TD@Z?#`#>R(mPD84cS:nq1kPupSE^2S;OeQH/G*<&"e/,T_=
-EllX,VXGD(kKY),E>#`u-J+HVNfSI**NN$t5(=1)G>X9e:+#q3!75IPpSS;pYSqtQe25_o4h/c/AXH
-PsiJ=Lt2SI$CH$8@?b&EO2t`X6Y)$*VO0f?/I`d>I\?HZ.1+\;U73R<pXOok*?DDlaAWrXKLVOFI
-.0pG+_m\!'j&,1LXH^jc,qZ%iF&Li6dfa?&0Dn&0L+b-fkgDT)H.Hr\*RCT@OtuX7pSZID=lmce
-SMtgAT@O%OhON98NI.E%3RV&9.a1FS(9dW5a?NV?1uYiJEWk-3s^uhY2R_i(upk)@#e_BI9N/.'VV
-CEX38sO+IkB"+oLJsA71Y*ch!VX5)2>h2b2l<2;YFTRRBYfdl,+ED17LsMF'6*J:?RDM@So\lc-I
-;g8##Q%r"8B)WC!VI$8a*7,d'ODFo!\EiCiH@eA<t37h!0eD_4@H4^:5DapE8H\HY7A%ku^:oKqR0
-cG8Y0WodbH(N"qNX%PkbsN#*PZ(G7R1,)hG^I$Xl;^`HKL$aa1r,)?Qlmgn$;G,r>4l^>GK22GYLp
-<S(q=o4.@3;!u<cJ,@!lRo&.Mp00gNHJ-/Nok^kk/E!KURf^3m0SK=+bTB#&eDYr92Si^ZI8?/0hho
-BXAEOjMRjC(TZ;BZPU,*8NJ&VO!u\spso&Ds0PBu%JmAc8+UF>+_bHiVP_V7e+Sn6W67@N4\&_3)
-V4Hc=We1f9NKl:mu/7C_=0gE#V\n=%32.E>9M!B;:?kPr1`cc,%Z(S7@r)iA=:d@E8EM4E?of">t
-a$pC<V2H(>eW#Fc;/8CAuq0YU9r,/M-NoIS*XNRE"6Jd&(Q>.MVOMuXU!a\$1G"Y$MQ'9ieODZC=s!
-(%`!;ApBB6XE8!!=,,!")(PtHca!IEn$as>(#dI4+ebW.F0eQ)>BiJ,b!5kN8!WYJf+TVVZU^l
-'&-5o8!2(J^&s=f^<E&TJ_,SYbW;>MeEY=u<:$poc%M*?;#Zd50.lNh5k-:FjS`VYeF-`ZqbZc(KBl
-%nQZ_%7e.kBnA'@tXM$^JH6;YWUN-'IA8.7>/B$JIC4Q/\''+7gjTa41#b'9DqeNa1uH<h;c2,T%8
-1&%U9K5FW$T=s=.oR^='85r%;kd@oAi%Bu58CNt!C9PH2%W5SFAN!.dPQY,92c?%N*R70@ri:".TN
-($@+LReKk+1l9.7D0^d:/KTnsaqLd\M-Z*Bc(0HuI%d29FQ\6EaY1O?2gVW=hrC;aM\?E(FSjC&Hd(
-9NtdO;c--/&8Ea&NE\AML8Y'?I-uCCas"/^+crW>J8H`*kK<EMg'ZVBC.rj/6tq_q0IGP`H%8,)1
-\Yg6"Lr4?sT)<LFk4A3oCKRG^"A1u'rN'ouAbjgCG\.WF,D`$15,h%TtF3G^S/3eV<AKT'qbSeQo
-Wiio:+mKr<#?9'J0ieBCp<i8SFi`39K\T'8Pn!BN=@6``U<>=Pd-Ec!1=4">)r:RMiq4;*aY7"5nu5
-Jmg,8Je4(^d\sPg_R8MdjE,g'7PG7?0moDX?)_,TPg.:C4hD(.++I&jgOpL=#W?"OOgi6%hQ.TZS
-VaR"?3lX?ORIP7f'9cA8_b6U^-sk>LWEH*E:m\bE0shTN'/aS"4?-Ye5gan,@NS;7C"<Q!l`/W#T(
-kY(_.7H#I9J8tc`J:-&?JEYM&XG.?LVEOKK39&;NUjD'cCNic2J3Q.S\GmLr7VPOBSTTH(,U:?DLe
-P%b^p((sZR.@JEos6*?*t)*!J(6u+!=$Y/lFb%8"#pC^<NV@3:hMf'iL'Bi2@Sn6gb9LA(3+\%%Q
-B$-EJJN,+,E1X(IXoo$mKX%K#!Tf_hb^WPC=h'(n);ZW4cD&3slSIj\3C_Mo.UJ4:E6^>e4lO"tT_
-&qNY'KEAtoDL+.&7Ys="J_<GTYntYr?o\Ip3"dlkr"Tnpun4.I*sH)aOf"g?ZY^LZ;I;"\M2I,h$K
-X/"i&1tk<9`oZj8q8717`k.q#H_VU/4A!YBqtJAjZ6$;b1H;*M?'^--rfp9)o!l\DU2eXOC!Be`%
-RMRb%:S=-!g%(0Wjp'=&N6i<6&df,WCrojl@gY^58TICnM2j'+AgdM$QX@^(8AlRJe12cVu;$95q"(
-5WK8j7<J?X!C:-!ts'4lB%p2!"EZh73k;<I1NIQ;9:%Qe4PasEbF3RS_aFj`Mj+<7G'p`tSNY-
-ld9f?3WR$:9Pa!<=eV:U)ogX$#^Q(66C40sC#k&Fg7Ni)X="%)5n%/>*!N@R$pifRtC@;h3aO0
-!mkWrU=<IDMbP9A?+lg>`ja_LpLu.SjGekLf_ar?XPj`'$C^+f"9aHm3V'c\$X&Pd;'m.V3)FW7`g
-/f.jA,UQMnH83Z`lr01cbTf;7E<*RsnE4fJ"LA_OTS2"#N;+JhOQlbAg`SpqLqn%obXf))114)
-p#^5+(lo=i\3\*U$a62T\:nj?qRtN:2EY)a`aCAgq1jRg0Qlt@VSp+?oP,)>$PK..T74g/4THm1KAk
-.F\7RUdHY/AZ`>CNtHmBDdZX8JhU2hU=<ZX8E\XNY`t:^Qs+\mS>RFHUhbQ#)7r-#q<^80uVYd7t
-?+<"p"uL!sZpsir$?:0saKOc)$"6-bBi3n880HgR\kBB@3;$T.^Y19P_<\DZm'qst64<CDFQQQ)
-Nl*BsUd_3ESq4XUT4$LH3Q/7I01Bi<f897W/N8VZ!!fq#<)M76eRWnd;m:k+Us*Q3Xuf5tEB(Ii
-5ZO3a&:cfuHtTgRSjE"@#"@g@B=NDjO"Em$u:qe-no(eP(,jDR#:c@mZWBj6P_!aW$YjnmJ7jE7o%
-<^)ZgpkqdUDP9\RAq&ki&M&dY39.@Z#q\+jl>;j15&;*OrMk#?YF`XC7(9s4+<)p/-A\_RYsk0)G
-ar"Oa5;c!)D6,U8?l3LrBme=I\f_Mo:a?G!)uag$q8WSM8h5M#EhOmZ-K;IeGaWL>K"iT1Bt6m5
-#tjK3S7J>22n(3#c$4J'9uYd+aIJ;fQ?.u!UK&_(SpF7(:QTGq?#``H@2j1-olA)R`UDX(Z)&n`K
-i:g4R?:#F6P*p>^9*dHU%@A/.TK>iL4LsD=lFk@mnD+6@#-qJ@:sq8oFsV`J2%qgM6?t\`.pfOc=
-+2a8Dj?-=e6?l^BK0mQSIWpHN/n\`:#(rS9\5c<e\M:l5QSh$\^5h*'OLCNu5VM#K`B4YFkq/9eK
-:#pN6$a3jq<40$:*_\W9+`=$sE!>nF(NFDpnIDlLrN!d-kuo`)-$!4OiW6o*CMZNE50o;TM.-ef\W
-69j$I"(gB:bq/:BR&"MLO2WlRF^I=k:YP*YXQe'hkUeJCTON.aKE)O="sq?)E-VJ&V#fa'mDP#KcJ
-8^Z*;Y;`i.9b`N&6a^?b1/lqHd%8hak<`)#Yf2NX#Y0A8tUhZj3Nq2Zfk#sLPLZkTKU#u-_oj&,me
-.I4I$t+Yg!=0)`"qeYH'VQ3L@'g/h0GL33;,A&<YN#L6enuZF%<!Bnc)r:FhK,BlM=<PDb/E?a.+R
-8<$t.eYai*h66KBF,)rn(CgcY'p-I&;b"pPd457FEt-"56@q$.UmgNj;>Vh(ba,(:ZE)IRc5J*(
-.8lR&<\9>T@m!*Up*:n$*6paQtRl$dQoNK_A29iu/JprM;^_n=aBoHS8+C+TSiA5F2aOqt*Y'97k
-bWpnst,SNH&"kTgJD(5OCCjp#'L;@"5IB4',QDq6A(EYpgrM%%CR0NY4+QeP94KImPX<?L=Y<
-3+e7/2:Q)Sq^Wd+V36QPl`,?Z0Q>B3b`3R+osI*-)i=Ci48:*"\#"fo;HRCNUZ;;$TEL-Gh/EOX*Vo
-.4.p@+`+eP#D=/gW>a*d$SK+3:Un4naSZXa:/QsEEZ5mLdW@)ne%Q/'#$\qbpY<3!HAmD5\O7Bnd%
-Nb&O<-,Td1(TjpEO!'1"&jAks:?dk!5E.<6^P(tGYNt>/,>#hq%Tr@$5nmin$:bSWj7_AO!>3b>.
-1E5YZ"gP=-6Q3O/<\Y>15.('eL6!W9oTk$0S4P&WXW@Y$tjsY&W\U9di=PU/)`J8;J.GU1cbW$!!2O
-<&u5L=XXC<$ZWX+0>>8umjk9#2`#Xn6LYLe'mp*-0XOYhWd\!>iQu/`7`aJDpehkQt&i#uV67!E
-p1.m4e*17PN@HZV<5RKPr+E&V25Al,p)"0K)(Wt/%h&EX=n)"^0c4fE%\,hNE#d3VunInrD1O1e$
-JG,.6+B*Y!PI,i2&LI,(Q`/+*WjjS1*Yg#+Op@.FhE"ZFk#.$Q;?Ju1-Km52'g)CC\0&:bhnM)`
-tB3>7Y;P,S7S\Jp=G3X"X^Z_n5;d#0_C0,-P3oQ_j+l6%l2)MUhZJ?*(rt$sX"<_^g!&-V!I7CIb6
-M%B>ZWuP6V^R%ADp,qd6=&%=\h(5jXU:+I!53JdXAM'r7"/Ud/l"#tC+U0N"8gEG3u3=S7p1npB
-dPq78+QnXd`,BYtrU<jk<g?,H$_Xl15XRtP".HB#si;_1`e4s$W\q0;M(\f'WaIJ2,g3^.E&)G'n
-270JiZnb<cs1"eVdQ5jOsf3UJP%<HKoNI8.SS54pF-F^n>B1L!jD;o@3j'sh'9G8KMD"b71Y^bB`#
-k8k@J=qtaTF%9,gIo@(H>LfoU_O39=mMOFL(9V6Z@/:S2#SB@+<IoKE'sJY-``Q6o>BN)7_Q-QK2N7
-d7<t?DnB1O_A6X,g;@hj/9Fus2Bhd\>pSoPSaG:<Keme;T2IOP6:%qkI8RuI*.+N&aiAi8cj^X)S*
-Xse6!J!>B4oBWBOpHFeq%M#KkU#FBZ0:P2P"QUc5QC2C6h:.Q>JRhEt+BlAl_&u(,%uI5@\k(Ap.
-#0mj$.$UM8C3IX6(,Mb'K:1a:)5EkODt6#2eAHT'&`@pPV?;\/GB6MI1,")%FV`MGCJQ*`;-
-K;E-eB3EV@"b2^r??1NN4?Etf^:G<'a\BQR-o+ehV5Y((HN2f^#FUG"2a;Go2g*_.Fr+_2o`2
-C(QYH.X#f!nC`"%D0;1u)V8bL0jAnS/T`piG;i$9@Ms0PIrX(MG8H6bQ`kY#2gZ@AGkJE=*8Vo'*a
-Xf#/V7%f26WW"*/HcI<X.\!\&P!hfMrO!r(f*QQppR"*4!9=uT$!(X6s/5BsZ"Ib5$WGR-fmWU!-
-Pu6%Q>(fWdsMt)+e^k.;bA7$'7b<<Jf!%677@Don,45Is<u+p\B1NEI\k%KXuo\)i*A@>&kOK6T\
-1\/g=5iI2UJ%)%Il/+;i,@YmJK&WFl&l37eNuf.)IMe9*u),LObt!RM-)QkfVOFlZ&/#0I9<8"n
-C1oab\T_D7I'4fV+4)kDYe-MqH@62PlC8Vi/(4NYS<OR)+JoIuLni);)KVfA(eiJErPO1<Gm=UU7U
-gQ-T?NmVA\\K?FOacVsOVnCc=UgPhq2fkLO-qeffWU4nF^d+5Lgfa-fITm%FbZ8PQ$HApR9u64A!O
-T;Nkl#WfcQ@P:HY%RQC2<NR=CRVK9rK)4IL,S),(rWSWt(DR!G*ffnGjg7?nN;.QML8=:a!Tpo2kS
-!dEJH'=Bb`AA"-?=EgTH'+Lnad!aqSQXYXRG"/,h4>MISltBN3U`Q-nX-kNSCbV:=o4Z`o:T7RTR$4
-'g'aRaWLW#^*Vof)3YA$R,G=lZU)GDNqA#X>';=+.U=q,mg*rg9/Y`njL_M_2NJ4-1c_%dMV-7%DqH
-9Zk?)ANQVHRc43cCmaEMhG\id+P$>(<G2K;R@VW#CGig2EmND5Z*EWLAmI\r3R,M5`MYWS4DQ3j#CX
-Z_;>K\%jG7JE=h6m$`oXI@&.g;g;kbH27XjJ3o@'.iN:hoY+"OVg?#LVl`WA<Y?Lh,RfBR<"0^
-G_YT!hOgC(8*$*d\FY$&`"96mfNa0I9SZ<JibRkM'o1U>amZPtj0gH2b3OE!T!P0IRne,#'muKF
-@9gsgJPBU>IGJ`TdOU4)_QsEOOVB?b3qHqg#YtK=>'?\-;RCerQmoNYT0i\JiN!>FE$KSkHo\bi5
-74/of<X1K=S\=82^>(u4=XDI4=Z8!)pQ#FQ+L8P0"cYqq8h7=QgXF&@/gX!VRdRRN^<qAW>Q
-;ImA%ioH6jq#H`b*<jhA@u^cWLNgOm8/ahbUj_>GdHk4$*&7j0_jiI!*%f%?6c,<G_E:-&HqhQb
-?,PG4_n9-kHfM`.7E%Ab``r2HgW@IJBuaIka..4kQ_E?D8uJMa?5$pgjdEcMoe)BGsSd>bB-.UWI
-narID!S;4sJ;&F\ibFH2fgptS^-d2G.bacl#gs=4MLprnE\"gqm*8f$j3ComcCF4Gh!`Q/o?QC:b
-W@E$h"B#7"41<Yd%(Qkh%.fdq8c`6`s!5=ih=U,LT>JdK?,fXC'<P&^t#Ee"&SLh$qb8@!.*dD,e
-2dM>N;G)@5dd)2-47L<A(Fpud%*P/g:h^c1Y#cTeNI'X2@,WC"Q^HfUZU)fgjH'Fk<1NbrpKt?%
-LE%MqVI7g7<$-h&!J(ZdcZafq#b!I@\SO-;*K6$<IC-gX4Y:X5.(5h49V&sH8FU*'?IhOM@9*;p.E
-"hVIsh4=H#h1a\5>K\&IeA=Z2^(8D8n'_IfR@rO7'>F>!-4sNk9GkSc@^k1XgdT`na/>?'X@i6Hh
-V-tL>8FOFN2#iM\#in`_V?=2h8$fd:Zi+pBo*_#5th;k%N,D0;3BPd1\cm(ou(c>a1ShK4iPNc?6k
-$o(e\D:LF6Z8PkBojR30WY3!_QEq-9G`%*gc47Q0Go-j5(*sSu:k&X0\,qkl/9WhS\b&QgB&tI""<
-F51/g?e5tP^4+nr^>n(PO<hNWEsN3*cpdS5sb*LgeO.'hZNEj@IS`<n@nA\rh-J0C/W_o:;`KI`
-pm2/b8m\o0%P^+#if+;q@R*hB,,Rs$uZ%%GLcQZl`0<>ncW*Dtap/gE,\IhduL&7J+?.?lqe>i9(`
-O3^$npYT9Cs+B1CLW\M6q-U2Vhg*^Y>O!;;qAr$#?VE0RWVYMmcX3*1It-=)AXj(qB(Xi5KWmHYK_
-PGf0;_&?+nbe_qj4hrZV@BJO&.T=>V'2$&(_)OH9T.hWo7$@W<fkH(N"qNX%;DbRQ'FMaX8s#TT.-.
-@!NeP1ark@540BV"".qhJkQ,8RtSA/F%dPThss;=u?M0,Dsq0&ZFc:5t`pkAr\l?EmY89rbL64amu
-7V:@+4>;`#"BnBHbZ$=K=T`VNXHgE*hXO^:f<&#!A<OKO_-lc"=8i,bDPp!7PoNNI"*r"!nsLI-)M
-*^MAi#k1o\U6DVVEo8.EEsQ.9X<<SN824)qp6j/7.n<C`^?8-^1P$Q/;5=c&M=QalQ\!oZM^K
-5GlKi6-(N>D^OUnbZVKoadOLdWB%I\lM:l.'s(p"H"\gY)CiZ<"S6QNkOqS/FoA(p?7E"iHEU.r
-fJni*MBpAVn/Dh970H;GG^93so"@"Or)$`O2CC^,$Y`pRL3D_0N"0O:.0#0NPoNms&%eN7(`iYb,'
-Xr$\>4b8rnllu":p_#\aKdVN*Q8M91?h"tr/W6s0%<ZBb-/1U(/$Ei4FskoXceMP8(JG_(rqh-qMd
-MQLLDVn_Z9#'7Ah$:33f(4AN6,mlaIQjSqBi1\Co::inQ&3umE$X5ml4W?*!YgL,9elRt'1cfDgh
-Rg?EB$N$Pm'TQe9*WA<)f,_:K>q&ARAM>2/Qu.<gAqc>ZUM(#WdrfjaCIep(`3h=;EcL@i<9hNBBiJ
-Pa`-(oX-='5"cV)Dc=%A6SHZ)%D-R`pD(@mOFtX*_:SBXNGLP^HrhU&OOC_OprYF.;=b7Z(MrSj
-*i#<i?7c1i16K;.!9ct*_?5Y\r7le"n=6G#)G=cdRPA0'*NR(ZH`j7`6GHF<F\?*J'^5?5J@Sq
-1?1A_<j'2;PGnhf.A=m'h<%XgEjBA7n)&s7h7!kB:q?4EiETSBA1i>RYPX($=V;.dCbji="'+TY
-j0XeVkUMR0.(dVkkr`cDIg6SYJDNgCHVs@M_kGmie9/$/g^\lHm7\;AIG:/;%0:=8Fg6,7gTN!IEZ
-:>+MJmgL1<&:$+$S74!tlQ/XRU.dQU'm"?iE";6=YTSX4!1?Wu&^4n#uUs"eaY%t/-J>u++Ti4VGl
-+=lK>l8eEff^mfIUASdq>Q9!d@is:%EJ1^s'aYZGKsL_Hj9,SnU(#V@>7KhYkah*XClcaIX3'lpu
-Oh'r.5aZ'rcBMK0%(;e/b!>C,)"@,Kb3T*"$3K=f-#sf9uh\b3u:hB2,BJB7Tlf3TcWV4//*9RhNP
-CBZcDSPr8=3LJt&<$55pC8<L$65eU`(21e5SlZoEh;iZ=B4(a=W@&-@AI"@TK6(df/?+(rre&Ab
->T"H.SO^\ee-c$SUA7(6k:d(V?^AT3RTS8K7UDScH:*W==!<=eV%rp_pa>@umEgJU)!;oLQK9''U
-"-BOqNS,mu)O,s=!m)osFt&OI)0h/PsA>GQMnle`/M'3:.F1d2=Shhuj*?'eLCk%1O)B&o_L`R7E
-BI&g\%C*Q3V3p*A!,r?;figog;R2.#%1+^Nj30j@uQS%BM(6_.4+>XPiu4rNj7I\ARkH^;=Zh>q!u
-qpgiAlp(-G,)UdCf3!!&1rB95Q2@@4A,KZE(`bh$G0!6"Vo6TASW`rdc&KJQrq8:/F7X@$Xj#`%p1K
-#>*Q5Nkd,LPG0/bBqV--Wu_;lkPS"pC<HSoAn'o4`E:)`=9Ljfo,H-.K#;P+eZFbG%3d!>XKaU8B
-IV'b&L\rYU^VdX4p6sNHV_`D%=uH<"A?N1&qXqSRZ!aaMJ;?#-c\t`8Zrkk$ga3S0`edAjN"#3
-J:oF-.01h7jbQ1J">o6L51-!=EI/WNA'&_p!2NRPIQ-0ZK`,1kE>!.9-XRKQ;5SVF4OI&n4rKM4olT
-feNsZ">GLiOf#7dVQbq.)_SJ*K$bqMo4OT:D5?dB-8,Zo>M>K.V=(Q2"2Jt`B#SsV'2!jKP0snn#XX
-;\$JUlDp?SgOP+K-0\gLQslN_ia8)$'WH$!=0qR.r*gCK$%2p4a`\4d%`S5ipAaL\i5oA6qJp
-FT)gSlW/h_mK#Y2dTl6dBH$bO9\5/),(4VY4>O.eoKsiJZ\l6Uj01FC1;NB5Jd?ZO&5Dqpq6\5:N
-0W%ETC>TdBJdh"gS?\dSWHFAid7gV&KJ0+:_bmT7O*e^%9G!`1DRp9D(qf_'qrPa.ISSQY<,OF&0$
-+El$0,Lg75?2Iab?TA`HT'%@apkq,S)=R5QpUi/SA:'*hRn,E(@n9?K2>JZYb=PYC4<P'M4FB/qn
-PoA?uq%EI+T\bMMU4H:11&n!b'?a>HF7-K%6UNC+/d<\;9kq+$F27s=cQ>Am)u#Cp79\:/sG
-Kn8Z"?rG1>6D<,0*BX*%IGeXF6UCE7,j27BjBqU\m'4a!rNcEP"HAhrWL3O*`Sa4*0q@r.^(ZI^G@>
-O"Fe."r\L2P/IR)ddH!D7R)umb?LNLN%,o^U\P(k1lGEU<n9S!RBsR(LC`D`NZf2jX-o)rH'^D>Cn
-imebns#CpbVs1rpr#2l!nKlEV#Z56_NR5M<FYDq>CkAG1t*+XY\@@'<@>37.^PL=>>>(0((XG!<??
-32L4nU_Gdi.hBo.FGl\SjFg4O9AI5'P2\k6dV#G:VU=4"Lu2<au0Q1I1DcFP)Pjdc4GF.R0r\Yi*_
-rE$+DNe,UmoSdDm8l:RF8\P;=%=ZNcFKdf6X&Jl5aNCoM/N>V>E8_&q>a9N:p0HR\<V^R"XF.33
-FV/+D%!_t/?kY<3VXn==46F)g&$r.gU/IQtu#NtLEb+.o3TF-ZP<n`'K@NV))*`HaLkIhkinf5j*q
-Ymhc4>2rlT"!/FY8QZ=GG=cJ^U9/!BC3CPT:oVja!:cY?BGnaQ,LEfWkBYtTE3?9c;TYI!p"2qI
-eK$"!&2<!T!h=4j1ms)%Dq7eTIr-sdprkI(ZIok5#)2nFmJ'3Iog-e0Ks1\+(^MEp9'CW*o=ms%^
-VhGZhV;Ap:sW/5/Q<MEF'>JNt1>^iTaqj7>L!'Yo)-5&$OU_nA&R,aiA:#m9KD9CaMnlb"J5Q_5,
-KH$^Snh,:U^m"CVZl_MK)SYPY^`4OaF88-Z+MQnY^tgDlln`C,sk9R5n#)(bT&cN.mg<Y6A-DrPTW
-8N/4"A#_V?cPVU(n%#s<m_ON?s'HBIs2aP<D(H^fee%Q+p'EhmOL`4dYCb@535f(N_X\.eEr'J=I(
-W9!4_t675C`()i847Pj_trQ7>X5@>8OTpU`&pYpKM9=5X_,36ki$>9MIpV77>p1_W4'P*)&c5:IU4
-C`4T/>6r$,a=%-@86prn#CfA;(:rPh+7KcSf+g+*mkW@O^R!BAsgH;KnGXMs,7Ylo@RRBWP5t7)R.n
-j_Jb\SVrDT<0)7^Ts6utiYE^oD36kjIX7!;&4Bh)ELa"1uE4F5&<ECrl8"=Kee8n.HGJF>pG,rf
-jEO0gGt:>Ma391VP^l:=I)Ap,aGbmEoS#f2D+I:)L9s+5jCH0@AjaX\aRG9=J;Zu\'hHE.7p;jJ*1"
-Y;HV$38`nHp(UmT986cld8DJF0$SgDPR+@>akWN1;!FIFEMsS>8A'&e'UqWuVoRSl8aN<Ge<S.GK
-upEoade40r0YOSDQAG58rT,VdA<79'JGC(b4O.Cokg1l'GL(!iRO#S7!Q\UhoW"Xm4NjH^?VXN>R
-SO0l_Y/A`%LXig_ubW./s'V%b%Z-7I$a\8AM*2(E,W(Nl+9LR)u"O5&9M9Ig"9SqHHd4Q8%baMZi5)
-Cj.)95<'1!8`V0";IGTLf8q=d3?GL$2eGm(*7_dS-1UbDa_@4Q/uu0$Z#p9SDBM9Z0R@WD6^>:/Uj_
-FQ6,,ap1&49Lu"`9%V@Q`#I+4Te*T-i@rGsOV5G!pD3.h!3pJV.&K,TZH\2An2A/J#/)P#Q8?ke
-0"'WT<JY3j6kZ\4j"9F;q!K=\tidE38rW%Pn"=1U1$@@<?aNl9Qcn9%Z<^8Er=52uKlC)>,mL)7'
-S/L`c+$@PlF8IFhPL!-d'C36cn'du4#Ukc#c-l$9^eO7/^$10P`41V9\;_K/5<'.`%^/QoK_c.4T`
-$;IF8iE$\AP(RglP(=VN$&4044)hO>-\N8CF#TV#YF.9!T!`^^"`@KBYM&7fldZ#Mbr;YN3/UuL"X
-m;Bq14jq5-S@#5%-.<:C\Qel'%RSUi^NN;NchU>1?%lHr.+J.!N0\!?YeD2t-)RNBnA^'6(PMb:
-g:*eKOI1p/<8iGRX,!'=F+uK2c)iPtJ85AAB.\`-:"%ZK%91l7\d!+dL35>>>nmAKOk"_gd+NQlXSp
-OH(*YO$&$i_tI/VPOOk,A3dnM=BW@lNQ+W,&gf,mkST*1HLR9Yed,MQqSTED!OdEoXY&ruk2'WVgE
-3CCp(en#P)NW<KBp<1Lf7dF/<0=5P%@abEWpI!jpk`*URb2b+X.;)JJrc@c?r^YTKr?F%Lac0.A-HX
-F"Y"g9/OM6-Em1YdKP-R<D1l"O3l^NeVK%5opUk'S(DI6=N-P-G`%o_.p:DJL9^JSYpEBalEC>MWr
-eA4l%i,GpEY`dWqs"<F_0,RY0_l@eQnEkomYWfVO2L^fsP5oc'oQ(XaroOX!Liu,k?_XffX2>'Y^R
-W)X"<Y$2dD=D_j(AWm>kBUHt>-4\O"b,2@`)S\+R#RclMQYSmZ<?QpaIU:T2'<m@aBX"8F#q"9_0
-luhPiR?)g/MjotT5.A^.=mV7Do:m,*Dn.8*3M".2!!?&o&P.&MF;S>+>rNZLu"NO/#'=J?'!giX
-A`QlaW2bboU^ZB2YkgQ0f%7M.HkUdKOL#:pm1T+bHZ+#<s?.=a`a=Cp86\:ti1;8!t)eT4e0QX&)
-:>l^p/XouKr*2\>Q$fHmA<rZdo7megD*B5l.`FIdPK_+f?-K8iIP@D_q8@<L@*EQ.W%K#6DnDK_
-6-dPjO)?14n$b:rP^P,-YGqinpUI>7IW6M9X1\g`.md'X9YdAIu<!f"#%i?EX-$=mSR>!*k:gF)G
-9bZ9k<geCNg26E-`YOuEo%&d$cn5f,qQDCaaBY#_@`BDGSePF)$!a&T>cmj*Q5<t$b$daqiou/hCB_
--TOHQXB,8-$h_Tq%mqd>E)iq!Oc9L@'4^=!QRt6sbNSmknd,X)dj2O85*DrB0.@gc@a_MlC9Zc)_
-W*fpj7YuPk""GQ4CenuR"dBX-,rqbY@N)R>cB\,6ls+#N09>j/UBV*^;4OQ=UUjuAhFhAp1h:3
-+A<pS7-;5"?Krl+eA6*5Nen/NCAt"0SAe&P;7P&/+C1ZY1k!!Ql^.;kCZZZlB,1G+p1e$Ds%UJjj
-%*JU.@".=@Q7(P/A!0mKdGp:?FH^k-fa$.B$l#@qQ9iBBCj\$)b$D9B^8BHDZchKA#,G%Z@r@-8
-mW@VuD<O0CkalU&24eCYEbMn;kT3e7F1.eHF\R,-f`=P2k\-X=l<OAmUniJd?f9DrWBu9P4^74
-A47-EEpl->sdk+LtiTeID4l:.6W:87"HVeN$(S;*NuZM&#;Rd+LelCOm<Nim+TVeSd`=lSRZ(9m(1T
-B^m./Mf%`Sp=h3Q):T91",CC%?&W&t\f0_W2b)A"S<kamr+#^oM^;$m9^2)$.llO+32T0Da_!IB
-(YkH*k2TY6F_<^pCi7I5#/';ocg6D6CmNFap<-EQb&&pHlRp*AB#/>=_!J5SSNa:Zg;71(Kd$l_
-0S!dIo?U&+01LmKsAso,j^l/28>PDAM/JDW3B+%IQ^MmPa:s6Q^3Kk&)7*mN1b5#4&SOn07;_mT/MV
-hWo(ij)5^sDW;f+p@`EJi9p=#DRs"i?M;9;qJU9HD_iI'54.egLlCpmE:?S,!*&DJPFOoE*=g^EXj
-n/#Ol@3n:E>>`s2%:$sha"<R2!@Y7Do1%IeiWE46AIj1(R.WFhieh7>LG6i2,'(DM1nJ;hohjcL#
-B>eBnFmZ;2o4@)0-6!nR!Bkk83W*H<GN?C)"<_,)jR4_UP05%+0L@Rj3H1lIo&hUqpFUFk0(TT
-,o+s1R-St?92"NX`F%8+ZG;f&J0QKB9F/Lt&nPGP#0lSi`*5QK14U5kG:I')gg(IN9l6hFGJoO
-gR6G=D.R7eD77(B$'h"<N<6++a-J*ERs%dbB:A#E!ocI$'-WBs<:qnEog`&*='#!L=7qnQ',,Og
-UM"_a>g_G7ouCBf30#H?KO#p*X3j2duDE@eN+7os\K*G@gJLB_HpiG(WWbDef!dC3J3Cp?-8cm+,
-?9Dg*"7pE+>J2feX_C\K3!pHNhF6(YQ4Kt'WupQ8e4Jbf%AG5'U4pYU01ms)JGTfE8^QLB4D7+3Fs)
-:8-e;q2a,B8-,!Ie7Y2KP*np-<*L9,8)A2Z.*0p\'oM<7;>im#m1uhn+^RT/asa.%^6$ht^W
-Fq1"7qpR<ri(1jf"/H/nCEOO\TBVYUqA+Tj#s#+@U`7*fGmSPmue=&CmQ6.KrA,XBV,(!<r#:XqP
-UB?a/aO>0S0ieK3tn\0=#p`/3A$q`hOd=1<Nh\,2N%qkprN\%2CN)0Oqq&RZcbKA?^W@q%l<23n
-ete$S>6Sai)gOAi:W9&b3IH=rC9PM>ad2d2B.560K^_HU/USQLW>?b:T,h8b_HdK:dQ>R+QdUeThm3
-D%7g3Q\KMYkNO4f21gO69ZIF)/Lf@bT8g\q`=rYODi#NC1kgO9CgrZC"r0BdkjaEcTrVu-Qfe8hl
-=iNrib_g&*&,jjF11oIh1=`kNMokhF;i)SA)o.0D5VEaeFW.J!\1TO2ZL?nEm-jPAl%2RV_%noE8
-O,9?34>%QLI>R1k'Iqc3#ooX0DOU#+!6P6JeC'P6;8SdaMJQlr2N12PKW'/)5E^T=Z)_tbL;npGr
-qVD-cW^i#'E8)Y@s/X4YE3mTMH'b+1So;km<+Q)6ZO'/J\C=VU'.^<WjfI5=(U%J(!J%=>$loo
-Ebes!%HebomrMtjQ*9r:rqP'i:+3\:(lRD^GiCkMq--$Q@ddE/7KE=VQc`,?G1`Q;K%C1VsHi*u
-!n'BG1m?YI^Z.A07o5e(%<5q6RRG8Q9qgbR(nG$6`2\Vb*jE(+p4uYESf&_#K4eCOeJ)0>qu/5"6
-:!coXX>V\!N<2piu#*_J-qF1=07+05!;piDpCo-")dO:1j'Z#C*_\=7+&(B;0hCOQ'O<XCL^;r>
-Jh':/G1sr)"oL,"Q&E7FJ#U0jq=Vn-<`0@&j7)NnT7nN`6#<(hFE^`Ho8sM"FhQ8OrTH)8J3S<,K
-Wi"R4$*sN1DCi&tG1Y&PIF0Da6"H\@fW*m)!C.n=1R(0MHT51r1j;_`&Io\V<p7WBhD1N;,>%\g3(
-0`a:)I5UuoGTnc&k&O)D8*;)\`N&Te&e\e3t)dd?JXQ85`E`#oqG/rC#18FU^o@eC@8cRZ`>G)3
-i(N>jKDQ(;DYf+k/3#qVAEELi!KkXrGQ2Po8eniR:<?1N"76e^J6V`nMQE"QHd)b_=3f\'@A3J\,e
-KG(f+*Dg/h":FkmjFeTTdcH-T.s`$=hgf!imAA)A*YrE8$f%J>9ZoQCIg@!FNoH4ZBRS;c/,rS<=
-e32P_p@i2@+MrT')5&29Oi?U`b\LIiJ9US(EPi\<&?'XOIDIJs$fb"OP);''.B;9X14eLcG%QU6H)C
-C04in;=gV;ur2$)_MVDPa8rHB+u*lIrdG@C"G-)9fF2T;J.4!r"Rm2J7>ZY)uB+eJ#s?IQ?#H`lJB
-mM5`7`6,JJ)D%e-*%(p,nJ@5a\8aVi*QIXi5:+A@HT)a+Eh(H#c#UJc3R@;Ck'+<+$"*e_oc6
-h.eb,JO?.\cjO(I#<SZcnbpDqS&h=mK/IGaf/f.WaCgC<q&W=sjnYKdS`fhjO/;+;T!,9^q=(km
-JELD\(#Y.*k^<RaP%Qt0i&;;98;Ab.>LiOOA0o1K,LdFq$,mcnOPSA_*;@5h.0ZBM(4sn=JIj4
-aL(M?A_^K"(@AGcs3%>k=aDh\uc4)B``ZE%=HOj!&VmUs+G;!fKd%EMLd;k%KOc`j,!$Tt`@VPKR
-k+DBMLq)HOg8;SqjQV;MlVj&Rm_sM(pP^MP45f@X,&50hiC@=K<1UZrW)/egua,F>%+q@#O%:?Ub=D
-0npObN=i0I`j(IWj&BuWituD;Z(2nFQP115!-g+p+r*:erVWr7ZD*i+k(Fo6)ehF)/1*99;(;bj.8
-h68LGhF`0_X^.l_sf-_jITp-eWH&m5B.A\SnPgZ^89!NgbUfrCcc\@2WEtl3H0B(+nWLXgABcco
-7!X7qnJKks'P)J8c8+^mGlQTPP-j0Nr3WLcGtlJ.$L(_@*<B&lEKS>N1E^N,1%3`<>;m>O0:=t=
-`i^E<n6C)o8W1cB6OKG-08h5fJXZrQ@>+e`IJjq`C)$TAENO1;td+IM&."lo-e4r7<3<_jI,_D-k)F
-VZh4X8;&OHS+R9$*Mr-`#gqPHp(38uY`^j_Z`:d_Ll9).P5R45k&&N=im%s"<F!m!3rq*.C9rZBVe
-J'\5t5Y)>?k&f"&&5!:(=>MiXgtGtoJe:=9h)F:\ie=_%(f#<k3^fe0;K2K@6jSJX7-*loe'Po8ad
-=je5NP,p4(F="$gNN@Z8kJKgs5p*:-(4U+tdof\$3Hkf"C6E$Q8\JId^I3attQBOn?<G1Pj/@8Bf<
-*EI:.qtiZVZ6dh-g)@CAs4a#.=,'.=k?.(daUt-=g)tQW*$h;17mC/nE=#A24`%Wuf0eb0cB+3h
-%?bl/M:FY\c"im#ZF@bEk?R2O9Wo2jIDneZH0b*,Mm8<9=?7%&DhN/F;:7U7>9--`KbpLcmZ(/f.j
-CdC+i$P'9&No88aQ0Zr2e0@,"I-WO4V#:Hhr3H#3:.NBajZ@bT$%M(kql`i2l`VTd2V""kSBWj`nI
-c$2BPk2fp&f00u$.`i-82/'*Y;RXL=hcqsFhBTgj=n<(,&4dYVZuF`d/MMBQ3He3$pqgQnm?=
-<R>6*?5,A-NO#IE!:"^nl,K5$&N_AH&SiC\/C?P@pt!!6G7K8sP%7Z_M,%K-5PuFPr$Fj#,W^0lmM
-lob.X1Bpf@p>c<DP_!Woqq*9bI:RL#9sQMC77SMCW^1!52>Ap>jC'POa.nU%qH??=5g/=$.=R<"A
-Mg-pRl*b(:W.g5!K3LVNXC**)H2VPcHcQ+OT__hML9C21d0b(eAfTtH//5`)n//Q::-Q$O-o=NX2S
-+.mlW0LV)5VE:*=Vh@2E+/'dWQ_Pg-qq#5`2=K'2+&ul&)3m(%q4fr^rSRQhJG$WbZ^H_XAkdY7
-p&qDJ>8%>0CuJ.\P,G541Ce6eDhp4+,.G,_'3lQEA:eRd2+<%>his!DM;TUFdjB84Elj1?9lt>e"0
-?Na/A7oI"k-.$L)@J*Am^75.'a8E'@24%1uemDWZ)`=d@f+"R&qhWCd-_#90c,-?-384?hZLbOH_
-tiTRB?WkaZj%nH(oK^NDHDba?89isK':)>B6@Xl2U7u9QR>jVX(UhH-/mp/H2Dg"n?)tTn.^&c
-Xk5s3s')u`BWPU^)\D_ZSX\u;Df6.lbll9*3B)F76G"JnIAYbB5qlmNf:<#%uI;<M?s'aQ8n8QY
->3mUZX7mgtSQHDQaFlK\R.PN,I(*0Xbf01Oi*:,d+JQfYNVREGF</Tj7XApkH+P5^f'lho5#HN%aR
-O#+&)>VDW=XM!6#f0&qZguN=NpPfC=%tG+)NiNZZ\Vt(ocMGQKB\P*h%'e3n"?7HhXO7kV!k<D=#
-A?ZLTIXhf$*sXX-!T&<;Lo;hrMm(DWP7^K;NrNB&j/h!#>.'ACEi;,cY!2P3rb24j=R2%:?(?k
-1^AE!6qtIDXuQ*SE:8#n'*!1Nro,pDUS#&XtFn10+ua:JDP6'qX*^mCmtP\\;d)o$3=&'"3Zb4Es
-)i@_;3:h'(chUjC0#-)SGm>c:DM"XLtHdN!.E=!2%1r%A&MY"4B;kg);Z?+0GS)57E@DO*/J@S.'/
-;?XB6t/hGX0QF>6,sEBt;D6u,h'_,0;ON7E=V^I3=g)6Ej>\,fH-NZ(D1R%0mORTI2>b3(U8T/
-nV%gbM&>c<))7*g;3;`9SJe+)3La5nY9W>b</)_nB4ENpIF2ZBe)tAAVEDfSPClY9@%\VAaOjt
-J7f,_-T*V&53dHM,lQ1'5+#3:-EUP!SocMTW+7RX1'o'9%3T%+L2S&EYTb''-Zoa+qbn?1+=BOd
-23#n*2?DpJ\<'9h%>f9,Vhe6E_.OSVAd::(U?_Okh#a-lUJqj!%VPnie:U@NXo4VJ9Q^Biuek:FD<
-Q*qFQ@aBm2FJ_rg-S:*$EgJ5\M'oTo-M!od\/.rKdj<-k`:'ZEYpCT.9DpPgZN17ia_(=$B.a
-k:InuXE_b*B8f/LagSEmPlu;'eQe.;*^d`F/*bq?<SQ"26_dQ&X,bpIFI-F.UVc6+2")O5@bPg1E;
-dib(.,msV0p6H28nTlB/>b3J1Xe?>1EA5B>;Uog1\4;*F#>b1>;UCri_ppV;bJpQ5a@O%1(-l81L2
-kZ8N0RaVGgbYP8c8u.l-F30T1W8QRP8ns,Da2cF+;i<OiWA$^AKE0UXYAD/BK#Gp%j9IW+m1i/d
-+@m61oan<F3p/8gHBVG4L<i&'A5Q"9g#cH4u:GI:Z"BXlTQ!65;WBtZi7>="Zf4P4nFXu;uJuQgpE:
-d5El%0e/jj)+!lE6?EH!ZkYf).mYuS1"2X;ZdhGX!Bi7s5h&FooB8M^3H2gitDnYe&+:gD)&Be6<
-#$)e,GPqFm,05.#h\oQ<>sJOae78<efr'R<8Kk=7@m8CW&P1nR;qG;7U*82Ql-oM%P,SN`:79(ka
-1q,u^O\E.09/JX`e>Z%SX%ZL1:,JkCPi#,th*c<#8i63!'NH5f1ja@0P.bWEGmqCr0HA*=eQ*3Zts
-2;jrF$X4UFPSouce)cB6p;=uM=WBjFI0iOec;cPPNe?r6j.o_co9%?+iF\PkY2c<XO;AEV>%*qt>=
-&h+b<Kqo4<Hh=uG?6Y;<E-A)<Cp:-B3/)a=LD>>FoCgGu#0'=>aSlC`-AuNCYi1;3>g'1,L76'iC.
-boZ9BsocWnW03i3>iG-Ve^n(9IpC4CPP*XnQ-,qga^/E5?FB$'2>LT:p9im?e,A>(#`P#cX6@e?a
-9.('@r&$!l*%@?pk%(&MD3o3W7^@!3,k8OHt;eQnIK?M27$'_,He).SsOAG-C;e`g9oTTpG#@_.F
-U'a*d4(-34@A4cO<^ULD,A.bh+r503<^`cB'53\\,PHCkp$$+TF_MUW>mqBQ;q5@okG6UBJtcUG+i
-U#RpH.jC0%ZTp2t.O^MHr@OjVcp<d:!95,0d@eSDJmE7Pqs/M6?-O27XKF&2d$,;0<d$<kKb:n
-ljWWE?ZEC-)`^nQ5j>-&D73^pJWB63I9B!WXVM$&",.3G6<(DSebZ"8rEeT=jS?5Cq((:YY,<8J
-QE0cZNf1U8h<GPXmE41gNf,8SCLtG*>G>nFUIfVfN*?EXFG7"GjYC'@js*r3EWM=V-4Ia^*1S8Eh
-K7Os`F2gN=<JHe3F.QHMq\TBdJE7\rSpW%E0pN2oFuRrkKroci`G\'PDjFlpj&-J?"_Q?b=dPJ#
-"g0\-Z`As+c2_Cjr5'J>ClPh7!@Em2sGpiF+42P+a"/^0Qhl!.P94^BQs_$iR`^,"sLq!KE1/%U-,
-l`$tgc"KU=Mpe"iEA7O807!N`n3-U.fC/fG$+kVB)pjR$-9#%,PIZ(e\dKs*-I"2c\U^fE#3n5
-hBH_M'?5`(^Yee+`cKp)9C_3"L(Qu/fHP'DnBfRo*KoMheCL:FdKpt\e,Y$P4sN:Z`AquAUmu81
-NAuWO@S_T#l#7K)OHMPb6XW/&-kJZ<MA0WT2NgEOiJ6&ELiI?o70eQlYT(OjLSPiAi:a-01a1%W?X
-b95R,sCg+d;Y:q8NI3;+N+@?4O3+o(eqfl`WA:Q%4NNHjcLq#-;"GE)E8Qam3c)3:'Y(RDU-QPkL;
-p.LcuOdF_fOSQ/IA1*N8,CVsDGZSaOa%Fs.h44:fJDs.\H!?2Pdu@LCJJS'9=;HW-opjlQ+=;f\WN
-@aV3ZCTQPf%)4d@EVkD`MR5t#2RJDN)k`W;Q^SMT3Kp2+-_S$?Tm?*mRLu"!iM(VJMq8Q7)Aem=n
-Qp>I'B3.hK^Mk9A#!32R3GY'fla0<)NoA8K`Wk23biQ5J5P&m)/$7@SWP$)6+@UO$XR)CqF_Vl#j
-mWHhpOg*<S#WM=`KQT9ttqQ6$OX-WTHU"TO<RN\^\-VkV<X;XNuGlO<Q9q1kRP'B)4RTN3C0;"P=TN
-WRp=l#sBE9)QR2EjY!.?E#+8t4JH@YBW.h#c/$D"SX4nYp3q8Nj,G3XJYBmCE(%\a-n$raTj'IN
-qXq)),I,utWZ+HHRQ8>-(N^GGImCQRmF1L/#>"3-G&N>g,#@*B<rK=X1)j=R!#9Ks+0Zoa&Pqa\
-/cO1AJ^/qodp>=5p49sT*r0\Rp)m?T;\#ZnC32\U4+k1la0OD\,s(M&qEM?q5p.(A#oN=WC3P/
-Ur!H-8WdXRd;92\%XpU^`,AJEu;P$,/LG^q8"*HQg41&%W\blW?r#<9''>+-MG.%bquag*V7bR
-a_J(@qochR0spgd`&p3#>Yi05<`uu6ZMT^$HqUab?,g))S#!ASHZ;Mb;a&*'<W"5_S28!OF2e'6`>
-iU3gc`S\<O4e.`Vc(FI%S4pT>Q%l_jmjO>U.C<?-@T@bIkI0r*.$Cc,cEg\bjRi4KH?3TuamqaSE>2
-489>.$-0S*Y+,+s7I27_$PqL7cl8n08L#&"3RI;CcoaP?*=^@9'@HapdG52XO`f'B(!uY_dTnTUI5B
-6`/'r-dN'jbSH%)%-du?Ye/^KrSPdk,%FcCgdQC+Oe@jJ9@DX5eQk7Ij'&N=4EdXd63-1I-=ScH
-%V<o^G_=@V<Q',*&9Ye0B2BKipnasp"B;Ig3p0YqO0($/</*gKgr.*PWp!ZeXB5h&XJh?-D#,MX<
-ihEAR+SYP$>\)+gChL4kJ^%pNUe)*h*gg.EFhdM@gYNt,h`m>*Wb3U*St*7iZe'JTaBB>af\p7B6
-,&$R4^fT)F'ti5\'QKhF$?,-0.HEjCH%YhGuCi0BKoJjk`0VSkqZN:-u5jJ3&J*b".o60:@Pk<=IY
-SpBLjGNArZjuuB$*ae.qIHKCCkoQ\a*a.W3Xm(;6kii8a>lE^>U#qqrkMEE/5+FrO7F'C7cPkpco0-
-d(nlFi69LX6p7-X-2i(O:0mf^i%53MAjmV(%n,E@T^@Ucgj6kdsnK.r(,ffCcJ5-%n/i&.?Q8I+$
-1e*>o04Pl-&:p,an+C!o:IR!3m^QM#Yn_knNR554_\-g\h<10a:+8PEhf8+llCpE&l!?;B1IJ85
-@pV2:SItd4KD>J'q&bUl5FM=sSbZWdq7i^#s/#S,WVBgnqVS4JIdgshEAATcj#ZCfK*a0M6>F9^CE
-Lu?5M,kKec#O$rZBtq5O&/smJ^J_rkJ((s7@E?`0(`:"G+Bt&9q.m)$u&7iR&Kq:*14-7A>ohe7Jp9
-BsXH#\%CJR-$?cSnp*p':>TWgLEhAo`,bmI9'6hde"0,!OM0iL)&3L06_dLm'M;@HQV"&Ql.$\h:8(
-Xd<GN=qeQTLdY1Dpi)28:A,C>P^2WX=`'GIV@tDSg&GlR@(gb`Tm&A^L(prbSC-_J\kjbfUOQI&
-WF\=EZ"_?4"6<7jRUuo`c!N$c"FANr>(/Mn;Vno1PV1GGhocFrL=F4nP(m.T2)`piZh/BclrYGf
-r^uKD/r*DlHQ-JCE/fL^Se"=kLo=EbLa)A0;m<?15rtgI4i:Cpa2_L.bN&3kINJNUBSk^r;PTG`k
-0\Uoq1Q'!gg\l1^O7LE't':_!k;B#!q``,6pP3KI7-oYf%t"6L`bd%RaX6Oq%S"A'1nYs_A&7*q-n
-s$cI"@eE2&S7NU.n*?Ua)T%C*CmC<Ij%>1,_I;^E\rt*8THq_,tZNqT.*AfUh5.-~>
-%%EndData
-end restore showpage
-%%Trailer
-%%EOF

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/interface/toolbox.sgml Deleted

@@ -1,48 +0,0 @@
-
-
-<?xml version="1.0" encoding="utf-8"?>
-<sect1 id="toolbox">
-<title>The toolbox</title>
-<para>
-apsldkfjañsdlfads ñlaskdfjñald skfañdkl fjañsdklfj añdslvf kjadsñfkjadñfjkaflñjak añ kfjañ fñakjd fañ
-a dfñladjf añdlkfj añlkf añldkf adlkf ajdñlf adñflkj dsñalj kfañldkf asjdñfkl asdñf akj
-añ kfd ñaj kasñj kds ñjk sñljks añljskañ kñasjksdañ jk dfñljk
-</para>
- <figure id="toolboximg">
- <title>Toolbox</title>
- <screenshot>
- <mediaobject>
- <imageobject>
- <imagedata fileref="toolbox" format="EPS" scale="50">
- </imageobject>
- </mediaobject>
- </screenshot>
- </figure>
-<para>
-asdf a dsf dsfa sdf adf adfadf ad f adsfasd fa sdf asd f asdf asdf asf adsf asdf asd fa
- adsf asdf asd f asdf a dfa sdf as fasdf asdf adf ad faf f asdf af asd fa sf asdf adf adf 
- a dsf a dfa sdf ad fa df asdf asdf asd f af
-</para>
-<para>
-<table>
-<title></title>
-<tgroup cols="4" align="center">
-<tbody>
-<row>
-<entry >New</entry>
-<entry >Open</entry>
-<entry >Save</entry>
-<entry >Save As</entry>
-</row>
-<row>
-<entry >Save All</entry>
-<entry >Undo</entry>
-<entry >Redo</entry>
-<entry >About Synfig Studio</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-
-</para>
-</sect1>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/interface/tooloptions.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/introduction Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/introduction/introduction.sgml Deleted

@@ -1,52 +0,0 @@
-
-
-<chapter id="introduction">
- 
- <title><acronym>Introduction</acronym></title>
- <para>Synfig, like most every other competent graphics program, breaks down 
- individual elements of a Canvas into Layers. However, it differs from other 
- programs in two major ways:</para>
- <orderedlist>
- <listitem>
- <para>An individual layer in Synfig usually represents a single "Primitive". 
- ie: A single region, an outline of a region, an imported JPEG, etc... This
- allows you to have a great deal of flexibility and control. It is not
- uncommon for a composition to have hundreds of layers(organized into a 
- hierarchy for artist sanity of course).</para>
- </listitem>
- <listitem>
- <para>A layer can not only composite information on top of the image below it,
- but also distort and/or modify it in some other way. In this sense, Synfig 
- Layers act much like filters do in Adobe Photoshop or the GIMP. For example, 
- we have a Blur Layer, Radial Blur Layer, Spherical Distortion Layer, 
- color-correct layer, bevel layer, etc... </para>
- </listitem>
- </orderedlist>
-
- <para>Each layer has a set of parameters which determine how it behaves. When 
- you click on a layer (either in the canvas window, or in the Layer Dialog), 
- you will see its parameters in the Params Dialog.</para>
-
- <para>Synfig Studio has an autorecover feature. If it crashes, even if the 
- current file has not been saved, it will not lose more than 5 minutes of work. 
- At restart it will automatically prompt the user to recover the unsaved changes. 
- Unfortunately history isn't recovered yet. That feature comes later.</para>
-
- <para>One thing you may notice is that Synfig Studio is SLOW, making it
- practically unusable on hardware that is over 3 years old. The biggest reason
- for this is that all of the color calculations are done in floating point 
- because Synfig Studio was built from the ground up with High-Dynamic-Range 
- Imaging in mind. HOWEVER, this will not be the case forever.</para>
-
- <para>darco has some fairly major re-implementations and optimizations that 
- he plans to implement that should quite dramatically improve the performance 
- of Synfig on all platforms. The goal is not a 200% speed increase, it is at 
- least a 2000% speed increase. With the optimizations that are planned to be
- implemented, we will be able to pipeline operations in such a way that this
- performance improvement can be realized. It should also pave the way to hardware
- acceleration using today's powerful graphics processors, which should yield 
- further performance improvements measurable in orders of magnitude.</para>
-</chapter>
-
-
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/steps Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/steps/done Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/steps/firststeps.sgml Deleted

@@ -1,69 +0,0 @@
- 
- 
-<chapter id="firststeps"> 
-<title>First Steps</title> 
-<para> Lets create something
-so that we can tweak with it. Now that you have a new composition open
-and the properties dialog is out of the way, go over to the toolbox and
-click on the circle tool(If you don't know which one it is, just mouse
-over them until you find the one with the tooltip that says "circle").</para>
-
-<para>The second you click on the circle tool, you should notice that the tool
-options tab changed. But we'll get to that later.
-
- <footnote><para>Some laptop users might experience trouble where click-drag on
- the canvas when using the circle tool doesn't seem to do anything
- or produce insanely huge circles. The problem is that Synfig has
- detected the touchpad and enabled that device (incorrectly!) To fix
- this: click File->Input devices... In the resulting dialog window,
- select 'Disabled' for your touchpad device. After this change,
- your external mouse and the touchpad will work as expected.</para></footnote>
-</para>
- <para>With the circle tool selected, you can now create circles in the
- canvas window. This pretty much works exactly as you might expect
- it to. Go ahead and create two (or more, if you fancy) circles. If
- by accident you just clicked on the canvas instead of clicking and
- dragging(with mouse button pressed) to draw the circle, you end up
- creating a circle with 0 radius and it is effectively invisible! No
- need to worry, you can easily fix this. In the Params dialog, you
- can change the parameters of the selected object. If you just made
- a 0 radius circle, it should be the current selected object. you can
- change its radius to some value other than 0, say 10, and manipulate
- it to your liking with the canvas ducks later.</para>
-
- <para>Now go back to the toolbox and click on the normal tool (the blue
- circle with the arrow on it). After you do this, click on one of your
- circles. You will then see a bounding box(which is kinda useless
- at this point in time, but I digress), a green dot at the center,
- and a cyan dot on the radius. Those dots are called ducks. If you
- want to modify the circle, grab a duck and drag it around. Easy!</para>
-
- <para>So you can select a layer by clicking on it. If you want to select
- more than one layer, hold down CONTROL while you are clicking--this
- works in both the canvas window and the layer tab. Try it!</para>
-
- <para>You can also select multiple ducks. You can do this in several
- ways. First, you can hold down CONTROL and individually click the
- ducks that you want selected, but this can be tedious. However, there
- is a much faster method--just create a selection box by clicking the
- mouse and dragging it over the area of ducks that you want selected.<para>
-
- <para>Go ahead and select two circles, and select all of their ducks. With
- several ducks selected, moving one duck will move all of the
- ducks. This behavior is dependent on the normal tool. Thus, a
- more descriptive name for this tool might have been the "move" or
- "translate" tool.</para>
-
- <para>The Rotate and Scale tools work much like the Normal tool, except in
- the case where you have multiple ducks selected. It is much easier
- to just try it than read about it. Select a few circles, select all
- of their ducks, and try using the rotate and scale tools.</para>
-
- <para>Note that, unlike the normal tool, the other duck manipulation tools
- DO have options associated with them. If a particular tool isn't
- doing what you want, take a look in the tool options tab to see if
- it is set up like you want it.</para>
-&linking.sgml; 
-&steplayers.sgml; 
-&shapes.sgml; 
-</chapter>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/steps/layers Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/steps/layers/combining.sgml Deleted

@@ -1,32 +0,0 @@
-
-
-<sect2 id="combining">
-<title>Combining</title>
-<para>Now there are two ways to proceed. In the first way, pick the gradient 
-tool from the Synfig Toolbox, and click into the canvas once. You should note
-that another layer was added in the Layers Dialog called 'Gradient'. This is 
-nothing special. If you see no gradient but just a plain color, pick the normal
-tool, click into the canvas to activate the gradient's ducks. You need to grab 
-the one you see and move it a bit until a gradient appears.</para>
-
-<para>You now have a gradient but it is not what you wanted: It spreads the 
-whole canvas and the goal was to have a gradient on the rectangle. Let's fix 
-this now.</para>
-
-<para>Select the gradient and the rectangle layer in the Layers Dialog. They 
-should appear with a blue background now. Then, context-click (ie. right-click 
-on Windows and Linux) and select 'Encapsulate' from the menu. The view of your 
-layer tab should change now, showing a small box called 'Inline Canvas' with an
-arrow in front. If you click the arrow, it will unfold and show your previous 
-two layers; the gradient and the rectangle.</para>
-
-<para>You can treat this layer like any other layer -- move it around, 
-duplicate it, copy and paste it. You'll notice an arrow next to the icon of the
-box. By clicking on this arrow, you can expand the inline canvas to see its 
-contents.</para>
-
-<para>If you want to change the name of it to something more descriptive, just 
-select the layer in the layer tab and click on its label. Then you just edit it
-in place. You can do this for ANY layer, and are strongly encouraged to do so. 
-</para>
-</sect2>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/steps/layers/done Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/steps/layers/layers.sgml Deleted

@@ -1,37 +0,0 @@
- 
- 
-<sect1 id="steplayers">
-<title>Layers</title> 
-<para> In the previous tutorial, you made a
-first simple animation by changing the attributes of primitive objects
-such as its position, color, and size. These simple types, however, are
-seldomly sufficient to create advanced characters and objects. To do so,
-Synfig uses Layers. They are similar to layers known from other drawing
-application such as the GIMP, for instance.</para>
-
-<para>However, Synfig is different to simple layers in at least two 
-respects:</para>
-<orderedlist>
- <listitem>
- <para>You can organize layers into hierarchical groups.</para>
- </listitem>
- <listitem>
- <para>You can use upper layers to change the behaviour (or look)
- or underlying layers.</para>
- </listitem>
-</orderedlist>
-
-<para>Doing so is quite easy. Let's look at a simple example.</para>
-
-<orderedlist>
- <listitem>
- <para>Create a new file with 0 duration. There's no need to bother
-	 with a timeline at this point.</para> 
- </listitem>
- <listitem>
- <para>Create a simple rectangle.</para>
- </listitem>
-</orderedlist>
-&using.sgml; 
-&combining.sgml; 
-</sect1>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/steps/layers/using.sgml Deleted

@@ -1,57 +0,0 @@
- 
- 
-<sect2 id="using">
-<title>Using</title> 
-<para> However, there is still a problem: The gradient still covers the whole 
-canvas although we wanted it to be restricted on the rectangle. To do so, 
-activate the gradient layer in the Layer tab. Now go to the Params Dialog (by 
-default a tab in the Params-Children-Keyframes window), and search the attribute
-called 'Blend Method'. Double-click the entry and select 'Onto' from the
-appearing drop-down menu.</para>
-
-<para>The gradient should now be restricted to the rectangle. Congratulations!
-You just made your first interacting layers with Synfig.</para>
-
-<para>If only for the additional organization, encapsulating layers into inline
-canvases dramatically improves the ease of use of Synfig Studio. But
-lots of programs can do this. The concept of scope as just demonstrated
-sets Synfig apart from other programs with layer hierarchies.</para>
-<para>
-<footnote><para>The following remarks seem to be outdated already! A blur 
-defaults to 'Straight' here (using SVN 110). --Claus 06:45, 11 Jan 2006 (PST)
-</para></footnote>
-
- <footnote><para>It defaulted to composite for me, as described (using 
- SVN 147) Matumio 07:56, 12 Mar 2006 (PST)</para></footnote>
-
- However, a layer can only modify the data that it gets from directly
- below it. In other words, if you were to throw a Blur Layer at
- the top of the objects inside the inline canvas we just created,
- it would just blur them -- anything under it would not be blurred!</para>
-
- <para>Lets try it. Add a few circles under the inline canvas we just
- created. Expand the inline canvas to show its contents, and select
- the top layer inside of it (should be the "Outline" layer). This
- is where we want to insert the blur. Right click on the selected
- layer and a popup menu will appear. The first item in that popup
- is "New Layer". Inside of the "New Layer" menu, you'll see several
- categories of layers you could create, but what we want is a blur,
- so goto the Blur category and select the "Blur" layer. (so that
- would be "New Layer->Blurs->Blur")</para>
-
- <para> Well, it blurred... but something is not quite right--the inside edge
- of the outline is now all soft, but it still kinda looks like there is
- a hard edge on the outside. It is doing this because the blend method
- of the blur defaulted to "Composite" (you can change the default
- blend method for new layers from the New Layer Defaults section of
- the Toolbox). What we want is a blend method of "Straight". Just
- select the blur layer, and change the Blend Method to "Straight"
- in the Params Dialog.</para>
-
- <para>(NOTE: I will probably change the way that default blend methods are
- handled in the future--as the way it is currently handled seems to
- only create hassles like this)</para>
-
- <para>Ok, now we have all of the contents of the inline canvas blurred,
- but everything under it is sharp!</para> 
-</sect2>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/steps/linking.sgml Deleted

@@ -1,53 +0,0 @@
- 
- 
-<sect1 id="linking">
-<title>Linking</title> 
-<para>Now lets try linking. Lets say we always
-want these two circles to be the same size. Select two circles, and then
-select both of their Radius ducks(the cyan dot). Then right click on
-either duck and a menu will pop up. Click on "Link". Boom. The parameters
-are linked together. You can prove it to yourself by selecting just one
-of the circles and changing its radius--the other one will change as
-well. Neat stuff, eh?</para>
-
-<para>Linking is a fundamental concept in Synfig. You can create links not only
-between ducks, but also between parameters as well by selecting multiple
-layers, right clicking on the parameter in the param tab, and selecting
-"Link".</para>
-
-<para>DIGRESSION: This is how outlines are attached to their regions-but
-I'm getting ahead of myself. At the moment, the fundamental power and
-flexibility of linking in Synfig Core is beyond what Synfig Studio
-currently allows for. This will change in the future. Anyway, back
-on track...</para>
-
-<para>Lets say you want one of the circles to be a different color. If you look
-in the toolbox below the tools, you'll see the foreground/background
-color selector, the outline width selector, and some other stuff like
-the default blend method and gradient. The foreground/background color
-widget works exactly as you might expect--you can click on the foreground
-color, and a modest color chooser will appear. Now to can change the
-color pretty easily.</para>
-
-<para>But sometimes you just want to click on a color and go. This is where
-the palette editor tab comes in. It's functionality isn't quite 100% yet
-(ie: saving and loading custom palettes hasn't been implemented yet),
-but the default palette is pretty decent. Click on the Palette editor tab
-and have a look--it's the one with the palette-ish looking icon. Clicking
-on colors in here will immediately change the default foreground color.</para>
-
-<para>That's all great, but we still haven't changed the color of the
-circle. There are two ways to do this. The first way is that you select
-the circle layer you want to modify, goto the params tab and double click
-on the color parameter--a color selector dialog shows up and you just
-tweak away. But lets say you already got the color you wanted selected as
-the default foreground color. Easy. Just click on the "Fill tool" from the
-toolbox, and then click on the circle in the canvas window. Boom. Circle
-changes color. This works with more than just circles, but we'll get to
-that in a sec.</para>
-
-<para>Try playing around with the circles for a bit. Muck around with the
-parameters, and see what happens. To get you started, play around with
-feather a bit. 
-</para> 
-</sect1>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/steps/shapes.sgml Deleted

@@ -1,82 +0,0 @@
-
-
-<sect1 id="shapes">
- <title>Shapes</title>
- <para> Basic primitives such as circles or
-rectangles are all great, but they are pretty much geometrically
-inflexible. What about shapes? To do this, we use the bline tool.</para>
- <para>In Synfig, the construct for describing shapes is called a Bline. This
-is roughly analogous to a "path" in other programs, except that it is
-strictly a hermite spline.</para>
- <para>When you click on the bline tool, you will see that the ducks from
-your currently selected layer (if there was one) will disappear, but
-the layer(s) will still remain selected in the Layers Dialog. This is
-normal. Anything you create in the bline tool will be inserted above the
-currently selected layer. Keep in mind that if you want to insert a shape
-somewhere, you should select where you want to insert it before you go
-into the Bline tool-changing the selection afterward will automatically
-swap you back to the normal tool.</para>
- <para>If you take a look at the tool options dialog, you'll notice that the
-first things you see are three checkboxes. Make sure that only "Fill"
-AND "Outline" are checked.</para>
- <para>First, go ahead and click on the "R" button in the lower left corner of
-the FG/BG color widget in the toolbox. This will reset us back to black
-and white. Also, go ahead and set the default line width (right next to
-the FG/BG widget) to something nice and thick -- 10pt should do the 
-trick.</para>
- <para>Clicking with your mouse in the canvas will place vertices. While you are
-placing a vertex, you can drag out its tangent by dragging the mouse. Do
-this over and over, and you construct a Bline.</para>
- <para>Keep in mind, however, that during this construction, there is nothing
-stopping you from just moving it if you don't like where you placed
-a vertex or a tangent. Honest! If you want to remove a vertex, right
-click on it and delete it. Want to split the tangents? Right click on
-the tangent and hit "split tangents". Want to loop the bline? right
-click on the first vertex and select "loop".</para>
- <para>So I assume you got your first Bline laid out like you want it. That's
-great. But we are still in construction mode -- the layers haven't been
-created yet. There are two ways to create the layers:</para>
- <orderedlist>
- <listitem>
- <para>just switch to another tool, or</para>
- </listitem>
- <listitem>
- <para>press the "create" button at the bottom of the tool options tab
- (it's the icon that looks like a gear).</para>
- </listitem>
- </orderedlist>
- <para> For now, just go ahead and click on the normal tool because we
- are done with the bline tool.</para>
- <para>// Insert Figure about here</para>
- <para>Ok, we now have a nice pretty white region with a thick black
- outline. Notice that there are two layers that we have created--the
- Outline and the Region. Despite the fact that they are two separate
- layers, their vertices parameter has already been linked--so you
- can select either one and move its ducks around and the other one
- will also change.</para>
- <para>If you want to manipulate the vertices after you have created
- the layers, it is very easy to do so. Just click on one of the
- layers and have at it. If you want to remove a vertex, right
- click on it and hit "Remove Item (smart)". Want to insert a point
- somewhere? Right click on the segment where you want to insert
- something and his "Insert item (smart)".</para>
- <para>NOTE: The only major difference between this normal editing mode
- and the construction mode is in how you split the tangents--in
- construction mode you right click on the tangent itself. In normal
- duck editing mode, you must right click on the vertex that the
- tangents are attached to. This could be considered a usability bug,
- and it will be resolved at some point.</para>
- <para>This may appear to be leading to a mess of layers. And yes, if
- you aren't using the software properly, that is exactly what you
- will get. But there is a way to make this more sane: Just study
- the previous tutorial</para>
- <para>One quick thing to mention before I finish up. You can change the
- width of an outline at each vertex. You do this by selecting the
- outline layer (NOTE: you must select the Outline Layer, the Region
- Layer has no width data) and tweaking with the width ducks. By
- default, these are masked. To show them, press Alt-5. Repeat to
- hide them again. You can also see other things to mask via the
- Canvas Menu Caret &gt; View Menu &gt; Mask Ducks Menu.</para>
- <para>That should give you enough of a grasp of the software to be able
- to figure out more stuff on your own.</para>
-</sect1>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/synfig-studio.sgml Deleted

@@ -1,64 +0,0 @@
-
-
-
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" 
- 
-
-<!ENTITY index.sgml SYSTEM "index.sgml">
-<!ENTITY introduction.sgml SYSTEM "##PATHLANG##/introduction/introduction.sgml">
-
-<!ENTITY interface.sgml SYSTEM "##PATHLANG##/interface/interface.sgml">
-<!ENTITY toolbox.sgml SYSTEM "##PATHLANG##/interface/toolbox.sgml">
-<!ENTITY layers.sgml SYSTEM "##PATHLANG##/interface/layers.sgml">
-<!ENTITY params.sgml SYSTEM "##PATHLANG##/interface/params.sgml">
-<!ENTITY tooloptions.sgml SYSTEM "##PATHLANG##/interface/tooloptions.sgml">
-<!ENTITY navigator.sgml SYSTEM "##PATHLANG##/interface/navigator.sgml">
-<!ENTITY history.sgml SYSTEM "##PATHLANG##/interface/history.sgml">
-
-<!ENTITY firststeps.sgml SYSTEM "##PATHLANG##/steps/firststeps.sgml">
-<!ENTITY linking.sgml SYSTEM "##PATHLANG##/steps/linking.sgml">
-<!ENTITY shapes.sgml SYSTEM "##PATHLANG##/steps/shapes.sgml">
-
-
-<!ENTITY steplayers.sgml SYSTEM "##PATHLANG##/steps/layers/layers.sgml">
-<!ENTITY combining.sgml SYSTEM "##PATHLANG##/steps/layers/combining.sgml">
-<!ENTITY using.sgml SYSTEM "##PATHLANG##/steps/layers/using.sgml">
-
-<!ENTITY apendices.sgml SYSTEM "##PATHLANG##/appendix/apendices.sgml">
->
-<book lang="en" id="gettingstarted">
- <bookinfo>
- <date>28 Aug 2006</date>
- <title><acronym>Synfig Studio</acronym>
- </title>
- <subtitle>Getting Started</subtitle>
- <releaseinfo>Initial Release</releaseinfo>
- <authorgroup>
- <author>
-	<firstname>xxxx</firstname>
-	<surname>xxx xxxxxx</surname>
- </author>
- <author>
- 	<firstname>et Alt.</firstname>
- </author>
- </authorgroup>
- <address>synfig@miguelgea.com</address>
- <legalnotice>
- <para>Released with GFDL license</para>
- </legalnotice>
- <revhistory>
- <revision>
-	<revnumber>0.1</revnumber>
-	<date>2006-8-28</date>
-	<authorinitials>mgm</authorinitials>
-	<revremark>Document start</revremark>
- </revision>
- </revhistory>
- </bookinfo>
-&introduction.sgml;
-&interface.sgml;
-&firststeps.sgml;
-&apendices.sgml;
-&index.sgml;
-</book>
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/tips Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/tips/bitmap.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/tips/closebline.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/tips/dock.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/tips/filloutline.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/tips/gradient_object.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/en/tips/layer.sgml Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/others Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/others/Authors Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/others/hola.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/png Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/png/toolbox.png Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/scripts Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/scripts/build.sh Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-docs/scripts/clean.sh Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/English.lproj Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/English.lproj/InfoPlist.strings Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/English.lproj/main.nib Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/English.lproj/main.nib/classes.nib Deleted

@@ -1,49 +0,0 @@
-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            ACTIONS = {
-                "apps_table_cancel" = id; 
-                "apps_table_delete" = id; 
-                "apps_table_done" = id; 
-                "apps_table_duplicate" = id; 
-                "apps_table_new" = id; 
-                "apps_table_show" = id; 
-                "bring_to_front" = id; 
-                "close_window" = id; 
-                "enable_fullscreen_changed" = id; 
-                "minimize_window" = id; 
-                "next_window" = id; 
-                "prefs_changed" = id; 
-                "prefs_show" = id; 
-                "previous_window" = id; 
-                "toggle_fullscreen" = id; 
-                "x11_help" = id; 
-                "zoom_window" = id; 
-            }; 
-            CLASS = X11Controller; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "apps_separator" = id; 
-                "apps_table" = id; 
-                depth = id; 
-                "dock_apps_menu" = id; 
-                "dock_menu" = id; 
-                "dock_window_separator" = id; 
-                "enable_auth" = id; 
-                "enable_fullscreen" = id; 
-                "enable_keyequivs" = id; 
-                "enable_tcp" = id; 
-                "fake_buttons" = id; 
-                "prefs_panel" = id; 
-                "sync_keymap" = id; 
-                "toggle_fullscreen_item" = id; 
-                "use_sysbeep" = id; 
-                "window_separator" = id; 
-                "x11_about_item" = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/English.lproj/main.nib/info.nib Deleted

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>61 48 372 379 0 0 1280 832 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>29</key>
-		<string>530 771 319 44 0 0 1280 832 </string>
-		<key>423</key>
-		<string>525 668 148 61 0 0 1280 832 </string>
-	</dict>
-	<key>IBFramework Version</key>
-	<string>437.0</string>
-	<key>IBGroupedObjects</key>
-	<dict>
-		<key>0</key>
-		<array>
-			<string>371</string>
-			<string>372</string>
-		</array>
-		<key>1</key>
-		<array>
-			<string>385</string>
-			<string>382</string>
-			<string>386</string>
-		</array>
-		<key>3</key>
-		<array>
-			<string>370</string>
-			<string>369</string>
-		</array>
-		<key>4</key>
-		<array>
-			<string>363</string>
-			<string>365</string>
-		</array>
-		<key>5</key>
-		<array>
-			<string>368</string>
-			<string>364</string>
-		</array>
-		<key>6</key>
-		<array>
-			<string>543</string>
-			<string>541</string>
-		</array>
-		<key>7</key>
-		<array>
-			<string>375</string>
-			<string>377</string>
-		</array>
-		<key>8</key>
-		<array>
-			<string>374</string>
-			<string>376</string>
-		</array>
-	</dict>
-	<key>IBLastGroupID</key>
-	<string>9</string>
-	<key>IBLockedObjects</key>
-	<array>
-		<integer>285</integer>
-		<integer>348</integer>
-		<integer>244</integer>
-	</array>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>423</integer>
-		<integer>29</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>8C46</string>
-</dict>
-</plist>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/English.lproj/main.nib/objects.nib Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/English.lproj/main~.nib Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/English.lproj/main~.nib/classes.nib Deleted

@@ -1,49 +0,0 @@
-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            ACTIONS = {
-                "apps_table_cancel" = id; 
-                "apps_table_delete" = id; 
-                "apps_table_done" = id; 
-                "apps_table_duplicate" = id; 
-                "apps_table_new" = id; 
-                "apps_table_show" = id; 
-                "bring_to_front" = id; 
-                "close_window" = id; 
-                "enable_fullscreen_changed" = id; 
-                "minimize_window" = id; 
-                "next_window" = id; 
-                "prefs_changed" = id; 
-                "prefs_show" = id; 
-                "previous_window" = id; 
-                "toggle_fullscreen" = id; 
-                "x11_help" = id; 
-                "zoom_window" = id; 
-            }; 
-            CLASS = X11Controller; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "apps_separator" = id; 
-                "apps_table" = id; 
-                depth = id; 
-                "dock_apps_menu" = id; 
-                "dock_menu" = id; 
-                "dock_window_separator" = id; 
-                "enable_auth" = id; 
-                "enable_fullscreen" = id; 
-                "enable_keyequivs" = id; 
-                "enable_tcp" = id; 
-                "fake_buttons" = id; 
-                "prefs_panel" = id; 
-                "sync_keymap" = id; 
-                "toggle_fullscreen_item" = id; 
-                "use_sysbeep" = id; 
-                "window_separator" = id; 
-                "x11_about_item" = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/English.lproj/main~.nib/info.nib Deleted

@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IBDocumentLocation</key>
-	<string>61 48 372 379 0 0 1280 832 </string>
-	<key>IBEditorPositions</key>
-	<dict>
-		<key>29</key>
-		<string>530 771 301 44 0 0 1280 832 </string>
-		<key>423</key>
-		<string>525 668 142 61 0 0 1280 832 </string>
-	</dict>
-	<key>IBFramework Version</key>
-	<string>349.0</string>
-	<key>IBGroupedObjects</key>
-	<dict>
-		<key>0</key>
-		<array>
-			<string>371</string>
-			<string>372</string>
-		</array>
-		<key>1</key>
-		<array>
-			<string>385</string>
-			<string>382</string>
-			<string>386</string>
-		</array>
-		<key>3</key>
-		<array>
-			<string>370</string>
-			<string>369</string>
-		</array>
-		<key>4</key>
-		<array>
-			<string>363</string>
-			<string>365</string>
-		</array>
-		<key>5</key>
-		<array>
-			<string>368</string>
-			<string>364</string>
-		</array>
-		<key>6</key>
-		<array>
-			<string>543</string>
-			<string>541</string>
-		</array>
-		<key>7</key>
-		<array>
-			<string>375</string>
-			<string>377</string>
-		</array>
-		<key>8</key>
-		<array>
-			<string>374</string>
-			<string>376</string>
-		</array>
-	</dict>
-	<key>IBLastGroupID</key>
-	<string>9</string>
-	<key>IBLockedObjects</key>
-	<array>
-		<integer>285</integer>
-		<integer>348</integer>
-		<integer>244</integer>
-	</array>
-	<key>IBOpenObjects</key>
-	<array>
-		<integer>423</integer>
-		<integer>29</integer>
-		<integer>285</integer>
-		<integer>244</integer>
-	</array>
-	<key>IBSystem Version</key>
-	<string>7R28</string>
-</dict>
-</plist>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/English.lproj/main~.nib/objects.nib Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/Imakefile Deleted

@@ -1,136 +0,0 @@
-XCOMM $XFree86: xc/programs/Xserver/hw/darwin/Imakefile,v 1.14 2002/08/28 06:19:15 torrey Exp $
-
-#include <Server.tmpl>
-#define IHaveSubdirs
-
-LinkSourceFile(XFree86.man,../xfree86)
-LinkSourceFile(appledri.h,$(LIBSRC)/GL/apple)
-LinkSourceFile(appledristr.h,$(LIBSRC)/GL/apple)
-
-SRCS =	darwin.c \
-	darwin-input.c \
- darwin-keyboard.c \
-	darwin-new-keymap.c \
-	darwin-old-keymap.c \
-	keysym2ucs.c \
- quartz.c \
- quartz-audio.c \
- quartz-cursor.c \
-	quartz-server.c \
- rootless-common.c \
- rootless-gc.c \
- rootless-picture.c \
- rootless-screen.c \
- rootless-val-tree.c \
- rootless-window.c \
- pseudoramiX.c \
-	appledri.c \
-	applewm-impl.c \
-	dri-surface.c \
-	x-list.c \
-	x-hash.c \
-	x-hook.c \
-	X11Application.m \
-	X11Controller.m
-
-OBJS =	darwin.o \
-	darwin-input.o \
- darwin-keyboard.o \
-	darwin-new-keymap.o \
-	darwin-old-keymap.o \
-	keysym2ucs.o \
- quartz.o \
- quartz-audio.o \
- quartz-cursor.o \
-	quartz-server.o \
- rootless-common.o \
- rootless-gc.o \
- rootless-picture.o \
- rootless-screen.o \
- rootless-val-tree.o \
- rootless-window.o \
- pseudoramiX.o \
- appledri.o \
- applewm-impl.o \
-	dri-surface.o \
-	x-list.o \
-	x-hash.o \
-	x-hook.o \
-	X11Application.o \
-	X11Controller.o	
-
-AS := /System/Library/Frameworks/ApplicationServices.framework
-
-INCLUDES = -I. -I$(SERVERSRC)/mi -I$(SERVERSRC)/fb -I$(EXTINCSRC) \
- -I$(SERVERSRC)/render -I$(SERVERSRC)/include -I$(XINCLUDESRC) \
- -I$(SERVERSRC)/os -I$(SERVERSRC)/Xext -I$(SERVERSRC)/GL/apple \
- -I$(INCLUDESRC) -I$(FONTINCSRC) -F$(AS)/Frameworks \
-	 $(XPLUGIN_INCLUDE)
-
-OSNAME = OSName
-OSVENDOR = OSVendor
-OSNAMEDEF = -DOSNAME='" $(OSNAME)"' -DOSVENDOR='" $(OSVENDOR)"'
-
-#if defined(XFree86CustomVersion)
-CUSTOMVERSION = XFree86CustomVersion
-CUSTOMVERDEF = -DXF86_CUSTOM_VERSION='$(CUSTOMVERSION)'
-#endif
-
-#if defined(BuilderString)
-BUILDERSTRING = BuilderString
-BUILDERMSG = -DBUILDERSTRING='$(BUILDERSTRING)'
-#endif
-
-SUBDIRS = utils
-
-DEFINES = $(CUSTOMVERDEF) -DXBINDIR=$(BINDIR) -DXINITDIR=$(XINITDIR) \
- $(QUARTZDEFINES) $(DEBUGDEFINES)
-
-#if XFree86Devel
-DEBUGDEFINES = -DROOTLESSDEBUG
-#endif
-
-EXTRAMANDEFS = -D__logdir__=$(LOGDIRECTORY)
-
-SpecialCObjectRule(darwin,$(ICONFIGFILES),$(OSNAMEDEF) $(BUILDERMSG) $(CUSTOMVERDEF))
-
-NormalLibraryObjectRule()
-NormalLibraryTarget(XQuartz,$(OBJS))
-
-InstallManPage(Xquartz,$(MANDIR))
-InstallManPage(XFree86,$(MANDIR))
-
-DependTarget()
-
-MakeSubdirs($(SUBDIRS))
-DependSubdirs($(SUBDIRS))
-
-#ifndef DarwinArchEnv
-#define DarwinArchEnv
-#endif
-
-PBXBUILD = DarwinArchEnv pbxbuild
-PBXBUILDSTYLE = Development
-PBXBUILDDIR= ./build
-
-DITTO = ditto
-
-#if NothingOutsideProjectRoot
-APPINSTALLDIR = $(BINDIR)/../Applications
-#else
-APPINSTALLDIR = /Applications/Utilities
-#endif
-
-all::
-	$(PBXBUILD) -buildstyle $(PBXBUILDSTYLE) build
-
-install::
-	$(PBXBUILD) -buildstyle $(PBXBUILDSTYLE) install
-	mkdir -p $(DESTDIR)$(APPINSTALLDIR)
-	$(DITTO) $(PBXBUILDDIR)/UninstalledProducts/X11.app $(DESTDIR)$(APPINSTALLDIR)/X11.app
-
-clean::
-	$(PBXBUILD) 'clean'
-
-%.o : %.m
-	$(CC) $(CFLAGS) -c -o $@ $<

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/Synfig Studio.pbproj Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/Synfig Studio.pbproj/darco.mode1 Deleted

@@ -1,1315 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>ActivePerspectiveName</key>
-	<string>Project</string>
-	<key>AllowedModules</key>
-	<array>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXSmartGroupTreeModule</string>
-			<key>Name</key>
-			<string>Groups and Files Outline View</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXNavigatorGroup</string>
-			<key>Name</key>
-			<string>Editor</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCTaskListModule</string>
-			<key>Name</key>
-			<string>Task List</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCDetailModule</string>
-			<key>Name</key>
-			<string>File and Smart Group Detail Viewer</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXBuildResultsModule</string>
-			<key>Name</key>
-			<string>Detailed Build Results Viewer</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXProjectFindModule</string>
-			<key>Name</key>
-			<string>Project Batch Find Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXRunSessionModule</string>
-			<key>Name</key>
-			<string>Run Log</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXBookmarksModule</string>
-			<key>Name</key>
-			<string>Bookmarks Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXClassBrowserModule</string>
-			<key>Name</key>
-			<string>Class Browser</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXCVSModule</string>
-			<key>Name</key>
-			<string>Source Code Control Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXDebugBreakpointsModule</string>
-			<key>Name</key>
-			<string>Debug Breakpoints Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>XCDockableInspector</string>
-			<key>Name</key>
-			<string>Inspector</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>n</string>
-			<key>Module</key>
-			<string>PBXOpenQuicklyModule</string>
-			<key>Name</key>
-			<string>Open Quickly Tool</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXDebugSessionModule</string>
-			<key>Name</key>
-			<string>Debugger</string>
-		</dict>
-		<dict>
-			<key>BundleLoadPath</key>
-			<string></string>
-			<key>MaxInstances</key>
-			<string>1</string>
-			<key>Module</key>
-			<string>PBXDebugCLIModule</string>
-			<key>Name</key>
-			<string>Debug Console</string>
-		</dict>
-	</array>
-	<key>Description</key>
-	<string>DefaultDescriptionKey</string>
-	<key>DockingSystemVisible</key>
-	<false/>
-	<key>Extension</key>
-	<string>mode1</string>
-	<key>FavBarConfig</key>
-	<dict>
-		<key>PBXProjectModuleGUID</key>
-		<string>A66420E408E74B62005A12D3</string>
-		<key>XCBarModuleItemNames</key>
-		<dict/>
-		<key>XCBarModuleItems</key>
-		<array/>
-	</dict>
-	<key>FirstTimeWindowDisplayed</key>
-	<false/>
-	<key>Identifier</key>
-	<string>com.apple.perspectives.project.mode1</string>
-	<key>MajorVersion</key>
-	<integer>31</integer>
-	<key>MinorVersion</key>
-	<integer>1</integer>
-	<key>Name</key>
-	<string>Default</string>
-	<key>Notifications</key>
-	<array/>
-	<key>OpenEditors</key>
-	<array>
-		<dict>
-			<key>Content</key>
-			<dict>
-				<key>PBXProjectModuleGUID</key>
-				<string>A664210208E74CC8005A12D3</string>
-				<key>PBXProjectModuleLabel</key>
-				<string>Target: SynfigStudio</string>
-				<key>PBXSplitModuleInNavigatorKey</key>
-				<dict>
-					<key>Split0</key>
-					<dict>
-						<key>PBXProjectModuleGUID</key>
-						<string>A664210308E74CC8005A12D3</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>Target: SynfigStudio</string>
-						<key>_historyCapacity</key>
-						<integer>0</integer>
-						<key>bookmark</key>
-						<string>A664210908E77262005A12D3</string>
-						<key>history</key>
-						<array>
-							<string>A664210408E74CC8005A12D3</string>
-						</array>
-					</dict>
-					<key>SplitCount</key>
-					<string>1</string>
-				</dict>
-				<key>StatusBarVisibility</key>
-				<true/>
-			</dict>
-			<key>Geometry</key>
-			<dict>
-				<key>Frame</key>
-				<string>{{0, 20}, {784, 658}}</string>
-				<key>PBXModuleWindowStatusBarHidden2</key>
-				<false/>
-				<key>RubberWindowFrame</key>
-				<string>42 107 784 699 0 0 1280 832 </string>
-			</dict>
-		</dict>
-	</array>
-	<key>PerspectiveWidths</key>
-	<array>
-		<integer>-1</integer>
-		<integer>-1</integer>
-	</array>
-	<key>Perspectives</key>
-	<array>
-		<dict>
-			<key>ChosenToolbarItems</key>
-			<array>
-				<string>active-target-popup</string>
-				<string>active-buildstyle-popup</string>
-				<string>action</string>
-				<string>NSToolbarFlexibleSpaceItem</string>
-				<string>build-and-debug</string>
-				<string>buildOrClean</string>
-				<string>get-info</string>
-				<string>toggle-editor</string>
-				<string>servicesModuleCVS</string>
-				<string>NSToolbarFlexibleSpaceItem</string>
-				<string>com.apple.pbx.toolbar.searchfield</string>
-			</array>
-			<key>ControllerClassBaseName</key>
-			<string></string>
-			<key>IconName</key>
-			<string>WindowOfProjectWithEditor</string>
-			<key>Identifier</key>
-			<string>perspective.project</string>
-			<key>IsVertical</key>
-			<false/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>BecomeActive</key>
-					<true/>
-					<key>ContentConfiguration</key>
-					<dict>
-						<key>PBXBottomSmartGroupGIDs</key>
-						<array>
-							<string>1C37FBAC04509CD000000102</string>
-							<string>1C37FAAC04509CD000000102</string>
-							<string>1C08E77C0454961000C914BD</string>
-							<string>1C37FABC05509CD000000102</string>
-							<string>1C37FABC05539CD112110102</string>
-							<string>E2644B35053B69B200211256</string>
-							<string>1C37FABC04509CD000100104</string>
-							<string>1CC0EA4004350EF90044410B</string>
-							<string>1CC0EA4004350EF90041110B</string>
-						</array>
-						<key>PBXProjectModuleGUID</key>
-						<string>1CE0B1FE06471DED0097A5F4</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>Files</string>
-						<key>PBXProjectStructureProvided</key>
-						<string>yes</string>
-						<key>PBXSmartGroupTreeModuleColumnData</key>
-						<dict>
-							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
-							<array>
-								<real>186</real>
-							</array>
-							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
-							<array>
-								<string>MainColumn</string>
-							</array>
-						</dict>
-						<key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
-						<dict>
-							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
-							<array>
-								<string>20286C29FDCF999611CA2CEA</string>
-								<string>20286C2CFDCF999611CA2CEA</string>
-								<string>02345980000FD03B11CA0E72</string>
-								<string>1C37FBAC04509CD000000102</string>
-								<string>1C08E77C0454961000C914BD</string>
-								<string>1C37FABC05509CD000000102</string>
-							</array>
-							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
-							<array>
-								<array>
-									<integer>7</integer>
-									<integer>2</integer>
-									<integer>0</integer>
-								</array>
-							</array>
-							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {186, 617}}</string>
-						</dict>
-						<key>PBXTopSmartGroupGIDs</key>
-						<array/>
-						<key>XCIncludePerspectivesSwitch</key>
-						<true/>
-						<key>XCSharingToken</key>
-						<string>com.apple.Xcode.GFSharingToken</string>
-					</dict>
-					<key>GeometryConfiguration</key>
-					<dict>
-						<key>Frame</key>
-						<string>{{0, 0}, {203, 635}}</string>
-						<key>GroupTreeTableConfiguration</key>
-						<array>
-							<string>MainColumn</string>
-							<real>186</real>
-						</array>
-						<key>RubberWindowFrame</key>
-						<string>297 92 845 676 0 0 1280 832 </string>
-					</dict>
-					<key>Module</key>
-					<string>PBXSmartGroupTreeModule</string>
-					<key>Proportion</key>
-					<string>203pt</string>
-				</dict>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CE0B20306471E060097A5F4</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>bundle-main.c</string>
-								<key>PBXSplitModuleInNavigatorKey</key>
-								<dict>
-									<key>Split0</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1CE0B20406471E060097A5F4</string>
-										<key>PBXProjectModuleLabel</key>
-										<string>bundle-main.c</string>
-										<key>_historyCapacity</key>
-										<integer>0</integer>
-										<key>bookmark</key>
-										<string>A664210808E77262005A12D3</string>
-										<key>history</key>
-										<array>
-											<string>A66420F808E74CC8005A12D3</string>
-											<string>A66420F908E74CC8005A12D3</string>
-											<string>A66420FA08E74CC8005A12D3</string>
-											<string>A66420FB08E74CC8005A12D3</string>
-										</array>
-										<key>prevStack</key>
-										<array>
-											<string>A66420FC08E74CC8005A12D3</string>
-											<string>A66420FD08E74CC8005A12D3</string>
-											<string>A66420FE08E74CC8005A12D3</string>
-											<string>A66420FF08E74CC8005A12D3</string>
-											<string>A664210008E74CC8005A12D3</string>
-										</array>
-									</dict>
-									<key>SplitCount</key>
-									<string>1</string>
-								</dict>
-								<key>StatusBarVisibility</key>
-								<true/>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {637, 384}}</string>
-								<key>RubberWindowFrame</key>
-								<string>297 92 845 676 0 0 1280 832 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>384pt</string>
-						</dict>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CE0B20506471E060097A5F4</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Detail</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 389}, {637, 246}}</string>
-								<key>RubberWindowFrame</key>
-								<string>297 92 845 676 0 0 1280 832 </string>
-							</dict>
-							<key>Module</key>
-							<string>XCDetailModule</string>
-							<key>Proportion</key>
-							<string>246pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>637pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Project</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCModuleDock</string>
-				<string>PBXSmartGroupTreeModule</string>
-				<string>XCModuleDock</string>
-				<string>PBXNavigatorGroup</string>
-				<string>XCDetailModule</string>
-			</array>
-			<key>TableOfContents</key>
-			<array>
-				<string>A66420E208E74B62005A12D3</string>
-				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>A66420E308E74B62005A12D3</string>
-				<string>1CE0B20306471E060097A5F4</string>
-				<string>1CE0B20506471E060097A5F4</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.default</string>
-		</dict>
-		<dict>
-			<key>ControllerClassBaseName</key>
-			<string></string>
-			<key>IconName</key>
-			<string>WindowOfProject</string>
-			<key>Identifier</key>
-			<string>perspective.morph</string>
-			<key>IsVertical</key>
-			<integer>0</integer>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>BecomeActive</key>
-					<integer>1</integer>
-					<key>ContentConfiguration</key>
-					<dict>
-						<key>PBXBottomSmartGroupGIDs</key>
-						<array>
-							<string>1C37FBAC04509CD000000102</string>
-							<string>1C37FAAC04509CD000000102</string>
-							<string>1C08E77C0454961000C914BD</string>
-							<string>1C37FABC05509CD000000102</string>
-							<string>1C37FABC05539CD112110102</string>
-							<string>E2644B35053B69B200211256</string>
-							<string>1C37FABC04509CD000100104</string>
-							<string>1CC0EA4004350EF90044410B</string>
-							<string>1CC0EA4004350EF90041110B</string>
-						</array>
-						<key>PBXProjectModuleGUID</key>
-						<string>11E0B1FE06471DED0097A5F4</string>
-						<key>PBXProjectModuleLabel</key>
-						<string>Files</string>
-						<key>PBXProjectStructureProvided</key>
-						<string>yes</string>
-						<key>PBXSmartGroupTreeModuleColumnData</key>
-						<dict>
-							<key>PBXSmartGroupTreeModuleColumnWidthsKey</key>
-							<array>
-								<real>186</real>
-							</array>
-							<key>PBXSmartGroupTreeModuleColumnsKey_v4</key>
-							<array>
-								<string>MainColumn</string>
-							</array>
-						</dict>
-						<key>PBXSmartGroupTreeModuleOutlineStateKey_v7</key>
-						<dict>
-							<key>PBXSmartGroupTreeModuleOutlineStateExpansionKey</key>
-							<array>
-								<string>29B97314FDCFA39411CA2CEA</string>
-								<string>1C37FABC05509CD000000102</string>
-							</array>
-							<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
-							<array>
-								<array>
-									<integer>0</integer>
-								</array>
-							</array>
-							<key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key>
-							<string>{{0, 0}, {186, 337}}</string>
-						</dict>
-						<key>PBXTopSmartGroupGIDs</key>
-						<array/>
-						<key>XCIncludePerspectivesSwitch</key>
-						<integer>1</integer>
-						<key>XCSharingToken</key>
-						<string>com.apple.Xcode.GFSharingToken</string>
-					</dict>
-					<key>GeometryConfiguration</key>
-					<dict>
-						<key>Frame</key>
-						<string>{{0, 0}, {203, 355}}</string>
-						<key>GroupTreeTableConfiguration</key>
-						<array>
-							<string>MainColumn</string>
-							<real>186</real>
-						</array>
-						<key>RubberWindowFrame</key>
-						<string>373 269 690 397 0 0 1440 878 </string>
-					</dict>
-					<key>Module</key>
-					<string>PBXSmartGroupTreeModule</string>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Morph</string>
-			<key>PreferredWidth</key>
-			<integer>300</integer>
-			<key>ServiceClasses</key>
-			<array>
-				<string>XCModuleDock</string>
-				<string>PBXSmartGroupTreeModule</string>
-			</array>
-			<key>TableOfContents</key>
-			<array>
-				<string>11E0B1FE06471DED0097A5F4</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.default.short</string>
-		</dict>
-	</array>
-	<key>PerspectivesBarVisible</key>
-	<false/>
-	<key>ShelfIsVisible</key>
-	<false/>
-	<key>SourceDescription</key>
-	<string>file at '/System/Library/PrivateFrameworks/DevToolsInterface.framework/Versions/A/Resources/XCPerspectivesSpecificationMode1.xcperspec'</string>
-	<key>StatusbarIsVisible</key>
-	<true/>
-	<key>TimeStamp</key>
-	<real>0.0</real>
-	<key>ToolbarDisplayMode</key>
-	<integer>2</integer>
-	<key>ToolbarIsVisible</key>
-	<true/>
-	<key>ToolbarSizeMode</key>
-	<integer>2</integer>
-	<key>Type</key>
-	<string>Perspectives</string>
-	<key>UpdateMessage</key>
-	<string>The Default Workspace in this version of Xcode now includes support to hide and show the detail view (what has been referred to as the "Metro-Morph" feature). You must discard your current Default Workspace settings and update to the latest Default Workspace in order to gain this feature. Do you wish to update to the latest Workspace defaults for project '%@'?</string>
-	<key>WindowJustification</key>
-	<integer>5</integer>
-	<key>WindowOrderList</key>
-	<array>
-		<string>A66420EE08E74B62005A12D3</string>
-		<string>A66420EF08E74B62005A12D3</string>
-		<string>A66420EC08E74B62005A12D3</string>
-		<string>A66420EB08E74B62005A12D3</string>
-		<string>1CD10A99069EF8BA00B06720</string>
-		<string>/Users/darco/Projects/X11App/Synfig Studio.pbproj</string>
-		<string>A664210208E74CC8005A12D3</string>
-	</array>
-	<key>WindowString</key>
-	<string>297 92 845 676 0 0 1280 832 </string>
-	<key>WindowTools</key>
-	<array>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.build</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD0528F0623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>&lt;No Editor&gt;</string>
-								<key>PBXSplitModuleInNavigatorKey</key>
-								<dict>
-									<key>Split0</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1CD052900623707200166675</string>
-									</dict>
-									<key>SplitCount</key>
-									<string>1</string>
-								</dict>
-								<key>StatusBarVisibility</key>
-								<integer>1</integer>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {500, 215}}</string>
-								<key>RubberWindowFrame</key>
-								<string>192 257 500 500 0 0 1280 1002 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>218pt</string>
-						</dict>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>XCMainBuildResultsModuleGUID</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Build</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 222}, {500, 236}}</string>
-								<key>RubberWindowFrame</key>
-								<string>192 257 500 500 0 0 1280 1002 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXBuildResultsModule</string>
-							<key>Proportion</key>
-							<string>236pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>458pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Build Results</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXBuildResultsModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C78EAA5065D492600B07095</string>
-				<string>1C78EAA6065D492600B07095</string>
-				<string>1CD0528F0623707200166675</string>
-				<string>XCMainBuildResultsModuleGUID</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.build</string>
-			<key>WindowString</key>
-			<string>192 257 500 500 0 0 1280 1002 </string>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.debugger</string>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>Debugger</key>
-								<dict>
-									<key>HorizontalSplitView</key>
-									<dict>
-										<key>_collapsingFrameDimension</key>
-										<real>0.0</real>
-										<key>_indexOfCollapsedView</key>
-										<integer>0</integer>
-										<key>_percentageOfCollapsedView</key>
-										<real>0.0</real>
-										<key>isCollapsed</key>
-										<string>yes</string>
-										<key>sizes</key>
-										<array>
-											<string>{{0, 0}, {305, 162}}</string>
-											<string>{{305, 0}, {389, 162}}</string>
-										</array>
-									</dict>
-									<key>VerticalSplitView</key>
-									<dict>
-										<key>_collapsingFrameDimension</key>
-										<real>0.0</real>
-										<key>_indexOfCollapsedView</key>
-										<integer>0</integer>
-										<key>_percentageOfCollapsedView</key>
-										<real>0.0</real>
-										<key>isCollapsed</key>
-										<string>yes</string>
-										<key>sizes</key>
-										<array>
-											<string>{{0, 0}, {694, 162}}</string>
-											<string>{{0, 162}, {694, 219}}</string>
-										</array>
-									</dict>
-								</dict>
-								<key>LauncherConfigVersion</key>
-								<string>8</string>
-								<key>PBXProjectModuleGUID</key>
-								<string>1C162984064C10D400B95A72</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Debug - GLUTExamples (Underwater)</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>DebugConsoleDrawerSize</key>
-								<string>{100, 120}</string>
-								<key>DebugConsoleVisible</key>
-								<string>None</string>
-								<key>DebugConsoleWindowFrame</key>
-								<string>{{200, 200}, {500, 300}}</string>
-								<key>DebugSTDIOWindowFrame</key>
-								<string>{{200, 200}, {500, 300}}</string>
-								<key>Frame</key>
-								<string>{{0, 0}, {694, 381}}</string>
-								<key>RubberWindowFrame</key>
-								<string>318 323 694 422 0 0 1280 832 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXDebugSessionModule</string>
-							<key>Proportion</key>
-							<string>381pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>381pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Debugger</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXDebugSessionModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>1CD10A99069EF8BA00B06720</string>
-				<string>A66420E508E74B62005A12D3</string>
-				<string>1C162984064C10D400B95A72</string>
-				<string>A66420E608E74B62005A12D3</string>
-				<string>A66420E708E74B62005A12D3</string>
-				<string>A66420E808E74B62005A12D3</string>
-				<string>A66420E908E74B62005A12D3</string>
-				<string>A66420EA08E74B62005A12D3</string>
-				<string>A66420EB08E74B62005A12D3</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.debug</string>
-			<key>WindowString</key>
-			<string>318 323 694 422 0 0 1280 832 </string>
-			<key>WindowToolGUID</key>
-			<string>1CD10A99069EF8BA00B06720</string>
-			<key>WindowToolIsVisible</key>
-			<true/>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.find</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Dock</key>
-							<array>
-								<dict>
-									<key>ContentConfiguration</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1CDD528C0622207200134675</string>
-										<key>PBXProjectModuleLabel</key>
-										<string>&lt;No Editor&gt;</string>
-										<key>PBXSplitModuleInNavigatorKey</key>
-										<dict>
-											<key>Split0</key>
-											<dict>
-												<key>PBXProjectModuleGUID</key>
-												<string>1CD0528D0623707200166675</string>
-											</dict>
-											<key>SplitCount</key>
-											<string>1</string>
-										</dict>
-										<key>StatusBarVisibility</key>
-										<integer>1</integer>
-									</dict>
-									<key>GeometryConfiguration</key>
-									<dict>
-										<key>Frame</key>
-										<string>{{0, 0}, {781, 167}}</string>
-										<key>RubberWindowFrame</key>
-										<string>62 385 781 470 0 0 1440 878 </string>
-									</dict>
-									<key>Module</key>
-									<string>PBXNavigatorGroup</string>
-									<key>Proportion</key>
-									<string>781pt</string>
-								</dict>
-							</array>
-							<key>Proportion</key>
-							<string>50%</string>
-						</dict>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD0528E0623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Project Find</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{8, 0}, {773, 254}}</string>
-								<key>RubberWindowFrame</key>
-								<string>62 385 781 470 0 0 1440 878 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXProjectFindModule</string>
-							<key>Proportion</key>
-							<string>50%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>428pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Project Find</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXProjectFindModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C530D57069F1CE1000CFCEE</string>
-				<string>1C530D58069F1CE1000CFCEE</string>
-				<string>1C530D59069F1CE1000CFCEE</string>
-				<string>1CDD528C0622207200134675</string>
-				<string>1C530D5A069F1CE1000CFCEE</string>
-				<string>1CE0B1FE06471DED0097A5F4</string>
-				<string>1CD0528E0623707200166675</string>
-			</array>
-			<key>WindowString</key>
-			<string>62 385 781 470 0 0 1440 878 </string>
-			<key>WindowToolGUID</key>
-			<string>1C530D57069F1CE1000CFCEE</string>
-			<key>WindowToolIsVisible</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>MENUSEPARATOR</string>
-		</dict>
-		<dict>
-			<key>FirstTimeWindowDisplayed</key>
-			<false/>
-			<key>Identifier</key>
-			<string>windowTool.debuggerConsole</string>
-			<key>IsVertical</key>
-			<true/>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1C78EAAC065D492600B07095</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Debugger Console</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {440, 358}}</string>
-								<key>RubberWindowFrame</key>
-								<string>339 322 440 400 0 0 1280 832 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXDebugCLIModule</string>
-							<key>Proportion</key>
-							<string>358pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>359pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Debugger Console</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXDebugCLIModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<true/>
-			<key>TableOfContents</key>
-			<array>
-				<string>A66420EC08E74B62005A12D3</string>
-				<string>A66420ED08E74B62005A12D3</string>
-				<string>1C78EAAC065D492600B07095</string>
-			</array>
-			<key>WindowString</key>
-			<string>339 322 440 400 0 0 1280 832 </string>
-			<key>WindowToolGUID</key>
-			<string>A66420EC08E74B62005A12D3</string>
-			<key>WindowToolIsVisible</key>
-			<false/>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.run</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>LauncherConfigVersion</key>
-								<string>3</string>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD0528B0623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Run</string>
-								<key>Runner</key>
-								<dict>
-									<key>HorizontalSplitView</key>
-									<dict>
-										<key>_collapsingFrameDimension</key>
-										<real>0.0</real>
-										<key>_indexOfCollapsedView</key>
-										<integer>0</integer>
-										<key>_percentageOfCollapsedView</key>
-										<real>0.0</real>
-										<key>isCollapsed</key>
-										<string>yes</string>
-										<key>sizes</key>
-										<array>
-											<string>{{0, 0}, {493, 167}}</string>
-											<string>{{0, 176}, {493, 267}}</string>
-										</array>
-									</dict>
-									<key>VerticalSplitView</key>
-									<dict>
-										<key>_collapsingFrameDimension</key>
-										<real>0.0</real>
-										<key>_indexOfCollapsedView</key>
-										<integer>0</integer>
-										<key>_percentageOfCollapsedView</key>
-										<real>0.0</real>
-										<key>isCollapsed</key>
-										<string>yes</string>
-										<key>sizes</key>
-										<array>
-											<string>{{0, 0}, {405, 443}}</string>
-											<string>{{414, 0}, {514, 443}}</string>
-										</array>
-									</dict>
-								</dict>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {460, 159}}</string>
-								<key>RubberWindowFrame</key>
-								<string>316 696 459 200 0 0 1280 1002 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXRunSessionModule</string>
-							<key>Proportion</key>
-							<string>159pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>159pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Run Log</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXRunSessionModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C0AD2B3069F1EA900FABCE6</string>
-				<string>1C0AD2B4069F1EA900FABCE6</string>
-				<string>1CD0528B0623707200166675</string>
-				<string>1C0AD2B5069F1EA900FABCE6</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.run</string>
-			<key>WindowString</key>
-			<string>316 696 459 200 0 0 1280 1002 </string>
-			<key>WindowToolGUID</key>
-			<string>1C0AD2B3069F1EA900FABCE6</string>
-			<key>WindowToolIsVisible</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.scm</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1C78EAB2065D492600B07095</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>&lt;No Editor&gt;</string>
-								<key>PBXSplitModuleInNavigatorKey</key>
-								<dict>
-									<key>Split0</key>
-									<dict>
-										<key>PBXProjectModuleGUID</key>
-										<string>1C78EAB3065D492600B07095</string>
-									</dict>
-									<key>SplitCount</key>
-									<string>1</string>
-								</dict>
-								<key>StatusBarVisibility</key>
-								<integer>1</integer>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>Frame</key>
-								<string>{{0, 0}, {452, 0}}</string>
-								<key>RubberWindowFrame</key>
-								<string>743 379 452 308 0 0 1280 1002 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXNavigatorGroup</string>
-							<key>Proportion</key>
-							<string>0pt</string>
-						</dict>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD052920623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>SCM</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>ConsoleFrame</key>
-								<string>{{0, 259}, {452, 0}}</string>
-								<key>Frame</key>
-								<string>{{0, 7}, {452, 259}}</string>
-								<key>RubberWindowFrame</key>
-								<string>743 379 452 308 0 0 1280 1002 </string>
-								<key>TableConfiguration</key>
-								<array>
-									<string>Status</string>
-									<real>30</real>
-									<string>FileName</string>
-									<real>199</real>
-									<string>Path</string>
-									<real>197.09500122070312</real>
-								</array>
-								<key>TableFrame</key>
-								<string>{{0, 0}, {452, 250}}</string>
-							</dict>
-							<key>Module</key>
-							<string>PBXCVSModule</string>
-							<key>Proportion</key>
-							<string>262pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>266pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>SCM</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXCVSModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>1</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C78EAB4065D492600B07095</string>
-				<string>1C78EAB5065D492600B07095</string>
-				<string>1C78EAB2065D492600B07095</string>
-				<string>1CD052920623707200166675</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.scm</string>
-			<key>WindowString</key>
-			<string>743 379 452 308 0 0 1280 1002 </string>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.breakpoints</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CD052930623707200166675</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Breakpoints</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>BreakpointsTreeTableConfiguration</key>
-								<array>
-									<string>enabledColumn</string>
-									<real>16</real>
-									<string>breakpointColumn</string>
-									<real>201.5830078125</real>
-								</array>
-								<key>Frame</key>
-								<string>{{0, 0}, {240, 195}}</string>
-								<key>RubberWindowFrame</key>
-								<string>342 421 240 216 0 0 1440 878 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXDebugBreakpointsModule</string>
-							<key>Proportion</key>
-							<string>195pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>195pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Breakpoints</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXDebugBreakpointsModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>0</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C0AD2AD069F1E9B00FABCE6</string>
-				<string>1C0AD2AE069F1E9B00FABCE6</string>
-				<string>1CD052930623707200166675</string>
-			</array>
-			<key>WindowString</key>
-			<string>342 421 240 216 0 0 1440 878 </string>
-			<key>WindowToolGUID</key>
-			<string>1C0AD2AD069F1E9B00FABCE6</string>
-			<key>WindowToolIsVisible</key>
-			<integer>0</integer>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.bookmarks</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>Module</key>
-							<string>PBXBookmarksModule</string>
-							<key>Proportion</key>
-							<string>100%</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>100%</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Bookmarks</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXBookmarksModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>0</integer>
-			<key>WindowString</key>
-			<string>538 42 401 187 0 0 1280 1002 </string>
-		</dict>
-		<dict>
-			<key>Identifier</key>
-			<string>windowTool.classBrowser</string>
-			<key>Layout</key>
-			<array>
-				<dict>
-					<key>Dock</key>
-					<array>
-						<dict>
-							<key>BecomeActive</key>
-							<integer>1</integer>
-							<key>ContentConfiguration</key>
-							<dict>
-								<key>OptionsSetName</key>
-								<string>Hierarchy, all classes</string>
-								<key>PBXProjectModuleGUID</key>
-								<string>1CA6456E063B45B4001379D8</string>
-								<key>PBXProjectModuleLabel</key>
-								<string>Class Browser - NSObject</string>
-							</dict>
-							<key>GeometryConfiguration</key>
-							<dict>
-								<key>ClassesFrame</key>
-								<string>{{0, 0}, {374, 96}}</string>
-								<key>ClassesTreeTableConfiguration</key>
-								<array>
-									<string>PBXClassNameColumnIdentifier</string>
-									<real>208</real>
-									<string>PBXClassBookColumnIdentifier</string>
-									<real>22</real>
-								</array>
-								<key>Frame</key>
-								<string>{{0, 0}, {630, 331}}</string>
-								<key>MembersFrame</key>
-								<string>{{0, 105}, {374, 395}}</string>
-								<key>MembersTreeTableConfiguration</key>
-								<array>
-									<string>PBXMemberTypeIconColumnIdentifier</string>
-									<real>22</real>
-									<string>PBXMemberNameColumnIdentifier</string>
-									<real>216</real>
-									<string>PBXMemberTypeColumnIdentifier</string>
-									<real>97</real>
-									<string>PBXMemberBookColumnIdentifier</string>
-									<real>22</real>
-								</array>
-								<key>PBXModuleWindowStatusBarHidden2</key>
-								<integer>1</integer>
-								<key>RubberWindowFrame</key>
-								<string>385 179 630 352 0 0 1440 878 </string>
-							</dict>
-							<key>Module</key>
-							<string>PBXClassBrowserModule</string>
-							<key>Proportion</key>
-							<string>332pt</string>
-						</dict>
-					</array>
-					<key>Proportion</key>
-					<string>332pt</string>
-				</dict>
-			</array>
-			<key>Name</key>
-			<string>Class Browser</string>
-			<key>ServiceClasses</key>
-			<array>
-				<string>PBXClassBrowserModule</string>
-			</array>
-			<key>StatusbarIsVisible</key>
-			<integer>0</integer>
-			<key>TableOfContents</key>
-			<array>
-				<string>1C0AD2AF069F1E9B00FABCE6</string>
-				<string>1C0AD2B0069F1E9B00FABCE6</string>
-				<string>1CA6456E063B45B4001379D8</string>
-			</array>
-			<key>ToolbarConfiguration</key>
-			<string>xcode.toolbar.config.classbrowser</string>
-			<key>WindowString</key>
-			<string>385 179 630 352 0 0 1440 878 </string>
-			<key>WindowToolGUID</key>
-			<string>1C0AD2AF069F1E9B00FABCE6</string>
-			<key>WindowToolIsVisible</key>
-			<integer>0</integer>
-		</dict>
-	</array>
-</dict>
-</plist>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/Synfig Studio.pbproj/darco.pbxuser Deleted

@@ -1,1624 +0,0 @@
-// !$*UTF8*$!
-{
-	20286C28FDCF999611CA2CEA = {
-		activeBuildStyle = 4A9504C5FFE6A39111CA0CBA;
-		activeExecutable = A65E397F07515B8200A66E82;
-		activeTarget = 20286C34FDCF999611CA2CEA;
-		addToTargets = (
-			20286C34FDCF999611CA2CEA,
-		);
-		codeSenseManager = A66420E108E74B3D005A12D3;
-		executables = (
-			A65E397F07515B8200A66E82,
-		);
-		perUserDictionary = {
-			PBXConfiguration.PBXFileTableDataSource3.PBXErrorsWarningsDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXErrorsWarningsDataSource_MessageID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					300,
-					200,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXErrorsWarningsDataSource_TypeID,
-					PBXErrorsWarningsDataSource_MessageID,
-					PBXErrorsWarningsDataSource_LocationID,
-				);
-			};
-			PBXConfiguration.PBXFileTableDataSource3.PBXFileTableDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					398,
-					20,
-					48,
-					43,
-					43,
-					20,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-					PBXFileDataSource_Target_ColumnID,
-				);
-			};
-			PBXConfiguration.PBXTargetDataSource.PBXTargetDataSource = {
-				PBXFileTableDataSourceColumnSortingDirectionKey = "-1";
-				PBXFileTableDataSourceColumnSortingKey = PBXFileDataSource_Filename_ColumnID;
-				PBXFileTableDataSourceColumnWidthsKey = (
-					20,
-					200,
-					218,
-					20,
-					48.1626,
-					43,
-					43,
-				);
-				PBXFileTableDataSourceColumnsKey = (
-					PBXFileDataSource_FiletypeID,
-					PBXFileDataSource_Filename_ColumnID,
-					PBXTargetDataSource_PrimaryAttribute,
-					PBXFileDataSource_Built_ColumnID,
-					PBXFileDataSource_ObjectSize_ColumnID,
-					PBXFileDataSource_Errors_ColumnID,
-					PBXFileDataSource_Warnings_ColumnID,
-				);
-			};
-			PBXPerProjectTemplateStateSaveDate = 149375796;
-			"PBXTemplateGeometry-F5CA7ECB015C094F0DCA290F" = {
-				ContentSize = "{668, 621}";
-				LeftSlideOut = {
-					Collapsed = NO;
-					Frame = "{{0, 0}, {668, 621}}";
-					Split0 = {
-						Collapsed = NO;
-						Frame = "{{0, 0}, {668, 621}}";
-						Split0 = {
-							Frame = "{{0, 0}, {668, 621}}";
-						};
-						SplitCount = 1;
-						Tab0 = {
-							Frame = "{{0, 0}, {484, 208}}";
-						};
-						Tab1 = {
-							Debugger = {
-								Collapsed = NO;
-								Frame = "{{0, 0}, {664, 208}}";
-								Split0 = {
-									Frame = "{{0, 24}, {664, 184}}";
-									Split0 = {
-										Frame = "{{0, 0}, {325, 184}}";
-									};
-									Split1 = {
-										DebugVariablesTableConfiguration = (
-											Name,
-											123,
-											Value,
-											85,
-											Summary,
-											96.123,
-										);
-										Frame = "{{334, 0}, {330, 184}}";
-									};
-									SplitCount = 2;
-								};
-								SplitCount = 1;
-								Tab0 = {
-									Frame = "{{0, 0}, {100, 50}}";
-								};
-								Tab1 = {
-									Frame = "{{0, 0}, {100, 50}}";
-								};
-								TabCount = 2;
-								TabsVisible = YES;
-							};
-							Frame = "{{0, 0}, {664, 208}}";
-							LauncherConfigVersion = 7;
-						};
-						Tab2 = {
-							Frame = "{{0, 0}, {664, 50}}";
-							LauncherConfigVersion = 3;
-							Runner = {
-								Frame = "{{0, 0}, {664, 50}}";
-							};
-						};
-						Tab3 = {
-							BuildMessageFrame = "{{0, 0}, {614, 203}}";
-							BuildTranscriptFrame = "{{0, 212}, {614, 85}}";
-							BuildTranscriptFrameExpanded = YES;
-							Frame = "{{0, 0}, {612, 295}}";
-						};
-						Tab4 = {
-							Frame = "{{0, 0}, {612, 295}}";
-						};
-						TabCount = 5;
-						TabsVisible = NO;
-					};
-					SplitCount = 1;
-					Tab0 = {
-						Frame = "{{0, 0}, {313, 531}}";
-						GroupTreeTableConfiguration = (
-							TargetStatusColumn,
-							18,
-							MainColumn,
-							280,
-						);
-					};
-					Tab1 = {
-						ClassesFrame = "{{0, 0}, {280, 398}}";
-						ClassesTreeTableConfiguration = (
-							PBXBookColumnIdentifier,
-							20,
-							PBXClassColumnIdentifier,
-							237,
-						);
-						Frame = "{{0, 0}, {278, 659}}";
-						MembersFrame = "{{0, 407}, {280, 252}}";
-						MembersTreeTableConfiguration = (
-							PBXBookColumnIdentifier,
-							20,
-							PBXMethodColumnIdentifier,
-							236,
-						);
-					};
-					Tab2 = {
-						Frame = "{{0, 0}, {200, 100}}";
-					};
-					Tab3 = {
-						Frame = "{{0, 0}, {200, 557}}";
-						TargetTableConfiguration = (
-							ActiveObject,
-							16,
-							ObjectNames,
-							202.296,
-						);
-					};
-					Tab4 = {
-						BreakpointsTreeTableConfiguration = (
-							breakpointColumn,
-							197,
-							enabledColumn,
-							31,
-						);
-						Frame = "{{0, 0}, {250, 100}}";
-					};
-					TabCount = 5;
-					TabsVisible = NO;
-				};
-				NavBarShownByDefault = YES;
-				StatusViewVisible = NO;
-				Template = F5CA7ECB015C094F0DCA290F;
-				ToolbarVisible = NO;
-				WindowLocation = "{425, 95}";
-			};
-			PBXWorkspaceContents = (
-				{
-					LeftSlideOut = {
-						Split0 = {
-							Split0 = {
-								NavContent0 = {
-									bookmark = A65E48C007518C4E00A66E82;
-									history = (
-										A65E3D3907515FE000A66E82,
-										A65E488907518C4E00A66E82,
-										A65E488A07518C4E00A66E82,
-										A65E488B07518C4E00A66E82,
-										A65E488C07518C4E00A66E82,
-										A65E488D07518C4E00A66E82,
-										A65E488E07518C4E00A66E82,
-										A65E488F07518C4E00A66E82,
-										A65E489007518C4E00A66E82,
-										A65E489107518C4E00A66E82,
-										A65E489207518C4E00A66E82,
-										A65E489307518C4E00A66E82,
-										A65E489407518C4E00A66E82,
-										A65E489507518C4E00A66E82,
-										A65E489607518C4E00A66E82,
-										A65E489707518C4E00A66E82,
-										A65E489807518C4E00A66E82,
-										A65E489907518C4E00A66E82,
-									);
-									prevStack = (
-										A65E3D3B07515FE000A66E82,
-										A65E3D3C07515FE000A66E82,
-										A65E3D3D07515FE000A66E82,
-										A65E3D3E07515FE000A66E82,
-										A65E3D3F07515FE000A66E82,
-										A65E3D4007515FE000A66E82,
-										A65E3D4107515FE000A66E82,
-										A65E489A07518C4E00A66E82,
-										A65E489B07518C4E00A66E82,
-										A65E489C07518C4E00A66E82,
-										A65E489D07518C4E00A66E82,
-										A65E489E07518C4E00A66E82,
-										A65E489F07518C4E00A66E82,
-										A65E48A007518C4E00A66E82,
-										A65E48A107518C4E00A66E82,
-										A65E48A207518C4E00A66E82,
-										A65E48A307518C4E00A66E82,
-										A65E48A407518C4E00A66E82,
-										A65E48A507518C4E00A66E82,
-										A65E48A607518C4E00A66E82,
-										A65E48A707518C4E00A66E82,
-										A65E48A807518C4E00A66E82,
-										A65E48A907518C4E00A66E82,
-										A65E48AA07518C4E00A66E82,
-										A65E48AB07518C4E00A66E82,
-										A65E48AC07518C4E00A66E82,
-										A65E48AD07518C4E00A66E82,
-										A65E48AE07518C4E00A66E82,
-										A65E48AF07518C4E00A66E82,
-										A65E48B007518C4E00A66E82,
-										A65E48B107518C4E00A66E82,
-										A65E48B207518C4E00A66E82,
-										A65E48B307518C4E00A66E82,
-										A65E48B407518C4E00A66E82,
-										A65E48B507518C4E00A66E82,
-										A65E48B607518C4E00A66E82,
-										A65E48B707518C4E00A66E82,
-										A65E48B807518C4E00A66E82,
-										A65E48B907518C4E00A66E82,
-										A65E48BA07518C4E00A66E82,
-										A65E48BB07518C4E00A66E82,
-										A65E48BC07518C4E00A66E82,
-										A65E48BD07518C4E00A66E82,
-										A65E48BE07518C4E00A66E82,
-										A65E48BF07518C4E00A66E82,
-									);
-								};
-								NavCount = 1;
-								NavGeometry0 = {
-									Frame = "{{0, 0}, {819, 439}}";
-									NavBarVisible = YES;
-								};
-								NavSplitVertical = NO;
-							};
-							SplitCount = 1;
-							Tab1 = {
-								Debugger = {
-									Split0 = {
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									TabCount = 2;
-								};
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								LauncherConfigVersion = 3;
-								Runner = {
-								};
-							};
-							TabCount = 5;
-						};
-						SplitCount = 1;
-						Tab1 = {
-							OptionsSetName = "Hierarchy, all classes";
-						};
-						TabCount = 5;
-					};
-				},
-				{
-					LeftSlideOut = {
-						Split0 = {
-							Split0 = {
-								NavContent0 = {
-									bookmark = A65E48C207518C4E00A66E82;
-									history = (
-										A65E48C107518C4E00A66E82,
-									);
-								};
-								NavCount = 1;
-								NavGeometry0 = {
-									Frame = "{{0, 0}, {668, 621}}";
-									NavBarVisible = YES;
-								};
-								NavSplitVertical = NO;
-							};
-							SplitCount = 1;
-							Tab1 = {
-								Debugger = {
-									Split0 = {
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									TabCount = 2;
-								};
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								LauncherConfigVersion = 3;
-								Runner = {
-								};
-							};
-							TabCount = 5;
-						};
-						SplitCount = 1;
-						Tab1 = {
-							OptionsSetName = "Hierarchy, all classes";
-						};
-						TabCount = 5;
-					};
-				},
-				{
-					LeftSlideOut = {
-						Split0 = {
-							Split0 = {
-								NavContent0 = {
-									bookmark = A65E48C407518C4E00A66E82;
-									history = (
-										A65E48C307518C4E00A66E82,
-									);
-								};
-								NavCount = 1;
-								NavGeometry0 = {
-									Frame = "{{0, 0}, {668, 621}}";
-									NavBarVisible = YES;
-								};
-								NavSplitVertical = NO;
-							};
-							SplitCount = 1;
-							Tab1 = {
-								Debugger = {
-									Split0 = {
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									TabCount = 2;
-								};
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								LauncherConfigVersion = 3;
-								Runner = {
-								};
-							};
-							TabCount = 5;
-						};
-						SplitCount = 1;
-						Tab1 = {
-							OptionsSetName = "Hierarchy, all classes";
-						};
-						TabCount = 5;
-					};
-				},
-				{
-					LeftSlideOut = {
-						Split0 = {
-							Split0 = {
-								NavContent0 = {
-									bookmark = A65E48C607518C4E00A66E82;
-									history = (
-										A65E48C507518C4E00A66E82,
-									);
-								};
-								NavCount = 1;
-								NavGeometry0 = {
-									Frame = "{{0, 0}, {668, 621}}";
-									NavBarVisible = YES;
-								};
-								NavSplitVertical = NO;
-							};
-							SplitCount = 1;
-							Tab1 = {
-								Debugger = {
-									Split0 = {
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									TabCount = 2;
-								};
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								LauncherConfigVersion = 3;
-								Runner = {
-								};
-							};
-							TabCount = 5;
-						};
-						SplitCount = 1;
-						Tab1 = {
-							OptionsSetName = "Hierarchy, all classes";
-						};
-						TabCount = 5;
-					};
-				},
-			);
-			PBXWorkspaceGeometries = (
-				{
-					ContentSize = "{1103, 612}";
-					LeftSlideOut = {
-						ActiveTab = 0;
-						ActiveTabName = PBXGroupTreeModule;
-						Collapsed = NO;
-						Frame = "{{0, 23}, {1103, 589}}";
-						Split0 = {
-							ActiveTab = 1;
-							ActiveTabName = PBXRunSessionModule;
-							Collapsed = NO;
-							Frame = "{{284, 0}, {819, 589}}";
-							Split0 = {
-								Frame = "{{0, 150}, {819, 439}}";
-							};
-							SplitCount = 1;
-							Tab0 = {
-								Frame = "{{0, 0}, {572, 214}}";
-							};
-							Tab1 = {
-								Debugger = {
-									Collapsed = NO;
-									Frame = "{{0, 0}, {572, 150}}";
-									Split0 = {
-										Frame = "{{0, 24}, {572, 126}}";
-										Split0 = {
-											Frame = "{{0, 0}, {279, 126}}";
-										};
-										Split1 = {
-											DebugVariablesTableConfiguration = (
-												Name,
-												123,
-												Value,
-												85,
-												Summary,
-												62.123,
-											);
-											Frame = "{{288, 0}, {284, 126}}";
-										};
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									Tab0 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									Tab1 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									TabCount = 2;
-									TabsVisible = YES;
-								};
-								Frame = "{{0, 0}, {572, 125}}";
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								Frame = "{{0, 0}, {819, 126}}";
-								LauncherConfigVersion = 3;
-								Runner = {
-									Frame = "{{0, 0}, {819, 126}}";
-								};
-							};
-							Tab3 = {
-								BuildMessageFrame = "{{0, 0}, {821, 165}}";
-								BuildTranscriptFrame = "{{0, 174}, {821, 69}}";
-								BuildTranscriptFrameExpanded = YES;
-								Frame = "{{0, 0}, {819, 265}}";
-							};
-							Tab4 = {
-								Frame = "{{0, 0}, {819, 295}}";
-							};
-							TabCount = 5;
-							TabsVisible = YES;
-						};
-						SplitCount = 1;
-						Tab0 = {
-							Frame = "{{0, 0}, {260, 589}}";
-							GroupTreeTableConfiguration = (
-								TargetStatusColumn,
-								18,
-								MainColumn,
-								227,
-							);
-						};
-						Tab1 = {
-							ClassesFrame = "{{0, 0}, {247, 330}}";
-							ClassesTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXClassColumnIdentifier,
-								204,
-							);
-							Frame = "{{0, 0}, {245, 549}}";
-							MembersFrame = "{{0, 339}, {247, 210}}";
-							MembersTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXMethodColumnIdentifier,
-								203,
-							);
-						};
-						Tab2 = {
-							Frame = "{{0, 0}, {226, 549}}";
-						};
-						Tab3 = {
-							Frame = "{{0, 0}, {191, 589}}";
-							TargetTableConfiguration = (
-								ActiveObject,
-								16,
-								ObjectNames,
-								202.296,
-							);
-						};
-						Tab4 = {
-							BreakpointsTreeTableConfiguration = (
-								breakpointColumn,
-								138,
-								enabledColumn,
-								31,
-							);
-							Frame = "{{0, 0}, {191, 549}}";
-						};
-						TabCount = 5;
-						TabsVisible = YES;
-					};
-					NavBarShownByDefault = YES;
-					StatusViewVisible = YES;
-					Template = F5F68CF101725D4C0D7A8F4C;
-					ToolbarVisible = YES;
-					WindowLocation = "{123, 29}";
-				},
-				{
-					ContentSize = "{668, 621}";
-					LeftSlideOut = {
-						Collapsed = NO;
-						Frame = "{{0, 0}, {668, 621}}";
-						Split0 = {
-							Collapsed = NO;
-							Frame = "{{0, 0}, {668, 621}}";
-							Split0 = {
-								Frame = "{{0, 0}, {668, 621}}";
-							};
-							SplitCount = 1;
-							Tab0 = {
-								Frame = "{{0, 0}, {484, 208}}";
-							};
-							Tab1 = {
-								Debugger = {
-									Collapsed = NO;
-									Frame = "{{0, 0}, {664, 208}}";
-									Split0 = {
-										Frame = "{{0, 24}, {664, 184}}";
-										Split0 = {
-											Frame = "{{0, 0}, {325, 184}}";
-										};
-										Split1 = {
-											DebugVariablesTableConfiguration = (
-												Name,
-												123,
-												Value,
-												85,
-												Summary,
-												96.123,
-											);
-											Frame = "{{334, 0}, {330, 184}}";
-										};
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									Tab0 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									Tab1 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									TabCount = 2;
-									TabsVisible = YES;
-								};
-								Frame = "{{0, 0}, {664, 208}}";
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								Frame = "{{0, 0}, {664, 50}}";
-								LauncherConfigVersion = 3;
-								Runner = {
-									Frame = "{{0, 0}, {664, 50}}";
-								};
-							};
-							Tab3 = {
-								BuildMessageFrame = "{{0, 0}, {614, 203}}";
-								BuildTranscriptFrame = "{{0, 212}, {614, 85}}";
-								BuildTranscriptFrameExpanded = YES;
-								Frame = "{{0, 0}, {612, 295}}";
-							};
-							Tab4 = {
-								Frame = "{{0, 0}, {612, 295}}";
-							};
-							TabCount = 5;
-							TabsVisible = NO;
-						};
-						SplitCount = 1;
-						Tab0 = {
-							Frame = "{{0, 0}, {313, 531}}";
-							GroupTreeTableConfiguration = (
-								TargetStatusColumn,
-								18,
-								MainColumn,
-								280,
-							);
-						};
-						Tab1 = {
-							ClassesFrame = "{{0, 0}, {280, 398}}";
-							ClassesTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXClassColumnIdentifier,
-								237,
-							);
-							Frame = "{{0, 0}, {278, 659}}";
-							MembersFrame = "{{0, 407}, {280, 252}}";
-							MembersTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXMethodColumnIdentifier,
-								236,
-							);
-						};
-						Tab2 = {
-							Frame = "{{0, 0}, {200, 100}}";
-						};
-						Tab3 = {
-							Frame = "{{0, 0}, {200, 557}}";
-							TargetTableConfiguration = (
-								ActiveObject,
-								16,
-								ObjectNames,
-								202.296,
-							);
-						};
-						Tab4 = {
-							BreakpointsTreeTableConfiguration = (
-								breakpointColumn,
-								197,
-								enabledColumn,
-								31,
-							);
-							Frame = "{{0, 0}, {250, 100}}";
-						};
-						TabCount = 5;
-						TabsVisible = NO;
-					};
-					NavBarShownByDefault = YES;
-					StatusViewVisible = NO;
-					Template = F5CA7ECB015C094F0DCA290F;
-					ToolbarVisible = NO;
-					WindowLocation = "{357, 158}";
-				},
-				{
-					ContentSize = "{668, 621}";
-					LeftSlideOut = {
-						Collapsed = NO;
-						Frame = "{{0, 0}, {668, 621}}";
-						Split0 = {
-							Collapsed = NO;
-							Frame = "{{0, 0}, {668, 621}}";
-							Split0 = {
-								Frame = "{{0, 0}, {668, 621}}";
-							};
-							SplitCount = 1;
-							Tab0 = {
-								Frame = "{{0, 0}, {484, 208}}";
-							};
-							Tab1 = {
-								Debugger = {
-									Collapsed = NO;
-									Frame = "{{0, 0}, {664, 208}}";
-									Split0 = {
-										Frame = "{{0, 24}, {664, 184}}";
-										Split0 = {
-											Frame = "{{0, 0}, {325, 184}}";
-										};
-										Split1 = {
-											DebugVariablesTableConfiguration = (
-												Name,
-												123,
-												Value,
-												85,
-												Summary,
-												96.123,
-											);
-											Frame = "{{334, 0}, {330, 184}}";
-										};
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									Tab0 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									Tab1 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									TabCount = 2;
-									TabsVisible = YES;
-								};
-								Frame = "{{0, 0}, {664, 208}}";
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								Frame = "{{0, 0}, {664, 50}}";
-								LauncherConfigVersion = 3;
-								Runner = {
-									Frame = "{{0, 0}, {664, 50}}";
-								};
-							};
-							Tab3 = {
-								BuildMessageFrame = "{{0, 0}, {614, 203}}";
-								BuildTranscriptFrame = "{{0, 212}, {614, 85}}";
-								BuildTranscriptFrameExpanded = YES;
-								Frame = "{{0, 0}, {612, 295}}";
-							};
-							Tab4 = {
-								Frame = "{{0, 0}, {612, 295}}";
-							};
-							TabCount = 5;
-							TabsVisible = NO;
-						};
-						SplitCount = 1;
-						Tab0 = {
-							Frame = "{{0, 0}, {313, 531}}";
-							GroupTreeTableConfiguration = (
-								TargetStatusColumn,
-								18,
-								MainColumn,
-								280,
-							);
-						};
-						Tab1 = {
-							ClassesFrame = "{{0, 0}, {280, 398}}";
-							ClassesTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXClassColumnIdentifier,
-								237,
-							);
-							Frame = "{{0, 0}, {278, 659}}";
-							MembersFrame = "{{0, 407}, {280, 252}}";
-							MembersTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXMethodColumnIdentifier,
-								236,
-							);
-						};
-						Tab2 = {
-							Frame = "{{0, 0}, {200, 100}}";
-						};
-						Tab3 = {
-							Frame = "{{0, 0}, {200, 557}}";
-							TargetTableConfiguration = (
-								ActiveObject,
-								16,
-								ObjectNames,
-								202.296,
-							);
-						};
-						Tab4 = {
-							BreakpointsTreeTableConfiguration = (
-								breakpointColumn,
-								197,
-								enabledColumn,
-								31,
-							);
-							Frame = "{{0, 0}, {250, 100}}";
-						};
-						TabCount = 5;
-						TabsVisible = NO;
-					};
-					NavBarShownByDefault = YES;
-					StatusViewVisible = NO;
-					Template = F5CA7ECB015C094F0DCA290F;
-					ToolbarVisible = NO;
-					WindowLocation = "{380, 137}";
-				},
-				{
-					ContentSize = "{668, 621}";
-					LeftSlideOut = {
-						Collapsed = NO;
-						Frame = "{{0, 0}, {668, 621}}";
-						Split0 = {
-							Collapsed = NO;
-							Frame = "{{0, 0}, {668, 621}}";
-							Split0 = {
-								Frame = "{{0, 0}, {668, 621}}";
-							};
-							SplitCount = 1;
-							Tab0 = {
-								Frame = "{{0, 0}, {484, 208}}";
-							};
-							Tab1 = {
-								Debugger = {
-									Collapsed = NO;
-									Frame = "{{0, 0}, {664, 208}}";
-									Split0 = {
-										Frame = "{{0, 24}, {664, 184}}";
-										Split0 = {
-											Frame = "{{0, 0}, {325, 184}}";
-										};
-										Split1 = {
-											DebugVariablesTableConfiguration = (
-												Name,
-												123,
-												Value,
-												85,
-												Summary,
-												96.123,
-											);
-											Frame = "{{334, 0}, {330, 184}}";
-										};
-										SplitCount = 2;
-									};
-									SplitCount = 1;
-									Tab0 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									Tab1 = {
-										Frame = "{{0, 0}, {100, 50}}";
-									};
-									TabCount = 2;
-									TabsVisible = YES;
-								};
-								Frame = "{{0, 0}, {664, 208}}";
-								LauncherConfigVersion = 7;
-							};
-							Tab2 = {
-								Frame = "{{0, 0}, {664, 50}}";
-								LauncherConfigVersion = 3;
-								Runner = {
-									Frame = "{{0, 0}, {664, 50}}";
-								};
-							};
-							Tab3 = {
-								BuildMessageFrame = "{{0, 0}, {614, 203}}";
-								BuildTranscriptFrame = "{{0, 212}, {614, 85}}";
-								BuildTranscriptFrameExpanded = YES;
-								Frame = "{{0, 0}, {612, 295}}";
-							};
-							Tab4 = {
-								Frame = "{{0, 0}, {612, 295}}";
-							};
-							TabCount = 5;
-							TabsVisible = NO;
-						};
-						SplitCount = 1;
-						Tab0 = {
-							Frame = "{{0, 0}, {313, 531}}";
-							GroupTreeTableConfiguration = (
-								TargetStatusColumn,
-								18,
-								MainColumn,
-								280,
-							);
-						};
-						Tab1 = {
-							ClassesFrame = "{{0, 0}, {280, 398}}";
-							ClassesTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXClassColumnIdentifier,
-								237,
-							);
-							Frame = "{{0, 0}, {278, 659}}";
-							MembersFrame = "{{0, 407}, {280, 252}}";
-							MembersTreeTableConfiguration = (
-								PBXBookColumnIdentifier,
-								20,
-								PBXMethodColumnIdentifier,
-								236,
-							);
-						};
-						Tab2 = {
-							Frame = "{{0, 0}, {200, 100}}";
-						};
-						Tab3 = {
-							Frame = "{{0, 0}, {200, 557}}";
-							TargetTableConfiguration = (
-								ActiveObject,
-								16,
-								ObjectNames,
-								202.296,
-							);
-						};
-						Tab4 = {
-							BreakpointsTreeTableConfiguration = (
-								breakpointColumn,
-								197,
-								enabledColumn,
-								31,
-							);
-							Frame = "{{0, 0}, {250, 100}}";
-						};
-						TabCount = 5;
-						TabsVisible = NO;
-					};
-					NavBarShownByDefault = YES;
-					StatusViewVisible = NO;
-					Template = F5CA7ECB015C094F0DCA290F;
-					ToolbarVisible = NO;
-					WindowLocation = "{403, 116}";
-				},
-			);
-			PBXWorkspaceStateSaveDate = 149375796;
-		};
-		perUserProjectItems = {
-			A66420F808E74CC8005A12D3 = A66420F808E74CC8005A12D3;
-			A66420F908E74CC8005A12D3 = A66420F908E74CC8005A12D3;
-			A66420FA08E74CC8005A12D3 = A66420FA08E74CC8005A12D3;
-			A66420FB08E74CC8005A12D3 = A66420FB08E74CC8005A12D3;
-			A66420FC08E74CC8005A12D3 = A66420FC08E74CC8005A12D3;
-			A66420FD08E74CC8005A12D3 = A66420FD08E74CC8005A12D3;
-			A66420FE08E74CC8005A12D3 = A66420FE08E74CC8005A12D3;
-			A66420FF08E74CC8005A12D3 = A66420FF08E74CC8005A12D3;
-			A664210008E74CC8005A12D3 = A664210008E74CC8005A12D3;
-			A664210408E74CC8005A12D3 = A664210408E74CC8005A12D3;
-			A664210808E77262005A12D3 = A664210808E77262005A12D3;
-			A664210908E77262005A12D3 = A664210908E77262005A12D3;
-		};
-		sourceControlManager = A66420E008E74B3D005A12D3;
-		userBuildSettings = {
-		};
-	};
-	20286C34FDCF999611CA2CEA = {
-		activeExec = 0;
-		executables = (
-			A65E397F07515B8200A66E82,
-		);
-	};
-	50EE2AB703849F0B0ECA21EC = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {596, 12726}}";
-			sepNavSelRange = "{19522, 64}";
-			sepNavVisRect = "{{0, 12081}, {596, 352}}";
-			sepNavWindowFrame = "{{19, 72}, {784, 755}}";
-		};
-	};
-	A65E397F07515B8200A66E82 = {
-		activeArgIndex = 2147483647;
-		activeArgIndices = (
-		);
-		argumentStrings = (
-		);
-		configStateDict = {
-			"PBXLSLaunchAction-0" = {
-				PBXLSLaunchAction = 0;
-				PBXLSLaunchStartAction = 1;
-				PBXLSLaunchStdioStyle = 1;
-				PBXLSLaunchStyle = 0;
-				class = PBXLSRunLaunchConfig;
-				identifier = com.apple.ProjectBuilder.launch.runConfig;
-				remoteHostInfo = "";
-				startActionInfo = "";
-			};
-		};
-		cppStopOnCatchEnabled = 0;
-		cppStopOnThrowEnabled = 0;
-		customDataFormattersEnabled = 1;
-		debuggerPlugin = GDBDebugging;
-		disassemblyDisplayState = 0;
-		dylibVariantSuffix = "";
-		enableDebugStr = 1;
-		environmentEntries = (
-		);
-		executableSystemSymbolLevel = 0;
-		executableUserSymbolLevel = 0;
-		isa = PBXExecutable;
-		libgmallocEnabled = 0;
-		name = SynfigStudio;
-		savedGlobals = {
-		};
-		shlibInfoDictList = (
-		);
-		shlibInfoDictList_v2 = (
-			{
-				level = 0;
-				path = /usr/lib/system/libmathCommon.A.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libSystem.B.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/X11R6/lib/libX11.6.2.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libicucore.A.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libauto.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libobjc.A.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libz.1.2.3.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Security.framework/Versions/A/Security;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CFNetwork.framework/Versions/A/CFNetwork;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/WebServicesCore.framework/Versions/A/WebServicesCore;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CarbonSound.framework/Versions/A/CarbonSound;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libbsm.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libcrypto.0.9.7.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSync.framework/Versions/A/ColorSync;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/CoreText.framework/Versions/A/CoreText;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libcups.2.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/LangAnalysis.framework/Versions/A/LangAnalysis;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/FindByContent.framework/Versions/A/FindByContent;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libRaw.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libmx.A.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ImageIO.framework/Versions/A/ImageIO;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libiconv.2.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libxml2.2.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/PrivateFrameworks/DesktopServicesPriv.framework/Versions/A/DesktopServicesPriv;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/ImageCapture.framework/Versions/A/ImageCapture;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SecurityHI.framework/Versions/A/SecurityHI;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Ink.framework/Versions/A/Ink;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Help.framework/Versions/A/Help;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/OpenScripting.framework/Versions/A/OpenScripting;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/Print.framework/Versions/A/Print;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HTMLRendering.framework/Versions/A/HTMLRendering;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/NavigationServices.framework/Versions/A/NavigationServices;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/CommonPanels.framework/Versions/A/CommonPanels;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Carbon.framework/Versions/A/Carbon;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libsqlite3.0.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/CoreData.framework/Versions/A/CoreData;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/JavaScriptCore.framework/Versions/A/JavaScriptCore;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /usr/lib/libxslt.1.dylib;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks/WebCore.framework/Versions/A/WebCore;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/WebKit.framework/Versions/A/WebKit;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/OSAKit.framework/Versions/A/OSAKit;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = /System/Library/Frameworks/AppleScriptKit.framework/Versions/A/AppleScriptKit;
-				whenToLoad = 0;
-			},
-			{
-				level = 0;
-				path = "/Users/darco/Projects/X11App/build/Synfig Studio.app/Contents/MacOS/Synfig Studio";
-				whenToLoad = 0;
-			},
-		);
-		sourceDirectories = (
-		);
-	};
-	A65E4880075176F200A66E82 = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {512, 271}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 0}, {512, 271}}";
-		};
-	};
-	A65E4881075176F200A66E82 = {
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {512, 271}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 0}, {512, 271}}";
-		};
-	};
-	A65E48D507518C4E00A66E82 = {
-		isa = PBXFileReference;
-		lastKnownFileType = sourcecode.c.objc;
-		name = X11Controller.m;
-		path = /Users/darco/Projects/X11App/X11Controller.m;
-		refType = 0;
-		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {662, 9674}}";
-			sepNavSelRange = "{0, 0}";
-			sepNavVisRect = "{{0, 409}, {596, 352}}";
-		};
-	};
-	A66420E008E74B3D005A12D3 = {
-		fallbackIsa = XCSourceControlManager;
-		isSCMEnabled = 0;
-		isa = PBXSourceControlManager;
-		scmConfiguration = {
-		};
-		scmType = "";
-	};
-	A66420E108E74B3D005A12D3 = {
-		indexTemplatePath = "";
-		isa = PBXCodeSenseManager;
-	};
-	A66420F508E74C31005A12D3 = {
-		isa = PBXFileReference;
-		name = "bundle-main.c";
-		path = "/Users/darco/Projects/X11App/bundle-main.c";
-		refType = 0;
-		sourceTree = "<absolute>";
-		uiCtxt = {
-			sepNavIntBoundsRect = "{{0, 0}, {596, 12726}}";
-			sepNavSelRange = "{19522, 64}";
-			sepNavVisRect = "{{0, 12081}, {596, 352}}";
-		};
-	};
-	A66420F808E74CC8005A12D3 = {
-		fRef = A65E4881075176F200A66E82;
-		isa = PBXTextBookmark;
-		name = "SynfigApplication.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 241;
-		vrLoc = 0;
-	};
-	A66420F908E74CC8005A12D3 = {
-		fRef = A65E4880075176F200A66E82;
-		isa = PBXTextBookmark;
-		name = "SynfigApplication.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 288;
-		vrLoc = 0;
-	};
-	A66420FA08E74CC8005A12D3 = {
-		fRef = A65E48D507518C4E00A66E82;
-		isa = PBXTextBookmark;
-		name = "X11Controller.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 463;
-		vrLoc = 1513;
-	};
-	A66420FB08E74CC8005A12D3 = {
-		fRef = A66420F508E74C31005A12D3;
-		isa = PBXTextBookmark;
-		rLen = 1;
-		rLoc = 875;
-		rType = 1;
-	};
-	A66420FC08E74CC8005A12D3 = {
-		fRef = A65E4881075176F200A66E82;
-		isa = PBXTextBookmark;
-		name = "SynfigApplication.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 241;
-		vrLoc = 0;
-	};
-	A66420FD08E74CC8005A12D3 = {
-		fRef = 50EE2AB703849F0B0ECA21EC;
-		isa = PBXTextBookmark;
-		name = "bundle-main.c: 535";
-		rLen = 0;
-		rLoc = 12130;
-		rType = 0;
-		vrLen = 531;
-		vrLoc = 11734;
-	};
-	A66420FE08E74CC8005A12D3 = {
-		fRef = A65E4881075176F200A66E82;
-		isa = PBXTextBookmark;
-		name = "SynfigApplication.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 241;
-		vrLoc = 0;
-	};
-	A66420FF08E74CC8005A12D3 = {
-		fRef = A65E4880075176F200A66E82;
-		isa = PBXTextBookmark;
-		name = "SynfigApplication.h: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 288;
-		vrLoc = 0;
-	};
-	A664210008E74CC8005A12D3 = {
-		fRef = A65E48D507518C4E00A66E82;
-		isa = PBXTextBookmark;
-		name = "X11Controller.m: 1";
-		rLen = 0;
-		rLoc = 0;
-		rType = 0;
-		vrLen = 463;
-		vrLoc = 1513;
-	};
-	A664210408E74CC8005A12D3 = {
-		isa = PBXTargetBookmark;
-		trg = 20286C34FDCF999611CA2CEA;
-	};
-	A664210808E77262005A12D3 = {
-		fRef = 50EE2AB703849F0B0ECA21EC;
-		isa = PBXTextBookmark;
-		name = "void (*initializeASKFunc)(void) = NSAddressOfSymbol(symbol);";
-		rLen = 64;
-		rLoc = 19522;
-		rType = 0;
-		vrLen = 488;
-		vrLoc = 19274;
-	};
-	A664210908E77262005A12D3 = {
-		isa = PBXTargetBookmark;
-		trg = 20286C34FDCF999611CA2CEA;
-		uiCtxt = {
-			TOCViewDetailVisibleRect = "{{0, 0}, {534, 609}}";
-			TOCViewExpandedItems = (
-				"com.apple.target-editor-pane.settings",
-				"com.apple.target-editor-pane.settings.simple",
-				"com.apple.target-editor-pane.info-plist",
-				"com.apple.target-editor-pane.info-plist.simple",
-				"com.apple.target-editor-pane.buildphases",
-			);
-			TOCViewMasterVisibleRect = "{{0, 0}, {211, 609}}";
-			TOCViewSelectedItems = (
-				"com.apple.target-editor-pane.info-plist",
-			);
-		};
-	};
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/Synfig Studio.pbproj/project.pbxproj Deleted

@@ -1,552 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 39;
-	objects = {
-		02345980000FD03B11CA0E72 = {
-			children = (
-				1870340FFE93FCAF11CA0CD7,
-			);
-			isa = PBXVariantGroup;
-			name = main.nib;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		02345981000FD03B11CA0E72 = {
-			fileRef = 02345980000FD03B11CA0E72;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		0249A667FF388E1711CA2CEA = {
-			explicitFileType = wrapper.application;
-			isa = PBXFileReference;
-			path = "Synfig Studio.app";
-			refType = 3;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-//020
-//021
-//022
-//023
-//024
-//040
-//041
-//042
-//043
-//044
-		04313892FE3035C9C02AAC07 = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXRezBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-//040
-//041
-//042
-//043
-//044
-//080
-//081
-//082
-//083
-//084
-		0867D6AAFE840B52C02AAC07 = {
-			children = (
-				0867D6ABFE840B52C02AAC07,
-			);
-			isa = PBXVariantGroup;
-			name = InfoPlist.strings;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		0867D6ABFE840B52C02AAC07 = {
-			fileEncoding = 10;
-			isa = PBXFileReference;
-			lastKnownFileType = text.plist.strings;
-			name = English;
-			path = English.lproj/InfoPlist.strings;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		0867D6ACFE840B52C02AAC07 = {
-			fileRef = 0867D6AAFE840B52C02AAC07;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-//080
-//081
-//082
-//083
-//084
-//180
-//181
-//182
-//183
-//184
-		1870340FFE93FCAF11CA0CD7 = {
-			isa = PBXFileReference;
-			lastKnownFileType = wrapper.nib;
-			name = English;
-			path = English.lproj/main.nib;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-//180
-//181
-//182
-//183
-//184
-//190
-//191
-//192
-//193
-//194
-		195DF8CFFE9D517E11CA2CBB = {
-			children = (
-				0249A667FF388E1711CA2CEA,
-			);
-			isa = PBXGroup;
-			name = Products;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-//190
-//191
-//192
-//193
-//194
-//200
-//201
-//202
-//203
-//204
-		20286C28FDCF999611CA2CEA = {
-			buildSettings = {
-			};
-			buildStyles = (
-				4A9504C5FFE6A39111CA0CBA,
-				4A9504C6FFE6A39111CA0CBA,
-			);
-			hasScannedForEncodings = 1;
-			isa = PBXProject;
-			mainGroup = 20286C29FDCF999611CA2CEA;
-			projectDirPath = "";
-			targets = (
-				20286C34FDCF999611CA2CEA,
-			);
-		};
-		20286C29FDCF999611CA2CEA = {
-			children = (
-				20286C2AFDCF999611CA2CEA,
-				20286C2CFDCF999611CA2CEA,
-				20286C32FDCF999611CA2CEA,
-				195DF8CFFE9D517E11CA2CBB,
-			);
-			isa = PBXGroup;
-			name = X11;
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C2AFDCF999611CA2CEA = {
-			children = (
-				50EE2AB703849F0B0ECA21EC,
-				A65E488407517A2600A66E82,
-				A65E44C807516A5C00A66E82,
-				A65E44C907516A5C00A66E82,
-				A65E4880075176F200A66E82,
-				A65E4881075176F200A66E82,
-			);
-			isa = PBXGroup;
-			name = Sources;
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C2CFDCF999611CA2CEA = {
-			children = (
-				A65E3D3307515F5900A66E82,
-				A65E3D3407515F5900A66E82,
-				50459C5F038587C60ECA21EC,
-				0867D6AAFE840B52C02AAC07,
-				02345980000FD03B11CA0E72,
-			);
-			isa = PBXGroup;
-			name = Resources;
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C32FDCF999611CA2CEA = {
-			children = (
-				50F4F0A7039D6ACA0E82C0CB,
-				A65E488607517A6900A66E82,
-				570C5748047186C400ACF82F,
-			);
-			isa = PBXGroup;
-			name = "External Frameworks and Libraries";
-			path = "";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		20286C34FDCF999611CA2CEA = {
-			buildPhases = (
-				20286C35FDCF999611CA2CEA,
-				A65E44BC075161B900A66E82,
-				20286C36FDCF999611CA2CEA,
-				20286C38FDCF999611CA2CEA,
-				20286C3BFDCF999611CA2CEA,
-				04313892FE3035C9C02AAC07,
-			);
-			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = "";
-				HEADER_SEARCH_PATHS = "/Users/darco/Desktop/X11ForMacOSXSource-1.0/xc/programs/Xserver/include /usr/X11R6/include/X11 /usr/X11R6/include";
-				LIBRARY_SEARCH_PATHS = /usr/X11R6/lib;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "-lXau -lX11";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = "Synfig Studio";
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
-				WRAPPER_EXTENSION = app;
-			};
-			dependencies = (
-			);
-			isa = PBXApplicationTarget;
-			name = SynfigStudio;
-			productName = X11;
-			productReference = 0249A667FF388E1711CA2CEA;
-			productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
-<!DOCTYPE plist PUBLIC \"-//Apple Computer//DTD PLIST 1.0//EN\" \"http://www.apple.com/DTDs/PropertyList-1.0.dtd\">
-<plist version=\"1.0\">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeExtensions</key>
-			<array>
-				<string>sif</string>
-			</array>
-			<key>CFBundleTypeIconFile</key>
-			<string>sif_file.icns</string>
-			<key>CFBundleTypeMIMETypes</key>
-			<array>
-				<string>image/x-sif</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>Synfig Composition</string>
-			<key>CFBundleTypeOSTypes</key>
-			<array>
-				<string>****</string>
-			</array>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>LSIsAppleDefaultForType</key>
-			<true/>
-			<key>NSDocumentClass</key>
-			<string>image</string>
-		</dict>
-	</array>
-	<key>CFBundleExecutable</key>
-	<string>Synfig Studio</string>
-	<key>CFBundleGetInfoString</key>
-	<string>Synfig</string>
-	<key>CFBundleIconFile</key>
-	<string>voria.icns</string>
-	<key>CFBundleIdentifier</key>
-	<string>com.voria.synfig</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>Synfig Studio</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>0.1</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>0.1</string>
-	<key>CSResourcesFileMapped</key>
-	<true/>
-	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2003, Apple Computer, Inc.
-Copyright © 2003, XFree86 Project, Inc.</string>
-	<key>NSMainNibFile</key>
-	<string>main</string>
-	<key>NSPrincipalClass</key>
-	<string>SynfigApplication</string>
-</dict>
-</plist>
-";
-		};
-		20286C35FDCF999611CA2CEA = {
-			buildActionMask = 2147483647;
-			files = (
-			);
-			isa = PBXHeadersBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		20286C36FDCF999611CA2CEA = {
-			buildActionMask = 2147483647;
-			files = (
-				0867D6ACFE840B52C02AAC07,
-				02345981000FD03B11CA0E72,
-				A65E488807517AA400A66E82,
-				50459C60038587C60ECA21EC,
-				A65E3D3507515F5900A66E82,
-				A65E3D3607515F5900A66E82,
-			);
-			isa = PBXResourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		20286C38FDCF999611CA2CEA = {
-			buildActionMask = 2147483647;
-			files = (
-				50EE2AB803849F0B0ECA21EC,
-			);
-			isa = PBXSourcesBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		20286C3BFDCF999611CA2CEA = {
-			buildActionMask = 2147483647;
-			files = (
-				50F4F0E8039D6ACA0E82C0CB,
-				570C5749047186C400ACF82F,
-				A65E488707517A6900A66E82,
-			);
-			isa = PBXFrameworksBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-//200
-//201
-//202
-//203
-//204
-//4A0
-//4A1
-//4A2
-//4A3
-//4A4
-		4A9504C5FFE6A39111CA0CBA = {
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_FIX_AND_CONTINUE = YES;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				OPTIMIZATION_CFLAGS = "-O0";
-				ZERO_LINK = YES;
-			};
-			isa = PBXBuildStyle;
-			name = Development;
-		};
-		4A9504C6FFE6A39111CA0CBA = {
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				GCC_ENABLE_FIX_AND_CONTINUE = NO;
-				ZERO_LINK = NO;
-			};
-			isa = PBXBuildStyle;
-			name = Deployment;
-		};
-//4A0
-//4A1
-//4A2
-//4A3
-//4A4
-//500
-//501
-//502
-//503
-//504
-		50459C5F038587C60ECA21EC = {
-			isa = PBXFileReference;
-			lastKnownFileType = image.icns;
-			path = X11.icns;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		50459C60038587C60ECA21EC = {
-			fileRef = 50459C5F038587C60ECA21EC;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		50EE2AB703849F0B0ECA21EC = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.c;
-			path = "bundle-main.c";
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		50EE2AB803849F0B0ECA21EC = {
-			fileRef = 50EE2AB703849F0B0ECA21EC;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		50F4F0A7039D6ACA0E82C0CB = {
-			isa = PBXFileReference;
-			lastKnownFileType = wrapper.framework;
-			name = CoreFoundation.framework;
-			path = /System/Library/Frameworks/CoreFoundation.framework;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		50F4F0E8039D6ACA0E82C0CB = {
-			fileRef = 50F4F0A7039D6ACA0E82C0CB;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-//500
-//501
-//502
-//503
-//504
-//570
-//571
-//572
-//573
-//574
-		570C5748047186C400ACF82F = {
-			isa = PBXFileReference;
-			lastKnownFileType = wrapper.framework;
-			name = SystemConfiguration.framework;
-			path = /System/Library/Frameworks/SystemConfiguration.framework;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		570C5749047186C400ACF82F = {
-			fileRef = 570C5748047186C400ACF82F;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-//570
-//571
-//572
-//573
-//574
-//A60
-//A61
-//A62
-//A63
-//A64
-		A65E3D3307515F5900A66E82 = {
-			isa = PBXFileReference;
-			lastKnownFileType = image.icns;
-			path = sif_file.icns;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		A65E3D3407515F5900A66E82 = {
-			isa = PBXFileReference;
-			lastKnownFileType = image.icns;
-			path = voria.icns;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		A65E3D3507515F5900A66E82 = {
-			fileRef = A65E3D3307515F5900A66E82;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		A65E3D3607515F5900A66E82 = {
-			fileRef = A65E3D3407515F5900A66E82;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		A65E44BC075161B900A66E82 = {
-			buildActionMask = 2147483647;
-			contextName = "";
-			files = (
-				A65E488507517A2600A66E82,
-			);
-			isSharedContext = 0;
-			isa = PBXAppleScriptBuildPhase;
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		A65E44C807516A5C00A66E82 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = X11Controller.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		A65E44C907516A5C00A66E82 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.objc;
-			path = X11Controller.m;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		A65E4880075176F200A66E82 = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.h;
-			path = SynfigApplication.h;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		A65E4881075176F200A66E82 = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.c.objc;
-			path = SynfigApplication.m;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		A65E488407517A2600A66E82 = {
-			fileEncoding = 30;
-			isa = PBXFileReference;
-			lastKnownFileType = sourcecode.applescript;
-			path = events.applescript;
-			refType = 4;
-			sourceTree = "<group>";
-		};
-		A65E488507517A2600A66E82 = {
-			fileRef = A65E488407517A2600A66E82;
-			isa = PBXBuildFile;
-			settings = {
-				ATTRIBUTES = (
-					Debug,
-				);
-			};
-		};
-		A65E488607517A6900A66E82 = {
-			isa = PBXFileReference;
-			lastKnownFileType = wrapper.framework;
-			name = AppleScriptKit.framework;
-			path = /System/Library/Frameworks/AppleScriptKit.framework;
-			refType = 0;
-			sourceTree = "<absolute>";
-		};
-		A65E488707517A6900A66E82 = {
-			fileRef = A65E488607517A6900A66E82;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-		A65E488807517AA400A66E82 = {
-			fileRef = A65E488407517A2600A66E82;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
-	};
-	rootObject = 20286C28FDCF999611CA2CEA;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/SynfigApplication.h Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/SynfigApplication.m Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/X11.icns Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/X11Application.h Deleted

@@ -1,102 +0,0 @@
-/* X11Application.h -- subclass of NSApplication to multiplex events
- $Id: X11Application.h,v 1.26 2003/08/08 19:16:13 jharper Exp $
-
- Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-#ifndef X11APPLICATION_H
-#define X11APPLICATION_H 1
-
-#if __OBJC__
-
-#import <Cocoa/Cocoa.h>
-#import "X11Controller.h"
-
-@interface X11Application : NSApplication {
- X11Controller *_controller;
-
- unsigned int _x_active :1;
-}
-
-- (void) set_controller:controller;
-- (void) set_window_menu:(NSArray *)list;
-
-- (int) prefs_get_integer:(NSString *)key default:(int)def;
-- (const char *) prefs_get_string:(NSString *)key default:(const char *)def;
-- (float) prefs_get_float:(NSString *)key default:(float)def;
-- (int) prefs_get_boolean:(NSString *)key default:(int)def;
-- (NSArray *) prefs_get_array:(NSString *)key;
-- (void) prefs_set_integer:(NSString *)key value:(int)value;
-- (void) prefs_set_float:(NSString *)key value:(float)value;
-- (void) prefs_set_boolean:(NSString *)key value:(int)value;
-- (void) prefs_set_array:(NSString *)key value:(NSArray *)value;
-- (void) prefs_set_string:(NSString *)key value:(NSString *)value;
-- (void) prefs_synchronize;
-
-- (BOOL) x_active;
-
-@end
-
-extern X11Application *X11App;
-
-#endif /* __OBJC__ */
-
-extern void X11ApplicationSetWindowMenu (int nitems, const char **items,
-					 const char *shortcuts);
-extern void X11ApplicationSetWindowMenuCheck (int idx);
-extern void X11ApplicationSetFrontProcess (void);
-extern void X11ApplicationSetCanQuit (int state);
-extern void X11ApplicationServerReady (void);
-extern void X11ApplicationShowHideMenubar (int state);
-
-extern void X11ApplicationMain (int argc, const char *argv,
-				void (*server_thread) (void *),
-				void *server_arg);
-
-extern int X11EnableKeyEquivalents;
-
-#define APP_PREFS "com.apple.x11"
-
-#define PREFS_APPSMENU		"apps_menu"
-#define PREFS_FAKEBUTTONS	"enable_fake_buttons"
-#define PREFS_SYSBEEP		"enable_system_beep"
-#define PREFS_KEYEQUIVS		"enable_key_equivalents"
-#define PREFS_KEYMAP_FILE	"keymap_file"
-#define PREFS_SYNC_KEYMAP	"sync_keymap"
-#define PREFS_DEPTH		"depth"
-#define PREFS_NO_AUTH		"no_auth"
-#define PREFS_NO_TCP		"nolisten_tcp"
-#define PREFS_DONE_XINIT_CHECK	"done_xinit_check"
-#define PREFS_NO_QUIT_ALERT	"no_quit_alert"
-#define PREFS_FAKE_BUTTON2	"fake_button2"
-#define PREFS_FAKE_BUTTON3	"fake_button3"
-#define PREFS_ROOTLESS		"rootless"
-#define PREFS_FULLSCREEN_HOTKEYS "fullscreen_hotkeys"
-#define PREFS_SWAP_ALT_META	"swap_alt_meta"
-#define PREFS_XP_OPTIONS	"xp_options"
-
-#endif /* X11APPLICATION_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/X11Application.m Deleted

@@ -1,1085 +0,0 @@
-/* X11Application.m -- subclass of NSApplication to multiplex events
- $Id: X11Application.m,v 1.53 2003/09/13 02:00:46 jharper Exp $
-
- Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-#import "X11Application.h"
-#include <Carbon/Carbon.h>
-
-/* ouch! */
-#define BOOL X_BOOL
-# include "Xproto.h"
-#define WindowPtr X_WindowPtr
-#define Cursor X_Cursor
-# include "quartz.h"
-# define _APPLEWM_SERVER_
-# include "applewm.h"
-# include "X.h"
-#undef Cursor
-#undef WindowPtr
-#undef BOOL
-
-#include "xf86Version.h"
-
-#include <mach/mach.h>
-#include <unistd.h>
-#include <pthread.h>
-
-#define DEFAULTS_FILE "/etc/X11/xserver/Xquartz.plist"
-
-int X11EnableKeyEquivalents = TRUE;
-
-X11Application *X11App;
-
-#define ALL_KEY_MASKS (NSShiftKeyMask | NSControlKeyMask \
-		 | NSAlternateKeyMask | NSCommandKeyMask)
-
-@implementation X11Application
-
-typedef struct message_struct message;
-struct message_struct {
- mach_msg_header_t hdr;
- SEL selector;
- NSObject *arg;
-};
-
-static mach_port_t _port;
-
-static void send_nsevent (NSEventType type, NSEvent *e);
-
-/* avoid header conflict hell */
-extern int RootlessKnowsWindowNumber (int number);
-extern void DarwinEnqueueEvent (const xEvent *e);
-
-static void
-init_ports (void)
-{
- kern_return_t r;
- NSPort *p;
-
- if (_port != MACH_PORT_NULL)
-	return;
-
- r = mach_port_allocate (mach_task_self (), MACH_PORT_RIGHT_RECEIVE, &_port);
- if (r != KERN_SUCCESS)
-	return;
-
- p = NSMachPort portWithMachPort:_port;
- p setDelegate:NSApp;
- p scheduleInRunLoop:NSRunLoop currentRunLoop forMode:NSDefaultRunLoopMode;
-}
-
-static void
-message_kit_thread (SEL selector, NSObject *arg)
-{
- message msg;
- kern_return_t r;
-
- msg.hdr.msgh_bits = MACH_MSGH_BITS (MACH_MSG_TYPE_MAKE_SEND, 0);
- msg.hdr.msgh_size = sizeof (msg);
- msg.hdr.msgh_remote_port = _port;
- msg.hdr.msgh_local_port = MACH_PORT_NULL;
- msg.hdr.msgh_reserved = 0;
- msg.hdr.msgh_id = 0;
-
- msg.selector = selector;
- msg.arg = arg retain;
-
- r = mach_msg (&msg.hdr, MACH_SEND_MSG, msg.hdr.msgh_size,
-		 0, MACH_PORT_NULL, 0, MACH_PORT_NULL);
- if (r != KERN_SUCCESS)
-	fprintf (stderr, "%s: mach_msg failed: %x\n", __FUNCTION__, r);
-}
-
-- (void) handleMachMessage:(void *)_msg
-{
- message *msg = _msg;
-
- self performSelector:msg->selector withObject:msg->arg;
- msg->arg release;
-}
-
-- (void) set_controller:obj
-{
- if (_controller == nil)
-	_controller = obj retain;
-}
-
-- (void) dealloc
-{
- if (_controller != nil)
-	_controller release;
-
- if (_port != MACH_PORT_NULL)
-	mach_port_deallocate (mach_task_self (), _port);
-
- super dealloc;
-}
-
-- (void) orderFrontStandardAboutPanel: (id) sender
-{
- NSMutableDictionary *dict;
- NSDictionary *infoDict;
- NSString *tem;
-
- dict = NSMutableDictionary dictionaryWithCapacity:2;
- infoDict = NSBundle mainBundle infoDictionary;
-
- dict setObject: NSLocalizedString (@"The X Window System", @"About panel")
- forKey:@"ApplicationName";
-
- tem = infoDict objectForKey:@"CFBundleShortVersionString";
-
- dict setObject:NSString stringWithFormat:@"X11 %@ - XFree86 %d.%d.%d",
-		 tem, XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
-		 XF86_VERSION_PATCH forKey:@"ApplicationVersion";
-
- self orderFrontStandardAboutPanelWithOptions: dict;
-}
-
-- (void) activateX:(BOOL)state
-{
- /* Create a TSM document that supports full Unicode input, and
- have it activated while X is active (unless using the old
- keymapping files) */
- static TSMDocumentID x11_document;
-
- if (state)
- {
-	QuartzMessageMainThread (kXquartzActivate, 0);
-
-	if (!_x_active)
-	{
-	 if (x11_document == 0 && darwinKeymapFile == NULL)
-	 {
-		OSType types1;
-		types0 = kUnicodeDocument;
-		NewTSMDocument (1, types, &x11_document, 0);
-	 }
-
-	 if (x11_document != 0)
-		ActivateTSMDocument (x11_document);
-	}
- }
- else
- {
-	QuartzMessageMainThread (kXquartzDeactivate, 0);
-
-	if (_x_active)
-	{
-	 if (x11_document != 0)
-		DeactivateTSMDocument (x11_document);
-	}
- }
-
- _x_active = state;
-}
-
-- (void) became_key:(NSWindow *)win
-{
- self activateX:NO;
-}
-
-- (void) sendEvent:(NSEvent *)e
-{
- NSEventType type;
- BOOL for_appkit, for_x;
-
- type = e type;
-
- /* By default pass down the responder chain and to X. */
- for_appkit = YES;
- for_x = YES;
-
- switch (type)
- {
- case NSLeftMouseDown: case NSRightMouseDown: case NSOtherMouseDown:
- case NSLeftMouseUp: case NSRightMouseUp: case NSOtherMouseUp:
-	if (e window != nil)
-	{
-	 /* Pointer event has a window. Probably something for the kit. */
-
-	 for_x = NO;
-
-	 if (_x_active)
-		self activateX:NO;
-	}
-	else if (self modalWindow == nil)
-	{
-	 /* Must be an X window. Tell appkit it doesn't have focus. */
-
-	 for_appkit = NO;
-
-	 if (self isActive)
-	 {
-		self deactivate;
-
-		if (!_x_active && RootlessKnowsWindowNumber (e windowNumber))
-		 self activateX:YES;
-	 }
-	}
-	break;
-
- case NSKeyDown: case NSKeyUp:
-	if (_x_active)
-	{
-	 static int swallow_up;
-
-	 /* No kit window is focused, so send it to X. */
-
-	 for_appkit = NO;
-
-	 if (type == NSKeyDown)
-	 {
-		/* Before that though, see if there are any global
-		 shortcuts bound to it. */
-
-		if (X11EnableKeyEquivalents
-		 && self mainMenu performKeyEquivalent:e)
-		{
-		 swallow_up = e keyCode;
-		 for_x = NO;
-		}
-		else if (!quartzEnableRootless
-			 && (e modifierFlags & ALL_KEY_MASKS)
-			 == (NSCommandKeyMask | NSAlternateKeyMask)
-			 && (e keyCode == 0 /*a*/
-			 || e keyCode == 53 /*Esc*/))
-		{
-		 swallow_up = 0;
-		 for_x = NO;
-		 QuartzMessageMainThread (kXquartzToggleFullscreen, 0);
-		}
-	 }
-	 else
-	 {
-		/* If we saw a key equivalent on the down, don't pass
-		 the up through to X. */
-
-		if (swallow_up != 0 && e keyCode == swallow_up)
-		{
-		 swallow_up = 0;
-		 for_x = NO;
-		}
-	 }
-	}
-	else
-	{
-	 for_x = NO;
-	}
-	break;
-
- case NSFlagsChanged:
-	/* For the l33t X users who remap modifier keys to normal keysyms. */
-	if (!_x_active)
-	 for_x = NO;
-	break;
-
- case NSAppKitDefined:
-	switch (e subtype)
-	{
-	case NSApplicationActivatedEventType:
-	 for_x = NO;
-	 if (self modalWindow == nil)
-	 {
-		for_appkit = NO;
-	 
-		/* FIXME: hack to avoid having to pass the event to appkit,
-		 which would cause it to raise one of its windows. */
-		_appFlags._active = YES;
-
-		self activateX:YES;
-	 }
-	 break;
-
-	case 18: /* ApplicationDidReactivate */
-	 if (quartzHasRoot)
-		for_appkit = NO;
-	 break;
-
-	case NSApplicationDeactivatedEventType:
-	 for_x = NO;
-	 self activateX:NO;
-	 break;
-	}
-	break;
-
- default: break; /* for gcc */
- }
-
- if (for_appkit)
- {
-	super sendEvent:e;
- }
-
- if (for_x)
- {
-	send_nsevent (type, e);
- }
-}
-
-- (void) set_window_menu:(NSArray *)list
-{
- _controller set_window_menu:list;
-}
-
-- (void) set_window_menu_check:(NSNumber *)n
-{
- _controller set_window_menu_check:n;
-}
-
-- (void) set_apps_menu:(NSArray *)list
-{
- _controller set_apps_menu:list;
-}
-
-- (void) set_front_process:unused
-{
- NSApp activateIgnoringOtherApps:YES;
-
- if (self modalWindow == nil)
-	self activateX:YES;
-}
-
-- (void) set_can_quit:(NSNumber *)state
-{
- _controller set_can_quit:state boolValue;
-}
-
-- (void) server_ready:unused
-{
- _controller server_ready;
-}
-
-- (void) show_hide_menubar:(NSNumber *)state
-{
- if (state boolValue)
-	ShowMenuBar ();
- else
-	HideMenuBar ();
-}
-
-&#xc;
-/* user preferences */
-
-/* Note that these functions only work for arrays whose elements
- can be toll-free-bridged between NS and CF worlds. */
-
-static const void *cfretain (CFAllocatorRef a, const void *b) {
- return CFRetain (b);
-}
-static void cfrelease (CFAllocatorRef a, const void *b) {
- CFRelease (b);
-}
-static CFMutableArrayRef
-nsarray_to_cfarray (NSArray *in)
-{
- CFMutableArrayRef out;
- CFArrayCallBacks cb;
- NSObject *ns;
- const CFTypeRef *cf;
- int i, count;
-
- memset (&cb, 0, sizeof (cb));
- cb.version = 0;
- cb.retain = cfretain;
- cb.release = cfrelease;
-
- count = in count;
- out = CFArrayCreateMutable (NULL, count, &cb);
-
- for (i = 0; i < count; i++)
- {
-	ns = in objectAtIndex:i;
-
-	if (ns isKindOfClass:NSArray class)
-	 cf = (CFTypeRef) nsarray_to_cfarray ((NSArray *) ns);
-	else
-	 cf = CFRetain ((CFTypeRef) ns);
-
-	CFArrayAppendValue (out, cf);
-	CFRelease (cf);
- }
-
- return out;
-}
-static NSMutableArray *
-cfarray_to_nsarray (CFArrayRef in)
-{
- NSMutableArray *out;
- const CFTypeRef *cf;
- NSObject *ns;
- int i, count;
-
- count = CFArrayGetCount (in);
- out = NSMutableArray alloc initWithCapacity:count;
-
- for (i = 0; i < count; i++)
- {
-	cf = CFArrayGetValueAtIndex (in, i);
-
-	if (CFGetTypeID (cf) == CFArrayGetTypeID ())
-	 ns = cfarray_to_nsarray ((CFArrayRef) cf);
-	else
-	 ns = (id)cf retain;
-
-	out addObject:ns;
-	ns release;
- }
-
- return out;
-}
-
-- (CFPropertyListRef) prefs_get:(NSString *)key
-{
- CFPropertyListRef value;
-
- value = CFPreferencesCopyAppValue ((CFStringRef) key, CFSTR (APP_PREFS));
-
- if (value == NULL)
- {
-	static CFDictionaryRef defaults;
-
-	if (defaults == NULL)
-	{
-	 CFStringRef error = NULL;
-	 CFDataRef data;
-	 CFURLRef url;
-	 SInt32 error_code;
-
-	 url = (CFURLCreateFromFileSystemRepresentation
-		 (NULL, DEFAULTS_FILE, strlen (DEFAULTS_FILE), false));
-	 if (CFURLCreateDataAndPropertiesFromResource (NULL, url, &data,
-							 NULL, NULL,
-							 &error_code))
-	 {
-		defaults = (CFPropertyListCreateFromXMLData
-			 (NULL, data, kCFPropertyListImmutable, &error));
-		if (error != NULL)
-		 CFRelease (error);
-		CFRelease (data);
-	 }
-	 CFRelease (url);
-	}
-
-	if (defaults != NULL)
-	 value = CFDictionaryGetValue (defaults, key);
-
-	if (value != NULL)
-	 CFRetain (value);
- }
-
- return value;
-}
-
-- (int) prefs_get_integer:(NSString *)key default:(int)def
-{
- CFPropertyListRef value;
- int ret;
-
- value = self prefs_get:key;
-
- if (value != NULL && CFGetTypeID (value) == CFNumberGetTypeID ())
-	CFNumberGetValue (value, kCFNumberIntType, &ret);
- else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
-	ret = CFStringGetIntValue (value);
- else
-	ret = def;
-
- if (value != NULL)
-	CFRelease (value);
-
- return ret;
-}
-
-- (const char *) prefs_get_string:(NSString *)key default:(const char *)def
-{
- CFPropertyListRef value;
- const char *ret = NULL;
-
- value = self prefs_get:key;
-
- if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
- {
-	NSString *s = (NSString *) value;
-
-	ret = s UTF8String;
- }
-
- if (value != NULL)
-	CFRelease (value);
-
- return ret != NULL ? ret : def;
-}
-
-- (float) prefs_get_float:(NSString *)key default:(float)def
-{
- CFPropertyListRef value;
- float ret = def;
-
- value = self prefs_get:key;
-
- if (value != NULL
-	&& CFGetTypeID (value) == CFNumberGetTypeID ()
-	&& CFNumberIsFloatType (value))
- {
-	CFNumberGetValue (value, kCFNumberFloatType, &ret);
- }
- else if (value != NULL && CFGetTypeID (value) == CFStringGetTypeID ())
- {
-	ret = CFStringGetDoubleValue (value);
- }
-
- if (value != NULL)
-	CFRelease (value);
-
- return ret;
-}
-
-- (int) prefs_get_boolean:(NSString *)key default:(int)def
-{
- CFPropertyListRef value;
- int ret = def;
-
- value = self prefs_get:key;
-
- if (value != NULL)
- {
-	if (CFGetTypeID (value) == CFNumberGetTypeID ())
-	 CFNumberGetValue (value, kCFNumberIntType, &ret);
-	else if (CFGetTypeID (value) == CFBooleanGetTypeID ())
-	 ret = CFBooleanGetValue (value);
-	else if (CFGetTypeID (value) == CFStringGetTypeID ())
-	{
-	 const char *tem = (NSString *) value lossyCString;
-	 if (strcasecmp (tem, "true") == 0 || strcasecmp (tem, "yes") == 0)
-		ret = YES;
-	 else
-		ret = NO;
-	}
-
-	CFRelease (value);
- }
-
- return ret;
-}
-
-- (NSArray *) prefs_get_array:(NSString *)key
-{
- NSArray *ret = nil;
- CFPropertyListRef value;
-
- value = self prefs_get:key;
-
- if (value != NULL)
- {
-	if (CFGetTypeID (value) == CFArrayGetTypeID ())
-	 ret = cfarray_to_nsarray (value) autorelease;
-
-	CFRelease (value);
- }
-
- return ret;
-}
-
-- (void) prefs_set_integer:(NSString *)key value:(int)value
-{
- CFNumberRef x;
-
- x = CFNumberCreate (NULL, kCFNumberIntType, &value);
-
- CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, CFSTR (APP_PREFS),
-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-
- CFRelease (x);
-}
-
-- (void) prefs_set_float:(NSString *)key value:(float)value
-{
- CFNumberRef x;
-
- x = CFNumberCreate (NULL, kCFNumberFloatType, &value);
-
- CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) x, CFSTR (APP_PREFS),
-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-
- CFRelease (x);
-}
-
-- (void) prefs_set_boolean:(NSString *)key value:(int)value
-{
- CFPreferencesSetValue ((CFStringRef) key,
-			 (CFTypeRef) value ? kCFBooleanTrue
-			 : kCFBooleanFalse, CFSTR (APP_PREFS),
-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
-
-}
-
-- (void) prefs_set_array:(NSString *)key value:(NSArray *)value
-{
- CFArrayRef cfarray;
-
- cfarray = nsarray_to_cfarray (value);
- CFPreferencesSetValue ((CFStringRef) key,
-			 (CFTypeRef) cfarray,
-			 CFSTR (APP_PREFS),
-			 kCFPreferencesCurrentUser, kCFPreferencesAnyHost);
- CFRelease (cfarray);
-}
-
-- (void) prefs_set_string:(NSString *)key value:(NSString *)value
-{
- CFPreferencesSetValue ((CFStringRef) key, (CFTypeRef) value,
-			 CFSTR (APP_PREFS), kCFPreferencesCurrentUser,
-			 kCFPreferencesAnyHost);
-}
-
-- (void) prefs_synchronize
-{
- CFPreferencesAppSynchronize (kCFPreferencesCurrentApplication);
-}
-
-- (void) read_defaults
-{
- extern int darwinFakeButtons;
- const char *tem;
-
- quartzUseSysBeep = self prefs_get_boolean:@PREFS_SYSBEEP
-		 default:quartzUseSysBeep;
- quartzEnableRootless = self prefs_get_boolean:@PREFS_ROOTLESS
-			 default:quartzEnableRootless;
- quartzFullscreenDisableHotkeys = !self prefs_get_boolean:
-				 @PREFS_FULLSCREEN_HOTKEYS default:
-				 !quartzFullscreenDisableHotkeys;
- quartzXpluginOptions = self prefs_get_integer:@PREFS_XP_OPTIONS
-			 default:quartzXpluginOptions;
-
- darwinSwapAltMeta = self prefs_get_boolean:@PREFS_SWAP_ALT_META
-			 default:darwinSwapAltMeta;
- darwinFakeButtons = self prefs_get_boolean:@PREFS_FAKEBUTTONS
-		 default:darwinFakeButtons;
- if (darwinFakeButtons)
- {
-	const char *fake2, *fake3;
-
-	fake2 = self prefs_get_string:@PREFS_FAKE_BUTTON2 default:NULL;
-	fake3 = self prefs_get_string:@PREFS_FAKE_BUTTON3 default:NULL;
-
-	DarwinSetFakeButtons (fake2, fake3);
- }
-
- X11EnableKeyEquivalents = self prefs_get_boolean:@PREFS_KEYEQUIVS
-			 default:X11EnableKeyEquivalents;
-
- darwinSyncKeymap = self prefs_get_boolean:@PREFS_SYNC_KEYMAP
-		 default:darwinSyncKeymap;
-
- tem = self prefs_get_string:@PREFS_KEYMAP_FILE default:NULL;
- if (tem != NULL)
-	darwinKeymapFile = strdup (tem);
-
- quartzDesiredDepth = self prefs_get_integer:@PREFS_DEPTH
-			 default:quartzDesiredDepth;
-}
-
-/* This will end up at the end of the responder chain. */
-- (void) copy:sender
-{
- QuartzMessageMainThread (kXquartzPasteboardNotify, 1,
-			 AppleWMCopyToPasteboard);
-}
-
-- (BOOL) x_active
-{
- return _x_active;
-}
-
-@end
-
-static NSArray *
-array_with_strings_and_numbers (int nitems, const char **items,
-				const char *numbers)
-{
- NSMutableArray *array, *subarray;
- NSString *string;
- NSString *number;
- int i;
-
- /* (Can't autorelease on the X server thread) */
-
- array = NSMutableArray alloc initWithCapacity:nitems;
-
- for (i = 0; i < nitems; i++)
- {
-	subarray = NSMutableArray alloc initWithCapacity:2;
-
-	string = NSString alloc initWithUTF8String:itemsi;
-	subarray addObject:string;
-	string release;
-
-	if (numbersi != 0)
-	{
-	 number = NSString alloc initWithFormat:@"%d", numbersi;
-	 subarray addObject:number;
-	 number release;
-	}
-	else
-	 subarray addObject:@"";
-
-	array addObject:subarray;
-	subarray release;
- }
-
- return array;
-}
-
-void
-X11ApplicationSetWindowMenu (int nitems, const char **items,
-			 const char *shortcuts)
-{
- NSArray *array;
-
- array = array_with_strings_and_numbers (nitems, items, shortcuts);
-
- /* Send the array of strings over to the appkit thread */
-
- message_kit_thread (@selector (set_window_menu:), array);
- array release;
-}
-
-void
-X11ApplicationSetWindowMenuCheck (int idx)
-{
- NSNumber *n;
-
- n = NSNumber alloc initWithInt:idx;
-
- message_kit_thread (@selector (set_window_menu_check:), n);
-
- n release;
-}
-
-void
-X11ApplicationSetFrontProcess (void)
-{
- message_kit_thread (@selector (set_front_process:), nil);
-}
-
-void
-X11ApplicationSetCanQuit (int state)
-{
- NSNumber *n;
-
- n = NSNumber alloc initWithBool:state;
-
- message_kit_thread (@selector (set_can_quit:), n);
-
- n release;
-}
-
-void
-X11ApplicationServerReady (void)
-{
- message_kit_thread (@selector (server_ready:), nil);
-}
-
-void
-X11ApplicationShowHideMenubar (int state)
-{
- NSNumber *n;
-
- n = NSNumber alloc initWithBool:state;
-
- message_kit_thread (@selector (show_hide_menubar:), n);
-
- n release;
-}
-
-static void *
-create_thread (void *func, void *arg)
-{
- pthread_attr_t attr;
- pthread_t tid;
-
- pthread_attr_init (&attr);
-
- pthread_attr_setscope (&attr, PTHREAD_SCOPE_SYSTEM);
- pthread_attr_setdetachstate (&attr, PTHREAD_CREATE_DETACHED);
-
- pthread_create (&tid, &attr, func, arg);
-
- pthread_attr_destroy (&attr);
-
- return (void *) tid;
-}
-
-static void
-check_xinitrc (void)
-{
- char *tem, buf1024;
- NSString *msg;
-
- if (X11App prefs_get_boolean:@PREFS_DONE_XINIT_CHECK default:NO)
-	return;
-
- tem = getenv ("HOME");
- if (tem == NULL)
-	goto done;
-
- snprintf (buf, sizeof (buf), "%s/.xinitrc", tem);
- if (access (buf, F_OK) != 0)
-	goto done;
-
- /* FIXME: put localized strings into Resources/English.lproj */
-
- msg = NSLocalizedString (
-@"You have an existing ~/.xinitrc file.\n\n\
-Windows displayed by X11 applications may not have titlebars, or may look \
-different to windows displayed by native applications.\n\n\
-Would you like to move aside the existing file and use the standard X11 \
-environment?", @"");
-
- if (NSRunAlertPanel (nil, msg, NSLocalizedString (@"Yes", @""),
-			 NSLocalizedString (@"No", @""), nil)
-	== NSAlertDefaultReturn)
- {
-	char buf21024;
-	int i = -1;
-
-	snprintf (buf2, sizeof (buf2), "%s.old", buf);
-
-	for (i = 1; access (buf2, F_OK) == 0; i++)
-	 snprintf (buf2, sizeof (buf2), "%s.old.%d", buf, i);
-
-	rename (buf, buf2);
- }
- 
-done:
- X11App prefs_set_boolean:@PREFS_DONE_XINIT_CHECK value:YES;
- X11App prefs_synchronize;
-}
-
-void
-X11ApplicationMain (int argc, const char *argv,
-		 void (*server_thread) (void *), void *server_arg)
-{
- NSAutoreleasePool *pool;
-
-#ifdef DEBUG
- while (access ("/tmp/x11-block", F_OK) == 0)
-	sleep (1);
-#endif
-
- pool = NSAutoreleasePool alloc init;
-
- X11App = (X11Application *) X11Application sharedApplication;
-
- init_ports ();
-
- NSApp read_defaults;
-
- NSBundle loadNibNamed:@"main" owner:NSApp;
-
- NSNotificationCenter defaultCenter addObserver:NSApp
- selector:@selector (became_key:)
- name:NSWindowDidBecomeKeyNotification object:nil;
-
- check_xinitrc ();
-
- if (!create_thread (server_thread, server_arg))
- {
-	fprintf (stderr, "can't create secondary thread\n");
-	exit (1);
- }
-
- NSApp run;
-
- /* not reached */
-}
-
-&#xc;
-/* event conversion */
-
-static inline unsigned short
-convert_flags (unsigned int nsflags)
-{
- unsigned int xflags;
-
- if (nsflags == ~0)
-	return 0xffff;
-
- xflags = 0;
-
- if (nsflags & NSAlphaShiftKeyMask)
-	xflags |= LockMask;
- if (nsflags & NSShiftKeyMask)
-	xflags |= ShiftMask;
- if (nsflags & NSControlKeyMask)
-	xflags |= ControlMask;
- if (nsflags & NSAlternateKeyMask)
-	xflags |= Mod1Mask;
- if (nsflags & NSCommandKeyMask)
-	xflags |= Mod2Mask;
- /* FIXME: secondaryfn? */
-
- return xflags;
-}
-
-static void
-send_nsevent (NSEventType type, NSEvent *e)
-{
- static unsigned int button_state = 0;
-
- xEvent xe;
-
- memset (&xe, 0, sizeof (xe));
-
- switch (type)
- {
-	NSRect screen;
-	NSPoint location;
-	NSWindow *window;
-	int pointer_x, pointer_y, count;
-
- case NSLeftMouseDown:
-	xe.u.u.type = ButtonPress;
-	xe.u.u.detail = 1;
-	goto do_press_event;
-
- case NSRightMouseDown:
-	xe.u.u.type = ButtonPress;
-	xe.u.u.detail = 3;
-	goto do_press_event;
-
- case NSOtherMouseDown:
-	xe.u.u.type = ButtonPress;
-	xe.u.u.detail = 2; /* FIXME? */
-	goto do_press_event;
-
- do_press_event:
-	if (RootlessKnowsWindowNumber (e windowNumber) == NULL)
-	{
-	 /* X server doesn't grok this window, drop the event.
-
-	 Note: theoretically this isn't necessary, but if I click
-	 on the menubar, we get sent a LeftMouseDown when the
-	 release happens, but no LeftMouseUp is ever seen! */
-
-	 break;
-	}
-	goto do_event;
-
- case NSLeftMouseUp:
-	xe.u.u.type = ButtonRelease;
-	xe.u.u.detail = 1;
-	goto do_release_event;
-
- case NSRightMouseUp:
-	xe.u.u.type = ButtonRelease;
-	xe.u.u.detail = 3;
-	goto do_release_event;
-
- case NSOtherMouseUp:
-	xe.u.u.type = ButtonRelease;
-	xe.u.u.detail = 2; /* FIXME? */
-	goto do_release_event;
-
- do_release_event:
-	if ((button_state & (1 << xe.u.u.detail)) == 0)
-	{
-	 /* X didn't see the button press for this release, so skip it */
-	 break;
-	}
-	goto do_event;
-
- case NSMouseMoved:
- case NSLeftMouseDragged:
- case NSRightMouseDragged:
- case NSOtherMouseDragged:
-	/* convert location to global top-left coordinates */
-
-	location = e locationInWindow;
-	window = e window;
-	screen = NSScreen screens objectAtIndex:0 frame;
-
-	if (window != nil)
-	{
-	 NSRect frame = window frame;
-	 pointer_x = location.x + frame.origin.x;
-	 pointer_y = (((screen.origin.y + screen.size.height)
-			 - location.y) - frame.origin.y);
-	}
-	else
-	{
-	 pointer_x = location.x;
-	 pointer_y = (screen.origin.y + screen.size.height) - location.y;
-	}
-
-	xe.u.keyButtonPointer.rootX = pointer_x;
-	xe.u.keyButtonPointer.rootY = pointer_y;
-	xe.u.u.type = MotionNotify;
-	goto do_event;
-
- case NSKeyDown:
-	xe.u.u.type = KeyPress;
-	xe.u.u.detail = e keyCode;
-	goto do_event;
-
- case NSKeyUp:
-	xe.u.u.type = KeyRelease;
-	xe.u.u.detail = e keyCode;
-	goto do_event;
-
- case NSScrollWheel:
-	xe.u.keyButtonPointer.state = convert_flags (e modifierFlags);
-	count = e deltaY;
-	xe.u.u.detail = count > 0 ? 4 : 5;
-	for (count = abs (count); count-- > 0;)
-	{
-	 xe.u.u.type = ButtonPress;
-	 DarwinEnqueueEvent (&xe);
-	 xe.u.u.type = ButtonRelease;
-	 DarwinEnqueueEvent (&xe);
-	}
-	xe.u.u.type = 0;
-	break;
-
- case NSFlagsChanged:
- do_event:
-	xe.u.keyButtonPointer.state = convert_flags (e modifierFlags);
-	DarwinEnqueueEvent (&xe);
-	break;
-
- default: break; /* for gcc */
- }
-
- if (xe.u.u.type == ButtonPress)
-	button_state |= (1 << xe.u.u.detail);
- else if (xe.u.u.type == ButtonRelease)
-	button_state &= ~(1 << xe.u.u.detail);
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/X11Controller.h Deleted

@@ -1,86 +0,0 @@
-/* X11Controller.h -- connect the IB ui
- $Id: X11Controller.h,v 1.21 2003/07/24 17:52:29 jharper Exp $
-
- Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-#ifndef X11CONTROLLER_H
-#define X11CONTROLLER_H 1
-
-#if __OBJC__
-
-#import <Cocoa/Cocoa.h>
-#include "x-list.h"
-
-@interface X11Controller : NSObject
-{
- NSPanel *prefs_panel;
-
- NSButton *fake_buttons;
- NSButton *enable_fullscreen;
- NSButton *use_sysbeep;
- NSButton *enable_keyequivs;
- NSButton *sync_keymap;
- NSButton *enable_auth;
- NSButton *enable_tcp;
- NSPopUpButton *depth;
-
- NSMenuItem *x11_about_item;
- NSMenuItem *window_separator;
- NSMenuItem *dock_window_separator;
- NSMenuItem *apps_separator;
- NSMenuItem *toggle_fullscreen_item;
- NSMenu *dock_apps_menu;
- NSTableView *apps_table;
-
- NSArray *apps;
- NSMutableArray *table_apps;
-
- NSMenu *dock_menu;
-
- int checked_window_item;
- x_list *pending_apps;
-
- BOOL finished_launching;
- BOOL can_quit;
-}
-
-- (void) set_window_menu:(NSArray *)list;
-- (void) set_window_menu_check:(NSNumber *)n;
-- (void) set_apps_menu:(NSArray *)list;
-- (void) set_can_quit:(BOOL)state;
-- (void) server_ready;
-
-@end
-
-#endif /* __OBJC__ */
-
-extern void X11ControllerMain (int argc, const char *argv,
-			 void (*server_thread) (void *),
-			 void *server_arg);
-
-#endif /* X11CONTROLLER_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/X11Controller.m Deleted

@@ -1,690 +0,0 @@
-/* X11Controller.m -- connect the IB ui, also the NSApp delegate
- $Id: X11Controller.m,v 1.36 2003/07/24 17:52:29 jharper Exp $
-
- Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-#define __DARWIN__
-
-#import "X11Controller.h"
-#import "X11Application.h"
-#import <Carbon/Carbon.h>
-
-
-/* ouch! */
-#define BOOL X_BOOL
-# include "Xproto.h"
-#define WindowPtr X_WindowPtr
-#define Cursor X_Cursor
-# include "quartz.h"
-# define _APPLEWM_SERVER_
-# include "applewm.h"
-# include "X.h"
-#undef Cursor
-#undef WindowPtr
-#undef BOOL
-
-#include <stdio.h>
-#include <unistd.h>
-
-#define TRACE() fprintf (stderr, "%s\n", __FUNCTION__)
-
-@implementation X11Controller
-
-- (void) awakeFromNib
-{
- X11Application *xapp = NSApp;
- NSArray *array;
-
- /* Point X11Application at ourself. */
- xapp set_controller:self;
-#if 0
- array = xapp prefs_get_array:@PREFS_APPSMENU;
- if (array != nil)
- {
-	int count;
-
-	/* convert from TITLE1 COMMAND1 TITLE2 COMMAND2 ...
-	 to TITLE1 COMMAND1 TITLE2 COMMAND2 ... format. */
-
-	count = array count;
-	if (count > 0
-	 && !array objectAtIndex:0 isKindOfClass:NSArray class)
-	{
-	 int i;
-	 NSMutableArray *copy, *sub;
-
-	 copy = NSMutableArray arrayWithCapacity:(count / 2);
-
-	 for (i = 0; i < count / 2; i++)
-	 {
-		sub = NSMutableArray alloc initWithCapacity:3;
-		sub addObject:array objectAtIndex:i*2;
-		sub addObject:array objectAtIndex:i*2+1;
-		sub addObject:@"";
-		copy addObject:sub;
-		sub release;
-	 }
-
-	 array = copy;
-	}
-
-	self set_apps_menu:array;
- }
-	#endif
-}
-
-- (void) item_selected:sender
-{
- NSApp activateIgnoringOtherApps:YES;
-
- QuartzMessageMainThread (kXquartzControllerNotify, 2,
-			 AppleWMWindowMenuItem, sender tag);
-}
-
-- (void) remove_window_menu
-{
- NSMenu *menu;
- int first, count, i;
-
- /* Work backwards so we don't mess up the indices */
- menu = window_separator menu;
- first = menu indexOfItem:window_separator + 1;
- count = menu numberOfItems;
- for (i = count - 1; i >= first; i--)
-	menu removeItemAtIndex:i;
-
- menu = dock_window_separator menu;
- count = menu indexOfItem:dock_window_separator;
- for (i = 0; i < count; i++)
-	dock_menu removeItemAtIndex:0;
-}
-
-- (void) install_window_menu:(NSArray *)list
-{
- NSMenu *menu;
- NSMenuItem *item;
- int first, count, i;
-
- menu = window_separator menu;
- first = menu indexOfItem:window_separator + 1;
- count = list count;
-
- for (i = 0; i < count; i++)
- {
-	NSString *name, *shortcut;
-
-	name = list objectAtIndex:i objectAtIndex:0;
-	shortcut = list objectAtIndex:i objectAtIndex:1;
-
-	item = (NSMenuItem *) menu addItemWithTitle:name action:@selector
-			 (item_selected:) keyEquivalent:shortcut;
-	item setTarget:self;
-	item setTag:i;
-	item setEnabled:YES;
-
-	item = (NSMenuItem *) dock_menu insertItemWithTitle:name
-			 action:@selector
-			 (item_selected:) keyEquivalent:shortcut
-			 atIndex:i;
-	item setTarget:self;
-	item setTag:i;
-	item setEnabled:YES;
- }
-
- if (checked_window_item >= 0 && checked_window_item < count)
- {
-	item = (NSMenuItem *) menu itemAtIndex:first + checked_window_item;
-	item setState:NSOnState;
-	item = (NSMenuItem *) dock_menu itemAtIndex:checked_window_item;
-	item setState:NSOnState;
- }
-}
-
-- (void) remove_apps_menu
-{
- NSMenu *menu;
- NSMenuItem *item;
- int i;
-
- if (apps == nil || apps_separator == nil)
-	return;
-
- menu = apps_separator menu;
-
- if (menu != nil)
- {
-	for (i = menu numberOfItems - 1; i >= 0; i--)
-	{
-	 item = (NSMenuItem *) menu itemAtIndex:i;
-	 if (item tag != 0)
-		menu removeItemAtIndex:i;
-	}
- }
-
- if (dock_apps_menu != nil)
- {
-	for (i = dock_apps_menu numberOfItems - 1; i >= 0; i--)
-	{
-	 item = (NSMenuItem *) dock_apps_menu itemAtIndex:i;
-	 if (item tag != 0)
-		dock_apps_menu removeItemAtIndex:i;
-	}
- }
-
- apps release;
- apps = nil;
-}
-
-- (void) prepend_apps_item:(NSArray *)list index:(int)i menu:(NSMenu *)menu
-{
- NSString *title, *shortcut = @"";
- NSArray *group;
- NSMenuItem *item;
-
- group = list objectAtIndex:i;
- title = group objectAtIndex:0;
- if (group count >= 3)
-	shortcut = group objectAtIndex:2;
-
- if (title length != 0)
- {
-	item = (NSMenuItem *) menu insertItemWithTitle:title
-			 action:@selector (app_selected:)
-			 keyEquivalent:shortcut atIndex:0;
-	item setTarget:self;
-	item setEnabled:YES;
- }
- else
- {
-	item = (NSMenuItem *) NSMenuItem separatorItem;
-	menu insertItem:item atIndex:0;
- }
-
- item setTag:i+1;			/* can't be zero, so add one */
-}
-
-- (void) install_apps_menu:(NSArray *)list
-{
- NSMenu *menu;
- int i, count;
-
- count = list count;
-
- if (count == 0 || apps_separator == nil)
-	return;
-
- menu = apps_separator menu;
-
- for (i = count - 1; i >= 0; i--)
- {
-	if (menu != nil)
-	 self prepend_apps_item:list index:i menu:menu;
-	if (dock_apps_menu != nil)
-	 self prepend_apps_item:list index:i menu:dock_apps_menu;
- }
-
- apps = list retain;
-}
-
-- (void) set_window_menu:(NSArray *)list
-{
- self remove_window_menu;
- self install_window_menu:list;
-
- QuartzMessageMainThread (kXquartzControllerNotify, 1,
-			 AppleWMWindowMenuNotify);
-}
-
-- (void) set_window_menu_check:(NSNumber *)nn
-{
- NSMenu *menu;
- NSMenuItem *item;
- int first, count;
- int n = nn intValue;
-
- menu = window_separator menu;
- first = menu indexOfItem:window_separator + 1;
- count = menu numberOfItems - first;
-
- if (checked_window_item >= 0 && checked_window_item < count)
- {
-	item = (NSMenuItem *) menu itemAtIndex:first + checked_window_item;
-	item setState:NSOffState;
-	item = (NSMenuItem *) dock_menu itemAtIndex:checked_window_item;
-	item setState:NSOffState;
- }
- if (n >= 0 && n < count)
- {
-	item = (NSMenuItem *) menu itemAtIndex:first + n;
-	item setState:NSOnState;
-	item = (NSMenuItem *) dock_menu itemAtIndex:n;
-	item setState:NSOnState;
- }
- checked_window_item = n;
-}
-
-- (void) set_apps_menu:(NSArray *)list
-{
- self remove_apps_menu;
- self install_apps_menu:list;
-}
-
-- (void) launch_client:(NSString *)command
-{
- QuartzRunClient (command cString);
-}
-
-- (void) app_selected:sender
-{
- int tag;
- NSString *item;
-
- tag = sender tag - 1;
- if (apps == nil || tag < 0 || tag >= apps count)
-	return;
-
- item = apps objectAtIndex:tag objectAtIndex:1;
-
- self launch_client:item;
-}
-
-- (IBAction) apps_table_show:sender
-{
- NSArray *columns;
-
- if (table_apps == nil)
- {
-	table_apps = NSMutableArray alloc initWithCapacity:1;
-
-	if (apps != nil)
-	 table_apps addObjectsFromArray:apps;
- }
-
- columns = apps_table tableColumns;
- columns objectAtIndex:0 setIdentifier:@"0";
- columns objectAtIndex:1 setIdentifier:@"1";
- columns objectAtIndex:2 setIdentifier:@"2";
-
- apps_table setDataSource:self;
- apps_table selectRow:0 byExtendingSelection:NO;
-
- apps_table window makeKeyAndOrderFront:sender;
-}
-
-- (IBAction) apps_table_cancel:sender
-{
- apps_table window orderOut:sender;
-
- table_apps release;
- table_apps = nil;
-}
-
-- (IBAction) apps_table_done:sender
-{
- apps_table deselectAll:sender;	/* flush edits? */
-
- self remove_apps_menu;
- self install_apps_menu:table_apps;
-
- NSApp prefs_set_array:@PREFS_APPSMENU value:table_apps;
- NSApp prefs_synchronize;
-
- apps_table window orderOut:sender;
-
- table_apps release;
- table_apps = nil;
-}
-
-- (IBAction) apps_table_new:sender
-{
- NSMutableArray *item;
-
- int row = apps_table selectedRow, i;
-
- if (row < 0)
-	row = 0;
- else
-	row = row + 1;
-
- i = row;
- if (i > table_apps count)
-	return;				/* avoid exceptions */
-
- item = NSMutableArray alloc initWithCapacity:3;
- item addObject:@"";
- item addObject:@"";
- item addObject:@"";
-
- table_apps insertObject:item atIndex:i;
- item release;
-
- apps_table noteNumberOfRowsChanged;
- apps_table selectRow:row byExtendingSelection:NO;
-}
-
-- (IBAction) apps_table_duplicate:sender
-{
- int row = apps_table selectedRow, i;
- NSObject *a;
-
- if (row < 0)
- {
-	self apps_table_new:sender;
-	return;
- }
-
- i = row;
- if (i > table_apps count - 1)
-	return;				/* avoid exceptions */
-
- a = table_apps objectAtIndex:i;
- table_apps insertObject:a copy atIndex:i;
-
- apps_table noteNumberOfRowsChanged;
- apps_table selectRow:row+1 byExtendingSelection:NO;
-}
-
-- (IBAction) apps_table_delete:sender
-{
- int row = apps_table selectedRow;
-
- if (row >= 0)
- {
-	int i = row;
-
-	if (i > table_apps count - 1)
-	 return;			/* avoid exceptions */
-
-	table_apps removeObjectAtIndex:i;
- }
-
- apps_table noteNumberOfRowsChanged;
-}
-
-- (int) numberOfRowsInTableView:(NSTableView *)tableView
-{
- if (table_apps == nil)
-	return 0;
-
- return table_apps count;
-}
-
-- (id) tableView:(NSTableView *)tableView
- objectValueForTableColumn:(NSTableColumn *)tableColumn row:(int)row
-{
- NSArray *item;
- int col;
-
- if (table_apps == nil)
-	return nil;
-
- col = tableColumn identifier intValue;
-
- item = table_apps objectAtIndex:row;
- if (item count > col)
-	return item objectAtIndex:col;
- else
-	return @"";
-}
-
-- (void) tableView:(NSTableView *)tableView setObjectValue:(id)object
- forTableColumn:(NSTableColumn *)tableColumn row:(int)row
-{
- NSMutableArray *item;
- int col;
-
- if (table_apps == nil)
-	return;
-
- col = tableColumn identifier intValue;
-
- item = table_apps objectAtIndex:row;
- item replaceObjectAtIndex:col withObject:object;
-}
-
-- (void) hide_window:sender
-{
- if (X11App x_active)
-	QuartzMessageMainThread (kXquartzControllerNotify, 1, AppleWMHideWindow);
- else
-	NSBeep ();			/* FIXME: something here */
-}
-
-- (IBAction)bring_to_front:sender
-{
- QuartzMessageMainThread (kXquartzControllerNotify, 1,
-			 AppleWMBringAllToFront);
-}
-
-- (IBAction)close_window:sender
-{
- if (X11App x_active)
-	QuartzMessageMainThread (kXquartzControllerNotify, 1, AppleWMCloseWindow);
- else
-	NSApp keyWindow performClose:sender;
-}
-
-- (IBAction)minimize_window:sender
-{
- if (X11App x_active)
-	QuartzMessageMainThread (kXquartzControllerNotify, 1, AppleWMMinimizeWindow);
- else
-	NSApp keyWindow performMiniaturize:sender;
-}
-
-- (IBAction)zoom_window:sender
-{
- if (X11App x_active)
-	QuartzMessageMainThread (kXquartzControllerNotify, 1, AppleWMZoomWindow);
- else
-	NSApp keyWindow performZoom:sender;
-}
-
-- (IBAction) next_window:sender
-{
- QuartzMessageMainThread (kXquartzControllerNotify, 1, AppleWMNextWindow);
-}
-
-- (IBAction) previous_window:sender
-{
- QuartzMessageMainThread (kXquartzControllerNotify,
-			 1, AppleWMPreviousWindow);
-}
-
-- (IBAction) enable_fullscreen_changed:sender
-{
- int value = !enable_fullscreen intValue;
-
- QuartzMessageMainThread (kXquartzSetRootless, 1, value);
-
- NSApp prefs_set_boolean:@PREFS_ROOTLESS value:value;
- NSApp prefs_synchronize;
-}
-
-- (IBAction) toggle_fullscreen:sender
-{
- QuartzMessageMainThread (kXquartzToggleFullscreen, 0);
-}
-
-- (void) set_can_quit:(BOOL)state
-{
- can_quit = state;
-}
-
-- (IBAction)prefs_changed:sender
-{
- darwinFakeButtons = fake_buttons intValue;
- quartzUseSysBeep = use_sysbeep intValue;
- X11EnableKeyEquivalents = enable_keyequivs intValue;
- darwinSyncKeymap = sync_keymap intValue;
-
- /* after adding prefs here, also add to X11Application read_defaults
- and below */
-
- NSApp prefs_set_boolean:@PREFS_FAKEBUTTONS value:darwinFakeButtons;
- NSApp prefs_set_boolean:@PREFS_SYSBEEP value:quartzUseSysBeep;
- NSApp prefs_set_boolean:@PREFS_KEYEQUIVS value:X11EnableKeyEquivalents;
- NSApp prefs_set_boolean:@PREFS_SYNC_KEYMAP value:darwinSyncKeymap;
- NSApp prefs_set_boolean:@PREFS_NO_AUTH value:!enable_auth intValue;
- NSApp prefs_set_boolean:@PREFS_NO_TCP value:!enable_tcp intValue;
- NSApp prefs_set_integer:@PREFS_DEPTH value:depth selectedTag;
-
- NSApp prefs_synchronize;
-}
-
-- (IBAction) prefs_show:sender
-{
- fake_buttons setIntValue:darwinFakeButtons;
- use_sysbeep setIntValue:quartzUseSysBeep;
- enable_keyequivs setIntValue:X11EnableKeyEquivalents;
- sync_keymap setIntValue:darwinSyncKeymap;
- sync_keymap setEnabled:darwinKeymapFile == NULL;
-
- enable_auth setIntValue:!NSApp prefs_get_boolean:@PREFS_NO_AUTH default:NO;
- enable_tcp setIntValue:!NSApp prefs_get_boolean:@PREFS_NO_TCP default:NO;
- depth selectItemAtIndex:depth indexOfItemWithTag:NSApp prefs_get_integer:@PREFS_DEPTH default:-1;
-
- enable_fullscreen setIntValue:!quartzEnableRootless;
-
- prefs_panel makeKeyAndOrderFront:sender;
-}
-
-- (IBAction) quit:sender
-{
- QuartzMessageMainThread (kXdarwinQuit, 0);
-}
-
-- (IBAction) x11_help:sender
-{
- AHLookupAnchor (CFSTR ("Mac Help"), CFSTR ("mchlp2276"));
-}
-
-- (BOOL) validateMenuItem:(NSMenuItem *)item
-{
- NSMenu *menu = item menu;
-
- if (item == toggle_fullscreen_item)
- {
-	return !quartzEnableRootless;
- }
- else if (menu == window_separator menu || menu == dock_menu
-	 || (menu == x11_about_item menu && item tag == 42))
- {
-	return (AppleWMSelectedEvents () & AppleWMControllerNotifyMask) != 0;
- }
- else
- {
-	return TRUE;
- }
-}
-
-- (void) applicationDidHide:(NSNotification *)notify
-{
- QuartzMessageMainThread (kXquartzControllerNotify, 1, AppleWMHideAll);
-}
-
-- (void) applicationDidUnhide:(NSNotification *)notify
-{
- QuartzMessageMainThread (kXquartzControllerNotify, 1, AppleWMShowAll);
-}
-
-- (NSApplicationTerminateReply) applicationShouldTerminate:sender
-{
- NSString *msg;
-
- if (can_quit || X11App prefs_get_boolean:@PREFS_NO_QUIT_ALERT default:NO)
- {
-	return NSTerminateNow;
- }
-
- /* Make sure we're frontmost. */
- NSApp activateIgnoringOtherApps:YES;
-
- msg = NSLocalizedString (@"Are you sure you want to quit X11?\n\n\
-If you quit X11, any X11 applications you are running will stop immediately \
-and you will lose any changes you have not saved.", @"");
-
- /* FIXME: safe to run the alert in here? Or should we return Later
- and then run the alert on a timer? It seems to work here, so.. */
-
- return (NSRunAlertPanel (nil, msg, NSLocalizedString (@"Quit", @""),
-			 NSLocalizedString (@"Cancel", @""), nil)
-	 == NSAlertDefaultReturn) ? NSTerminateNow : NSTerminateCancel;
-}
-
-- (void) applicationWillTerminate:(NSNotification *)aNotification
-{
- X11App prefs_synchronize;
-
- /* shutdown the X server, it will exit () for us. */
- QuartzMessageMainThread (kXdarwinQuit, 0);
-
- /* In case it doesn't, exit anyway after a while. */
- while (sleep (10) != 0) ;
- exit (1);
-}
-
-- (void) server_ready
-{
- x_list *node;
-
- finished_launching = YES;
-
- for (node = pending_apps; node != NULL; node = node->next)
- {
-	NSString *filename = node->data;
-	QuartzRunClient (filename UTF8String);
-	filename release;
- }
-
- x_list_free (pending_apps);
- pending_apps = NULL;
-}
-
-- (BOOL) application:(NSApplication *)app openFile:(NSString *)filename
-{
-#if 0
- const char *name = filename UTF8String;
-
- if (finished_launching)
-	QuartzRunClient (name);
- else if (name0 != ':')		/* ignore display names */
-	pending_apps = x_list_prepend (pending_apps, filename retain);
-
- /* FIXME: report failures. */
- return YES;
-#endif
-	return NO;
-}
-
-@end
-
-void X11ControllerMain (int argc, const char *argv,
-			void (*server_thread) (void *), void *server_arg)
-{
- X11ApplicationMain (argc, argv, server_thread, server_arg);
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/Xquartz.man Deleted

@@ -1,158 +0,0 @@
-.\" $XFree86: xc/programs/Xserver/hw/darwin/XDarwin.man,v 1.4 2002/01/09 18:01:58 torrey Exp $
-.\"
-.TH XQUARTZ 1 __vendorversion__
-.SH NAME
-Xquartz \- X window system server for Quartz operating system
-.SH SYNOPSIS
-.B Xquartz
- options  ...
-.SH DESCRIPTION
-.I Xquartz
-is the X window server for Mac OS X provided by Apple.
-.I Xquartz
-runs in parallel with Aqua in rootless mode. In rootless mode, the X
-window system and Mac OS X share your display.  The root window of the
-X11 display is the size of the screen and contains all the other
-windows. The X11 root window is not displayed in rootless mode as Mac
-OS X handles the desktop background.
-.SH OPTIONS
-.PP
-In addition to the normal server options described in the \fIXserver(1)\fP
-manual page, \fIXquartz\fP accepts the following command line switches:
-.TP 8
-.B \-fakebuttons
-Emulates a 3 button mouse using modifier keys. By default, the Command modifier
-is used to emulate button 2 and Option is used for button 3. Thus, clicking the
-first mouse button while holding down Command will act like clicking
-button 2. Holding down Option will simulate button 3.
-.TP 8
-.B \-nofakebuttons
-Do not emulate a 3 button mouse. This is the default.
-.TP 8
-.B "\-fakemouse2 \fImodifiers\fP"
-Change the modifier keys used to emulate the second mouse button. By default,
-Command is used to emulate the second button. Any combination of the following
-modifier names may be used: Shift, Option, Control, Command, Fn. For example,
-.B \-fakemouse2 """Option,Shift""
-will set holding Option, Shift and clicking on button one as equivalent to
-clicking the second mouse button.
-.TP 8
-.B "\-fakemouse3 \fImodifiers\fP"
-Change the modifier keys used to emulate the third mouse button. By default,
-Option is used to emulate the third button. Any combination of the following
-modifier names may be used: Shift, Option, Control, Command, Fn. For example,
-.B \-fakemouse3 """Control,Shift""
-will set holding Control, Shift and clicking on button one as equivalent to
-clicking the third mouse button.
-.TP 8
-.B "\-swapAltMeta"
-Swaps the meaning of the Alt and Meta modifier keys.
-.TP 8
-.B "\-keymap \fIfile\fP"
-On startup \fIXquartz\fP translates a Darwin keymapping into an X keymap.
-The default is to read this keymapping from USA.keymapping. With this option
-the keymapping will be read from \fIfile\fP instead. If the file's path is
-not specified, it will be searched for in Library/Keyboards/ underneath the
-following directories (in order): ~, /, /Network, /System.
-.TP 8
-.B \-nokeymap
-On startup \fIXquartz\fP translates a Darwin keymapping into an X keymap.
-With this option \fIXquartz\fP queries the kernel for the current keymapping
-instead of reading it from a file. This will often fail on newer kernels.
-.TP 8
-.B "\-depth \fIdepth\fP"
-Specifies the color bit depth to use. Currently only 15, and 24 color
-bits per pixel are supported. If not specified, defaults to the depth
-of the main display.
-.SH CUSTOMIZATION
-\fIXquartz\fP can also be customized using the defaults(1) command. The available options are:
-.TP 8
-.B defaults write com.apple.x11 enable_fake_buttons -boolean true
-Equivalent to the \fB-fakebuttons\fP command line option.
-.TP 8
-.B defaults write com.apple.x11 fake_button2 \fImodifiers\fP
-Equivalent to the \fB-fakemouse2\fP option.
-.TP 8
-.B defaults write com.apple.x11 fake_button3 \fImodifiers\fP
-Equivalent to the \fB-fakemouse3\fP option.
-.TP 8
-.B defaults write com.apple.x11 swap_alt_meta -boolean true
-Equivalent to the \fB-swapAltMeta\fP option.
-.TP 8
-.B defaults write com.apple.x11 keymap_file \fIfilename\fP
-Equivalent to the \fB-keymap\fP option.
-.TP 8
-.B defaults write com.apple.x11 no_quit_alert -boolean true
-Disables the alert dialog displayed when attempting to quit X11.
-.TP 8
-.B defaults write com.apple.x11 no_auth -boolean true
-Stops the X server requiring that clients authenticate themselves when
-connecting. See Xsecurity(__miscmansuffix__).
-.TP 8
-.B defaults write com.apple.x11 nolisten_tcp -boolean true
-Prevents the X server accepting remote connections.
-.TP 8
-.B defaults write com.apple.x11 xinit_kills_server -boolean false
-Stops the X server exiting when the xinitrc script terminates.
-.TP 8
-.B defaults write com.apple.x11 fullscreen_hotkeys -boolean false
-Allows system hotkeys to be handled while in X11 fullscreen mode.
-.TP 8
-.B defaults write com.apple.x11 enable_system_beep -boolean false
-Don't use the standard system beep effect for X11 alerts.
-.TP 8
-.B defaults write com.apple.x11 enable_key_equivalents -boolean false
-Disable menu keyboard equivalents while X11 windows are focused.
-.TP 8
-.B defaults write com.apple.x11 depth \fIdepth\fP
-Equivalent to the \fB-depth\fP option.
-.SH "SEE ALSO"
-.PP
-X(__miscmansuffix__), XFree86(1), Xserver(1), xdm(1), xinit(1)
-.PP
-.SH AUTHORS
-XFree86 was originally ported to Mac OS X Server by John Carmack. Dave
-Zarzycki used this as the basis of his port of XFree86 4.0 to Darwin 1.0.
-Torrey T. Lyons improved and integrated this code into the XFree86
-Project's mainline for the 4.0.2 release.
-.PP
-The following members of the XonX Team contributed to the following
-releases (in alphabetical order):
-.TP 4
-XFree86 4.1.0:
-.br
-Rob Braun - Darwin x86 support
-.br
-Torrey T. Lyons - Project Lead
-.br
-Andreas Monitzer - Cocoa version of XDarwin front end
-.br
-Gregory Robert Parker - Original Quartz implementation
-.br
-Christoph Pfisterer - Dynamic shared X libraries
-.br
-Toshimitsu Tanaka - Japanese localization
-.TP 4
-XFree86 4.2.0:
-.br
-Rob Braun - Darwin x86 support
-.br
-Pablo Di Noto - Spanish localization
-.br
-Paul Edens - Dutch localization
-.br
-Kyunghwan Kim - Korean localization
-.br
-Mario Klebsch - Non-US keyboard support
-.br
-Torrey T. Lyons - Project Lead
-.br
-Andreas Monitzer - German localization
-.br
-Patrik Montgomery - Swedish localization
-.br
-Greg Parker - Rootless support
-.br
-Toshimitsu Tanaka - Japanese localization
-.br
-Olivier Verdier - French localization

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/appledri.c Deleted

@@ -1,349 +0,0 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.10 2000/12/07 20:26:14 dawes Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- * Kevin E. Martin <martin@valinux.com>
- * Jens Owen <jens@valinux.com>
- * Rickard E. (Rik) Faith <faith@valinux.com>
- *
- */
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
-#include "misc.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include "colormapst.h"
-#include "cursorstr.h"
-#include "scrnintstr.h"
-#include "servermd.h"
-#define _APPLEDRI_SERVER_
-#include "appledristr.h"
-#include "swaprep.h"
-#include "dri.h"
-#include "dri-surface.h"
-#include "dristruct.h"
-#include "rootless-common.h"
-#include "X11Application.h"
-
-static int DRIErrorBase;
-
-static DISPATCH_PROC(ProcAppleDRIDispatch);
-static DISPATCH_PROC(SProcAppleDRIDispatch);
-
-static void AppleDRIResetProc(ExtensionEntry* extEntry);
-
-static unsigned char DRIReqCode = 0;
-static int DRIEventBase = 0;
-
-extern void AppleDRIExtensionInit(void);
-
-static void SNotifyEvent(xAppleDRINotifyEvent *from, xAppleDRINotifyEvent *to);
-
-typedef struct _DRIEvent *DRIEventPtr;
-typedef struct _DRIEvent {
- DRIEventPtr next;
- ClientPtr	 client;
- XID		 clientResource;
- unsigned int mask;
-} DRIEventRec;
-
-void
-AppleDRIExtensionInit(void)
-{
- ExtensionEntry* extEntry;
-
- if (DRIExtensionInit() &&
-	(extEntry = AddExtension(APPLEDRINAME,
-				 AppleDRINumberEvents,
-				 AppleDRINumberErrors,
-				 ProcAppleDRIDispatch,
-				 SProcAppleDRIDispatch,
-				 AppleDRIResetProc,
-				 StandardMinorOpcode))) {
-	DRIReqCode = (unsigned char)extEntry->base;
-	DRIErrorBase = extEntry->errorBase;
-	DRIEventBase = extEntry->eventBase;
-	EventSwapVectorDRIEventBase = (EventSwapPtr) SNotifyEvent;
- }
-}
-
-/*ARGSUSED*/
-static void
-AppleDRIResetProc (
- ExtensionEntry* extEntry
-)
-{
- DRIReset();
-}
-
-static int
-ProcAppleDRIQueryVersion(
- register ClientPtr client
-)
-{
- xAppleDRIQueryVersionReply rep;
- register int n;
-
- REQUEST_SIZE_MATCH(xAppleDRIQueryVersionReq);
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- rep.majorVersion = APPLE_DRI_MAJOR_VERSION;
- rep.minorVersion = APPLE_DRI_MINOR_VERSION;
- rep.patchVersion = APPLE_DRI_PATCH_VERSION;
- if (client->swapped) {
- 	swaps(&rep.sequenceNumber, n);
- 	swapl(&rep.length, n);
- }
- WriteToClient(client, sizeof(xAppleDRIQueryVersionReply), (char *)&rep);
- return (client->noClientException);
-}
-
-&#xc;
-/* surfaces */
-
-static int
-ProcAppleDRIQueryDirectRenderingCapable(
- register ClientPtr client
-)
-{
- xAppleDRIQueryDirectRenderingCapableReply	rep;
- Bool isCapable;
-
- REQUEST(xAppleDRIQueryDirectRenderingCapableReq);
- REQUEST_SIZE_MATCH(xAppleDRIQueryDirectRenderingCapableReq);
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
-
- if (!DRIQueryDirectRenderingCapable( screenInfo.screensstuff->screen, 
-					 &isCapable)) {
-	return BadValue;
- }
- rep.isCapable = isCapable;
-
- if (!LocalClient(client))
-	rep.isCapable = 0;
-
- WriteToClient(client, 
-	sizeof(xAppleDRIQueryDirectRenderingCapableReply), (char *)&rep);
- return (client->noClientException);
-}
-
-static int
-ProcAppleDRIAuthConnection(
- register ClientPtr client
-)
-{
- xAppleDRIAuthConnectionReply rep;
- 
- REQUEST(xAppleDRIAuthConnectionReq);
- REQUEST_SIZE_MATCH(xAppleDRIAuthConnectionReq);
-
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- rep.authenticated = 1;
-
- if (!DRIAuthConnection( screenInfo.screensstuff->screen, stuff->magic)) {
- ErrorF("Failed to authenticate %u\n", stuff->magic);
-	rep.authenticated = 0;
- }
- WriteToClient(client, sizeof(xAppleDRIAuthConnectionReply), (char *)&rep);
- return (client->noClientException);
-}
-
-static void surface_notify (void *_arg, void *data)
-{
- DRISurfaceNotifyArg *arg = _arg;
- int client_index = (int) data;
- ClientPtr client;
- xAppleDRINotifyEvent se;
-
- if (client_index < 0 || client_index >= currentMaxClients)
-	return;
-
- client = clientsclient_index;
- if (client == NULL || client == serverClient || client->clientGone)
-	return;
-
- se.type = DRIEventBase + AppleDRISurfaceNotify;
- se.kind = arg->kind;
- se.arg = arg->id;
- se.sequenceNumber = client->sequence;
- se.time = currentTime.milliseconds;
- WriteEventsToClient (client, 1, (xEvent *) &se);
-}
-
-static int
-ProcAppleDRICreateSurface(
- ClientPtr client
-)
-{
- xAppleDRICreateSurfaceReply	rep;
- DrawablePtr pDrawable;
- xp_surface_id sid;
- unsigned int key2;
-
- REQUEST(xAppleDRICreateSurfaceReq);
- REQUEST_SIZE_MATCH(xAppleDRICreateSurfaceReq);
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
-
- if (!(pDrawable = (DrawablePtr)SecurityLookupDrawable(
-						(Drawable)stuff->drawable,
-						client, 
-						SecurityReadAccess))) {
-	return BadValue;
- }
-
- rep.key_0 = rep.key_1 = rep.uid = 0;
-
- if (!DRICreateSurface( screenInfo.screensstuff->screen,
-			 (Drawable)stuff->drawable, pDrawable,
-			 stuff->client_id, &sid, key,
-			 surface_notify, (void *) client->index)) {
-	return BadValue;
- }
-
- rep.key_0 = key0;
- rep.key_1 = key1;
- rep.uid = sid;
-
- WriteToClient(client, sizeof(xAppleDRICreateSurfaceReply), (char *)&rep);
- return (client->noClientException);
-}
-
-static int
-ProcAppleDRIDestroySurface(
- register ClientPtr client
-)
-{
- REQUEST(xAppleDRIDestroySurfaceReq);
- DrawablePtr pDrawable;
- REQUEST_SIZE_MATCH(xAppleDRIDestroySurfaceReq);
-
- if (!(pDrawable = (DrawablePtr)SecurityLookupDrawable(
-						(Drawable)stuff->drawable,
-						client, 
-						SecurityReadAccess))) {
-	return BadValue;
- }
-
- if (!DRIDestroySurface( screenInfo.screensstuff->screen, 
-			 (Drawable)stuff->drawable,
-			 pDrawable, NULL, NULL)) {
-	return BadValue;
- }
-
- return (client->noClientException);
-}
-
-&#xc;
-/* dispatch */
-
-static int
-ProcAppleDRIDispatch (
- register ClientPtr	client
-)
-{
- REQUEST(xReq);
-
- switch (stuff->data)
- {
- case X_AppleDRIQueryVersion:
-	return ProcAppleDRIQueryVersion(client);
- case X_AppleDRIQueryDirectRenderingCapable:
-	return ProcAppleDRIQueryDirectRenderingCapable(client);
- }
-
- if (!LocalClient(client))
-	return DRIErrorBase + AppleDRIClientNotLocal;
-
- switch (stuff->data)
- {
- case X_AppleDRIAuthConnection:
-	return ProcAppleDRIAuthConnection(client);
- case X_AppleDRICreateSurface:
-	return ProcAppleDRICreateSurface(client);
- case X_AppleDRIDestroySurface:
-	return ProcAppleDRIDestroySurface(client);
- default:
-	return BadRequest;
- }
-}
-
-static void
-SNotifyEvent(from, to)
- xAppleDRINotifyEvent *from, *to;
-{
- to->type = from->type;
- to->kind = from->kind;
- cpswaps (from->sequenceNumber, to->sequenceNumber);
- cpswapl (from->time, to->time);
- cpswapl (from->arg, to->arg);
-}
-
-static int
-SProcAppleDRIQueryVersion(
- register ClientPtr	client
-)
-{
- register int n;
- REQUEST(xAppleDRIQueryVersionReq);
- swaps(&stuff->length, n);
- return ProcAppleDRIQueryVersion(client);
-}
-
-static int
-SProcAppleDRIDispatch (
- register ClientPtr	client
-)
-{
- REQUEST(xReq);
-
- /* It is bound to be non-local when there is byte swapping */
- if (!LocalClient(client))
-	return DRIErrorBase + AppleDRIClientNotLocal;
-
- /* only local clients are allowed DRI access */
- switch (stuff->data)
- {
- case X_AppleDRIQueryVersion:
-	return SProcAppleDRIQueryVersion(client);
- default:
-	return BadRequest;
- }
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/applewm-impl.c Deleted

@@ -1,656 +0,0 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/xf86dri.c,v 1.10 2000/12/07 20:26:14 dawes Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
-#include "misc.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include "colormapst.h"
-#include "cursorstr.h"
-#include "scrnintstr.h"
-#include "servermd.h"
-#define _APPLEWM_SERVER_
-#include "applewmstr.h"
-#include "swaprep.h"
-#include "rootless-common.h"
-#include "X11Application.h"
-
-static int WMErrorBase;
-
-static DISPATCH_PROC(ProcAppleWMDispatch);
-static DISPATCH_PROC(SProcAppleWMDispatch);
-
-static void AppleWMResetProc(ExtensionEntry* extEntry);
-
-static unsigned char WMReqCode = 0;
-static int WMEventBase = 0;
-
-static RESTYPE ClientType, EventType; /* resource types for event masks */
-static XID eventResource;
-
-/* Currently selected events */
-static unsigned int eventMask = 0;
-
-extern void AppleWMExtensionInit(void);
-
-static int WMFreeClient (pointer data, XID id);
-static int WMFreeEvents (pointer data, XID id);
-static void SNotifyEvent(xAppleWMNotifyEvent *from, xAppleWMNotifyEvent *to);
-
-typedef struct _WMEvent *WMEventPtr;
-typedef struct _WMEvent {
- WMEventPtr next;
- ClientPtr	 client;
- XID		 clientResource;
- unsigned int mask;
-} WMEventRec;
-
-static inline BoxRec
-make_box (int x, int y, int w, int h)
-{
- BoxRec r;
- r.x1 = x;
- r.y1 = y;
- r.x2 = x + w;
- r.y2 = y + h;
- return r;
-}
-
-void
-AppleWMExtensionInit(void)
-{
- ExtensionEntry* extEntry;
-
- ClientType = CreateNewResourceType(WMFreeClient);
- EventType = CreateNewResourceType(WMFreeEvents);
- eventResource = FakeClientID(0);
-
- if (ClientType && EventType &&
-	(extEntry = AddExtension(APPLEWMNAME,
-				 AppleWMNumberEvents,
-				 AppleWMNumberErrors,
-				 ProcAppleWMDispatch,
-				 SProcAppleWMDispatch,
-				 AppleWMResetProc,
-				 StandardMinorOpcode))) {
-	WMReqCode = (unsigned char)extEntry->base;
-	WMErrorBase = extEntry->errorBase;
-	WMEventBase = extEntry->eventBase;
-	EventSwapVectorWMEventBase = (EventSwapPtr) SNotifyEvent;
- }
-}
-
-/*ARGSUSED*/
-static void
-AppleWMResetProc (
- ExtensionEntry* extEntry
-)
-{
-}
-
-static int
-ProcAppleWMQueryVersion(
- register ClientPtr client
-)
-{
- xAppleWMQueryVersionReply rep;
- register int n;
-
- REQUEST_SIZE_MATCH(xAppleWMQueryVersionReq);
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- rep.majorVersion = APPLE_WM_MAJOR_VERSION;
- rep.minorVersion = APPLE_WM_MINOR_VERSION;
- rep.patchVersion = APPLE_WM_PATCH_VERSION;
- if (client->swapped) {
- 	swaps(&rep.sequenceNumber, n);
- 	swapl(&rep.length, n);
- }
- WriteToClient(client, sizeof(xAppleWMQueryVersionReply), (char *)&rep);
- return (client->noClientException);
-}
-
-&#xc;
-/* events */
-
-static inline void
-updateEventMask (WMEventPtr *pHead)
-{
- WMEventPtr pCur;
-
- eventMask = 0;
- for (pCur = *pHead; pCur != NULL; pCur = pCur->next)
-	eventMask |= pCur->mask;
-}
-
-/*ARGSUSED*/
-static int
-WMFreeClient (data, id)
- pointer	 data;
- XID		 id;
-{
- WMEventPtr pEvent;
- WMEventPtr *pHead, pCur, pPrev;
-
- pEvent = (WMEventPtr) data;
- pHead = (WMEventPtr *) LookupIDByType(eventResource, EventType);
- if (pHead) {
-	pPrev = 0;
-	for (pCur = *pHead; pCur && pCur != pEvent; pCur=pCur->next)
-	 pPrev = pCur;
-	if (pCur)
-	{
-	 if (pPrev)
-	 	pPrev->next = pEvent->next;
-	 else
-	 	*pHead = pEvent->next;
-	}
-	updateEventMask (pHead);
- }
- xfree ((pointer) pEvent);
- return 1;
-}
-
-/*ARGSUSED*/
-static int
-WMFreeEvents (data, id)
- pointer	 data;
- XID		 id;
-{
- WMEventPtr *pHead, pCur, pNext;
-
- pHead = (WMEventPtr *) data;
- for (pCur = *pHead; pCur; pCur = pNext) {
-	pNext = pCur->next;
-	FreeResource (pCur->clientResource, ClientType);
-	xfree ((pointer) pCur);
- }
- xfree ((pointer) pHead);
- eventMask = 0;
- return 1;
-}
-
-static int
-ProcAppleWMSelectInput (client)
- register ClientPtr	client;
-{
- REQUEST(xAppleWMSelectInputReq);
- WMEventPtr	pEvent, pNewEvent, *pHead;
- XID			clientResource;
-
- REQUEST_SIZE_MATCH (xAppleWMSelectInputReq);
- pHead = (WMEventPtr *)SecurityLookupIDByType(client,
-			eventResource, EventType, SecurityWriteAccess);
- if (stuff->mask != 0) {
-	if (pHead) {
-	 /* check for existing entry. */
-	 for (pEvent = *pHead; pEvent; pEvent = pEvent->next)
-	 {
-		if (pEvent->client == client)
-		{
-		 pEvent->mask = stuff->mask;
-		 updateEventMask (pHead);
-		 return Success;
-		}
-	 }
-	}
-
-	/* build the entry */
- 	pNewEvent = (WMEventPtr) xalloc (sizeof (WMEventRec));
- 	if (!pNewEvent)
-	 return BadAlloc;
- 	pNewEvent->next = 0;
- 	pNewEvent->client = client;
-	pNewEvent->mask = stuff->mask;
- 	/*
- 	 * add a resource that will be deleted when
- 	 * the client goes away
- 	 */
- 	clientResource = FakeClientID (client->index);
- 	pNewEvent->clientResource = clientResource;
- 	if (!AddResource (clientResource, ClientType, (pointer)pNewEvent))
-	 return BadAlloc;
- 	/*
- 	 * create a resource to contain a pointer to the list
- 	 * of clients selecting input. This must be indirect as
- 	 * the list may be arbitrarily rearranged which cannot be
- 	 * done through the resource database.
- 	 */
- 	if (!pHead)
- 	{
-	 pHead = (WMEventPtr *) xalloc (sizeof (WMEventPtr));
-	 if (!pHead ||
-	 	!AddResource (eventResource, EventType, (pointer)pHead))
-	 {
-	 	FreeResource (clientResource, RT_NONE);
-	 	return BadAlloc;
-	 }
-	 *pHead = 0;
- 	}
- 	pNewEvent->next = *pHead;
- 	*pHead = pNewEvent;
-	updateEventMask (pHead);
- } else if (stuff->mask == 0) {
-	/* delete the interest */
-	if (pHead) {
-	 pNewEvent = 0;
-	 for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
-		if (pEvent->client == client)
-		 break;
-		pNewEvent = pEvent;
-	 }
-	 if (pEvent) {
-		FreeResource (pEvent->clientResource, ClientType);
-		if (pNewEvent)
-		 pNewEvent->next = pEvent->next;
-		else
-		 *pHead = pEvent->next;
-		xfree (pEvent);
-		updateEventMask (pHead);
-	 }
-	}
- } else {
-	client->errorValue = stuff->mask;
-	return BadValue;
- }
- return Success;
-}
-
-/*
- * deliver the event
- */
-
-void
-AppleWMSendEvent (type, mask, which, arg)
- int type, which, arg;
- unsigned int mask;
-{
- WMEventPtr	*pHead, pEvent;
- ClientPtr		client;
- xAppleWMNotifyEvent se;
-
- pHead = (WMEventPtr *) LookupIDByType(eventResource, EventType);
- if (!pHead)
-	return;
- for (pEvent = *pHead; pEvent; pEvent = pEvent->next) {
-	client = pEvent->client;
-	if ((pEvent->mask & mask) == 0
-	 || client == serverClient || client->clientGone)
-	{
-	 continue;
-	}
-	se.type = type + WMEventBase;
-	se.kind = which;
-	se.arg = arg;
-	se.sequenceNumber = client->sequence;
-	se.time = currentTime.milliseconds;
-	WriteEventsToClient (client, 1, (xEvent *) &se);
- }
-}
-
-/* Safe to call from any thread. */
-unsigned int
-AppleWMSelectedEvents (void)
-{
- return eventMask;
-}
-
-&#xc;
-/* general utility functions */
-
-static int
-ProcAppleWMDisableUpdate(
- register ClientPtr client
-)
-{
- REQUEST_SIZE_MATCH(xAppleWMDisableUpdateReq);
-
- xp_disable_update ();
-
- return (client->noClientException);
-}
-
-static int
-ProcAppleWMReenableUpdate(
- register ClientPtr client
-)
-{
- REQUEST_SIZE_MATCH(xAppleWMReenableUpdateReq);
-
- xp_reenable_update ();
-
- return (client->noClientException);
-}
-
-&#xc;
-/* window functions */
-
-static int
-ProcAppleWMSetWindowMenu(
- register ClientPtr client
-)
-{
- const char *bytes, **items;
- char *shortcuts;
- int max_len, nitems, i, j;
- REQUEST(xAppleWMSetWindowMenuReq);
-
- REQUEST_AT_LEAST_SIZE(xAppleWMSetWindowMenuReq);
-
- nitems = stuff->nitems;
- items = alloca (sizeof (char *) * nitems);
- shortcuts = alloca (sizeof (char) * nitems);
-
- max_len = (stuff->length << 2) - sizeof(xAppleWMSetWindowMenuReq);
- bytes = (char *) &stuff1;
-
- for (i = j = 0; i < max_len && j < nitems;)
- {
-	shortcutsj = bytesi++;
-	itemsj++ = bytes + i;
-
-	while (i < max_len)
-	{
-	 if (bytesi++ == 0)
-		break;
-	}
- }
-
- X11ApplicationSetWindowMenu (nitems, items, shortcuts);
-
- return (client->noClientException);
-}
-
-static int
-ProcAppleWMSetWindowMenuCheck(
- register ClientPtr client
-)
-{
- REQUEST(xAppleWMSetWindowMenuCheckReq);
-
- REQUEST_SIZE_MATCH(xAppleWMSetWindowMenuCheckReq);
-
- X11ApplicationSetWindowMenuCheck (stuff->index);
-
- return (client->noClientException);
-}
-
-static int
-ProcAppleWMSetFrontProcess(
- register ClientPtr client
-)
-{
- REQUEST_SIZE_MATCH(xAppleWMSetFrontProcessReq);
-
- X11ApplicationSetFrontProcess ();
-
- return (client->noClientException);
-}
-
-static int
-ProcAppleWMSetWindowLevel(
- register ClientPtr client
-)
-{
- REQUEST(xAppleWMSetWindowLevelReq);
- WindowPtr pWin;
-
- REQUEST_SIZE_MATCH(xAppleWMSetWindowLevelReq);
-
- if (!(pWin = SecurityLookupWindow((Drawable)stuff->window,
-				 client, SecurityReadAccess))) {
-	return BadValue;
- }
-
- if (stuff->level < 0 || stuff->level >= AppleWMNumWindowLevels) {
-	return BadValue;
- }
-
- RootlessSetWindowLevel (pWin, stuff->level);
-
- return (client->noClientException);
-}
-
-static int
-ProcAppleWMSetCanQuit(
- register ClientPtr client
-)
-{
- REQUEST(xAppleWMSetCanQuitReq);
-
- REQUEST_SIZE_MATCH(xAppleWMSetCanQuitReq);
-
- X11ApplicationSetCanQuit (stuff->state);
-
- return (client->noClientException);
-}
-
-&#xc;
-/* frame functions */
-
-static int
-ProcAppleWMFrameGetRect(
- register ClientPtr client
-)
-{
- xAppleWMFrameGetRectReply rep;
- BoxRec ir, or, rr;
- REQUEST(xAppleWMFrameGetRectReq);
-
- REQUEST_SIZE_MATCH(xAppleWMFrameGetRectReq);
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
-
- ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
- or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
-
- if (xp_frame_get_rect (stuff->frame_rect,
-			 stuff->frame_class,
-			 &or, &ir, &rr) != Success) {
-	return BadValue;
- }
-
- rep.x = rr.x1;
- rep.y = rr.y1;
- rep.w = rr.x2 - rr.x1;
- rep.h = rr.y2 - rr.y1;
-
- WriteToClient(client, sizeof(xAppleWMFrameGetRectReply), (char *)&rep);
- return (client->noClientException);
-}
-
-static int
-ProcAppleWMFrameHitTest(
- register ClientPtr client
-)
-{
- xAppleWMFrameHitTestReply rep;
- BoxRec ir, or;
- int ret;
- REQUEST(xAppleWMFrameHitTestReq);
-
- REQUEST_SIZE_MATCH(xAppleWMFrameHitTestReq);
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
-
- ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
- or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
-
- if (xp_frame_hit_test (stuff->frame_class, stuff->px,
-			 stuff->py, &or, &ir, &ret) != Success)
- {
-	return BadValue;
- }
-
- rep.ret = ret;
-
- WriteToClient(client, sizeof(xAppleWMFrameHitTestReply), (char *)&rep);
- return (client->noClientException);
-}
-
-static int
-ProcAppleWMFrameDraw(
- register ClientPtr client
-)
-{
- BoxRec ir, or;
- unsigned int title_length, title_max;
- unsigned char *title_bytes;
- REQUEST(xAppleWMFrameDrawReq);
- WindowPtr pWin;
- xp_window_id wid;
-
- REQUEST_AT_LEAST_SIZE(xAppleWMFrameDrawReq);
-
- if (!(pWin = SecurityLookupWindow((Drawable)stuff->window,
-				 client, SecurityReadAccess))) {
-	return BadValue;
- }
-
- ir = make_box (stuff->ix, stuff->iy, stuff->iw, stuff->ih);
- or = make_box (stuff->ox, stuff->oy, stuff->ow, stuff->oh);
-
- title_length = stuff->title_length;
- title_max = (stuff->length << 2) - sizeof(xAppleWMFrameDrawReq);
-
- if (title_max < title_length)
-	return BadValue;
-
- title_bytes = (unsigned char *) &stuff1;
-
- wid = RootlessGetPhysicalWindow (pWin, FALSE);
- if (wid == 0)
-	return BadWindow;
-
- if (xp_frame_draw (wid, stuff->frame_class,
-		 stuff->frame_attr, &or, &ir,
-		 title_length, title_bytes) != Success) {
-	return BadValue;
- }
-
- return (client->noClientException);
-}
-
-&#xc;
-/* dispatch */
-
-static int
-ProcAppleWMDispatch (
- register ClientPtr	client
-)
-{
- REQUEST(xReq);
-
- switch (stuff->data)
- {
- case X_AppleWMQueryVersion:
-	return ProcAppleWMQueryVersion(client);
- }
-
- if (!LocalClient(client))
-	return WMErrorBase + AppleWMClientNotLocal;
-
- switch (stuff->data)
- {
- case X_AppleWMSelectInput:
-	return ProcAppleWMSelectInput(client);
- case X_AppleWMDisableUpdate:
-	return ProcAppleWMDisableUpdate(client);
- case X_AppleWMReenableUpdate:
-	return ProcAppleWMReenableUpdate(client);
- case X_AppleWMSetWindowMenu:
-	return ProcAppleWMSetWindowMenu(client);
- case X_AppleWMSetWindowMenuCheck:
-	return ProcAppleWMSetWindowMenuCheck(client);
- case X_AppleWMSetFrontProcess:
-	return ProcAppleWMSetFrontProcess(client);
- case X_AppleWMSetWindowLevel:
-	return ProcAppleWMSetWindowLevel(client);
- case X_AppleWMSetCanQuit:
-	return ProcAppleWMSetCanQuit(client);
- case X_AppleWMFrameGetRect:
-	return ProcAppleWMFrameGetRect(client);
- case X_AppleWMFrameHitTest:
-	return ProcAppleWMFrameHitTest(client);
- case X_AppleWMFrameDraw:
-	return ProcAppleWMFrameDraw(client);
- default:
-	return BadRequest;
- }
-}
-
-static void
-SNotifyEvent(from, to)
- xAppleWMNotifyEvent *from, *to;
-{
- to->type = from->type;
- to->kind = from->kind;
- cpswaps (from->sequenceNumber, to->sequenceNumber);
- cpswapl (from->time, to->time);
- cpswapl (from->arg, to->arg);
-}
-
-static int
-SProcAppleWMQueryVersion(
- register ClientPtr	client
-)
-{
- register int n;
- REQUEST(xAppleWMQueryVersionReq);
- swaps(&stuff->length, n);
- return ProcAppleWMQueryVersion(client);
-}
-
-static int
-SProcAppleWMDispatch (
- register ClientPtr	client
-)
-{
- REQUEST(xReq);
-
- /* It is bound to be non-local when there is byte swapping */
- if (!LocalClient(client))
-	return WMErrorBase + AppleWMClientNotLocal;
-
- /* only local clients are allowed WM access */
- switch (stuff->data)
- {
- case X_AppleWMQueryVersion:
-	return SProcAppleWMQueryVersion(client);
- default:
-	return BadRequest;
- }
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/applewm.c Deleted

@@ -1,529 +0,0 @@
-/* $XFree86: xc/lib/GL/dri/XF86dri.c,v 1.12 2001/08/27 17:40:57 dawes Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/* THIS IS NOT AN X CONSORTIUM STANDARD */
-
-#define NEED_EVENTS
-#define NEED_REPLIES
-#include <X11/Xlibint.h>
-#include "applewmstr.h"
-#include <X11/extensions/Xext.h>
-#include "extutil.h"
-#include <stdio.h>
-
-static XExtensionInfo _applewm_info_data;
-static XExtensionInfo *applewm_info = &_applewm_info_data;
-static char *applewm_extension_name = APPLEWMNAME;
-
-#define AppleWMCheckExtension(dpy,i,val) \
- XextCheckExtension (dpy, i, applewm_extension_name, val)
-
-/*****************************************************************************
- * *
- *			 private utility routines *
- * *
- *****************************************************************************/
-
-static int close_display(Display *dpy, XExtCodes *extCodes);
-static Bool wire_to_event();
-static Status event_to_wire();
-
-static /* const */ XExtensionHooks applewm_extension_hooks = {
- NULL,				/* create_gc */
- NULL,				/* copy_gc */
- NULL,				/* flush_gc */
- NULL,				/* free_gc */
- NULL,				/* create_font */
- NULL,				/* free_font */
- close_display,			/* close_display */
- wire_to_event,			/* wire_to_event */
- event_to_wire,			/* event_to_wire */
- NULL,				/* error */
- NULL,				/* error_string */
-};
-
-static XEXT_GENERATE_FIND_DISPLAY (find_display, applewm_info, 
-				 applewm_extension_name, 
-				 &applewm_extension_hooks, 
-				 AppleWMNumberEvents, NULL)
-
-static XEXT_GENERATE_CLOSE_DISPLAY (close_display, applewm_info)
-
-static Bool wire_to_event (dpy, re, event)
- Display *dpy;
- XEvent *re;
- xEvent *event;
-{
- XExtDisplayInfo *info = find_display (dpy);
- XAppleWMNotifyEvent *se;
- xAppleWMNotifyEvent *sevent;
-
- AppleWMCheckExtension (dpy, info, False);
-
- switch ((event->u.u.type & 0x7f) - info->codes->first_event) {
- case AppleWMControllerNotify:
- case AppleWMActivationNotify:
- case AppleWMPasteboardNotify:
- 	se = (XAppleWMNotifyEvent *) re;
-	sevent = (xAppleWMNotifyEvent *) event;
- 	se->type = sevent->type & 0x7f;
- 	se->serial = _XSetLastRequestRead(dpy,(xGenericReply *) event);
- 	se->send_event = (sevent->type & 0x80) != 0;
- 	se->display = dpy;
-	se->window = 0;
-	se->time = sevent->time;
- 	se->kind = sevent->kind;
- 	se->arg = sevent->arg;
- 	return True;
- }
- return False;
-}
-
-static Status event_to_wire (dpy, re, event)
- Display *dpy;
- XEvent *re;
- xEvent *event;
-{
- XExtDisplayInfo *info = find_display (dpy);
- XAppleWMNotifyEvent *se;
- xAppleWMNotifyEvent *sevent;
-
- AppleWMCheckExtension (dpy, info, False);
-
- switch ((re->type & 0x7f) - info->codes->first_event) {
- case AppleWMControllerNotify:
- case AppleWMActivationNotify:
- case AppleWMPasteboardNotify:
- 	se = (XAppleWMNotifyEvent *) re;
-	sevent = (xAppleWMNotifyEvent *) event;
- 	sevent->type = se->type | (se->send_event ? 0x80 : 0);
- 	sevent->sequenceNumber = se->serial & 0xffff;
- 	sevent->kind = se->kind;
- 	sevent->arg = se->arg;
-	sevent->time = se->time;
- 	return 1;
- }
- return 0;
-}
-
-/*****************************************************************************
- * *
- *		 public Apple-WM Extension routines *
- * *
- *****************************************************************************/
-
-#if 0
-#include <stdio.h>
-#define TRACE(msg) fprintf(stderr, "AppleWM%s\n", msg);
-#else
-#define TRACE(msg)
-#endif
-
-
-Bool XAppleWMQueryExtension (dpy, event_basep, error_basep)
- Display *dpy;
- int *event_basep, *error_basep;
-{
- XExtDisplayInfo *info = find_display (dpy);
-
- TRACE("QueryExtension...");
- if (XextHasExtension(info)) {
-	*event_basep = info->codes->first_event;
-	*error_basep = info->codes->first_error;
- TRACE("QueryExtension... return True");
-	return True;
- } else {
- TRACE("QueryExtension... return False");
-	return False;
- }
-}
-
-Bool XAppleWMQueryVersion(dpy, majorVersion, minorVersion, patchVersion)
- Display* dpy;
- int* majorVersion; 
- int* minorVersion;
- int* patchVersion;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMQueryVersionReply rep;
- xAppleWMQueryVersionReq *req;
-
- TRACE("QueryVersion...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMQueryVersion, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMQueryVersion;
- if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
- TRACE("QueryVersion... return False");
-	return False;
- }
- *majorVersion = rep.majorVersion;
- *minorVersion = rep.minorVersion;
- *patchVersion = rep.patchVersion;
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("QueryVersion... return True");
- return True;
-}
-
-Bool XAppleWMDisableUpdate(dpy, screen)
- Display* dpy;
- int screen;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMDisableUpdateReq *req;
-
- TRACE("DisableUpdate...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMDisableUpdate, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMDisableUpdate;
- req->screen = screen;
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("DisableUpdate... return True");
- return True;
-}
-
-Bool XAppleWMReenableUpdate(dpy, screen)
- Display* dpy;
- int screen;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMReenableUpdateReq *req;
-
- TRACE("ReenableUpdate...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMReenableUpdate, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMReenableUpdate;
- req->screen = screen;
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("ReenableUpdate... return True");
- return True;
-}
-
-Bool XAppleWMSelectInput(dpy, mask)
- Display* dpy;
- unsigned long mask;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMSelectInputReq *req;
-
- TRACE("SelectInput...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMSelectInput, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMSelectInput;
- req->mask = mask;
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("SetlectInput... return True");
- return True;
-}
-
-Bool XAppleWMSetWindowMenuWithShortcuts(dpy, nitems, items, shortcuts)
- Display* dpy;
- int nitems;
- const char **items;
- const char *shortcuts;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMSetWindowMenuReq *req;
- int i, total_length, len;
- char *buf, *ptr;
-
- TRACE("SetWindowMenu...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMSetWindowMenu, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMSetWindowMenu;
- req->nitems = nitems;
-
- total_length = 0;
- for (i = 0; i < nitems; i++)
-	total_length += strlen (itemsi) + 2;
-
- ptr = buf = alloca (total_length);
- for (i = 0; i < nitems; i++)
- {
-	len = strlen (itemsi);
-	*ptr++ = shortcuts ? shortcutsi : 0;
-	memcpy (ptr, itemsi, len);
-	ptrlen = 0;
-	ptr += len + 1;
- }
-
- req->length += (total_length + 3) >> 2;
- Data (dpy, buf, total_length);
-
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("SetlectInput... return True");
- return True;
-}
-
-Bool XAppleWMSetWindowMenu(dpy, nitems, items)
- Display* dpy;
- int nitems;
- const char **items;
-{
- return XAppleWMSetWindowMenuWithShortcuts (dpy, nitems, items, NULL);
-}
-
-Bool XAppleWMSetWindowMenuCheck(dpy, idx)
- Display* dpy;
- int idx;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMSetWindowMenuCheckReq *req;
-
- TRACE("SetWindowMenuCheck...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMSetWindowMenuCheck, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMSetWindowMenuCheck;
- req->index = idx;
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("SetWindowMenuCheck... return True");
- return True;
-}
-
-Bool XAppleWMSetFrontProcess(dpy)
- Display* dpy;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMSetFrontProcessReq *req;
-
- TRACE("SetFrontProcess...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMSetFrontProcess, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMSetFrontProcess;
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("SetFrontProcess... return True");
- return True;
-}
-
-Bool XAppleWMSetWindowLevel(dpy, id, level)
- Display* dpy;
- Window id;
- int level;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMSetWindowLevelReq *req;
-
- TRACE("SetWindowLevel...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMSetWindowLevel, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMSetWindowLevel;
- req->window = id;
- req->level = level;
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("SetWindowLevel... return True");
- return True;
-}
-
-Bool XAppleWMSetCanQuit(dpy, state)
- Display* dpy;
- Bool state;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMSetCanQuitReq *req;
-
- TRACE("SetCanQuit...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMSetCanQuit, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMSetCanQuit;
- req->state = state;
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("SetCanQuit... return True");
- return True;
-}
-
-Bool XAppleWMFrameGetRect(dpy, frame_class, frame_rect,
-			 ix, iy, iw, ih, ox, oy, ow, oh, rx, ry, rw, rh)
- Display* dpy;
- unsigned int frame_class, frame_rect;
- short ix, iy, iw, ih;
- short ox, oy, ow, oh;
- short *rx, *ry, *rw, *rh;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMFrameGetRectReply rep;
- xAppleWMFrameGetRectReq *req;
-
- TRACE("FrameGetRect...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMFrameGetRect, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMFrameGetRect;
- req->frame_class = frame_class;
- req->frame_rect = frame_rect;
- req->ix = ix;
- req->iy = iy;
- req->iw = iw;
- req->ih = ih;
- req->ox = ox;
- req->oy = oy;
- req->ow = ow;
- req->oh = oh;
- rep.x = rep.y = rep.w = rep.h = 0;
- if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
- TRACE("FrameGetRect... return False");
-	return False;
- }
- *rx = rep.x; *ry = rep.y;
- *rw = rep.w; *rh = rep.h;
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("FrameGetRect... return True");
- return True;
-}
-
-unsigned int XAppleWMFrameHitTest(dpy, frame_class, px, py,
-				 ix, iy, iw, ih, ox, oy, ow, oh)
- Display* dpy;
- unsigned int frame_class;
- short px, py;
- short ix, iy, iw, ih;
- short ox, oy, ow, oh;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMFrameHitTestReply rep;
- xAppleWMFrameHitTestReq *req;
-
- TRACE("FrameHitTest...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMFrameHitTest, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMFrameHitTest;
- req->frame_class = frame_class;
- req->px = px;
- req->py = py;
- req->ix = ix;
- req->iy = iy;
- req->iw = iw;
- req->ih = ih;
- req->ox = ox;
- req->oy = oy;
- req->ow = ow;
- req->oh = oh;
- rep.ret = 0;
- if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
-	UnlockDisplay(dpy);
-	SyncHandle();
- TRACE("FrameHitTest... return False");
-	return False;
- }
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("FrameHiTest... return True");
- return rep.ret;
-}
-
-Bool XAppleWMFrameDraw(dpy, screen, window,
-			frame_class, frame_attr,
-			ix, iy, iw, ih, ox, oy, ow, oh,
-			title_length, title_bytes)
- Display* dpy;
- int screen;
- Window window;
- unsigned int frame_class, frame_attr;
- short ix, iy, iw, ih;
- short ox, oy, ow, oh;
- unsigned int title_length;
- const unsigned char *title_bytes;
-{
- XExtDisplayInfo *info = find_display (dpy);
- xAppleWMFrameDrawReq *req;
-
- TRACE("FrameDraw...");
- AppleWMCheckExtension (dpy, info, False);
-
- LockDisplay(dpy);
- GetReq(AppleWMFrameDraw, req);
- req->reqType = info->codes->major_opcode;
- req->wmReqType = X_AppleWMFrameDraw;
- req->screen = screen;
- req->window = window;
- req->frame_class = frame_class;
- req->frame_attr = frame_attr;
- req->ix = ix;
- req->iy = iy;
- req->iw = iw;
- req->ih = ih;
- req->ox = ox;
- req->oy = oy;
- req->ow = ow;
- req->oh = oh;
- req->title_length = title_length;
-
- req->length += (title_length + 3)>>2;
- Data (dpy, title_bytes, title_length);
-
- UnlockDisplay(dpy);
- SyncHandle();
- TRACE("FrameDraw... return True");
- return True;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/applewm.h Deleted

@@ -1,160 +0,0 @@
-/* $XFree86: xc/lib/GL/dri/xf86dri.h,v 1.7 2000/12/07 20:26:02 dawes Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-#ifndef _APPLEWM_H_
-#define _APPLEWM_H_
-
-#include <X11/Xfuncproto.h>
-
-#define X_AppleWMQueryVersion			0
-#define X_AppleWMFrameGetRect			1
-#define X_AppleWMFrameHitTest			2
-#define X_AppleWMFrameDraw			3
-#define X_AppleWMDisableUpdate			4
-#define X_AppleWMReenableUpdate			5
-#define X_AppleWMSelectInput			6
-#define X_AppleWMSetWindowMenuCheck		7
-#define X_AppleWMSetFrontProcess		8
-#define X_AppleWMSetWindowLevel			9
-#define X_AppleWMSetCanQuit			10
-#define X_AppleWMSetWindowMenu			11
-
-/* Events */
-#define AppleWMControllerNotify		0
-#define AppleWMActivationNotify		1
-#define AppleWMPasteboardNotify		2
-#define AppleWMNumberEvents		3
-
-#define AppleWMControllerNotifyMask	(1L << 0)
-#define AppleWMActivationNotifyMask	(1L << 1)
-#define AppleWMPasteboardNotifyMask	(1L << 2)
-
-/* "Kinds" of ControllerNotify events */
-#define AppleWMMinimizeWindow		0
-#define AppleWMZoomWindow		1
-#define AppleWMCloseWindow		2
-#define AppleWMBringAllToFront		3
-#define AppleWMHideWindow		4
-#define AppleWMHideAll			5
-#define AppleWMShowAll			6
-#define AppleWMWindowMenuItem		9
-#define AppleWMWindowMenuNotify		10
-#define AppleWMNextWindow		11
-#define AppleWMPreviousWindow		12
-
-/* "Kinds" of ActivationNotify events */
-#define AppleWMIsActive			0
-#define AppleWMIsInactive		1
-
-/* "Kinds" of PasteboardNotify events */
-#define AppleWMCopyToPasteboard		0
-
-/* Errors */
-#define AppleWMClientNotLocal		0
-#define AppleWMOperationNotSupported	1
-#define AppleWMNumberErrors		(AppleWMOperationNotSupported + 1)
-
-/* Window level ids */
-#define AppleWMWindowLevelNormal	0
-#define AppleWMWindowLevelFloating	1
-#define AppleWMWindowLevelTornOff	2
-#define AppleWMWindowLevelDock		3
-#define AppleWMWindowLevelDesktop	4
-#define AppleWMNumWindowLevels		5
-
-#ifndef _APPLEWM_SERVER_
-
-typedef struct {
- int	type;		 /* of event */
- unsigned long serial; /* # of last request processed by server */
- Bool send_event;	 /* true if this came from a SendEvent request */
- Display *display;	 /* Display the event was read from */
- Window window;	 /* window of event */
- Time time;		 /* server timestamp when event happened */
- int kind;		 /* subtype of event */
- int arg;
-} XAppleWMNotifyEvent;
-
-_XFUNCPROTOBEGIN
-
-Bool XAppleWMQueryExtension (Display *dpy, int *event_base, int *error_base);
-
-Bool XAppleWMQueryVersion (Display *dpy, int *majorVersion,
-			 int *minorVersion, int *patchVersion);
-
-Bool XAppleWMDisableUpdate (Display *dpy, int screen);
-
-Bool XAppleWMReenableUpdate (Display *dpy, int screen);
-
-Bool XAppleWMSelectInput (Display *dpy, unsigned long mask);
-
-Bool XAppleWMSetWindowMenu (Display *dpy, int nitems, const char **items);
-Bool XAppleWMSetWindowMenuWithShortcuts (Display *dpy, int nitems,
-					 const char **items,
-					 const char *shortcuts);
-
-Bool XAppleWMSetWindowMenuCheck (Display *dpy, int index);
-
-Bool XAppleWMSetFrontProcess (Display *dpy);
-
-Bool XAppleWMSetWindowLevel (Display *dpy, Window id, int level);
-
-Bool XAppleWMSetCanQuit (Display *dpy, Bool state);
-
-Bool XAppleWMFrameGetRect (Display *dpy,
-			 unsigned int frame_class, unsigned int frame_rect,
-			 short inner_x, short inner_y,
-			 short inner_w, short inner_h,
-			 short outer_x, short outer_y,
-			 short outer_w, short outer_h,
-			 short *ret_x, short *ret_y,
-			 short *ret_w, short *ret_h);
-
-unsigned int XAppleWMFrameHitTest (Display *dpy,
-				 unsigned int frame_class,
-				 short point_x, short point_y,
-				 short inner_x, short inner_y,
-				 short inner_w, short inner_h,
-				 short outer_x, short outer_y,
-				 short outer_w, short outer_h);
-
-Bool XAppleWMFrameDraw (Display *dpy, int screen, Window window,
-			 unsigned int frame_class, unsigned int frame_attr,
-			 short inner_x, short inner_y,
-			 short inner_w, short inner_h,
-			 short outer_x, short outer_y,
-			 short outer_w, short outer_h,
-			 unsigned int title_length,
-			 const unsigned char * title_bytes);
-
-_XFUNCPROTOEND
-
-#endif /* _APPLEWM_SERVER_ */
-#endif /* _APPLEWM_H_ */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/applewmstr.h Deleted

@@ -1,333 +0,0 @@
-/* $XFree86: xc/lib/GL/dri/xf86dristr.h,v 1.9 2001/03/21 16:01:08 dawes Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- * Kevin E. Martin <martin@valinux.com>
- * Jens Owen <jens@valinux.com>
- * Rickard E. (Rik) Fiath <faith@valinux.com>
- *
- */
-
-#ifndef _APPLEWMSTR_H_
-#define _APPLEWMSTR_H_
-
-#include "applewm.h"
-
-#define APPLEWMNAME "Apple-WM"
-
-#define APPLE_WM_MAJOR_VERSION	1	/* current version numbers */
-#define APPLE_WM_MINOR_VERSION	0
-#define APPLE_WM_PATCH_VERSION	0
-
-typedef struct _AppleWMQueryVersion {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMQueryVersion */
- CARD16	length B16;
-} xAppleWMQueryVersionReq;
-#define sz_xAppleWMQueryVersionReq	4
-
-typedef struct {
- BYTE	type;			/* X_Reply */
- BOOL	pad1;
- CARD16	sequenceNumber B16;
- CARD32	length B32;
- CARD16	majorVersion B16;	/* major version of WM protocol */
- CARD16	minorVersion B16;	/* minor version of WM protocol */
- CARD32	patchVersion B32; /* patch version of WM protocol */
- CARD32	pad3 B32;
- CARD32	pad4 B32;
- CARD32	pad5 B32;
- CARD32	pad6 B32;
-} xAppleWMQueryVersionReply;
-#define sz_xAppleWMQueryVersionReply	32
-
-typedef struct _AppleWMQueryDirectRenderingCapable {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* X_WMQueryDirectRenderingCapable */
- CARD16	length B16;
- CARD32	screen B32;
-} xAppleWMQueryDirectRenderingCapableReq;
-#define sz_xAppleWMQueryDirectRenderingCapableReq	8
-
-typedef struct {
- BYTE	type;			/* X_Reply */
- BOOL	pad1;
- CARD16	sequenceNumber B16;
- CARD32	length B32;
- BOOL	isCapable;
- BOOL	pad2;
- BOOL	pad3;
- BOOL	pad4;
- CARD32	pad5 B32;
- CARD32	pad6 B32;
- CARD32	pad7 B32;
- CARD32	pad8 B32;
- CARD32	pad9 B32;
-} xAppleDRIQueryDirectRenderingCapableReply;
-#define sz_xAppleWMQueryDirectRenderingCapableReply	32
-
-typedef struct _AppleWMAuthConnection {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMCloseConnection */
- CARD16	length B16;
- CARD32	screen B32;
- CARD32 magic B32;
-} xAppleWMAuthConnectionReq;
-#define sz_xAppleWMAuthConnectionReq	12
-
-typedef struct {
- BYTE type;
- BOOL pad1;
- CARD16 sequenceNumber B16;
- CARD32 length B32;
- CARD32 authenticated B32;
- CARD32 pad2 B32;
- CARD32 pad3 B32;
- CARD32 pad4 B32;
- CARD32 pad5 B32;
- CARD32 pad6 B32;
-} xAppleWMAuthConnectionReply;
-#define zx_xAppleWMAuthConnectionReply 32
-
-typedef struct _AppleWMCreateSurface {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMCreateSurface */
- CARD16	length B16;
- CARD32	screen B32;
- CARD32	drawable B32;
- CARD32	client_id B32;
-} xAppleWMCreateSurfaceReq;
-#define sz_xAppleWMCreateSurfaceReq	16
-
-typedef struct {
- BYTE	type;			/* X_Reply */
- BOOL	pad1;
- CARD16	sequenceNumber B16;
- CARD32	length B32;
- CARD32	key_0 B32;
- CARD32	key_1 B32;
- CARD32	uid B32;
- CARD32	pad4 B32;
- CARD32	pad5 B32;
- CARD32	pad6 B32;
-} xAppleWMCreateSurfaceReply;
-#define sz_xAppleWMCreateSurfaceReply	32
-
-typedef struct _AppleWMDestroySurface {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMDestroySurface */
- CARD16	length B16;
- CARD32	screen B32;
- CARD32	drawable B32;
-} xAppleWMDestroySurfaceReq;
-#define sz_xAppleWMDestroySurfaceReq	12
-
-typedef struct _AppleWMDisableUpdate {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMDisableUpdate */
- CARD16	length B16;
- CARD32	screen B32;
-} xAppleWMDisableUpdateReq;
-#define sz_xAppleWMDisableUpdateReq	8
-
-typedef struct _AppleWMReenableUpdate {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMReenableUpdate */
- CARD16	length B16;
- CARD32	screen B32;
-} xAppleWMReenableUpdateReq;
-#define sz_xAppleWMReenableUpdateReq	8
-
-typedef struct _AppleWMSelectInput {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMSelectInput */
- CARD16	length B16;
- CARD32	mask B32;
-} xAppleWMSelectInputReq;
-#define sz_xAppleWMSelectInputReq	8
-
-typedef struct _AppleWMNotify {
-	BYTE	type;		/* always eventBase + event type */
-	BYTE	kind;
-	CARD16	sequenceNumber B16;
-	Time	time B32;	/* time of change */
-	CARD16	pad1 B16;
-	CARD32	arg B32;
-	CARD32	pad3 B32;
-} xAppleWMNotifyEvent;
-#define sz_xAppleWMNotifyEvent	20
-
-typedef struct _AppleWMSetWindowMenu {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMSetWindowMenu */
- CARD16	length B16;
- CARD16	nitems B16;
- CARD16	pad1 B16;
-} xAppleWMSetWindowMenuReq;
-#define sz_xAppleWMSetWindowMenuReq	8
-
-typedef struct _AppleWMSetWindowMenuCheck {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMSetWindowMenuCheck */
- CARD16	length B16;
- CARD32	index;
-} xAppleWMSetWindowMenuCheckReq;
-#define sz_xAppleWMSetWindowMenuCheckReq 8
-
-typedef struct _AppleWMSetFrontProcess {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMSetFrontProcess */
- CARD16	length B16;
-} xAppleWMSetFrontProcessReq;
-#define sz_xAppleWMSetFrontProcessReq 4
-
-typedef struct _AppleWMSetWindowLevel {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMSetWindowLevel */
- CARD16	length B16;
- CARD32	window;
- CARD32	level;
-} xAppleWMSetWindowLevelReq;
-#define sz_xAppleWMSetWindowLevelReq 12
-
-typedef struct _AppleWMSetCanQuit {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMSetCanQuit */
- CARD16	length B16;
- CARD32	state;
-} xAppleWMSetCanQuitReq;
-#define sz_xAppleWMSetCanQuitReq 8
-
-typedef struct _AppleWMFrameGetRect {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMFrameGetRect */
- CARD16	length B16;
- CARD16	frame_class B16;
- CARD16	frame_rect B16;
- CARD16	ix B16;
- CARD16	iy B16;
- CARD16	iw B16;
- CARD16	ih B16;
- CARD16	ox B16;
- CARD16	oy B16;
- CARD16	ow B16;
- CARD16	oh B16;
-} xAppleWMFrameGetRectReq;
-#define sz_xAppleWMFrameGetRectReq	24
-
-typedef struct {
- BYTE	type;			/* X_Reply */
- BOOL	pad1;
- CARD16	sequenceNumber B16;
- CARD32	length B32;
- CARD16	x B16;
- CARD16	y B16;
- CARD16	w B16;
- CARD16	h B16;
- CARD32	pad3 B32;
- CARD32	pad4 B32;
- CARD32	pad5 B32;
- CARD32	pad6 B32;
-} xAppleWMFrameGetRectReply;
-#define sz_xAppleWMFrameGetRectReply	32
-
-typedef struct _AppleWMFrameHitTest {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMFrameHitTest */
- CARD16	length B16;
- CARD16	frame_class B16;
- CARD16	pad1 B16;
- CARD16	px B16;
- CARD16	py B16;
- CARD16	ix B16;
- CARD16	iy B16;
- CARD16	iw B16;
- CARD16	ih B16;
- CARD16	ox B16;
- CARD16	oy B16;
- CARD16	ow B16;
- CARD16	oh B16;
-} xAppleWMFrameHitTestReq;
-#define sz_xAppleWMFrameHitTestReq	28
-
-typedef struct {
- BYTE	type;			/* X_Reply */
- BOOL	pad1;
- CARD16	sequenceNumber B16;
- CARD32	length B32;
- CARD32	ret B32;
- CARD32	pad2 B32;
- CARD32	pad3 B32;
- CARD32	pad4 B32;
- CARD32	pad5 B32;
- CARD32	pad6 B32;
-} xAppleWMFrameHitTestReply;
-#define sz_xAppleWMFrameHitTestReply	32
-
-typedef struct _AppleWMFrameDraw {
- CARD8	reqType;		/* always WMReqCode */
- CARD8	wmReqType;		/* always X_WMFrameDraw */
- CARD16	length B16;
- CARD32	screen B32;
- CARD32	window B32;
- CARD16	frame_class B16;
- CARD16	frame_attr B16;
- CARD16	ix B16;
- CARD16	iy B16;
- CARD16	iw B16;
- CARD16	ih B16;
- CARD16	ox B16;
- CARD16	oy B16;
- CARD16	ow B16;
- CARD16	oh B16;
- CARD32	title_length B32;
-} xAppleWMFrameDrawReq;
-#define sz_xAppleWMFrameDrawReq	36
-
-#ifdef _APPLEWM_SERVER_
-
-void AppleWMSendEvent (
-#if NeedFunctionPrototypes
- int			/* type */,
- unsigned int	/* mask */,
- int			/* which */,
- int			/* arg */
-#endif
-);
-
-unsigned int AppleWMSelectedEvents (
-#if NeedFunctionPrototypes
- void
-#endif
-);
-
-#endif /* _APPLEWM_SERVER_ */
-#endif /* _APPLEWMSTR_H_ */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/bundle-main.c Deleted

@@ -1,908 +0,0 @@
-/* bundle-main.c -- X server launcher
- $Id: bundle-main.c,v 1.17 2003/09/11 00:17:10 jharper Exp $
-
- Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization.
-
- Parts of this file are derived from xdm, which has this copyright:
-
- Copyright 1988, 1998 The Open Group
-
- Permission to use, copy, modify, distribute, and sell this software
- and its documentation for any purpose is hereby granted without fee,
- provided that the above copyright notice appear in all copies and
- that both that copyright notice and this permission notice appear in
- supporting documentation.
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name of The Open Group shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from The Open Group. */
-
-#include <stdio.h>
-#include <unistd.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <sys/utsname.h>
-#include <ifaddrs.h>
-#include <netdb.h>
-#include <netinet/in.h>
-#include <time.h>
-#include <sys/wait.h>
-#include <setjmp.h>
-#include <sys/ioctl.h>
-
-#include <X11/Xlib.h>
-#include <X11/Xauth.h>
-
-#include <CoreFoundation/CoreFoundation.h>
-#include <SystemConfiguration/SystemConfiguration.h>
-
-#define X_SERVER "/usr/X11R6/bin/Xquartz"
-#define XTERM_PATH "/usr/X11R6/bin/xterm"
-#define WM_PATH "/usr/X11R6/bin/quartz-wm"
-#define DEFAULT_XINITRC "/usr/X11R6/lib/X11/xinit/xinitrc"
-#include <mach-o/dyld.h>
-
-/* what xinit does */
-#ifndef SHELL
-# define SHELL "sh"
-#endif
-
-#undef FALSE
-#define FALSE 0
-#undef TRUE
-#define TRUE 1
-
-#define MAX_DISPLAYS 64
-
-static int server_pid = -1, client_pid = -1;
-static int xinit_kills_server = FALSE;
-static jmp_buf exit_continuation;
-static const char *server_name = NULL;
-static Display *server_dpy;
-
-static char *auth_file;
-
-typedef struct addr_list_struct addr_list;
-
-struct addr_list_struct {
- addr_list *next;
- Xauth auth;
-};
-
-static addr_list *addresses;
-
-&#xc;
-/* Utility functions. */
-
-/* Return the current host name. Matches what Xlib does. */
-static char *
-host_name (void)
-{
-#ifdef NEED_UTSNAME
- static struct utsname name;
-
- uname(&name);
-
- return name.nodename;
-#else
- static char buf100;
-
- gethostname(buf, sizeof(buf));
-
- return buf;
-#endif
-}
-
-static int
-read_boolean_pref (CFStringRef name, int default_)
-{
- int value;
- Boolean ok;
-
- value = CFPreferencesGetAppBooleanValue (name,
-					 CFSTR ("com.apple.x11"), &ok);
- return ok ? value : default_;
-}
-
-static inline int
-binary_equal (const void *a, const void *b, int length)
-{
- return memcmp (a, b, length) == 0;
-}
-
-static inline void *
-binary_dup (const void *a, int length)
-{
- void *b = malloc (length);
- if (b != NULL)
-	memcpy (b, a, length);
- return b;
-}
-
-static inline void
-binary_free (void *data, int length)
-{
- if (data != NULL)
-	free (data);
-}
-
-&#xc;
-/* Functions for managing the authentication entries. */
-
-/* Returns true if something matching AUTH is in our list of auth items */
-static int
-check_auth_item (Xauth *auth)
-{
- addr_list *a;
-
- for (a = addresses; a != NULL; a = a->next)
- {
-	if (a->auth.family == auth->family
-	 && a->auth.address_length == auth->address_length
-	 && binary_equal (a->auth.address, auth->address, auth->address_length)
-	 && a->auth.number_length == auth->number_length
-	 && binary_equal (a->auth.number, auth->number, auth->number_length)
-	 && a->auth.name_length == auth->name_length
-	 && binary_equal (a->auth.name, auth->name, auth->name_length))
-	{
-	 return TRUE;
-	}
- }
-
- return FALSE;
-}
-
-/* Add one item to our list of auth items. */
-static void
-add_auth_item (Xauth *auth)
-{
- addr_list *a = malloc (sizeof (addr_list));
-
- a->auth.family = auth->family;
- a->auth.address_length = auth->address_length;
- a->auth.address = binary_dup (auth->address, auth->address_length);
- a->auth.number_length = auth->number_length;
- a->auth.number = binary_dup (auth->number, auth->number_length);
- a->auth.name_length = auth->name_length;
- a->auth.name = binary_dup (auth->name, auth->name_length);
- a->auth.data_length = auth->data_length;
- a->auth.data = binary_dup (auth->data, auth->data_length);
-
- a->next = addresses;
- addresses = a;
-}
-
-/* Free all allocated auth items. */
-static void
-free_auth_items (void)
-{
- addr_list *a;
-
- while ((a = addresses) != NULL)
- {
-	addresses = a->next;
-
-	binary_free (a->auth.address, a->auth.address_length);
-	binary_free (a->auth.number, a->auth.number_length);
-	binary_free (a->auth.name, a->auth.name_length);
-	binary_free (a->auth.data, a->auth.data_length);
-	free (a);
- }
-}
-
-/* Add the unix domain auth item. */
-static void
-define_local (Xauth *auth)
-{
- char *host = host_name ();
-
-#ifdef DEBUG
- fprintf (stderr, "x11: hostname is %s\n", host);
-#endif
-
- auth->family = FamilyLocal;
- auth->address_length = strlen (host);
- auth->address = host;
-
- add_auth_item (auth);
-}
-
-/* Add the tcp auth item. */
-static void
-define_named (Xauth *auth, const char *name)
-{
- struct ifaddrs *addrs, *ptr;
-
- if (getifaddrs (&addrs) != 0)
-	return;
-
- for (ptr = addrs; ptr != NULL; ptr = ptr->ifa_next)
- {
-	if (ptr->ifa_addr->sa_family != AF_INET)
-	 continue;
-
-	auth->family = FamilyInternet;
-	auth->address_length = sizeof (struct sockaddr_in);
-	auth->address = (char *) &(((struct sockaddr_in *) ptr->ifa_addr)->sin_addr);
-
-#ifdef DEBUG
-	fprintf (stderr, "x11: ipaddr is %d.%d.%d.%d\n",
-		 (unsigned char) auth->address0,
-		 (unsigned char) auth->address1,
-		 (unsigned char) auth->address2,
-		 (unsigned char) auth->address3);
-#endif
-
-	add_auth_item (auth);
- }
-
- freeifaddrs (addrs);
-}
-
-/* Parse the display number from NAME and add it to AUTH. */
-static void
-set_auth_number (Xauth *auth, const char *name)
-{
- char *colon;
- char *dot, *number;
-
- colon = strrchr(name, ':');
- if (colon != NULL)
- {
-	colon++;
-	dot = strchr(colon, '.');
-
-	if (dot != NULL)
-	 auth->number_length = dot - colon;
-	else
-	 auth->number_length = strlen (colon);
-
-	number = malloc (auth->number_length + 1);
-	if (number != NULL)
-	{
-	 strncpy (number, colon, auth->number_length);
-	 numberauth->number_length = '\0';
-	}
-	else
-	{
-	 auth->number_length = 0;
-	}
-
-	auth->number = number;
- }
-}
-
-/* Put 128 bits of random data into DATA. If possible, it will be "high
- quality" */
-static int
-generate_mit_magic_cookie (char data16)
-{
- int fd, ret, i;
- long *ldata = (long *) data;
-
- fd = open ("/dev/random", O_RDONLY);
- if (fd > 0)
- {
-	ret = read (fd, data, 16);
-	if (ret == 16)
-	 return TRUE;
-
-	close (fd);
- }
-
- /* fall back to the usual crappy rng */
-
- srand48 (getpid () ^ time (NULL));
-
- for (i = 0; i < 4; i++)
-	ldatai = lrand48 ();
-
- return TRUE;
-}
-
-/* Create the keys we'll be using for the display named NAME. */
-static int
-make_auth_keys (const char *name)
-{
- Xauth auth;
- char key16;
-
- if (auth_file == NULL)
-	return FALSE;
-
- auth.name = "MIT-MAGIC-COOKIE-1";
- auth.name_length = strlen (auth.name);
-
- if (!generate_mit_magic_cookie (key))
- {
-	auth_file = NULL;
-	return FALSE;
- }
-
- auth.data = key;
- auth.data_length = 16;
-
- set_auth_number (&auth, name);
-
- define_named (&auth, host_name ());
- define_local (&auth);
-
- free (auth.number);
-
- return TRUE;
-}
-
-/* If ADD-ENTRIES is true, merge our auth entries into the existing
- Xauthority file. If ADD-ENTRIES is false, remove our entries. */
-static int
-write_auth_file (int add_entries)
-{
- char *home, newname1024;
- int fd, ret;
- FILE *new_fh, *old_fh;
- addr_list *addr;
- Xauth *auth;
-
- if (auth_file == NULL)
-	return FALSE;
-
- home = getenv ("HOME");
- if (home == NULL)
- {
-	auth_file = NULL;
-	return FALSE;
- }
-
- snprintf (newname, sizeof (newname), "%s/.XauthorityXXXXXX", home);
- mktemp (newname);
-
- if (XauLockAuth (auth_file, 1, 2, 10) != LOCK_SUCCESS)
- {
-	/* FIXME: do something here? */
-
-	auth_file = NULL;
-	return FALSE;
- }
-
- fd = open (newname, O_WRONLY | O_CREAT | O_TRUNC, 0600);
- if (fd >= 0)
- {
-	new_fh = fdopen (fd, "w");
-	if (new_fh != NULL)
-	{
-	 if (add_entries)
-	 {
-		for (addr = addresses; addr != NULL; addr = addr->next)
-		{
-		 XauWriteAuth (new_fh, &addr->auth);
-		}
-	 }
-
-	 old_fh = fopen (auth_file, "r");
-	 if (old_fh != NULL)
-	 {
-		while ((auth = XauReadAuth (old_fh)) != NULL)
-		{
-		 if (!check_auth_item (auth))
-			XauWriteAuth (new_fh, auth);
-		 XauDisposeAuth (auth);
-		}
-		fclose (old_fh);
-	 }
-
-	 fclose (new_fh);
-	 unlink (auth_file);
-
-	 ret = rename (newname, auth_file);
-
-	 if (ret != 0)
-		auth_file = NULL;
-
-	 XauUnlockAuth (auth_file);
-	 return ret == 0;
-	}
-
-	close (fd);
- }
-
- XauUnlockAuth (auth_file);
- auth_file = NULL;
- return FALSE;
-}
-
-&#xc;
-/* Subprocess management functions. */
-
-static int
-start_server (char **xargv)
-{
- int child;
-
- child = fork ();
-
- switch (child)
- {
- case -1:				/* error */
-	perror ("fork");
-	return FALSE;
-
- case 0:				/* child */
-	execv (X_SERVER, xargv);
-	perror ("Couldn't exec " X_SERVER);
-	_exit (1);
-
- default:				/* parent */
-	server_pid = child;
-	return TRUE;
- }
-}
-
-static int
-wait_for_server (void)
-{
- int count = 100;
-
- while (count-- > 0)
- {
-	int status;
-
-	server_dpy = XOpenDisplay (server_name);
-	if (server_dpy != NULL)
-	 return TRUE;
-
-	if (waitpid (server_pid, &status, WNOHANG) == server_pid)
-	 return FALSE;
-
-	sleep (1);
- }
-
- return FALSE;
-}
-
-static int
-start_client (void)
-{
- int child;
-
- child = fork ();
-
- switch (child)
- {
-	char *tem, buf1024;
-
- case -1:				/* error */
-	perror ("fork");
-	return FALSE;
-
- case 0:				/* child */
-	/* cd $HOME */
-	tem = getenv ("HOME");
-	if (tem != NULL)
-	 chdir (tem);
-
-	/* Setup environment */
-
-	setenv ("DISPLAY", server_name, TRUE);
-	tem = getenv ("PATH");
-	if (tem != NULL && tem0 != NULL)
-	 snprintf (buf, sizeof (buf), "%s:/usr/X11R6/bin", tem);
-	else
-	 snprintf (buf, sizeof (buf), "/bin:/usr/bin:/usr/X11R6/bin");
-	setenv ("PATH", buf, TRUE);
-
-#if 1
-	setenv("GTK_USE_XFT","1",0);
-	system(WM_PATH " &");
-	execl("/usr/local/bin/synfigstudio","/usr/local/bin/synfigstudio",NULL);
-
-#else
-	/* First look for .xinitrc in user's home directory. */
-
-	tem = getenv ("HOME");
-	if (tem != NULL)
-	{
-	 snprintf (buf, sizeof (buf), "%s/.xinitrc", tem);
-	 if (access (buf, R_OK) == 0)
-		execlp (SHELL, SHELL, buf, NULL);
-	}
-
-	/* Then try the default xinitrc in the lib directory. */
-
-	if (access (DEFAULT_XINITRC, R_OK) == 0)
-	 execlp (SHELL, SHELL, DEFAULT_XINITRC, NULL);
-
-	/* Then fallback to hardcoding an xterm and the window manager. */
-
-	system (XTERM_PATH " &");
-	execl (WM_PATH, WM_PATH, NULL);
-	
-#endif
-	perror ("exec");
-	_exit (1);
-
- default:				/* parent */
-	client_pid = child;
-	return TRUE;
- }
-}
-
-static void
-sigchld_handler (int sig)
-{
- int pid, status;
-
-again:
- pid = waitpid (WAIT_ANY, &status, WNOHANG);
-
- if (pid > 0)
- {
-	if (pid == server_pid)
-	{
-	 server_pid = -1;
-
-	 if (client_pid >= 0)
-		kill (client_pid, SIGTERM);
-	}
-	else if (pid == client_pid)
-	{
-	 client_pid = -1;
-
-	 if (server_pid >= 0 && xinit_kills_server)
-		kill (server_pid, SIGTERM);
-	}
-	goto again;
- }
-
- if (server_pid == -1 && client_pid == -1)
-	longjmp (exit_continuation, 1);
-
- signal (SIGCHLD, sigchld_handler);
-}
-
-&#xc;
-/* Server utilities. */
-
-static Boolean
-display_exists_p (int number)
-{
- char buf64;
- void *conn;
- char *fullname = NULL;
- int idisplay, iscreen;
- char *conn_auth_name, *conn_auth_data;
- int conn_auth_namelen, conn_auth_datalen;
-
- extern void *_X11TransConnectDisplay ();
- extern void _XDisconnectDisplay ();
-
- /* Since connecting to the display waits for a few seconds if the
- display doesn't exist, check for trivial non-existence - if the
- socket in /tmp exists or not.. (note: if the socket exists, the
- server may still not, so we need to try to connect in that case..) */
-
- snprintf (buf, sizeof (buf), "/tmp/.X11-unix/X%d", number);
- if (access (buf, F_OK) != 0)
-	return FALSE;
-
- /* This is a private function that we shouldn't really be calling,
- but it's the best way to see if the server exists (without
- needing to hold the necessary authentication to use it) */
-
- snprintf (buf, sizeof (buf), ":%d", number);
- conn = _X11TransConnectDisplay (buf, &fullname, &idisplay, &iscreen,
-				 &conn_auth_name, &conn_auth_namelen,
-				 &conn_auth_data, &conn_auth_datalen);
- if (conn == NULL)
-	return FALSE;
-
- _XDisconnectDisplay (conn);
- return TRUE;
-}
-
-&#xc;
-/* Monitoring when the system's ip addresses change. */
-
-static Boolean pending_timer;
-
-static void
-timer_callback (CFRunLoopTimerRef timer, void *info)
-{
- pending_timer = FALSE;
-
- /* Update authentication names. Need to write .Xauthority file first
- without the existing entries, then again with the new entries.. */
-
- write_auth_file (FALSE);
-
- free_auth_items ();
- make_auth_keys (server_name);
-
- write_auth_file (TRUE);
-}
-
-/* This function is called when the system's ip addresses may have changed. */
-static void
-ipaddr_callback (SCDynamicStoreRef store, CFArrayRef changed_keys, void *info)
-{
- if (auth_file != NULL && !pending_timer)
- {
-	CFRunLoopTimerRef timer;
-
-	timer = CFRunLoopTimerCreate (NULL, CFAbsoluteTimeGetCurrent () + 1.0,
-				 0.0, 0, 0, timer_callback, NULL);
-	CFRunLoopAddTimer (CFRunLoopGetCurrent (), timer,
-			 kCFRunLoopDefaultMode);
-	CFRelease (timer);
-
-	pending_timer = TRUE;
- }
-}
-
-/* This code adapted from "Living in a Dynamic TCP/IP Environment" technote. */
-static Boolean
-install_ipaddr_source (void)
-{
- CFRunLoopSourceRef source = NULL;
-
- SCDynamicStoreContext context = {0};
- SCDynamicStoreRef ref;
-
- ref = SCDynamicStoreCreate (NULL,
-				CFSTR ("AddIPAddressListChangeCallbackSCF"),
-				ipaddr_callback, &context);
-
- if (ref != NULL)
- {
-	const void *keys2;
-
-	/* This should tell us when any IPV4 address changes */
-	keys0 = (SCDynamicStoreKeyCreateNetworkServiceEntity
-		 (NULL, kSCDynamicStoreDomainState,
-		 kSCCompAnyRegex, kSCEntNetIPv4));
-
-	/* This should tell us when the hostname(s) change */
-	keys1 = SCDynamicStoreKeyCreateHostNames (NULL);
-
-	if (keys0 != NULL && keys1 != NULL)
-	{
-	 CFArrayRef pattern_array;
-
-	 pattern_array = CFArrayCreate (NULL, keys, 2,
-					 &kCFTypeArrayCallBacks);
-
-	 if (pattern_array != NULL)
-	 {
-		SCDynamicStoreSetNotificationKeys (ref, NULL, pattern_array);
-		source = SCDynamicStoreCreateRunLoopSource (NULL, ref, 0);
-
-		CFRelease (pattern_array);
-	 }
-
-	 if (keys0 != NULL)
-		CFRelease (keys0);
-	 if (keys1 != NULL)
-		CFRelease (keys1);
-	}
-
-	CFRelease (ref); 
- }
-
- if (source != NULL)
- {
-	CFRunLoopAddSource (CFRunLoopGetCurrent (),
-			 source, kCFRunLoopDefaultMode);
-	CFRelease (source);
- }
-
- return source != NULL;
-}
-
-
-&#xc;
-/* Entrypoint. */
-int
-main (int argc, char **argv)
-{
- char **xargv;
- int i, j;
- int fd;
-
-
-
-
-
-
- xargv = alloca (sizeof (char *) * (argc + 32));
-
- if (!read_boolean_pref (CFSTR ("no_auth"), FALSE))
-	auth_file = XauFileName ();
-
- /* The standard X11 behaviour is for the server to quit when the first
- client exits. But it can be useful for debugging (and to mimic our
- behaviour in the beta releases) to not do that. */
-
- xinit_kills_server = read_boolean_pref (CFSTR ("xinit_kills_server"), TRUE);
-
- for (i = 1; i < argc; i++)
- {
-	if (argvi0 == ':')
-	 server_name = argvi;
- }
-
- if (server_name == NULL)
- {
-	static char name8;
-
-	/* No display number specified, so search for the first unused.
-
-	 There's a big old race condition here if two servers start at
-	 the same time, but that's fairly unlikely. We could create
-	 lockfiles or something, but that's seems more likely to cause
-	 problems than the race condition itself.. */
-
-	for (i = 2; i < MAX_DISPLAYS; i++)
-	{
-	 if (!display_exists_p (i))
-		break;
-	}
-
-	if (i == MAX_DISPLAYS)
-	{
-	 fprintf (stderr, "%s: couldn't allocate a display number", argv0);
-	 exit (1);
-	}
-
-	snprintf (name, sizeof (name), ":%d", i);
-	server_name = name;
- }
-
- if (auth_file != NULL)
- {
-	/* Create new Xauth keys and add them to the .Xauthority file */
-
-	make_auth_keys (server_name);
-	write_auth_file (TRUE);
- }
-
- /* Construct our new argv */
-
- i = j = 0;
-
- xargvi++ = argvj++;
-
- if (auth_file != NULL)
- {
-	xargvi++ = "-auth";
-	xargvi++ = auth_file;
- }
-
- /* By default, don't listen on tcp sockets if Xauth is disabled. */
-
- if (read_boolean_pref (CFSTR ("nolisten_tcp"), auth_file == NULL))
- {
-	xargvi++ = "-nolisten";
-	xargvi++ = "tcp";
- }
-
- while (j < argc)
- {
-	if (argvj++0 != ':')
-	 xargvi++ = argvj-1;
- }
-
- xargvi++ = (char *) server_name;
- xargvi++ = NULL;
-
- /* Detach from any controlling terminal and connect stdin to /dev/null */
-
-#ifdef TIOCNOTTY
- fd = open ("/dev/tty", O_RDONLY);
- if (fd != -1)
- {
-	ioctl (fd, TIOCNOTTY, 0);
-	close (fd);
- }
-#endif
-
- fd = open ("/dev/null", O_RDWR, 0);
- if (fd >= 0)
- {
-	dup2 (fd, 0);
-	if (fd > 0)
-	 close (fd);
- }
-
- if (!start_server (xargv))
-	return 1;
-
- if (!wait_for_server ())
- {
-	kill (server_pid, SIGTERM);
-	return 1;
- }
-
- if (!start_client ())
- {
-	kill (server_pid, SIGTERM);
-	return 1;
- }
-
- signal (SIGCHLD, sigchld_handler);
-
-	if (NSIsSymbolNameDefined("_ASKInitialize"))
-	{
-		NSSymbol *symbol = NSLookupAndBindSymbol("_ASKInitialize");
-		if (symbol)
-		{
-			void (*initializeASKFunc)(void) = NSAddressOfSymbol(symbol);
-			if (initializeASKFunc)
-			{
-				initializeASKFunc();
-			}
-			else
-				return 666;
-		}
-		else return 667;
-	}else
-	return 668;
-
- if (setjmp (exit_continuation) == 0)
- {
-	if (install_ipaddr_source ())
-	 CFRunLoopRun ();
-	else
-	 while (1) pause ();
- }
-
- signal (SIGCHLD, SIG_IGN);
-
- if (auth_file != NULL)
- {
-	/* Remove our Xauth keys */
-
-	write_auth_file (FALSE);
- }
-
- free_auth_items ();
-
- return 0;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/darwin-input.c Deleted

@@ -1,216 +0,0 @@
-/* darwin-input.c -- code to manage the input event queue
- $Id: darwin-input.c,v 1.4 2002/12/13 00:22:51 jharper Exp $ */
-
-/*
- * Copyright (c) 2001-2002 Torrey T. Lyons. All Rights Reserved.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#include "darwin.h"
-
-#include "mipointer.h"		// mi software cursor
-
-#include <pthread.h>
-
-#define QUEUE_SIZE 256
-
-static struct {
- pthread_mutex_t mutex;
-
- /* DIX looks at these two integer values, when they're equal
- it won't call ProcessInputEvents (). */
- HWEventQueueType head, tail;
-
- xEvent eventsQUEUE_SIZE;
-} event_queue;
-
-/* fd0 = reading, fd1 = writing */
-static int event_fd2;
-
-void
-DarwinEnqueueEvent (const xEvent *e)
-{
- int newtail, oldtail;
- int need_write = FALSE;
-
- pthread_mutex_lock (&event_queue.mutex);
-
- oldtail = (event_queue.tail - 1) % QUEUE_SIZE;
-
- if (e->u.u.type == MotionNotify
-	&& event_queue.tail != event_queue.head
-	&& event_queue.eventsoldtail.u.u.type == MotionNotify)
- {
-	/* Two adjacent motion notify events. Coalesce them. */
-
-	memcpy (&event_queue.eventsoldtail, e, sizeof (xEvent));
- }
- else
- {
-	newtail = (event_queue.tail + 1) % QUEUE_SIZE;
-
-	if (newtail != event_queue.head)
-	{	
-	 memcpy (&event_queue.eventsevent_queue.tail, e, sizeof (xEvent));
-	 event_queue.tail = newtail;
-	 need_write = TRUE;
-	}
- }
-
- pthread_mutex_unlock (&event_queue.mutex);
-
- if (need_write)
-	write (event_fd1, &need_write, sizeof (need_write));
-}
-
-Bool
-DarwinDequeueEvent (xEvent *e)
-{
- Bool ret = FALSE;
- int unused;
-
- pthread_mutex_lock (&event_queue.mutex);
-
- if (event_queue.head != event_queue.tail)
- {
-	memcpy (e, &event_queue.eventsevent_queue.head, sizeof (xEvent));
-	event_queue.head = (event_queue.head + 1) % QUEUE_SIZE;
-	ret = TRUE;
- }
-	
- pthread_mutex_unlock (&event_queue.mutex);
-
- if (ret)
-	read (event_fd0, &unused, sizeof (unused));
-
- return ret;
-}
-
-void
-DarwinInputPreInit (void)
-{
- if (pipe (event_fd) != 0)
- {
-	perror ("pipe");
-	exit (1);
- }
-
- event_queue.head = event_queue.tail = 0;
- pthread_mutex_init (&event_queue.mutex, NULL);
-}
-
-void
-DarwinInputInit (void)
-{
- SetInputCheck (&event_queue.head, &event_queue.tail);
-}
-
-&#xc;
-/*
- =============================================================================
-
- mouse and keyboard callbacks
-
- =============================================================================
-*/
-
-/*
- * DarwinChangePointerControl
- * Set mouse acceleration and thresholding
- * FIXME: We currently ignore the threshold in ctrl->threshold.
- */
-static void DarwinChangePointerControl(DeviceIntPtr device, PtrCtrl *ctrl)
-{
- /* do nothing here */
-}
-
-
-/*
- * DarwinMouseProc
- * Handle the initialization, etc. of a mouse
- */
-
-int DarwinMouseProc(DeviceIntPtr pPointer, int what)
-{
- char map6;
-
- switch (what) {
-
- case DEVICE_INIT:
- pPointer->public.on = FALSE;
-
- // Set button map.
- map1 = 1;
- map2 = 2;
- map3 = 3;
- map4 = 4;
- map5 = 5;
- InitPointerDeviceStruct( (DevicePtr)pPointer,
- map,
- 5, // numbuttons (4 & 5 are scroll wheel)
- miPointerGetMotionEvents,
- DarwinChangePointerControl,
- 0 );
- break;
-
- case DEVICE_ON:
- pPointer->public.on = TRUE;
- AddEnabledDevice(event_fd0);
- return Success;
-
- case DEVICE_CLOSE:
- case DEVICE_OFF:
- pPointer->public.on = FALSE;
- RemoveEnabledDevice(event_fd0);
- return Success;
- }
-
- return Success;
-}
-
-/*
- * DarwinKeybdProc
- * Callback from X
- */
-int DarwinKeybdProc(DeviceIntPtr pDev, int onoff)
-{
- switch ( onoff ) {
- case DEVICE_INIT:
- DarwinKeyboardInit( pDev );
- break;
- case DEVICE_ON:
- pDev->public.on = TRUE;
- AddEnabledDevice(event_fd0);
- break;
- case DEVICE_OFF:
- pDev->public.on = FALSE;
- RemoveEnabledDevice(event_fd0);
- break;
- case DEVICE_CLOSE:
- break;
- }
-
- return Success;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/darwin-keyboard.c Deleted

@@ -1,301 +0,0 @@
-/* darwin-keyboard.c -- Keyboard support for the Darwin X Server
-
- Copyright (c) 2001-2002 Torrey T. Lyons. All Rights Reserved.
- Copyright (c) 2003 Apple Computer, Inc. All Rights Reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
-
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwinKeyboard.c,v 1.16 2002/03/28 02:21:08 torrey Exp $ */
-
-
-/* An X keyCode must be in the range XkbMinLegalKeyCode (8) to
- XkbMaxLegalKeyCode(255).
-
- The keyCodes we get from the kernel range from 0 to 127, so we need to
- offset the range before passing the keyCode to X.
-
- An X KeySym is an extended ascii code that is device independent.
-
- The modifier map is accessed by the keyCode, but the normal map is
- accessed by keyCode - MIN_KEYCODE. Sigh. */
-
-
-/* Define this to get a diagnostic output to stderr which is helpful
- in determining how the X server is interpreting the Darwin keymap. */
-#undef DUMP_DARWIN_KEYMAP
-
-/* Define this to use Alt for Mode_switch. */
-#define ALT_IS_MODE_SWITCH 1
-
-#include "darwin.h"
-#include "darwin-keyboard.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include "darwin.h"
-#include "quartz-audio.h"
-
-/* For NX_ constants */
-#include <IOKit/hidsystem/IOLLEvent.h>
-#include <IOKit/hidsystem/ev_keymap.h>
-
-#include "keysym.h"
-
-static darwin_keyboard_info info;
-
-static void
-DarwinChangeKeyboardControl (DeviceIntPtr device, KeybdCtrl *ctrl)
-{
- /* keyclick, bell volume / pitch, autorepeat, LED's */
-}
-
-/* Use the key_map field of INFO to populate the mod_map and
- modifier_keycodes fields */
-static void
-build_modifier_maps (darwin_keyboard_info *info)
-{
- int i;
- KeySym *k;
-
- memset (info->mod_map, NoSymbol, sizeof (info->mod_map));
- memset (info->modifier_keycodes, 0, sizeof (info->modifier_keycodes));
-
- for (i = 0; i < NUM_KEYCODES; i++)
- {
-	k = info->key_map + i * GLYPHS_PER_KEY;
-
-	switch (k0)
-	{
-	case XK_Shift_L:
-	 info->modifier_keycodesNX_MODIFIERKEY_SHIFT0 = i;
-	 info->mod_mapMIN_KEYCODE + i = ShiftMask;
-	 break;
-
-	case XK_Shift_R:
-	 info->modifier_keycodesNX_MODIFIERKEY_SHIFT1 = i;
-	 info->mod_mapMIN_KEYCODE + i = ShiftMask;
-	 break;
-
-	case XK_Control_L:
-	 info->modifier_keycodesNX_MODIFIERKEY_CONTROL0 = i;
-	 info->mod_mapMIN_KEYCODE + i = ControlMask;
-	 break;
-
-	case XK_Control_R:
-	 info->modifier_keycodesNX_MODIFIERKEY_CONTROL1 = i;
-	 info->mod_mapMIN_KEYCODE + i = ControlMask;
-	 break;
-
-	case XK_Caps_Lock:
-	 info->modifier_keycodesNX_MODIFIERKEY_ALPHALOCK0 = i;
-	 info->mod_mapMIN_KEYCODE + i = LockMask;
-	 break;
-
-	case XK_Alt_L:
-	 info->modifier_keycodesNX_MODIFIERKEY_ALTERNATE0 = i;
-	 info->mod_mapMIN_KEYCODE + i = Mod1Mask;
-	 break;
-
-	case XK_Alt_R:
-	 info->modifier_keycodesNX_MODIFIERKEY_ALTERNATE1 = i;
-	 info->mod_mapMIN_KEYCODE + i = Mod1Mask;
-	 break;
-
-	case XK_Mode_switch:
-	 info->mod_mapMIN_KEYCODE + i = Mod1Mask;
-	 break;
-
-	case XK_Meta_L:
-	 info->modifier_keycodesNX_MODIFIERKEY_COMMAND0 = i;
-	 info->mod_mapMIN_KEYCODE + i = Mod2Mask;
-	 break;
-
-	case XK_Meta_R:
-	 info->modifier_keycodesNX_MODIFIERKEY_COMMAND1 = i;
-	 info->mod_mapMIN_KEYCODE + i = Mod2Mask;
-	 break;
-
-	case XK_Num_Lock:
-	 info->mod_mapMIN_KEYCODE + i = Mod3Mask;
-	 break; 
-	}
-
-	if (darwinSwapAltMeta)
-	{
-	 switch (k0)
-	 {
-	 case XK_Alt_L:
-		k0 = XK_Meta_L; break;
-	 case XK_Alt_R:
-		k0 = XK_Meta_R; break;
-	 case XK_Meta_L:
-		k0 = XK_Alt_L; break;
-	 case XK_Meta_R:
-		k0 = XK_Alt_R; break;
-	 }
-	}
-
-#if ALT_IS_MODE_SWITCH
-	if (k0 == XK_Alt_L || k0 == XK_Alt_R)
-	 k0 = XK_Mode_switch;
-#endif
- }
-}
-
-static void
-load_keyboard_mapping (KeySymsRec *keysyms)
-{
- memset (info.key_map, 0, sizeof (info.key_map));
-
- if (darwinKeymapFile == NULL
-	|| !DarwinParseKeymapFile (&info))
- {
-	/* Load the system keymapping. */
-
-	DarwinReadSystemKeymap (&info);
- }
-
- build_modifier_maps (&info);
-
-#ifdef DUMP_DARWIN_KEYMAP
- ErrorF("Darwin -> X converted keyboard map\n");
- for (i = 0, k = map; i < NX_NUMKEYCODES; i++, k += GLYPHS_PER_KEY) {
- int j;
- ErrorF("0x%02x:", i);
- for (j = 0; j < GLYPHS_PER_KEY; j++) {
- if (kj == NoSymbol) {
- ErrorF("\tNoSym");
- } else {
- ErrorF("\t0x%x", kj);
- }
- }
- ErrorF("\n");
- }
-#endif
-
- keysyms->map = info.key_map;
- keysyms->mapWidth = GLYPHS_PER_KEY;
- keysyms->minKeyCode = MIN_KEYCODE;
- keysyms->maxKeyCode = MAX_KEYCODE;
-}
-
-/* Get the Darwin keyboard map and compute an equivalent X keyboard map
- and modifier map. Set the new keyboard device structure. */
-void
-DarwinKeyboardInit (DeviceIntPtr pDev)
-{
- KeySymsRec keysyms;
- BellProcPtr bellProc;
-
- load_keyboard_mapping (&keysyms);
-
- /* Initialize the seed, so we don't reload the keymap unnecessarily
- (and possibly overwrite xinitrc changes) */
- DarwinSystemKeymapSeed ();
-
- bellProc = QuartzBell;
-
- InitKeyboardDeviceStruct ((DevicePtr) pDev, &keysyms, info.mod_map,
-			 bellProc, DarwinChangeKeyboardControl);
-}
-
-/* Borrowed from dix/devices.c */
-static Bool
-InitModMap(register KeyClassPtr keyc)
-{
- int i, j;
- CARD8 keysPerModifier8;
- CARD8 mask;
-
- if (keyc->modifierKeyMap != NULL)
-	xfree (keyc->modifierKeyMap);
-
- keyc->maxKeysPerModifier = 0;
- for (i = 0; i < 8; i++)
-	keysPerModifieri = 0;
- for (i = 8; i < MAP_LENGTH; i++)
- {
-	for (j = 0, mask = 1; j < 8; j++, mask <<= 1)
-	{
-	 if (mask & keyc->modifierMapi)
-	 {
-		if (++keysPerModifierj > keyc->maxKeysPerModifier)
-		 keyc->maxKeysPerModifier = keysPerModifierj;
-	 }
-	}
- }
- keyc->modifierKeyMap = (KeyCode *)xalloc(8*keyc->maxKeysPerModifier);
- if (!keyc->modifierKeyMap && keyc->maxKeysPerModifier)
-	return (FALSE);
- bzero((char *)keyc->modifierKeyMap, 8*(int)keyc->maxKeysPerModifier);
- for (i = 0; i < 8; i++)
-	keysPerModifieri = 0;
- for (i = 8; i < MAP_LENGTH; i++)
- {
-	for (j = 0, mask = 1; j < 8; j++, mask <<= 1)
-	{
-	 if (mask & keyc->modifierMapi)
-	 {
-		keyc->modifierKeyMap(j*keyc->maxKeysPerModifier) +
-				 keysPerModifierj = i;
-		keysPerModifierj++;
-	 }
-	}
- }
- return TRUE;
-}
-
-void
-DarwinKeyboardReload (DeviceIntPtr pDev)
-{
- KeySymsRec keysyms;
-
- load_keyboard_mapping (&keysyms);
-
- if (SetKeySymsMap (&pDev->key->curKeySyms, &keysyms))
- {
-	/* now try to update modifiers. */
-
-	memmove (pDev->key->modifierMap, info.mod_map, MAP_LENGTH);
-	InitModMap (pDev->key);
- }
-
- SendMappingNotify (MappingKeyboard, MIN_KEYCODE, NUM_KEYCODES, 0);
- SendMappingNotify (MappingModifier, 0, 0, 0);
-}
-
-/* Return the keycode for an NX_MODIFIERKEY_* modifier. side = 0 for left
- or 1 for right. Returns 0 if key+side is not a known modifier. */
-int
-DarwinModifierNXKeyToNXKeycode (int key, int side)
-{
- return info.modifier_keycodeskeyside;
-}
-
-/* This allows the ddx layer to prevent some keys from being remapped
- as modifier keys. */
-Bool
-LegalModifier (unsigned int key, DevicePtr pDev)
-{
- return 1;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/darwin-keyboard.h Deleted

@@ -1,58 +0,0 @@
-/* darwin-keyboard.h
-   $Id: darwin-keyboard.h,v 1.1 2003/01/22 01:54:10 jharper Exp $
-
-   Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
-
-#ifndef DARWIN_KEYBOARD_H
-#define DARWIN_KEYBOARD_H 1
-
-#include "X.h"
-
-/* Each key can generate 4 glyphs. They are, in order:
-   unshifted, shifted, modeswitch unshifted, modeswitch shifted */
-
-#ifndef MIN_KEYCODE
-# define MIN_KEYCODE 8
-#endif
-
-#define GLYPHS_PER_KEY  4
-#define NUM_KEYCODES    248
-#define MAX_KEYCODE     NUM_KEYCODES + MIN_KEYCODE - 1
-
-typedef struct darwin_keyboard_info_struct darwin_keyboard_info;
-
-struct darwin_keyboard_info_struct {
-    unsigned char mod_mapMAX_KEYCODE+1;
-    KeySym key_mapNUM_KEYCODES * GLYPHS_PER_KEY;
-    unsigned char modifier_keycodes322;
-};
-
-extern int DarwinReadSystemKeymap (darwin_keyboard_info *info);
-extern int DarwinParseKeymapFile (darwin_keyboard_info *info);
-
-#endif /* DARWIN_KEYBOARD_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/darwin-new-keymap.c Deleted

@@ -1,364 +0,0 @@
-/* darwin-new-keymap.c -- code to build a keymap from the system
- $Id: darwin-new-keymap.c,v 1.7 2003/02/21 22:33:19 jharper Exp $
-
- Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-
-#define Cursor X_Cursor
-# include "darwin-keyboard.h"
-# include "keysym.h"
-#undef Cursor
-
-#include <CoreServices/CoreServices.h>
-#include <Carbon/Carbon.h>
-
-#include "keysym2ucs.h"
-
-#define HACK_MISSING 1
-#define HACK_KEYPAD 1
-
-enum {
- MOD_COMMAND = 256,
- MOD_SHIFT = 512,
- MOD_OPTION = 2048,
- MOD_CONTROL = 4096,
-};
-
-#define UKEYSYM(u) ((u) | 0x01000000)
-
-/* Table of keycode->keysym mappings we use to fallback on for important
- keys that are often not in the Unicode mapping. */
-
-const static struct {
- unsigned short keycode;
- KeySym keysym;
-} known_keys = {
- {55, XK_Meta_L},
- {56, XK_Shift_L},
- {57, XK_Caps_Lock},
- {58, XK_Alt_L},
- {59, XK_Control_L},
- {60, XK_Shift_R},
- {61, XK_Alt_R},
- {62, XK_Control_R},
-
- {122, XK_F1},
- {120, XK_F2},
- {99, XK_F3},
- {118, XK_F4},
- {96, XK_F5},
- {97, XK_F6},
- {98, XK_F7},
- {100, XK_F8},
- {101, XK_F9},
- {109, XK_F10},
- {103, XK_F11},
- {111, XK_F12},
- {105, XK_F13},
- {107, XK_F14},
- {113, XK_F15},
-};
-
-/* Table of keycode->old,new-keysym mappings we use to fixup the numeric
- keypad entries. */
-
-const static struct {
- unsigned short keycode;
- KeySym normal, keypad;
-} known_numeric_keys = {
- {65, XK_period, XK_KP_Decimal},
- {67, XK_asterisk, XK_KP_Multiply},
- {69, XK_plus, XK_KP_Add},
- {75, XK_slash, XK_KP_Divide},
- {76, 0x01000003, XK_KP_Enter},
- {78, XK_minus, XK_KP_Subtract},
- {81, XK_equal, XK_KP_Equal},
- {82, XK_0, XK_KP_0},
- {83, XK_1, XK_KP_1},
- {84, XK_2, XK_KP_2},
- {85, XK_3, XK_KP_3},
- {86, XK_4, XK_KP_4},
- {87, XK_5, XK_KP_5},
- {88, XK_6, XK_KP_6},
- {89, XK_7, XK_KP_7},
- {91, XK_8, XK_KP_8},
- {92, XK_9, XK_KP_9},
-};
-
-/* Table mapping normal keysyms to their dead equivalents.
- FIXME: all the unicode keysyms (apart from circumflex) were guessed. */
-
-const static struct {
- KeySym normal, dead;
-} dead_keys = {
- {XK_grave, XK_dead_grave},
- {XK_acute, XK_dead_acute},
- {XK_asciicircum, XK_dead_circumflex},
- {UKEYSYM (0x2c6), XK_dead_circumflex},	/* MODIFIER LETTER CIRCUMFLEX ACCENT */
- {XK_asciitilde, XK_dead_tilde},
- {UKEYSYM (0x2dc), XK_dead_tilde},		/* SMALL TILDE */
- {XK_macron, XK_dead_macron},
- {XK_breve, XK_dead_breve},
- {XK_abovedot, XK_dead_abovedot},
- {XK_diaeresis, XK_dead_diaeresis},
- {UKEYSYM (0x2da), XK_dead_abovering},	/* DOT ABOVE */
- {XK_doubleacute, XK_dead_doubleacute},
- {XK_caron, XK_dead_caron},
- {XK_cedilla, XK_dead_cedilla},
- {XK_ogonek, XK_dead_ogonek},
- {UKEYSYM (0x269), XK_dead_iota},		/* LATIN SMALL LETTER IOTA */
- {UKEYSYM (0x2ec), XK_dead_voiced_sound},	/* MODIFIER LETTER VOICING */
-/* {XK_semivoiced_sound, XK_dead_semivoiced_sound}, */
- {UKEYSYM (0x323), XK_dead_belowdot},	/* COMBINING DOT BELOW */
- {UKEYSYM (0x309), XK_dead_hook}, 		/* COMBINING HOOK ABOVE */
- {UKEYSYM (0x31b), XK_dead_horn},		/* COMBINING HORN */
-};
-
-unsigned int
-DarwinSystemKeymapSeed (void)
-{
- static unsigned int seed;
-
- static KeyboardLayoutRef last_key_layout;
- KeyboardLayoutRef key_layout;
-
- KLGetCurrentKeyboardLayout (&key_layout);
-
- if (key_layout != last_key_layout)
-	seed++;
-
- last_key_layout = key_layout;
-
- return seed;
-}
-
-static inline UniChar
-macroman2ucs (unsigned char c)
-{
- /* Precalculated table mapping MacRoman-128 to Unicode. Generated
- by creating single element CFStringRefs then extracting the
- first character. */
-
- static const unsigned short table128 = {
-	0xc4, 0xc5, 0xc7, 0xc9, 0xd1, 0xd6, 0xdc, 0xe1,
-	0xe0, 0xe2, 0xe4, 0xe3, 0xe5, 0xe7, 0xe9, 0xe8,
-	0xea, 0xeb, 0xed, 0xec, 0xee, 0xef, 0xf1, 0xf3,
-	0xf2, 0xf4, 0xf6, 0xf5, 0xfa, 0xf9, 0xfb, 0xfc,
-	0x2020, 0xb0, 0xa2, 0xa3, 0xa7, 0x2022, 0xb6, 0xdf,
-	0xae, 0xa9, 0x2122, 0xb4, 0xa8, 0x2260, 0xc6, 0xd8,
-	0x221e, 0xb1, 0x2264, 0x2265, 0xa5, 0xb5, 0x2202, 0x2211,
-	0x220f, 0x3c0, 0x222b, 0xaa, 0xba, 0x3a9, 0xe6, 0xf8,
-	0xbf, 0xa1, 0xac, 0x221a, 0x192, 0x2248, 0x2206, 0xab,
-	0xbb, 0x2026, 0xa0, 0xc0, 0xc3, 0xd5, 0x152, 0x153,
-	0x2013, 0x2014, 0x201c, 0x201d, 0x2018, 0x2019, 0xf7, 0x25ca,
-	0xff, 0x178, 0x2044, 0x20ac, 0x2039, 0x203a, 0xfb01, 0xfb02,
-	0x2021, 0xb7, 0x201a, 0x201e, 0x2030, 0xc2, 0xca, 0xc1,
-	0xcb, 0xc8, 0xcd, 0xce, 0xcf, 0xcc, 0xd3, 0xd4,
-	0xf8ff, 0xd2, 0xda, 0xdb, 0xd9, 0x131, 0x2c6, 0x2dc,
-	0xaf, 0x2d8, 0x2d9, 0x2da, 0xb8, 0x2dd, 0x2db, 0x2c7,
- };
-
- if (c < 128)
-	return c;
- else
-	return tablec - 128;
-}
-
-static KeySym
-make_dead_key (KeySym in)
-{
- int i;
-
- for (i = 0; i < sizeof (dead_keys) / sizeof (dead_keys0); i++)
- {
-	if (dead_keysi.normal == in)
-	 return dead_keysi.dead;
- }
-
- return in;
-}
-
-int
-DarwinReadSystemKeymap (darwin_keyboard_info *info)
-{
- KeyboardLayoutRef key_layout;
- const void *chr_data;
- int num_keycodes = NUM_KEYCODES;
- UInt32 keyboard_type = 0;
- int is_uchr, i, j;
- OSStatus err;
- KeySym *k;
-
- KLGetCurrentKeyboardLayout (&key_layout);
- KLGetKeyboardLayoutProperty (key_layout, kKLuchrData, &chr_data);
-
- if (chr_data != NULL)
- {
-	is_uchr = 1;
-	keyboard_type = LMGetKbdType ();
- }
- else
- {
-	KLGetKeyboardLayoutProperty (key_layout, kKLKCHRData, &chr_data);
-
-	if (chr_data == NULL)
-	{
-	 fprintf (stderr, "couldn't get uchr or kchr resource\n");
-	 return FALSE;
-	}
-
-	is_uchr = 0;
-	num_keycodes = 128;
- } 
-
-
- /* Scan the keycode range for the Unicode character that each
- key produces in the four shift states. Then convert that to
- an X11 keysym (which may just the bit that says "this is
- Unicode" if it can't find the real symbol.) */
-
- for (i = 0; i < num_keycodes; i++)
- {
-	static const int mods4 = {0, MOD_SHIFT, MOD_OPTION,
-				 MOD_OPTION | MOD_SHIFT};
-
-	k = info->key_map + i * GLYPHS_PER_KEY;
-
-	for (j = 0; j < 4; j++)
-	{
-	 if (is_uchr)
-	 {
-		UniChar s8;
-		UniCharCount len;
-		UInt32 dead_key_state, extra_dead;
-
-		dead_key_state = 0;
-		err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,
-				 modsj >> 8, keyboard_type, 0,
-				 &dead_key_state, 8, &len, s);
-		if (err != noErr)
-		 continue;
-
-		if (len == 0 && dead_key_state != 0)
-		{
-		 /* Found a dead key. Work out which one it is, but
-		 remembering that it's dead. */
-
-		 extra_dead = 0;
-		 err = UCKeyTranslate (chr_data, i, kUCKeyActionDown,
-					 modsj >> 8, keyboard_type,
-					 kUCKeyTranslateNoDeadKeysMask,
-					 &extra_dead, 8, &len, s);
-		 if (err != noErr)
-			continue;
-		}
-
-		if (len > 0 && s0 != 0x0010)
-		{
-		 kj = ucs2keysym (s0);
-
-		 if (dead_key_state != 0)
-			kj = make_dead_key (kj);
-		}
-	 }
-	 else
-	 {
-		UInt32 c, state = 0;
-		UInt16 code;
-
-		code = i | modsj;
-		c = KeyTranslate (chr_data, code, &state);
-
-		/* Dead keys are only processed on key-down, so ask
-		 to translate those events. When we find a dead key,
-		 translating the matching key up event will give
-		 us the actual dead character. */
-
-		if (state != 0)
-		{
-		 UInt32 state2 = 0;
-		 c = KeyTranslate (chr_data, code | 128, &state2);
-		}
-
-		/* Characters seem to be in MacRoman encoding. */
-
-		if (c != 0 && c != 0x0010)
-		{
-		 kj = ucs2keysym (macroman2ucs (c & 255));
-
-		 if (state != 0)
-			kj = make_dead_key (kj);
-		}
-	 }
-	}
-
-	if (k3 == k2)
-	 k3 = NoSymbol;
-	if (k2 == k1)
-	 k2 = NoSymbol;
-	if (k1 == k0)
-	 k1 = NoSymbol;
-	if (k0 == k2 && k1 == k3)
-	 k2 = k3 = NoSymbol;
- }
-
- /* Fix up some things that are normally missing.. */
-
- if (HACK_MISSING)
- {
-	for (i = 0; i < sizeof (known_keys) / sizeof (known_keys0); i++)
-	{
-	 k = info->key_map + known_keysi.keycode * GLYPHS_PER_KEY;
-
-	 if (k0 == NoSymbol && k1 == NoSymbol
-		&& k2 == NoSymbol && k3 == NoSymbol)
-	 {
-		k0 = known_keysi.keysym;
-	 }
-	}
- }
-
- /* And some more things. We find the right symbols for the numeric
- keypad, but not the KP_ keysyms. So try to convert known keycodes. */
-
- if (HACK_KEYPAD)
- {
-	for (i = 0; i < sizeof (known_numeric_keys)
-	 / sizeof (known_numeric_keys0); i++)
-	{
-	 k = info->key_map + known_numeric_keysi.keycode * GLYPHS_PER_KEY;
-
-	 if (k0 == known_numeric_keysi.normal)
-	 {
-		k0 = known_numeric_keysi.keypad;
-	 }
-	}
- }
-
- return TRUE;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/darwin-old-keymap.c Deleted

@@ -1,613 +0,0 @@
-/* darwin-old-keymap.c -- ugly code we need to keep around for now
-
- Copyright (c) 2001-2002 Torrey T. Lyons. All Rights Reserved.
-
- The code to parse the Darwin keymap is derived from dumpkeymap.c
- by Eric Sunshine, which includes the following copyright:
-
- Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
- All rights reserved.
- 
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are met:
- 
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
- derived from this software without specific prior written permission.
- 
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
- NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
- TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
-
-#include "darwin.h"
-#include "darwin-keyboard.h"
-#include <errno.h>
-#include <sys/stat.h>
-#include <drivers/event_status_driver.h>
-#include <IOKit/hidsystem/ev_keymap.h>
-#include <architecture/byte_order.h> // For the NXSwap*
-
-#define XK_TECHNICAL		// needed to get XK_Escape
-#define XK_PUBLISHING
-#include "keysym.h"
-
-static FILE *fref = NULL;
-static char *inBuffer = NULL;
-
-// FIXME: It would be nice to support some of the extra keys in XF86keysym.h,
-// at least the volume controls that now ship on every Apple keyboard.
-
-#define UK(a) NoSymbol	// unknown symbol
-
-static KeySym const next_to_x256 = {
-	NoSymbol,	NoSymbol,	NoSymbol,	XK_KP_Enter,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	XK_BackSpace,	XK_Tab,		XK_Linefeed,	NoSymbol,
-	NoSymbol,	XK_Return,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	NoSymbol,	NoSymbol,	NoSymbol,	XK_Escape,
-	NoSymbol,	NoSymbol,	NoSymbol,	NoSymbol,
-	XK_space,	XK_exclam,	XK_quotedbl,	XK_numbersign,
-	XK_dollar,	XK_percent,	XK_ampersand,	XK_apostrophe,
-	XK_parenleft,	XK_parenright,	XK_asterisk,	XK_plus,
-	XK_comma,	XK_minus,	XK_period,	XK_slash,
-	XK_0,		XK_1,		XK_2,		XK_3,
-	XK_4,		XK_5,		XK_6,		XK_7,
-	XK_8,		XK_9,		XK_colon,	XK_semicolon,
-	XK_less,	XK_equal,	XK_greater,	XK_question,
-	XK_at,		XK_A,		XK_B,		XK_C,
-	XK_D,		XK_E,		XK_F,		XK_G,
-	XK_H,		XK_I,		XK_J,		XK_K,
-	XK_L,		XK_M,		XK_N,		XK_O,
-	XK_P,		XK_Q,		XK_R,		XK_S,
-	XK_T,		XK_U,		XK_V,		XK_W,
-	XK_X,		XK_Y,		XK_Z,		XK_bracketleft,
-	XK_backslash,	XK_bracketright,XK_asciicircum,	XK_underscore,
-	XK_grave,	XK_a,		XK_b,		XK_c,
-	XK_d,		XK_e,		XK_f,		XK_g,
-	XK_h,		XK_i,		XK_j,		XK_k,
-	XK_l,		XK_m,		XK_n,		XK_o,
-	XK_p,		XK_q,		XK_r,		XK_s,
-	XK_t,		XK_u,		XK_v,		XK_w,
-	XK_x,		XK_y,		XK_z,		XK_braceleft,
-	XK_bar,		XK_braceright,	XK_asciitilde,	XK_BackSpace,
-// 128
-	NoSymbol,	XK_Agrave,	XK_Aacute,	XK_Acircumflex,
-	XK_Atilde,	XK_Adiaeresis,	XK_Aring,	XK_Ccedilla,
-	XK_Egrave,	XK_Eacute,	XK_Ecircumflex,	XK_Ediaeresis,
-	XK_Igrave,	XK_Iacute,	XK_Icircumflex,	XK_Idiaeresis,
-// 144
-	XK_ETH,		XK_Ntilde,	XK_Ograve,	XK_Oacute,
-	XK_Ocircumflex,	XK_Otilde,	XK_Odiaeresis,	XK_Ugrave,
-	XK_Uacute,	XK_Ucircumflex,	XK_Udiaeresis,	XK_Yacute,
-	XK_THORN,	XK_mu,		XK_multiply,	XK_division,
-// 160
-	XK_copyright,	XK_exclamdown,	XK_cent,	XK_sterling,
-	UK(fraction),	XK_yen,		UK(fhook),	XK_section,
-	XK_currency,	XK_rightsinglequotemark,
-					XK_leftdoublequotemark,
-							XK_guillemotleft,
-	XK_leftanglebracket,
-			XK_rightanglebracket,
-					UK(filigature),	UK(flligature),
-// 176
-	XK_registered,	XK_endash,	XK_dagger,	XK_doubledagger,
-	XK_periodcentered,XK_brokenbar,	XK_paragraph,	UK(bullet),
-	XK_singlelowquotemark,
-			XK_doublelowquotemark,
-					XK_rightdoublequotemark,
-							XK_guillemotright,
-	XK_ellipsis,	UK(permille),	XK_notsign,	XK_questiondown,
-// 192
-	XK_onesuperior,	XK_dead_grave,	XK_dead_acute,	XK_dead_circumflex,
-	XK_dead_tilde,	XK_dead_macron,	XK_dead_breve,	XK_dead_abovedot,
-	XK_dead_diaeresis,
-			XK_twosuperior,	XK_dead_abovering,
-							XK_dead_cedilla,
-	XK_threesuperior,
-			XK_dead_doubleacute,
-					XK_dead_ogonek,	XK_dead_caron,
-// 208
-	XK_emdash,	XK_plusminus,	XK_onequarter,	XK_onehalf,
-	XK_threequarters,
-			XK_agrave,	XK_aacute,	XK_acircumflex,
-	XK_atilde,	XK_adiaeresis,	XK_aring,	XK_ccedilla,
-	XK_egrave,	XK_eacute,	XK_ecircumflex,	XK_ediaeresis,
-// 224
-	XK_igrave,	XK_AE,		XK_iacute,	XK_ordfeminine,
-	XK_icircumflex,	XK_idiaeresis,	XK_eth,		XK_ntilde,
-	XK_Lstroke,	XK_Ooblique,	XK_OE,		XK_masculine,
-	XK_ograve,	XK_oacute,	XK_ocircumflex, XK_otilde,
-// 240
-	XK_odiaeresis,	XK_ae,		XK_ugrave,	XK_uacute,
-	XK_ucircumflex,	XK_idotless,	XK_udiaeresis,	XK_ygrave,
-	XK_lstroke,	XK_ooblique,	XK_oe,		XK_ssharp,
-	XK_thorn,	XK_ydiaeresis,	NoSymbol,	NoSymbol,
- };
-
-#define MIN_SYMBOL		0xAC
-static KeySym const symbol_to_x = {
- XK_Left, XK_Up, XK_Right, XK_Down
- };
-int const NUM_SYMBOL = sizeof(symbol_to_x) / sizeof(symbol_to_x0);
-
-#define MIN_FUNCKEY		0x20
-static KeySym const funckey_to_x = {
- XK_F1, XK_F2, XK_F3, XK_F4,
- XK_F5, XK_F6, XK_F7, XK_F8,
- XK_F9, XK_F10, XK_F11, XK_F12,
- XK_Insert, XK_Delete, XK_Home, XK_End,
- XK_Page_Up, XK_Page_Down, XK_F13, XK_F14,
- XK_F15
- };
-int const NUM_FUNCKEY = sizeof(funckey_to_x) / sizeof(funckey_to_x0);
-
-typedef struct {
- KeySym		normalSym;
- KeySym		keypadSym;
-} darwinKeyPad_t;
-
-static darwinKeyPad_t const normal_to_keypad = {
- { XK_0, XK_KP_0 },
- { XK_1, XK_KP_1 },
- { XK_2, XK_KP_2 },
- { XK_3, XK_KP_3 },
- { XK_4, XK_KP_4 },
- { XK_5, XK_KP_5 },
- { XK_6, XK_KP_6 },
- { XK_7, XK_KP_7 },
- { XK_8, XK_KP_8 },
- { XK_9, XK_KP_9 },
- { XK_equal, XK_KP_Equal },
- { XK_asterisk, XK_KP_Multiply },
- { XK_plus, XK_KP_Add },
- { XK_comma, XK_KP_Separator },
- { XK_minus, XK_KP_Subtract },
- { XK_period, XK_KP_Decimal },
- { XK_slash, XK_KP_Divide }
-};
-int const NUM_KEYPAD = sizeof(normal_to_keypad) / sizeof(normal_to_keypad0);
-
-
-//-----------------------------------------------------------------------------
-// Data Stream Object
-// Can be configured to treat embedded "numbers" as being composed of
-// either 1, 2, or 4 bytes, apiece.
-//-----------------------------------------------------------------------------
-typedef struct _DataStream
-{
- unsigned char const *data;
- unsigned char const *data_end;
- short number_size; // Size in bytes of a "number" in the stream.
-} DataStream;
-
-static DataStream* new_data_stream( unsigned char const* data, int size )
-{
- DataStream* s = (DataStream*)xalloc( sizeof(DataStream) );
- s->data = data;
- s->data_end = data + size;
- s->number_size = 1; // Default to byte-sized numbers.
- return s;
-}
-
-static void destroy_data_stream( DataStream* s )
-{
- xfree(s);
-}
-
-static unsigned char get_byte( DataStream* s )
-{
- assert(s->data + 1 <= s->data_end);
- return *s->data++;
-}
-
-static short get_word( DataStream* s )
-{
- short hi, lo;
- assert(s->data + 2 <= s->data_end);
- hi = *s->data++;
- lo = *s->data++;
- return ((hi << 8) | lo);
-}
-
-static int get_dword( DataStream* s )
-{
- int b1, b2, b3, b4;
- assert(s->data + 4 <= s->data_end);
- b4 = *s->data++;
- b3 = *s->data++;
- b2 = *s->data++;
- b1 = *s->data++;
- return ((b4 << 24) | (b3 << 16) | (b2 << 8) | b1);
-}
-
-static int get_number( DataStream* s )
-{
- switch (s->number_size) {
- case 4: return get_dword(s);
- case 2: return get_word(s);
- default: return get_byte(s);
- }
-}
-
-
-//-----------------------------------------------------------------------------
-// Utility functions to help parse Darwin keymap
-//-----------------------------------------------------------------------------
-
-/*
- * bits_set
- * Calculate number of bits set in the modifier mask.
- */
-static short bits_set( short mask )
-{
- short n = 0;
-
- for ( ; mask != 0; mask >>= 1)
- if ((mask & 0x01) != 0)
- n++;
- return n;
-}
-
-/*
- * parse_next_char_code
- * Read the next character code from the Darwin keymapping
- * and write it to the X keymap.
- */
-static void parse_next_char_code(
- DataStream *s,
- KeySym *k )
-{
- const short charSet = get_number(s);
- const short charCode = get_number(s);
-
- if (charSet == 0) { // ascii character
- if (charCode >= 0 && charCode < 256)
- *k = next_to_xcharCode;
- } else if (charSet == 0x01) { // symbol character
- if (charCode >= MIN_SYMBOL &&
- charCode <= MIN_SYMBOL + NUM_SYMBOL)
- *k = symbol_to_xcharCode - MIN_SYMBOL;
- } else if (charSet == 0xFE) { // function key
- if (charCode >= MIN_FUNCKEY &&
- charCode <= MIN_FUNCKEY + NUM_FUNCKEY)
- *k = funckey_to_xcharCode - MIN_FUNCKEY;
- }
-}
-
-/*
- * DarwinReadKeymapFile
- * Read the appropriate keymapping from a keymapping file.
- */
-static Bool _DarwinReadKeymapFile(
- NXKeyMapping *keyMap)
-{
- struct stat st;
- NXEventSystemDevice info20;
- int interface = 0, handler_id = 0;
- int map_interface, map_handler_id, map_size = 0;
- unsigned int i, size;
- int *bufferEnd;
- union km_tag {
- int *intP;
- char *charP;
- } km;
- char *filename;
-
- filename = DarwinFindLibraryFile (darwinKeymapFile, "Keyboards");
- if (filename == NULL) {
-	FatalError("Could not find keymapping file %s.\n", darwinKeymapFile);
-	return FALSE;
- }
-
- fref = fopen( filename, "rb" );
- xfree (filename);
-
- if (fref == NULL) {
- ErrorF("Unable to open keymapping file '%s' (errno %d).\n",
- darwinKeymapFile, errno);
- return FALSE;
- }
- if (fstat(fileno(fref), &st) == -1) {
- ErrorF("Could not stat keymapping file '%s' (errno %d).\n",
- darwinKeymapFile, errno);
- return FALSE;
- }
-
- // check to make sure we don't crash later
- if (st.st_size <= 16*sizeof(int)) {
- ErrorF("Keymapping file '%s' is invalid (too small).\n",
- darwinKeymapFile);
- return FALSE;
- }
-
- inBuffer = (char*) xalloc( st.st_size );
- bufferEnd = (int *) (inBuffer + st.st_size);
- if (fread(inBuffer, st.st_size, 1, fref) != 1) {
- ErrorF("Could not read %qd bytes from keymapping file '%s' (errno %d).\n",
- st.st_size, darwinKeymapFile, errno);
- return FALSE;
- }
-
- if (strncmp( inBuffer, "KYM1", 4 ) == 0) {
- // Magic number OK.
- } else if (strncmp( inBuffer, "KYMP", 4 ) == 0) {
- ErrorF("Keymapping file '%s' is intended for use with the original NeXT keyboards and cannot be used by XDarwin.\n", darwinKeymapFile);
- return FALSE;
- } else {
- ErrorF("Keymapping file '%s' has a bad magic number and cannot be used by XDarwin.\n", darwinKeymapFile);
- return FALSE;
- }
-
- // find the keyboard interface and handler id
- {NXEventHandle hid;
- NXEventSystemInfoType info_type;
-
- size = sizeof( info ) / sizeof( int );
- hid = NXOpenEventStatus ();
- info_type = NXEventSystemInfo (hid, NX_EVS_DEVICE_INFO,
-				 (int *) info, &size);
- NXCloseEventStatus (hid);
- if (!info_type) {
-	 ErrorF("Error reading event status driver info.\n");
-	 return FALSE;
- }}
-
- size = size * sizeof( int ) / sizeof( info0 );
- for( i = 0; i < size; i++) {
- if (infoi.dev_type == NX_EVS_DEVICE_TYPE_KEYBOARD) {
- Bool hasInterface = FALSE;
- Bool hasMatch = FALSE;
-
- interface = infoi.interface;
- handler_id = infoi.id;
-
- // Find an appropriate keymapping:
- // The first time we try to match both interface and handler_id.
- // If we can't match both, we take the first match for interface.
-
- do {
- km.charP = inBuffer;
- km.intP++;
- while (km.intP+3 < bufferEnd) {
- map_interface = NXSwapBigIntToHost(*(km.intP++));
- map_handler_id = NXSwapBigIntToHost(*(km.intP++));
- map_size = NXSwapBigIntToHost(*(km.intP++));
- if (map_interface == interface) {
- if (map_handler_id == handler_id || hasInterface) {
- hasMatch = TRUE;
- break;
- } else {
- hasInterface = TRUE;
- }
- }
- km.charP += map_size;
- }
- } while (hasInterface && !hasMatch);
-
- if (hasMatch) {
- // fill in NXKeyMapping structure
- keyMap->size = map_size;
- keyMap->mapping = (char*) xalloc(map_size);
- memcpy(keyMap->mapping, km.charP, map_size);
- return TRUE;
- }
- } // if dev_id == keyboard device
- } // foreach info struct
-
- // The keymapping file didn't match any of the info structs
- // returned by NXEventSystemInfo.
- ErrorF("Keymapping file '%s' did not contain appropriate keyboard interface.\n", darwinKeymapFile);
- return FALSE;
-}
-
-static Bool DarwinReadKeymapFile(NXKeyMapping *keyMap)
-{
- Bool ret;
-
- ret = _DarwinReadKeymapFile (keyMap);
-
- if (inBuffer != NULL)
-	xfree (inBuffer);
- if (fref != NULL)
-	fclose (fref);
-
- return ret;
-}
-
-int DarwinParseKeymapFile (darwin_keyboard_info *info)
-{
- short numMods, numKeys, numPadKeys = 0;
- NXKeyMapping keyMap;
- DataStream *keyMapStream;
- unsigned char const *numPadStart = 0;
- Bool haveKeymap;
- int i;
- KeySym *k;
-
- if (darwinKeymapFile == NULL)
-	return FALSE;
-
- haveKeymap = DarwinReadKeymapFile(&keyMap);
- if (!haveKeymap) {
-	ErrorF("Reverting to system keymapping.\n");
-	return FALSE;
- }
-
- keyMapStream = new_data_stream( (unsigned char const*)keyMap.mapping,
- keyMap.size );
-
- // check the type of map
- if (get_word(keyMapStream)) {
- keyMapStream->number_size = 2;
- ErrorF("Current 16-bit keymapping may not be interpreted correctly.\n");
- }
-
- // Compute the modifier map and
- // insert X modifier KeySyms into keyboard map.
- // Store modifier keycodes in modifierKeycodes.
- numMods = get_number(keyMapStream);
- while (numMods-- > 0) {
- int left = 1; // first keycode is left
- short const charCode = get_number(keyMapStream);
- short numKeyCodes = get_number(keyMapStream);
-
- // This is just a marker, not a real modifier.
- // Store numeric keypad keys for later.
- if (charCode == NX_MODIFIERKEY_NUMERICPAD) {
- numPadStart = keyMapStream->data;
- numPadKeys = numKeyCodes;
- }
-
- while (numKeyCodes-- > 0) {
- const short keyCode = get_number(keyMapStream);
- if (charCode != NX_MODIFIERKEY_NUMERICPAD) {
- switch (charCode) {
- case NX_MODIFIERKEY_ALPHALOCK:
- info->key_mapkeyCode * GLYPHS_PER_KEY = XK_Caps_Lock;
- break;
- case NX_MODIFIERKEY_SHIFT:
- info->key_mapkeyCode * GLYPHS_PER_KEY =
- (left ? XK_Shift_L : XK_Shift_R);
- break;
- case NX_MODIFIERKEY_CONTROL:
- info->key_mapkeyCode * GLYPHS_PER_KEY =
- (left ? XK_Control_L : XK_Control_R);
- break;
- case NX_MODIFIERKEY_ALTERNATE:
- info->key_mapkeyCode * GLYPHS_PER_KEY =
- (left ? XK_Alt_L : XK_Alt_R);
- break;
- case NX_MODIFIERKEY_COMMAND:
- info->key_mapkeyCode * GLYPHS_PER_KEY =
- (left ? XK_Meta_L : XK_Meta_R);
- break;
- case NX_MODIFIERKEY_SECONDARYFN:
- info->key_mapkeyCode * GLYPHS_PER_KEY =
- (left ? XK_Control_L : XK_Control_R);
- break;
- case NX_MODIFIERKEY_HELP:
- info->key_mapkeyCode * GLYPHS_PER_KEY = XK_Help;
- break;
- }
- }
- left = 0;
- }
- }
-
- // Convert the Darwin keyboard map to an X keyboard map.
- // A key can have a different character code for each combination of
- // modifiers. We currently ignore all modifier combinations except
- // those with Shift, AlphaLock, and Alt.
- numKeys = get_number(keyMapStream);
- for (i = 0, k = info->key_map; i < numKeys; i++, k += GLYPHS_PER_KEY) {
- short const charGenMask = get_number(keyMapStream);
- if (charGenMask != 0xFF) { // is key bound?
- short numKeyCodes = 1 << bits_set(charGenMask);
-
- // Record unmodified case
- parse_next_char_code( keyMapStream, k );
- numKeyCodes--;
-
- // If AlphaLock and Shift modifiers produce different codes,
- // we record the Shift case since X handles AlphaLock.
- if (charGenMask & 0x01) {		// AlphaLock
- parse_next_char_code( keyMapStream, k+1 );
- numKeyCodes--;
- }
-
- if (charGenMask & 0x02) {		// Shift
- parse_next_char_code( keyMapStream, k+1 );
- numKeyCodes--;
-
- if (charGenMask & 0x01) {	// Shift-AlphaLock
- get_number(keyMapStream); get_number(keyMapStream);
- numKeyCodes--;
- }
- }
-
- // Skip the Control cases
- if (charGenMask & 0x04) {		// Control
- get_number(keyMapStream); get_number(keyMapStream);
- numKeyCodes--;
-
- if (charGenMask & 0x01) {	// Control-AlphaLock
- get_number(keyMapStream); get_number(keyMapStream);
- numKeyCodes--;
- }
-
- if (charGenMask & 0x02) {	// Control-Shift
- get_number(keyMapStream); get_number(keyMapStream);
- numKeyCodes--;
-
- if (charGenMask & 0x01) {	// Shift-Control-AlphaLock
- get_number(keyMapStream); get_number(keyMapStream);
- numKeyCodes--;
- }
- }
- }
-
- // Process Alt cases
- if (charGenMask & 0x08) {		// Alt
- parse_next_char_code( keyMapStream, k+2 );
- numKeyCodes--;
-
- if (charGenMask & 0x01) {	// Alt-AlphaLock
- parse_next_char_code( keyMapStream, k+3 );
- numKeyCodes--;
- }
-
- if (charGenMask & 0x02) {	// Alt-Shift
- parse_next_char_code( keyMapStream, k+3 );
- numKeyCodes--;
-
- if (charGenMask & 0x01) {	// Alt-Shift-AlphaLock
- get_number(keyMapStream); get_number(keyMapStream);
- numKeyCodes--;
- }
- }
- }
-
- while (numKeyCodes-- > 0) {
- get_number(keyMapStream); get_number(keyMapStream);
- }
-
- if (k3 == k2) k3 = NoSymbol;
- if (k2 == k1) k2 = NoSymbol;
- if (k1 == k0) k1 = NoSymbol;
- if (k0 == k2 && k1 == k3) k2 = k3 = NoSymbol;
- }
- }
-
- // Now we have to go back through the list of keycodes that are on the
- // numeric keypad and update the X keymap.
- keyMapStream->data = numPadStart;
- while(numPadKeys-- > 0) {
- const short keyCode = get_number(keyMapStream);
- k = &info->key_mapkeyCode * GLYPHS_PER_KEY;
- for (i = 0; i < NUM_KEYPAD; i++) {
- if (*k == normal_to_keypadi.normalSym) {
- k0 = normal_to_keypadi.keypadSym;
- break;
- }
- }
- }
-
- // free Darwin keyboard map
- destroy_data_stream( keyMapStream );
- xfree( keyMap.mapping );
-
- return TRUE;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/darwin.c Deleted

@@ -1,982 +0,0 @@
-/**************************************************************
- *
- * Shared code for the Darwin X Server
- * running with Quartz or the IOKit
- *
- **************************************************************/
-/*
- * Copyright (c) 2001-2002 Torrey T. Lyons. All Rights Reserved.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.c,v 1.45 2002/03/28 02:21:08 torrey Exp $ */
-
-#include <CoreGraphics/CoreGraphics.h>
-
-#include "X.h"
-#include "Xproto.h"
-#include "os.h"
-#include "servermd.h"
-#include "inputstr.h"
-#include "scrnintstr.h"
-#include "mibstore.h"		// mi backing store implementation
-#include "mipointer.h"		// mi software cursor
-#include "micmap.h"		// mi colormap code
-#include "fb.h"			// fb framebuffer code
-#include "site.h"
-#include "globals.h"
-#include "xf86Version.h"
-#include "dix.h"
-#include "dri-surface.h"
-#define _APPLEDRI_SERVER_
-#include "appledristr.h"
-
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/syslimits.h>
-#include <stdio.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <dirent.h>
-
-#define NO_CFPLUGIN
-#include <IOKit/IOKitLib.h>
-#include <IOKit/hidsystem/IOHIDLib.h>
-#include <IOKit/hidsystem/ev_keymap.h>
-
-#include "darwin.h"
-#include "quartz.h"
-#include "rootless-common.h"
-#include "pseudoramiX.h"
-#include "X11Application.h"
-
-/* Fake button press/release for scroll wheel move. */
-#define SCROLLWHEELUPFAKE	4
-#define SCROLLWHEELDOWNFAKE	5
-
-/* X server shared global variables */
-int darwinScreensFound = 0;
-int darwinScreenIndex = 0;
-int darwinFakeButtons = 1;
-Bool darwinSwapAltMeta = FALSE;
-
-/* location of X11's (0,0) point in global screen coordinates */
-int darwinMainScreenX = 0;
-int darwinMainScreenY = 0;
-
-/* parameters read from the command line or user preferences */
-char *darwinKeymapFile;
-Bool darwinSyncKeymap = TRUE;
-
-/* modifier masks for faking mouse buttons */
-static int darwinFakeMouse2Mask = Mod1Mask;	/* option */
-static int darwinFakeMouse3Mask = Mod2Mask;	/* command */
-
-static DeviceIntPtr darwinPointer;
-static DeviceIntPtr darwinKeyboard;
-
-/* Track our view of the keyboard state. Everything we sent to dix will
- be represented here until released. */
-static CARD8 keysDownDOWN_LENGTH;
-static int lockMods;
-
-#define SetBit(ptr,bit) \
- do {((BYTE *) ptr)(bit) >> 3 |= (1 << ((bit) & 7));} while (0)
-
-#define ClearBit(ptr,bit) \
- do {((BYTE *) ptr)(bit) >> 3 &= ~(1 << ((bit) & 7));} while (0)
-
-/* Common pixmap formats */
-static PixmapFormatRec formats = {
- { 1, 1, BITMAP_SCANLINE_PAD },
- { 4, 8, BITMAP_SCANLINE_PAD },
- { 8, 8, BITMAP_SCANLINE_PAD },
- { 15, 16, BITMAP_SCANLINE_PAD },
- { 16, 16, BITMAP_SCANLINE_PAD },
- { 24, 32, BITMAP_SCANLINE_PAD },
- { 32, 32, BITMAP_SCANLINE_PAD }
-};
-const int NUMFORMATS = sizeof(formats)/sizeof(formats0);
-
-#ifndef OSNAME
-#define OSNAME " Mac OS X"
-#endif
-#ifndef OSVENDOR
-#define OSVENDOR " Apple"
-#endif
-#ifndef PRE_RELEASE
-#define PRE_RELEASE XF86_VERSION_SNAP
-#endif
-
-extern void AppleDRIExtensionInit(void);
-extern void AppleWMExtensionInit(void);
-
-static void
-DarwinPrintBanner (void)
-{
- ErrorF("\nXFree86 Version %d.%d.%d", XF86_VERSION_MAJOR, XF86_VERSION_MINOR,
- XF86_VERSION_PATCH);
-#if XF86_VERSION_SNAP > 0
- ErrorF(".%d", XF86_VERSION_SNAP);
-#endif
-
-#if XF86_VERSION_SNAP >= 900
- ErrorF(" (%d.%d.0 RC %d)", XF86_VERSION_MAJOR, XF86_VERSION_MINOR + 1,
-				XF86_VERSION_SNAP - 900);
-#endif
-
-#ifdef XF86_CUSTOM_VERSION
- ErrorF(" (%s)", XF86_CUSTOM_VERSION);
-#endif
- ErrorF(" / X Window System\n");
- ErrorF("(protocol Version %d, revision %d, vendor release %d)\n",
- X_PROTOCOL, X_PROTOCOL_REVISION, VENDOR_RELEASE );
-}
-
-/* X screensaver support. Not implemented. */
-static Bool
-DarwinSaveScreen (ScreenPtr pScreen, int on)
-{
- return TRUE;
-}
-
-/* This is a callback from dix during AddScreen() from InitOutput().
- Initialize the screen and communicate information about it back to dix. */
-static Bool
-DarwinAddScreen (int index, ScreenPtr pScreen, int argc, char **argv)
-{
- int i, dpi;
- static int foundIndex = 0;
- Bool ret;
- VisualPtr visual;
- DarwinFramebufferPtr dfb;
-
- /* reset index of found screens for each server generation */
- if (index == 0)
-	foundIndex = 0;
-
- /* allocate space for private per screen storage */
- dfb = xalloc (sizeof (DarwinFramebufferRec));
- SCREEN_PRIV(pScreen) = dfb;
-
- /* setup hardware/mode specific details */
- ret = QuartzAddScreen (foundIndex, pScreen);
- foundIndex++;
- if (!ret)
- return FALSE;
-
- /* reset the visual list */
- miClearVisualTypes();
-
- /* setup a single visual appropriate for our pixel type. Note: we use
- TrueColor, not DirectColor */
- if (dfb->componentCount != 1)
- {
-	if (!miSetVisualTypes (dfb->colorBitsPerPixel, TrueColorMask,
-			 dfb->bitsPerComponent, TrueColor))
-	 return FALSE;
-#ifdef ENABLE_PSEUDOCOLOR
-	/* FIXME: currently we can't handle pseudocolor windows
-	 inside truecolor top-level windows, so disable this. */
-	if (!miSetVisualTypes (8, PseudoColorMask, 8, PseudoColor))
-	 return FALSE;
-#endif
- }
- else
- {
-	if (!miSetVisualTypes (8, PseudoColorMask, 8, PseudoColor))
-	 return FALSE;
- }
-
- /* create the common 8 bit PseudoColor visual; do this last to prevent
- it becoming the root visual. */
-
- miSetPixmapDepths();
-
- /* Machine independent screen init */
- if (monitorResolution)
- dpi = monitorResolution;
- else
- dpi = 75;
-
- /* initialize fb */
- if (!fbScreenInit (pScreen, dfb->framebuffer, dfb->width,
-		 dfb->height, dpi, dpi,
-		 dfb->pitch/(dfb->bitsPerPixel/8), dfb->bitsPerPixel))
- {
- return FALSE;
- }
-
- /* set the RGB order correctly for TrueColor */
- if (dfb->bitsPerPixel > 8)
- {
-	int bitsPerRGB = dfb->bitsPerComponent;
-
- for (i = 0, visual = pScreen->visuals;
- i < pScreen->numVisuals; i++, visual++)
-	{
- if (visual->class == TrueColor) {
- visual->offsetRed = bitsPerRGB * 2;
- visual->offsetGreen = bitsPerRGB;
- visual->offsetBlue = 0;
- visual->redMask = ((1<<bitsPerRGB)-1) << visual->offsetRed;
- visual->greenMask = ((1<<bitsPerRGB)-1) << visual->offsetGreen;
- visual->blueMask = ((1<<bitsPerRGB)-1) << visual->offsetBlue;
- }
- }
- }
-
-#ifdef RENDER
- if (! fbPictureInit (pScreen, 0, 0))
- return FALSE;
-#endif
-
-#ifdef MITSHM
- ShmRegisterFbFuncs (pScreen);
-#endif
-
- /* this must be initialized (why doesn't X have a default?) */
- pScreen->SaveScreen = DarwinSaveScreen;
-
- /* finish mode dependent screen setup including cursor support */
- if (!QuartzSetupScreen (index, pScreen))
-	return FALSE;
-
- /* create and install the default colormap and set black / white pixels */
- if (!miCreateDefColormap (pScreen))
- return FALSE;
-
- dixScreenOriginsindex.x = dfb->x;
- dixScreenOriginsindex.y = dfb->y;
-
- ErrorF("Screen %d added: %dx%d @ (%d,%d)\n",
- index, dfb->width, dfb->height, dfb->x, dfb->y);
-
- return TRUE;
-}
-
-/* Search for a file in the standard Library paths, which are (in order):
-
- ~/Library/ user specific
- /Library/ host specific
- /Network/Library/ LAN specific
- /System/Library/ OS specific
-
- A sub-path can be specified to search in below the various Library
- directories. Returns a new character string (owned by the caller)
- containing the full path to the first file found. */
-
-/* Library search paths */
-static const char *libraryPathList = {
- "",
- "/Network",
- "/System",
- NULL
-};
-
-char *
-DarwinFindLibraryFile (const char *file, const char *pathext)
-{
- char *home;
- char *fullPath;
- int i = 0;
-
- // Return the file name as is if it is already a fully qualified path.
- if (!access(file, F_OK)) {
- fullPath = xalloc(strlen(file)+1);
- strcpy(fullPath, file);
- return fullPath;
- }
-
- fullPath = xalloc(PATH_MAX);
-
- home = getenv("HOME");
- if (home) {
- snprintf(fullPath, PATH_MAX, "%s/Library/%s/%s", home, pathext, file);
- if (!access(fullPath, F_OK))
- return fullPath;
- }
-
- while (libraryPathListi) {
- snprintf(fullPath, PATH_MAX, "%s/Library/%s/%s", libraryPathListi++,
- pathext, file);
- if (!access(fullPath, F_OK))
- return fullPath;
- }
-
- xfree(fullPath);
- return NULL;
-}
-
-/* Press or release the given key, specified by NX keycode. xe must already
- have event time and mouse location filled in. pressed is KeyPress or
- KeyRelease. keycode is NX keycode without MIN_KEYCODE adjustment. */
-static inline void
-DarwinPressKeycode (xEvent *xe, int pressed, int keycode)
-{
- if (pressed == KeyRelease && !BitIsOn (keysDown, keycode + MIN_KEYCODE))
- {
-	/* Don't release keys that aren't pressed. It generates extra
-	 KeyPress events instead of just discarding them. */
-
-	return;
- }
-
- if (pressed == KeyPress)
-	SetBit (keysDown, keycode + MIN_KEYCODE);
- else
-	ClearBit (keysDown, keycode + MIN_KEYCODE);
-
- xe->u.u.type = pressed;
- xe->u.u.detail = keycode + MIN_KEYCODE;
- (darwinKeyboard->public.processInputProc) (xe, darwinKeyboard, 1);
-}
-
-/* Ensure that X's idea of what modifiers are down matches the real
- window server's. Do this by looking at what keys we previously sent
- X and deciding if they need to be released/toggled yet to make FLAGS
- become X's current modifier state. */
-static void
-DarwinUpdateModifiers (xEvent xe, unsigned int flags)
-{
- static const struct {int mask; int nxkey;} pairs = {
-	{ShiftMask, NX_MODIFIERKEY_SHIFT},
-	{ControlMask, NX_MODIFIERKEY_CONTROL},
-	{Mod1Mask, NX_MODIFIERKEY_ALTERNATE},
-	{Mod2Mask, NX_MODIFIERKEY_COMMAND},
-	{Mod3Mask, NX_MODIFIERKEY_SECONDARYFN}
- };
-
- int i, keycode;
-
- for (i = 0; i < (int) (sizeof (pairs) / sizeof (pairs0)); i++)
- {
-	keycode = DarwinModifierNXKeyToNXKeycode (pairsi.nxkey, 0);
-
-	if (keycode == 0)
-	 continue;
-
-	/* For each known modifier, sync up the state of the key X thinks
-	 it's bound to and the real value of the flag. */
-
-	if ((flags & pairsi.mask)
-	 && !BitIsOn (keysDown, keycode + MIN_KEYCODE))
-	{
-	 DarwinPressKeycode (&xe, KeyPress, keycode);
-	}
-	else if (!(flags & pairsi.mask)
-		 && BitIsOn (keysDown, keycode + MIN_KEYCODE))
-	{
-	 DarwinPressKeycode (&xe, KeyRelease, keycode);
-	}
- }
-
- /* Do the same for Lock, but need both press and release to toggle it. */
-
- if ((flags ^ lockMods) & LockMask)
- {
-	keycode = DarwinModifierNXKeyToNXKeycode (NX_MODIFIERKEY_ALPHALOCK, 0);
-
-	if (keycode != 0)
-	{
-	 DarwinPressKeycode (&xe, KeyPress, keycode);
-	 DarwinPressKeycode (&xe, KeyRelease, keycode);
-
-	 lockMods ^= LockMask;
-	}
- }
-}
-
-/* Release all non-modifier keys that we think are currently pressed.
- Usually this is done when X becomes inactive to avoid leaving keys
- stuck down when we become active again. Modifiers are handled separately
- in the function above. */
-static void
-DarwinReleaseKeys (void)
-{
- KeyClassPtr keyc = darwinKeyboard->key;
- xEvent xe;
- int i, x, y;
-
- memset (&xe, 0, sizeof (xe));
- xe.u.keyButtonPointer.time = GetTimeInMillis ();
- xe.u.keyButtonPointer.state = darwinKeyboard->key->state;
- GetSpritePosition (&x, &y);
- xe.u.keyButtonPointer.rootX = x;
- xe.u.keyButtonPointer.rootY = y;
- 
- for (i = 0; i < DOWN_LENGTH * 8; i++)
- {
-	if (!keyc->modifierMapi && BitIsOn (keysDown, i))
-	 DarwinPressKeycode (&xe, KeyRelease, i - MIN_KEYCODE);
- }
-}
-
-static int
-parseModifierString (const char *str)
-{
- if (strcasecmp (str, "shift") == 0)
-	return ShiftMask;
- else if (strcasecmp (str, "control") == 0)
-	return ControlMask;
- else if (strcasecmp (str, "option") == 0)
-	return Mod1Mask;
- else if (strcasecmp (str, "command") == 0)
-	return Mod2Mask;
- else if (strcasecmp (str, "fn") == 0)
-	return Mod3Mask;
- else
-	return 0;
-}
-
-/* Parse a list of modifier names and return a corresponding modifier mask */
-static int
-DarwinParseModifierList (const char *constmodifiers)
-{
- int result, mask;
- char *modifiers, *modifier, *p;
-
- if (constmodifiers == NULL
-	|| strlen (constmodifiers) == 0
-	|| strcasecmp (constmodifiers, "none") == 0)
- {
-	return 0;
- }
-
- modifiers = strdup (constmodifiers);
- p = modifiers;
- result = 0;
-
- while (p != NULL)
- {
-	modifier = strsep (&p, " ,+&|/"); /* allow lots of separators */
-	mask = parseModifierString (modifier);
-	if (mask != 0)
-	 result |= mask;
-	else
-	 ErrorF ("fakebuttons: Unknown modifier \"%s\"\n", modifier);
- }
-
- free (modifiers);
- return result;
-}
-
-void
-DarwinSetFakeButtons (const char *mod2, const char *mod3)
-{
- if (mod2 != NULL)
-	darwinFakeMouse2Mask = DarwinParseModifierList (mod2);
- if (mod3 != NULL)
-	darwinFakeMouse3Mask = DarwinParseModifierList (mod3);
-}
-
-/* Read and process events from the event pipe until it is empty. */
-void
-ProcessInputEvents (void)
-{
- static int here_before = 0;
-
- /* last known modifier state */
- static unsigned int current_flags = 0;
-
- /* button number and modifier mask of currently pressed fake button */
- static int fake_button;
- static unsigned int fake_button_mask, fake_button_modifier;
-
- xEvent xe;
-
- if (!here_before)
- {
-	X11ApplicationServerReady ();
-	here_before = TRUE;
- }
-
- while (DarwinDequeueEvent (&xe))
- {
-	unsigned int real_state;
-
-	real_state = xe.u.keyButtonPointer.state;
-	xe.u.keyButtonPointer.state |= fake_button_modifier;
-
-	/* Filter event for faked mouse button presses. */
-	if (darwinFakeButtons)
-	{
-	 switch (xe.u.u.type)
-	 {
-	 case ButtonPress:
-		if (xe.u.u.detail != 1)
-		 break;
-		if ((xe.u.keyButtonPointer.state & darwinFakeMouse2Mask)
-		 == darwinFakeMouse2Mask)
-		{
-		 fake_button = 2;
-		 fake_button_modifier = Button2Mask;
-		 fake_button_mask = darwinFakeMouse2Mask;
-		 xe.u.u.detail = 2;
-		}
-		else if ((xe.u.keyButtonPointer.state & darwinFakeMouse3Mask)
-			 == darwinFakeMouse3Mask)
-		{
-		 fake_button = 3;
-		 fake_button_modifier = Button3Mask;
-		 fake_button_mask = darwinFakeMouse3Mask;
-		 xe.u.u.detail = 3;
-		}
-		break;
-
-	 case ButtonRelease:
-		if (fake_button != 0 && xe.u.u.detail == 1)
-		 xe.u.u.detail = fake_button;
-		break;
-	 }
-	}
-
-	xe.u.keyButtonPointer.state &= ~fake_button_mask;
-
-	switch (xe.u.u.type)
-	{
-	case 0: /* flags-changed */
-	case KeyPress:
-	 if (current_flags == 0
-		&& darwinSyncKeymap && darwinKeymapFile == NULL)
-	 {
-		/* See if keymap has changed. */
-
-		static unsigned int last_seed;
-		unsigned int this_seed;
-
-		this_seed = DarwinSystemKeymapSeed ();
-		if (this_seed != last_seed)
-		{
-		 last_seed = this_seed;
-		 DarwinKeyboardReload (darwinKeyboard);
-		}
-	 }
-	 /* fall through */
-
-	case KeyRelease:
-	case ButtonPress:
-	case ButtonRelease:
-	case MotionNotify:
-
-	 /* Initialize time field. */
-
-	 xe.u.keyButtonPointer.time = GetTimeInMillis ();
-
-	 /* Update X's idea of what modifiers are set. */
-
-	 if (xe.u.keyButtonPointer.state != 0xffff
-		&& current_flags != xe.u.keyButtonPointer.state)
-	 {
-		current_flags = xe.u.keyButtonPointer.state;
-		DarwinUpdateModifiers (xe, current_flags);
-	 }
-	}
-
- switch (xe.u.u.type)
-	{
-	case 0:
-	 break;
-
-	case MotionNotify:
-	 if (!quartzServerVisible)
-	 {
-		xp_window_id wid;
-
-		/* Sigh. Need to check that we're really over one of
-		 our windows. (We need to receive pointer events while
-		 not in the foreground, and the only way to do that
-		 right now is to ask for _all_ pointer events..) */
-
-		wid = 0;
-		xp_find_window (xe.u.keyButtonPointer.rootX,
-				xe.u.keyButtonPointer.rootY, 0, &wid);
-		if (wid == 0)
-		 break;
-	 }
-
-	 /* Shift from global screen coordinates to coordinates
-	 relative to the origin of the current screen. */
-
-	 xe.u.keyButtonPointer.rootX -= darwinMainScreenX -
-		 dixScreenOriginsmiPointerCurrentScreen()->myNum.x;
-	 xe.u.keyButtonPointer.rootY -= darwinMainScreenY -
-		 dixScreenOriginsmiPointerCurrentScreen()->myNum.y;
-
-	 miPointerAbsoluteCursor (xe.u.keyButtonPointer.rootX,
-				 xe.u.keyButtonPointer.rootY,
-				 xe.u.keyButtonPointer.time);
-	 break;
-
-	case ButtonPress:
-	case ButtonRelease:
-	 darwinPointer->public.processInputProc (&xe, darwinPointer, 1);
-	 break;
-
-	case KeyPress:
-	case KeyRelease:
-	 DarwinPressKeycode (&xe, xe.u.u.type, xe.u.u.detail);
-	 break;
-
-	case ClientMessage:
-	 /* Update server's current time, since we may generate
-	 events, and it's nice if the timestamps are correct. */
-	 currentTime.milliseconds = GetTimeInMillis ();
-
-	 switch (xe.u.clientMessage.u.l.type)
-	 {
-	 case kXdarwinQuit:
-		GiveUp (0);
-		break;
-
-	 case kXquartzDeactivate:
-		DarwinReleaseKeys ();
-		/* fall through */
-
-	 default:
-		if (xe.u.clientMessage.u.l.type >= kXquartzFirstEvent
-		 && xe.u.clientMessage.u.l.type <= kXquartzLastEvent)
-		{
-		 QuartzClientMessage (&xe);
-		}
-		else
-		{
-		 ErrorF ("Unknown application defined event: %d.\n",
-			 xe.u.clientMessage.u.l.longs0);
-		}
-		break;
-	 }
-	 break;
-
-	default:
-	 ErrorF("Unknown event caught: %d\n", xe.u.u.type);
-	 break;
- }
-
-	/* Filter event for faked mouse button releases. */
-	if (fake_button != 0 && xe.u.u.type == ButtonRelease)
-	{
-	 current_flags |= (real_state & fake_button_mask);
-	 DarwinUpdateModifiers (xe, current_flags);
-
-	 fake_button = 0;
-	 fake_button_modifier = 0;
-	 fake_button_mask = 0;
-	}
- }
-
- miPointerUpdate ();
-}
-
-void
-DarwinEnqueuePointerEvent (xEvent *xe)
-{
- darwinPointer->public.processInputProc (xe, darwinPointer, 1);
-}
-
-/* Register the keyboard and mouse devices */
-void
-InitInput (int argc, char **argv)
-{
- DarwinInputInit ();
-
- darwinPointer = AddInputDevice(DarwinMouseProc, TRUE);
- RegisterPointerDevice( darwinPointer );
-
- darwinKeyboard = AddInputDevice(DarwinKeybdProc, TRUE);
- RegisterKeyboardDevice( darwinKeyboard );
-}
-
-void
-DarwinAdjustScreenOrigins (ScreenInfo *pScreenInfo)
-{
- int i, left, top;
-
- /* Shift all screens so the X11 (0, 0) coordinate is at the top
- left of the global screen coordinates.
-
- Screens can be arranged so the top left isn't on any screen, so
- instead use the top left of the leftmost screen as (0,0). This
- may mean some screen space is in -y, but it's better that (0,0)
- be onscreen, or else default xterms disappear. It's better that
- -y be used than -x, because when popup menus are forced
- "onscreen" by dumb window managers like twm, they'll shift the
- menus down instead of left, which still looks funny but is an
- easier target to hit. */
-
- left = dixScreenOrigins0.x;
- top = dixScreenOrigins0.y;
-
- /* Find leftmost screen. If there's a tie, take the topmost of the two. */
- for (i = 1; i < pScreenInfo->numScreens; i++) {
- if (dixScreenOriginsi.x < left ||
- (dixScreenOriginsi.x == left &&
- dixScreenOriginsi.y < top))
- {
- left = dixScreenOriginsi.x;
- top = dixScreenOriginsi.y;
- }
- }
-
- darwinMainScreenX = left;
- darwinMainScreenY = top;
-
- /* Shift all screens so that there is a screen whose top left
- is at X11 (0,0) and at global screen coordinate
- (darwinMainScreenX, darwinMainScreenY). */
-
- if (darwinMainScreenX != 0 || darwinMainScreenY != 0) {
- for (i = 0; i < pScreenInfo->numScreens; i++) {
- dixScreenOriginsi.x -= darwinMainScreenX;
- dixScreenOriginsi.y -= darwinMainScreenY;
- ErrorF("Screen %d placed at X11 coordinate (%d,%d).\n",
- i, dixScreenOriginsi.x, dixScreenOriginsi.y);
- }
- }
-}
-
-/* Initialize screenInfo for all actually accessible framebuffers.
-
- The display mode dependent code gets called three times. The mode
- specific InitOutput routines are expected to discover the number of
- potentially useful screens and cache routes to them internally.
- Inside DarwinAddScreen are two other mode specific calls. A mode
- specific AddScreen routine is called for each screen to actually
- initialize the screen with the ScreenPtr structure. After other
- screen setup has been done, a mode specific SetupScreen function can
- be called to finalize screen setup. */
-
-void
-InitOutput (ScreenInfo *pScreenInfo, int argc, char **argv)
-{
- int i;
- static unsigned long generation = 0;
-
- pScreenInfo->imageByteOrder = IMAGE_BYTE_ORDER;
- pScreenInfo->bitmapScanlineUnit = BITMAP_SCANLINE_UNIT;
- pScreenInfo->bitmapScanlinePad = BITMAP_SCANLINE_PAD;
- pScreenInfo->bitmapBitOrder = BITMAP_BIT_ORDER;
-
- /* List how we want common pixmap formats to be padded */
- pScreenInfo->numPixmapFormats = NUMFORMATS;
- for (i = 0; i < NUMFORMATS; i++)
- pScreenInfo->formatsi = formatsi;
-
- /* Allocate private storage for each screen's Darwin specific info */
- if (generation != serverGeneration) {
- darwinScreenIndex = AllocateScreenPrivateIndex();
- generation = serverGeneration;
- }
-
- /* Discover screens and do mode specific initialization */
- QuartzInitOutput(argc, argv);
-
- for (i = 0; i < darwinScreensFound; i++)
- AddScreen( DarwinAddScreen, argc, argv );
-
- DarwinAdjustScreenOrigins (pScreenInfo);
-
- PseudoramiXExtensionInit (argc, argv);
- AppleDRIExtensionInit ();
- AppleWMExtensionInit ();
-
- DRIExtensionInit ();
-}
-
-void
-OsVendorFatalError (void)
-{
- ErrorF( " OsVendorFatalError\n" );
-}
-
-void
-OsVendorInit (void)
-{
- if (serverGeneration == 1)
- DarwinPrintBanner();
-}
-
-/* Process device-dependent command line args. Returns 0 if argument is
- not device dependent, otherwise Count of number of elements of argv
- that are part of a device dependent commandline option. */
-int
-ddxProcessArgument (int argc, char *argv, int i)
-{
- int numDone;
-
- if ((numDone = QuartzProcessArgument( argc, argv, i )))
- return numDone;
-
- if ( !strcmp( argvi, "-fakebuttons" ) ) {
- darwinFakeButtons = TRUE;
- ErrorF( "Faking a three button mouse\n" );
- return 1;
- }
-
- if ( !strcmp( argvi, "-nofakebuttons" ) ) {
- darwinFakeButtons = FALSE;
- ErrorF( "Not faking a three button mouse\n" );
- return 1;
- }
-
- if (!strcmp( argvi, "-fakemouse2" ) ) {
- if ( i == argc-1 ) {
- FatalError( "-fakemouse2 must be followed by a modifier list\n" );
- }
-	darwinFakeMouse2Mask = DarwinParseModifierList(argvi+1);
- return 2;
- }
-
- if (!strcmp( argvi, "-fakemouse3" ) ) {
- if ( i == argc-1 ) {
- FatalError( "-fakemouse3 must be followed by a modifier list\n" );
- }
-	darwinFakeMouse3Mask = DarwinParseModifierList(argvi+1);
- return 2;
- }
-
- if ( !strcmp( argvi, "-keymap" ) ) {
- if ( i == argc-1 ) {
- FatalError( "-keymap must be followed by a filename\n" );
- }
- darwinKeymapFile = argvi+1;
- return 2;
- }
-
- if ( !strcmp( argvi, "-nokeymap" ) ) {
- darwinKeymapFile = NULL;
- return 1;
- }
-
- if ( !strcmp( argvi, "+synckeymap" ) ) {
- darwinSyncKeymap = TRUE;
- return 1;
- }
- if ( !strcmp( argvi, "-synckeymap" ) ) {
- darwinSyncKeymap = FALSE;
- return 1;
- }
-
- if (strcmp (argvi, "-swapAltMeta") == 0) {
-	darwinSwapAltMeta = TRUE;
-	return 1;
- }
-
- if (!strcmp( argvi, "-showconfig" ) || !strcmp( argvi, "-version" )) {
- DarwinPrintBanner();
- exit(0);
- }
-
- /* XDarwinStartup uses this argument to indicate the IOKit X server
- should be started. Ignore it here. */
- if ( !strcmp( argvi, "-iokit" ) ) {
- return 1;
- }
-
- return 0;
-}
-
-/* Print out correct use of device dependent commandline options.
- Maybe the user now knows what really to do ... */
-void
-ddxUseMsg (void)
-{
- ErrorF("\n");
- ErrorF("\n");
- ErrorF("Device Dependent Usage:\n");
- ErrorF("\n");
- ErrorF("-depth <depth> use <depth> bits per pixel. Options: 8, 15, 24\b\n");
- ErrorF("-fakebuttons fake a 3 button mouse with Command and Option\n");
- ErrorF("-nofakebuttons\n");
- ErrorF("-fakemouse2 <keys> fake middle mouse button with modifier keys\n");
- ErrorF("-fakemouse3 <keys> fake right mouse button with modifier keys\n");
- ErrorF(" e.g.: -fakemouse2 \"option,shift\"\n");
- ErrorF("-keymap <file> read the keymap from <file>\n");
- ErrorF("-nokeymap\n");
- ErrorF("+synckeymap synchronize X keymap with system keymap\n");
- ErrorF("-synckeymap only set X keymap on server startup\n");
- ErrorF("-swapAltMeta swap meaning of Alt and Meta modifiers\n");
- ErrorF("-version show server version.\n");
- ErrorF("\n");
-}
-
-/* Device dependent cleanup. Called by dix before normal server death. */
-void
-ddxGiveUp (void)
-{
- ErrorF( "Quitting XDarwin...\n" );
- QuartzGiveUp();
-}
-
-/* DDX - specific abort routine. Called by AbortServer(). The attempt is
- made to restore all original setting of the displays. Also all devices
- are closed. */
-void
-AbortDDX (void)
-{
- ErrorF( " AbortDDX\n" );
-
- /* This is needed for a abnormal server exit, since the normal exit stuff
- MUST also be performed (i.e. the vt must be left in a defined state) */
- ddxGiveUp();
-}
-
-extern void GlxExtensionInit();
-extern void GlxWrapInitVisuals(void *procPtr);
-void DarwinGlxExtensionInit (void) { GlxExtensionInit (); }
-void DarwinGlxWrapInitVisuals (void *ptr) { GlxWrapInitVisuals (ptr); }
-
-#ifdef DPMSExtension
-Bool
-DPMSSupported (void)
-{
- return FALSE;
-}
-
-void
-DPMSSet (int level)
-{
-}
-
-int
-DPMSGet (int *level)
-{
- return -1;
-}
-#endif
-
-#ifdef DDXTIME
-CARD32
-GetTimeInMillis (void)
-{
- extern void Microseconds ();
- UnsignedWide usec;
-
- /* This doesn't involve trapping into the kernel, unlike gettimeofday. */
- Microseconds (&usec);
-
- /* Should be good enough? (-2% error) */
- return (usec.hi << 22) | (usec.lo >> 10);
-}
-#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/darwin.h Deleted

@@ -1,117 +0,0 @@
-/*
- * Copyright (c) 2001 Torrey T. Lyons. All Rights Reserved.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/darwin.h,v 1.11 2002/03/28 02:21:08 torrey Exp $ */
-
-#ifndef _DARWIN_H
-#define _DARWIN_H
-
-#include "inputstr.h"
-#include "screenint.h"
-#include "scrnintstr.h"
-#include "extensions/XKB.h"
-
-typedef struct {
-    void                *framebuffer;
-    int                 x;
-    int                 y;
-    int                 width;
-    int                 height;
-    int                 pitch;
-    int                 bitsPerPixel;
-    int			componentCount;
-    int			bitsPerComponent;
-    int                 colorBitsPerPixel;
-    unsigned int	redMask, greenMask, blueMask;
-} DarwinFramebufferRec, *DarwinFramebufferPtr;
-
-/* From darwinKeyboard.c */
-int DarwinModifierNXKeyToNXKeycode(int key, int side);
-void DarwinKeyboardInit(DeviceIntPtr pDev);
-void DarwinKeyboardReload (DeviceIntPtr pDev);
-
-/* from darwin-new-keymap.c */
-unsigned int DarwinSystemKeymapSeed (void);
-
-/* from darwin-input.c */
-void DarwinEnqueueEvent (const xEvent *e);
-Bool DarwinDequeueEvent (xEvent *e);
-void DarwinInputInit (void);
-void DarwinInputPreInit (void);
-int DarwinMouseProc(DeviceIntPtr pPointer, int what);
-int DarwinKeybdProc(DeviceIntPtr pDev, int onoff);
-
-#undef assert
-#define assert(x) { if ((x) == 0) \
-    FatalError("assert failed on line %d of %s!\n", __LINE__, __FILE__); }
-#define kern_assert(x) { if ((x) != KERN_SUCCESS) \
-    FatalError("assert failed on line %d of %s with kernel return 0x%x!\n", \
-                __LINE__, __FILE__, x); }
-#define SCREEN_PRIV(pScreen) \
-    ((DarwinFramebufferPtr)pScreen->devPrivatesdarwinScreenIndex.ptr)
-
-#define MIN_KEYCODE XkbMinLegalKeyCode     // unfortunately, this isn't 0...
-
-extern void DarwinEnqueuePointerEvent (xEvent *xe);
-extern void DarwinAdjustScreenOrigins (ScreenInfo *pScreenInfo);
-
-/* Global variables from darwin.c */
-extern int darwinScreenIndex; // index into pScreen.devPrivates
-extern int darwinScreensFound;
-
-/* User preferences used by generic Darwin X server code */
-extern Bool darwinSwapAltMeta;
-extern int darwinFakeButtons;
-extern char *darwinKeymapFile;
-extern Bool darwinSyncKeymap;
-
-/* location of X11's (0,0) point in global screen coordinates */
-extern int darwinMainScreenX;
-extern int darwinMainScreenY;
-
-/* Client message event type ranges. */
-enum {
-    kXdarwinFirstEvent = 1,
-    kXdarwinLastEvent = kXdarwinFirstEvent + 99,
-    kXquartzFirstEvent = kXdarwinLastEvent + 1,
-    kXquartzLastEvent = kXquartzFirstEvent + 99,
-};
-
-/* "Darwin" client message types */
-enum {
-    kXdarwinQuit = kXdarwinFirstEvent,
-};
-
-extern char *DarwinFindLibraryFile (const char *file, const char *pathext);
-extern void DarwinForeachLibraryFile (const char *dir,
-				      void (*callback) (const char *dir,
-							const char *file,
-							void *data),
-				      void *data);
-
-extern void DarwinSetFakeButtons (const char *mod2, const char *mod3);
-
-#endif	/* _DARWIN_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/dri-surface.c Deleted

@@ -1,940 +0,0 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dri.c,v 1.34 2001/12/10 19:07:19 dawes Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright 2000 VA Linux Systems, Inc.
-Copyright (c) 2002 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- * Jens Owen <jens@valinux.com>
- * Rickard E. (Rik) Faith <faith@valinux.com>
- *
- */
-
-#ifdef XFree86LOADER
-#include "xf86.h"
-#include "xf86_ansic.h"
-#else
-#include <sys/time.h>
-#include <unistd.h>
-#endif
-
-#define NEED_REPLIES
-#define NEED_EVENTS
-#include "X.h"
-#include "Xproto.h"
-#include "misc.h"
-#include "dixstruct.h"
-#include "extnsionst.h"
-#include "colormapst.h"
-#include "cursorstr.h"
-#include "scrnintstr.h"
-#include "windowstr.h"
-#include "servermd.h"
-#define _APPLEDRI_SERVER_
-#include "appledristr.h"
-#include "swaprep.h"
-#include "dri-surface.h"
-#include "dristruct.h"
-#include "mi.h"
-#include "mipointer.h"
-#include "rootless-common.h"
-#include "x-hash.h"
-#include "x-hook.h"
-
-#include <AvailabilityMacros.h>
-
-static int DRIScreenPrivIndex = -1;
-static int DRIWindowPrivIndex = -1;
-static int DRIPixmapPrivIndex = -1;
-static unsigned long DRIGeneration = 0;
-
-static RESTYPE DRIDrawablePrivResType;
-
-static x_hash_table *surface_hash;	/* maps surface ids -> drawablePrivs */
-
-Bool
-DRIScreenInit(ScreenPtr pScreen)
-{
- DRIScreenPrivPtr pDRIPriv;
- int i;
-
- if (DRIGeneration != serverGeneration) {
-	if ((DRIScreenPrivIndex = AllocateScreenPrivateIndex()) < 0)
-	 return FALSE;
-	DRIGeneration = serverGeneration;
- }
-
- pDRIPriv = (DRIScreenPrivPtr) xcalloc(1, sizeof(DRIScreenPrivRec));
- if (!pDRIPriv) {
- pScreen->devPrivatesDRIScreenPrivIndex.ptr = NULL;
- return FALSE;
- }
-
- pScreen->devPrivatesDRIScreenPrivIndex.ptr = (pointer) pDRIPriv;
- pDRIPriv->directRenderingSupport = TRUE;
- pDRIPriv->nrWindows = 0;
-
- /* Initialize drawable tables */
- for( i=0; i < DRI_MAX_DRAWABLES; i++) {
-	pDRIPriv->DRIDrawablesi = NULL;
- }
-
- return TRUE;
-}
-
-Bool
-DRIFinishScreenInit(ScreenPtr pScreen)
-{
- DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
- /* Wrap DRI support */
- pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
- pScreen->ValidateTree = DRIValidateTree;
-
- pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
- pScreen->PostValidateTree = DRIPostValidateTree;
-
- pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures;
- pScreen->WindowExposures = DRIWindowExposures;
-
- pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow;
- pScreen->CopyWindow = DRICopyWindow;
-
- pDRIPriv->wrap.ClipNotify = pScreen->ClipNotify;
- pScreen->ClipNotify = DRIClipNotify;
-
- ErrorF("DRI screen %d installation complete\n", pScreen->myNum);
-
- return TRUE;
-}
-
-void
-DRICloseScreen(ScreenPtr pScreen)
-{
- DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
- if (pDRIPriv && pDRIPriv->directRenderingSupport) {
-	xfree(pDRIPriv);
-	pScreen->devPrivatesDRIScreenPrivIndex.ptr = NULL;
- }
-}
-
-Bool
-DRIExtensionInit(void)
-{
- int		 	i;
- ScreenPtr		pScreen;
-
- if (DRIScreenPrivIndex < 0) {
-	return FALSE;
- }
-
- /* Allocate a window private index with a zero sized private area for
- * each window, then should a window become a DRI window, we'll hang
- * a DRIWindowPrivateRec off of this private index.
- */
- if ((DRIWindowPrivIndex = AllocateWindowPrivateIndex()) < 0)
-	return FALSE;
- if ((DRIPixmapPrivIndex = AllocatePixmapPrivateIndex()) < 0)
-	return FALSE;
-
- DRIDrawablePrivResType = CreateNewResourceType(DRIDrawablePrivDelete);
-
- for (i = 0; i < screenInfo.numScreens; i++)
- {
-	pScreen = screenInfo.screensi;
-	if (!AllocateWindowPrivate(pScreen, DRIWindowPrivIndex, 0))
-	 return FALSE;
-	if (!AllocatePixmapPrivate(pScreen, DRIPixmapPrivIndex, 0))
-	 return FALSE;
- }
-
- return TRUE;
-}
-
-void
-DRIReset(void)
-{
- /*
- * This stub routine is called when the X Server recycles, resources
- * allocated by DRIExtensionInit need to be managed here.
- *
- * Currently this routine is a stub because all the interesting resources
- * are managed via the screen init process.
- */
-}
-
-Bool
-DRIQueryDirectRenderingCapable(ScreenPtr pScreen, Bool* isCapable)
-{
- DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
- if (pDRIPriv)
-	*isCapable = pDRIPriv->directRenderingSupport;
- else
-	*isCapable = FALSE;
-
- return TRUE;
-}
-
-Bool
-DRIAuthConnection(ScreenPtr pScreen, unsigned int magic)
-{
-#if 0
- /* FIXME: something? */
-
- DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
- if (drmAuthMagic(pDRIPriv->drmFD, magic)) return FALSE;
-#endif
- return TRUE;
-}
-
-static void
-DRIUpdateSurface (DRIDrawablePrivPtr pDRIDrawablePriv, DrawablePtr pDraw)
-{
- WindowPtr pTopWin;
- xp_window_changes wc;
- unsigned int flags = 0;
-
- if (pDRIDrawablePriv->sid == 0)
-	return;
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
- wc.depth = (pDraw->bitsPerPixel == 32 ? XP_DEPTH_ARGB8888
-		: pDraw->bitsPerPixel == 16 ? XP_DEPTH_RGB555 : XP_DEPTH_NIL);
- if (wc.depth != XP_DEPTH_NIL)
-	flags |= XP_DEPTH;
-#endif
-
- if (pDraw->type == DRAWABLE_WINDOW) {
-	WindowPtr pWin = (WindowPtr) pDraw;
-
-	DRIStopDrawing (&pWin->drawable, FALSE);
-
-	pTopWin = TopLevelParent (pWin);
-
-	wc.x = pWin->drawable.x - (pTopWin->drawable.x - pTopWin->borderWidth);
-	wc.y = pWin->drawable.y - (pTopWin->drawable.y - pTopWin->borderWidth);
-	wc.width = pWin->drawable.width;
-	wc.height = pWin->drawable.height;
-	wc.bit_gravity = XP_GRAVITY_NONE;
-
-	wc.shape_nrects = REGION_NUM_RECTS (&pWin->clipList);
-	wc.shape_rects = REGION_RECTS (&pWin->clipList);
-	wc.shape_tx = - (pTopWin->drawable.x - pTopWin->borderWidth);
-	wc.shape_ty = - (pTopWin->drawable.y - pTopWin->borderWidth);
-
-	flags |= XP_BOUNDS | XP_SHAPE;
-
-	pDRIDrawablePriv->x = pWin->drawable.x - pTopWin->borderWidth;
-	pDRIDrawablePriv->y = pWin->drawable.y - pTopWin->borderWidth;
-
- } else if (pDraw->type == DRAWABLE_PIXMAP) {
-	wc.x = 0;
-	wc.y = 0;
-	wc.width = pDraw->width;
-	wc.height = pDraw->height;
-	wc.bit_gravity = XP_GRAVITY_NONE;
-	flags |= XP_BOUNDS;
- }
-
- xp_configure_surface (pDRIDrawablePriv->sid, flags, &wc);
-}
-
-Bool
-DRICreateSurface (ScreenPtr pScreen, Drawable id,
-		 DrawablePtr pDrawable, xp_client_id client_id,
-		 xp_surface_id *surface_id, unsigned int ret_key2,
-		 void (*notify) (void *arg, void *data), void *notify_data)
-{
- DRIScreenPrivPtr	pDRIPriv = DRI_SCREEN_PRIV(pScreen);
- DRIDrawablePrivPtr	pDRIDrawablePriv;
- WindowPtr		pWin;
- PixmapPtr		pPix;
- xp_window_id	wid = 0;
-
- if (pDrawable->type == DRAWABLE_WINDOW) {
-	pWin = (WindowPtr)pDrawable;
-	pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
-	if (pDRIDrawablePriv == NULL) {
-	 WindowPtr pTopWin;
- xp_error err;
-	 xp_window_changes wc;
-
-	 pTopWin = TopLevelParent (pWin);
-
-	 /* allocate a DRI Window Private record */
-	 if (!(pDRIDrawablePriv = xcalloc(1, sizeof(DRIDrawablePrivRec)))) {
-		return FALSE;
-	 }
-
-	 pDRIDrawablePriv->pDraw = pDrawable;
-	 pDRIDrawablePriv->pScreen = pScreen;
-	 pDRIDrawablePriv->refCount = 0;
-	 pDRIDrawablePriv->drawableIndex = -1;
-	 pDRIDrawablePriv->notifiers = NULL;
-
-	 /* find the physical window */
-	 wid = RootlessGetPhysicalWindow (pTopWin, TRUE);
-	 if (wid == 0) {
-		xfree (pDRIDrawablePriv);
-		return FALSE;
-	 }
-
-	 /* allocate the physical surface */
-	 err = xp_create_surface (wid, &pDRIDrawablePriv->sid);
-	 if (err != Success) {
-		xfree (pDRIDrawablePriv);
-		return FALSE;
-	 }
-
-	 /* Make it visible */
-	 wc.stack_mode = XP_MAPPED_ABOVE;
-	 wc.sibling = 0;
-	 err = xp_configure_surface (pDRIDrawablePriv->sid,
-					XP_STACKING, &wc);
-	 if (err != Success)
-	 {
-		xp_destroy_surface (pDRIDrawablePriv->sid);
-		xfree (pDRIDrawablePriv);
-		return FALSE;
-	 }
-
-	 /* save private off of preallocated index */
-	 pWin->devPrivatesDRIWindowPrivIndex.ptr = (pointer)pDRIDrawablePriv;
-	}
- }
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
- else if (pDrawable->type == DRAWABLE_PIXMAP) {
-	pPix = (PixmapPtr)pDrawable;
-	pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix);
-	if (pDRIDrawablePriv == NULL) {
-	 xp_error err;
-
-	 /* allocate a DRI Window Private record */
-	 if (!(pDRIDrawablePriv = xcalloc(1, sizeof(DRIDrawablePrivRec)))) {
-		return FALSE;
-	 }
-
-	 pDRIDrawablePriv->pDraw = pDrawable;
-	 pDRIDrawablePriv->pScreen = pScreen;
-	 pDRIDrawablePriv->refCount = 0;
-	 pDRIDrawablePriv->drawableIndex = -1;
-	 pDRIDrawablePriv->notifiers = NULL;
-
-	 /* Passing a null window id to Xplugin in 10.3+ asks for
-	 an accelerated offscreen surface. */
-
-	 err = xp_create_surface (0, &pDRIDrawablePriv->sid);
-	 if (err != Success) {
-		xfree (pDRIDrawablePriv);
-		return FALSE;
-	 }
-
-	 /* save private off of preallocated index */
-	 pPix->devPrivatesDRIPixmapPrivIndex.ptr = (pointer)pDRIDrawablePriv;
-	}
- }
-#endif
- else { /* for GLX 1.3, a PBuffer */
-	/* NOT_DONE */
-	return FALSE;
- }
-
- /* Finish initialization of new surfaces */
- if (pDRIDrawablePriv->refCount == 0) {
-	unsigned int key2 = {0};
-	xp_error err;
-
-	/* try to give the client access to the surface
-	 FIXME: how to export pixmaps? */
-	if (client_id != 0 && wid != 0)
-	{
-	 err = xp_export_surface (wid, pDRIDrawablePriv->sid,
-				 client_id, key);
-	 if (err != Success) {
-		xp_destroy_surface (pDRIDrawablePriv->sid);
-		xfree (pDRIDrawablePriv);
-		return FALSE;
-	 }
-	}
-
-	pDRIDrawablePriv->key0 = key0;
-	pDRIDrawablePriv->key1 = key1;
-
-	++pDRIPriv->nrWindows;
-
-	/* and stash it by surface id */
-	if (surface_hash == NULL)
-	 surface_hash = x_hash_table_new (NULL, NULL, NULL, NULL);
-	x_hash_table_insert (surface_hash,
-			 (void *) pDRIDrawablePriv->sid, pDRIDrawablePriv);
-
-	/* track this in case this window is destroyed */
-	AddResource(id, DRIDrawablePrivResType, (pointer)pDrawable);
-
-	/* Initialize shape */
-	DRIUpdateSurface (pDRIDrawablePriv, pDrawable);
- }
-
- pDRIDrawablePriv->refCount++;
-
- *surface_id = pDRIDrawablePriv->sid;
-
- if (ret_key != NULL) {
-	ret_key0 = pDRIDrawablePriv->key0;
-	ret_key1 = pDRIDrawablePriv->key1;
- }
-
- if (notify != NULL) {
-	pDRIDrawablePriv->notifiers = x_hook_add (pDRIDrawablePriv->notifiers,
-						 notify, notify_data);
- }
-
- return TRUE;
-}
-
-Bool
-DRIDestroySurface(ScreenPtr pScreen, Drawable id, DrawablePtr pDrawable,
-		 void (*notify) (void *, void *), void *notify_data)
-{
- DRIDrawablePrivPtr	pDRIDrawablePriv;
-
- if (pDrawable->type == DRAWABLE_WINDOW) {
-	pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW((WindowPtr)pDrawable);
- } else if (pDrawable->type == DRAWABLE_PIXMAP) {
-	pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP((PixmapPtr)pDrawable);
- } else {
-	return FALSE;
- }
-
- if (pDRIDrawablePriv != NULL) {
-	if (notify != NULL) {
-	 pDRIDrawablePriv->notifiers = x_hook_remove (pDRIDrawablePriv->notifiers,
-							 notify, notify_data);
-	}
-	if (--pDRIDrawablePriv->refCount <= 0) {
-	 /* This calls back to DRIDrawablePrivDelete
-	 which frees the private area */
-	 FreeResourceByType(id, DRIDrawablePrivResType, FALSE);
-	}
- }
-
- return TRUE;
-}
-
-Bool
-DRIDrawablePrivDelete(pointer pResource, XID id)
-{
- DrawablePtr		pDrawable = (DrawablePtr)pResource;
- DRIScreenPrivPtr	pDRIPriv = DRI_SCREEN_PRIV(pDrawable->pScreen);
- DRIDrawablePrivPtr	pDRIDrawablePriv = NULL;
- WindowPtr		pWin = NULL;
- PixmapPtr		pPix = NULL;
-
- if (pDrawable->type == DRAWABLE_WINDOW) {
-	pWin = (WindowPtr)pDrawable;
-	pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
-	DRIStopDrawing (pDrawable, FALSE);
-	pDRIPriv->drawing = x_list_remove (pDRIPriv->drawing,
-					 pDRIDrawablePriv);
- } else if (pDrawable->type == DRAWABLE_PIXMAP) {
-	pPix = (PixmapPtr)pDrawable;
-	pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix);
- }
-
- if (pDRIDrawablePriv == NULL)
-	return FALSE;
-
- if (pDRIDrawablePriv->drawableIndex != -1) {
-	/* release drawable table entry */
-	pDRIPriv->DRIDrawablespDRIDrawablePriv->drawableIndex = NULL;
- }
-
- if (pDRIDrawablePriv->sid != 0) {
-	xp_destroy_surface (pDRIDrawablePriv->sid);
-	x_hash_table_remove (surface_hash, (void *) pDRIDrawablePriv->sid);
- }
-
- if (pDRIDrawablePriv->notifiers != NULL)
-	x_hook_free (pDRIDrawablePriv->notifiers);
-
- xfree(pDRIDrawablePriv);
-
- if (pDrawable->type == DRAWABLE_WINDOW) {
-	pWin->devPrivatesDRIWindowPrivIndex.ptr = NULL;
- } else if (pDrawable->type == DRAWABLE_PIXMAP) {
-	pPix->devPrivatesDRIPixmapPrivIndex.ptr = NULL;
- }
-
- --pDRIPriv->nrWindows;
-
- return TRUE;
-}
-
-void
-DRIWindowExposures(WindowPtr pWin, RegionPtr prgn, RegionPtr bsreg)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
- DRIDrawablePrivPtr pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin);
-
- if(pDRIDrawablePriv) {
-	/* FIXME: something? */
- }
-
- pScreen->WindowExposures = pDRIPriv->wrap.WindowExposures;
-
- (*pScreen->WindowExposures)(pWin, prgn, bsreg);
-
- pDRIPriv->wrap.WindowExposures = pScreen->WindowExposures;
- pScreen->WindowExposures = DRIWindowExposures;
-
-}
-
-void
-DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
- DRIDrawablePrivPtr pDRIDrawablePriv;
-
- if(pDRIPriv->nrWindows > 0) {
- pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW (pWin);
- if (pDRIDrawablePriv != NULL) {
-	 DRIUpdateSurface (pDRIDrawablePriv, &pWin->drawable);
- }
- }
-
- /* unwrap */
- pScreen->CopyWindow = pDRIPriv->wrap.CopyWindow;
-
- /* call lower layers */
- (*pScreen->CopyWindow)(pWin, ptOldOrg, prgnSrc);
-
- /* rewrap */
- pDRIPriv->wrap.CopyWindow = pScreen->CopyWindow;
- pScreen->CopyWindow = DRICopyWindow;
-}
-
-int
-DRIValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
-{
- ScreenPtr pScreen = pParent->drawable.pScreen;
- DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
- int returnValue;
-
- /* unwrap */
- pScreen->ValidateTree = pDRIPriv->wrap.ValidateTree;
-
- /* call lower layers */
- returnValue = (*pScreen->ValidateTree)(pParent, pChild, kind);
-
- /* rewrap */
- pDRIPriv->wrap.ValidateTree = pScreen->ValidateTree;
- pScreen->ValidateTree = DRIValidateTree;
-
- return returnValue;
-}
-
-void
-DRIPostValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
-{
- ScreenPtr pScreen;
- DRIScreenPrivPtr pDRIPriv;
-
- if (pParent) {
-	pScreen = pParent->drawable.pScreen;
- } else {
-	pScreen = pChild->drawable.pScreen;
- }
- pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
- if (pDRIPriv->wrap.PostValidateTree) {
-	/* unwrap */
-	pScreen->PostValidateTree = pDRIPriv->wrap.PostValidateTree;
-
-	/* call lower layers */
-	(*pScreen->PostValidateTree)(pParent, pChild, kind);
-
-	/* rewrap */
-	pDRIPriv->wrap.PostValidateTree = pScreen->PostValidateTree;
-	pScreen->PostValidateTree = DRIPostValidateTree;
- }
-}
-
-void
-DRIClipNotify(WindowPtr pWin, int dx, int dy)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- DRIScreenPrivPtr pDRIPriv = DRI_SCREEN_PRIV(pScreen);
- DRIDrawablePrivPtr	pDRIDrawablePriv;
-
- if ((pDRIDrawablePriv = DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin))) {
-	DRIUpdateSurface (pDRIDrawablePriv, &pWin->drawable);
- }
-
- if(pDRIPriv->wrap.ClipNotify) {
- pScreen->ClipNotify = pDRIPriv->wrap.ClipNotify;
-
- (*pScreen->ClipNotify)(pWin, dx, dy);
-
- pDRIPriv->wrap.ClipNotify = pScreen->ClipNotify;
- pScreen->ClipNotify = DRIClipNotify;
- }
-}
-
-/* This lets get at the unwrapped functions so that they can correctly
- * call the lowerlevel functions, and choose whether they will be
- * called at every level of recursion (eg in validatetree).
- */
-DRIWrappedFuncsRec *
-DRIGetWrappedFuncs(ScreenPtr pScreen)
-{
- return &(DRI_SCREEN_PRIV(pScreen)->wrap);
-}
-
-void
-DRIQueryVersion(int *majorVersion,
- int *minorVersion,
- int *patchVersion)
-{
- *majorVersion = APPLE_DRI_MAJOR_VERSION;
- *minorVersion = APPLE_DRI_MINOR_VERSION;
- *patchVersion = APPLE_DRI_PATCH_VERSION;
-}
-
-void
-DRISurfaceNotify (xp_surface_id id, int kind)
-{
- DRIDrawablePrivPtr pDRIDrawablePriv = NULL;
- DRISurfaceNotifyArg arg;
-
- arg.id = id;
- arg.kind = kind;
-
- if (surface_hash != NULL)
- {
-	pDRIDrawablePriv = x_hash_table_lookup (surface_hash,
-						(void *) id, NULL);
- }
-
- if (pDRIDrawablePriv == NULL)
-	return;
-
- if (kind == AppleDRISurfaceNotifyDestroyed)
- {
-	pDRIDrawablePriv->sid = 0;
-	x_hash_table_remove (surface_hash, (void *) id);
- }
-
- x_hook_run (pDRIDrawablePriv->notifiers, &arg);
-
- if (kind == AppleDRISurfaceNotifyDestroyed)
- {
-	/* Kill off the handle. */
-
-	FreeResourceByType (pDRIDrawablePriv->pDraw->id,
-			 DRIDrawablePrivResType, FALSE);
- }
-}
-
-&#xc;
-/* Experimental support for X drawing directly into VRAM surfaces. */
-
-Bool
-DRIStartDrawing (DrawablePtr pDraw)
-{
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030
- return FALSE;
-#else
- DRIDrawablePrivPtr priv = NULL;
- DRIScreenPrivPtr pDRIPriv;
-
- if (pDraw->type == DRAWABLE_WINDOW)
-	priv = DRI_DRAWABLE_PRIV_FROM_WINDOW ((WindowPtr)pDraw);
-#if 0
- /* FIXME: support pixmaps */
- else if (pDraw->type == DRAWABLE_PIXMAP)
-	priv = DRI_DRAWABLE_PRIV_FROM_PIXMAP ((PixmapPtr)pDraw);
-#endif
-
- if (priv == NULL)
-	return FALSE;
-
- pDRIPriv = DRI_SCREEN_PRIV(priv->pScreen);
-
- if (!priv->is_drawing)
- {
-	xp_error err;
-	xp_box r;
-
-	err = xp_lock_window (priv->sid, NULL, NULL,
-			 &priv->data, &priv->rowbytes, &r);
-	if (err != Success)
-	 return FALSE;
-
-	if (pDraw->type == DRAWABLE_WINDOW)
-	{
-	 WindowPtr pWin = (WindowPtr) pDraw;
-	 int bw = wBorderWidth (pWin);
-
-	 priv->pixmap =
- GetScratchPixmapHeader(pWin->drawable.pScreen, r.x2 - r.x1,
-				 r.y2 - r.y1, pWin->drawable.depth,
- pWin->drawable.bitsPerPixel,
- priv->rowbytes, priv->data);
-	 TranslatePixmapBase (priv->pixmap,
-				 - (pWin->drawable.x - bw),
-				 - (pWin->drawable.y - bw));
-	}
-
- priv->is_drawing = TRUE;
-	pDRIPriv->drawing = x_list_prepend (pDRIPriv->drawing, priv);
- }
- 
- if (pDraw->type == DRAWABLE_WINDOW)
- {
-	WindowPtr pWin = (WindowPtr) pDraw;
-
-	priv->oldPixmap = pWin->drawable.pScreen->GetWindowPixmap (pWin);
-	pWin->drawable.pScreen->SetWindowPixmap (pWin, priv->pixmap);
- }
-
- return TRUE;
-#endif
-}
-
-Bool
-DRIStopDrawing (DrawablePtr pDraw, Bool flush)
-{
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030
- return FALSE;
-#else
- DRIDrawablePrivPtr priv = NULL;
- ScreenPtr pScreen;
- DRIScreenPrivPtr pDRIPriv;
-
- if (pDraw->type == DRAWABLE_WINDOW)
-	priv = DRI_DRAWABLE_PRIV_FROM_WINDOW ((WindowPtr)pDraw);
- else if (pDraw->type == DRAWABLE_PIXMAP)
-	priv = DRI_DRAWABLE_PRIV_FROM_PIXMAP ((PixmapPtr)pDraw);
-
- if (priv == NULL)
-	return FALSE;
-
- pScreen = priv->pScreen;
- pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
- if (priv->is_drawing)
- {
-	xp_unlock_window (priv->sid, flush);
-
-	if (pDraw->type == DRAWABLE_WINDOW)
-	{
-	 FreeScratchPixmapHeader (priv->pixmap);
-	 pScreen->SetWindowPixmap ((WindowPtr)pDraw, priv->oldPixmap);
-	}
-
- priv->pixmap = NULL;
-
-	/* If we didn't flush don't forget that we still need to.. */
-	if (flush)
-	 pDRIPriv->drawing = x_list_remove (pDRIPriv->drawing, priv);
-
- priv->is_drawing = FALSE;
- }
- else if (flush)
- {
-	xp_flush_window (priv->sid);
- }
-
- return TRUE;
-#endif /* 10.3 */
-}
-
-/* true iff two Boxes overlap */
-#define EXTENTCHECK(r1,r2) \
- (!( ((r1)->x2 <= (r2)->x1) || \
- ((r1)->x1 >= (r2)->x2) || \
- ((r1)->y2 <= (r2)->y1) || \
- ((r1)->y1 >= (r2)->y2) ) )
-
-Bool
-DRIDamageRegion (DrawablePtr pDraw, RegionPtr pRegion)
-{
-#if MAC_OS_X_VERSION_MAX_ALLOWED < 1030
- return FALSE;
-#else
- DRIDrawablePrivPtr priv = NULL;
- RegionRec clipped;
- BoxPtr b1, b2;
-
- if (pDraw->type == DRAWABLE_WINDOW)
-	priv = DRI_DRAWABLE_PRIV_FROM_WINDOW ((WindowPtr)pDraw);
-
- if (priv == NULL)
-	return FALSE;
-
- /* adapted from RootlessDamageRegion () */
-
- if (pDraw->type == DRAWABLE_WINDOW)
- {
-	WindowPtr pWin = (WindowPtr) pDraw;
-
-	b1 = REGION_EXTENTS (pWin->drawable.pScreen, &pWin->borderClip);
-	b2 = REGION_EXTENTS (pWin->drawable.pScreen, pRegion);
-
-	if (EXTENTCHECK (b1, b2))
-	{
-	 /* Regions may overlap. */
-
-	 if (REGION_NUM_RECTS (pRegion) == 1)
-	 {
-		int in;
-
-		/* Damaged region only has a single rect, so we can
-		 just compare that against the region */
-
-		in = RECT_IN_REGION (pWin->drawable.pScreen, &pWin->borderClip,
-				 REGION_RECTS (pRegion));
-		if (in == rgnIN)
-		{
-		 /* clip totally contains pRegion */
-
-		 xp_mark_window (priv->sid, REGION_NUM_RECTS (pRegion),
-				 REGION_RECTS (pRegion),
-				 -priv->x, -priv->y);
-
-		 RootlessQueueRedisplay (pWin->drawable.pScreen);
-		 goto out;
-		}
-		else if (in == rgnOUT)
-		{
-		 /* clip doesn't contain pRegion */
-
-		 goto out;
-		}
-	 }
-
-	 /* clip overlaps pRegion, need to intersect */
-
-	 REGION_INIT (pWin->drawable.pScreen, &clipped, NullBox, 0);
-	 REGION_INTERSECT (pWin->drawable.pScreen, &clipped,
-			 &pWin->borderClip, pRegion);
-
-	 xp_mark_window (priv->sid, REGION_NUM_RECTS (&clipped),
-			 REGION_RECTS (&clipped), -priv->x, -priv->y);
-
-	 REGION_UNINIT (pWin->drawable.pScreen, &clipped);
-
-	 RootlessQueueRedisplay (pWin->drawable.pScreen);
-	}
- }
-
-out:
- return TRUE;
-#endif /* 10.3 */
-}
-
-void
-DRISynchronizeDrawable (DrawablePtr pDraw, Bool flush)
-{
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
- ScreenPtr pScreen;
- DRIScreenPrivPtr pDRIPriv;
- DRIDrawablePrivPtr priv;
- x_list *node, *copy;
-
- pScreen = pDraw->pScreen;
- pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
- if (pDRIPriv == NULL || pDRIPriv->drawing == NULL)
-	return;
-
- if (pDraw->type == DRAWABLE_WINDOW)
- {
-	WindowPtr pWin = TopLevelParent ((WindowPtr) pDraw);
-
-	/* need to find _any_ window under pWin that is drawing. Scan the
-	 list looking for candidates. */
-
-	copy = x_list_copy (pDRIPriv->drawing);
-
-	for (node = copy; node != NULL; node = node->next)
-	{
-	 priv = node->data;
-
-	 if (priv->pDraw->type == DRAWABLE_WINDOW
-		&& TopLevelParent ((WindowPtr) priv->pDraw) == pWin)
-	 {
-		DRIStopDrawing (priv->pDraw, flush);
-	 }
-	}
-
-	x_list_free (copy);
- }
- else
- {
-	DRIStopDrawing (pDraw, flush);
- }
-#endif /* 10.3 */
-}
-
-void
-DRISynchronize (Bool flush)
-{
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
- int i;
- ScreenPtr pScreen;
- DRIScreenPrivPtr pDRIPriv;
- DRIDrawablePrivPtr priv;
- x_list *node, *copy;
-
- for (i = 0; i < screenInfo.numScreens; i++)
- {
-	pScreen = screenInfo.screensi;
-	pDRIPriv = DRI_SCREEN_PRIV(pScreen);
-
-	if (pDRIPriv == NULL || pDRIPriv->drawing == NULL)
-	 continue;
-
-	copy = x_list_copy (pDRIPriv->drawing);
-
-	for (node = copy; node != NULL; node = node->next)
-	{
-	 priv = node->data;
-
-	 DRIStopDrawing (priv->pDraw, flush);
-	}
-
-	x_list_free (copy);
- }
-#endif /* 10.3 */
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/dri-surface.h Deleted

@@ -1,115 +0,0 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2002 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- * Jens Owen <jens@precisioninsight.com>
- *
- */
-
-/* Prototypes for DRI functions */
-
-#ifndef _DRI_SURFACE_H_
-#define _DRI_SURFACE_H_
-
-#include "dri.h"
-#include "Xplugin.h"
-
-typedef void (*ClipNotifyPtr)( WindowPtr, int, int );
-
-
-/*
- * These functions can be wrapped by the DRI. Each of these have
- * generic default funcs (initialized in DRICreateInfoRec) and can be
- * overridden by the driver in its driverDRIScreenInit function.
- */
-typedef struct {
- WindowExposuresProcPtr WindowExposures;
- CopyWindowProcPtr CopyWindow;
- ValidateTreeProcPtr ValidateTree;
- PostValidateTreeProcPtr PostValidateTree;
- ClipNotifyProcPtr ClipNotify;
-} DRIWrappedFuncsRec, *DRIWrappedFuncsPtr;
-
-typedef struct {
- xp_surface_id id;
- int kind;
-} DRISurfaceNotifyArg;
-
-extern void DRIClipNotify(WindowPtr pWin,
- int dx,
- int dy);
-
-extern void DRICloseScreen(ScreenPtr pScreen);
-
-extern void DRICopyWindow(WindowPtr pWin,
- DDXPointRec ptOldOrg,
- RegionPtr prgnSrc);
-
-extern Bool DRICreateSurface(ScreenPtr pScreen,
-			 Drawable id,
-			 DrawablePtr pDrawable,
-			 xp_client_id client_id,
-			 xp_surface_id *surface_id,
-			 unsigned int key2,
-			 void (*notify) (void *arg, void *data),
-			 void *notify_data);
-
-extern Bool DRIDestroySurface(ScreenPtr pScreen,
-			 Drawable id,
-			 DrawablePtr pDrawable,
-			 void (*notify) (void *arg, void *data),
-			 void *notify_data);
-
-extern Bool DRIDrawablePrivDelete(pointer pResource,
- XID id);
-
-extern DRIWrappedFuncsRec *DRIGetWrappedFuncs(ScreenPtr pScreen);
-
-extern void DRIPostValidateTree(WindowPtr pParent,
- WindowPtr pChild,
- VTKind kind);
-
-extern int DRIValidateTree(WindowPtr pParent,
- WindowPtr pChild,
- VTKind kind);
-
-extern void DRIWindowExposures(WindowPtr pWin,
- RegionPtr prgn,
- RegionPtr bsreg);
-
-extern void DRISurfaceNotify (xp_surface_id id, int kind);
-
-extern Bool DRIStartDrawing (DrawablePtr pDraw);
-extern Bool DRIStopDrawing (DrawablePtr pDraw, Bool flush);
-extern Bool DRIDamageRegion (DrawablePtr pDraw, RegionPtr pRegion);
-extern void DRISynchronizeDrawable (DrawablePtr pDraw, Bool flush);
-extern void DRISynchronize (Bool flush);
-
-#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/dri.h Deleted

@@ -1,64 +0,0 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dri.h,v 1.18 2001/03/21 16:21:40 dawes Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2002 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- * Jens Owen <jens@precisioninsight.com>
- *
- */
-
-/* Prototypes for DRI functions */
-
-#ifndef _DRI_H_
-
-#include "Xdefs.h"
-#include "screenint.h"
-#define _APPLEDRI_SERVER_
-#include "appledri.h"
-
-extern Bool DRIAuthConnection(ScreenPtr pScreen, unsigned int magic);
-
-extern Bool DRIExtensionInit(void);
-
-extern Bool DRIFinishScreenInit(ScreenPtr pScreen);
-
-extern Bool DRIQueryDirectRenderingCapable(ScreenPtr pScreen,
- Bool *isCapable);
-
-extern void DRIQueryVersion(int *majorVersion,
- int *minorVersion,
- int *patchVersion);
-
-extern void DRIReset(void);
-
-extern Bool DRIScreenInit(ScreenPtr pScreen);
-
-#define _DRI_H_
-
-#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/dristruct.h Deleted

@@ -1,91 +0,0 @@
-/* $XFree86: xc/programs/Xserver/GL/dri/dristruct.h,v 1.10 2001/03/21 16:21:40 dawes Exp $ */
-/**************************************************************************
-
-Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.
-Copyright (c) 2002 Apple Computer, Inc.
-All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sub license, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice (including the
-next paragraph) shall be included in all copies or substantial portions
-of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
-IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
-ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-**************************************************************************/
-
-/*
- * Authors:
- * Jens Owen <jens@precisioninsight.com>
- *
- */
-
-#ifndef DRI_STRUCT_H
-#define DRI_STRUCT_H
-
-#include "dri-surface.h"
-#include "x-list.h"
-
-#define DRI_MAX_DRAWABLES 256
-
-#define DRI_DRAWABLE_PRIV_FROM_WINDOW(pWin) \
- ((DRIWindowPrivIndex < 0) ? \
- NULL : \
- ((DRIDrawablePrivPtr)((pWin)->devPrivatesDRIWindowPrivIndex.ptr)))
-
-#define DRI_DRAWABLE_PRIV_FROM_PIXMAP(pPix) \
- ((DRIPixmapPrivIndex < 0) ? \
- NULL : \
- ((DRIDrawablePrivPtr)((pPix)->devPrivatesDRIPixmapPrivIndex.ptr)))
-
-typedef struct _DRIDrawablePrivRec
-{
- xp_surface_id	sid;
- int			drawableIndex;
- DrawablePtr		pDraw;
- ScreenPtr		pScreen;
- int 		refCount;
- unsigned int	key2;
- x_list		*notifiers;	/* list of (FUN . DATA) */
-
- int x, y;				/* relative to physical window */
-
- void *data;
- unsigned int rowbytes;
- PixmapPtr pixmap, oldPixmap;
-
- unsigned int	is_drawing :1;
-} DRIDrawablePrivRec, *DRIDrawablePrivPtr;
-
-#define DRI_SCREEN_PRIV(pScreen) \
- ((DRIScreenPrivIndex < 0) ? \
- NULL : \
- ((DRIScreenPrivPtr)((pScreen)->devPrivatesDRIScreenPrivIndex.ptr)))
-
-#define DRI_SCREEN_PRIV_FROM_INDEX(screenIndex) ((DRIScreenPrivPtr) \
- (screenInfo.screensscreenIndex->devPrivatesDRIScreenPrivIndex.ptr))
-
-
-typedef struct _DRIScreenPrivRec
-{
- Bool		directRenderingSupport;
- int nrWindows;
- DRIWrappedFuncsRec	wrap;
- DrawablePtr		DRIDrawablesDRI_MAX_DRAWABLES;
- x_list		*drawing;	/* list of DRIDrawablePrivPtr */
-} DRIScreenPrivRec, *DRIScreenPrivPtr;
-
-#endif /* DRI_STRUCT_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/events.applescript Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/keysym2ucs.c Deleted

@@ -1,908 +0,0 @@
-/* $XFree86$
- * This module converts keysym values into the corresponding ISO 10646
- * (UCS, Unicode) values.
- *
- * The array keysymtab contains pairs of X11 keysym values for graphical
- * characters and the corresponding Unicode value. The function
- * keysym2ucs() maps a keysym onto a Unicode value using a binary search,
- * therefore keysymtab must remain SORTED by keysym value.
- *
- * The keysym -> UTF-8 conversion will hopefully one day be provided
- * by Xlib via XmbLookupString() and should ideally not have to be
- * done in X applications. But we are not there yet.
- *
- * We allow to represent any UCS character in the range U-00000000 to
- * U-00FFFFFF by a keysym value in the range 0x01000000 to 0x01ffffff.
- * This admittedly does not cover the entire 31-bit space of UCS, but
- * it does cover all of the characters up to U-10FFFF, which can be
- * represented by UTF-16, and more, and it is very unlikely that higher
- * UCS codes will ever be assigned by ISO. So to get Unicode character
- * U+ABCD you can directly use keysym 0x0100abcd.
- *
- * NOTE: The comments in the table below contain the actual character
- * encoded in UTF-8, so for viewing and editing best use an editor in
- * UTF-8 mode.
- *
- * Author: Markus G. Kuhn <mkuhn@acm.org>, University of Cambridge, April 2001
- *
- * Special thanks to Richard Verhoeven <river@win.tue.nl> for preparing
- * an initial draft of the mapping table.
- *
- * This software is in the public domain. Share and enjoy!
- *
- * AUTOMATICALLY GENERATED FILE, DO NOT EDIT !!! (unicode/convmap.pl)
- */
-
-#include "keysym2ucs.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-struct codepair {
- unsigned short keysym;
- unsigned short ucs;
-};
-
-const static struct codepair keysymtab = {
- { 0x01a1, 0x0104 },
- { 0x01a2, 0x02d8 },
- { 0x01a3, 0x0141 },
- { 0x01a5, 0x013d },
- { 0x01a6, 0x015a },
- { 0x01a9, 0x0160 },
- { 0x01aa, 0x015e },
- { 0x01ab, 0x0164 },
- { 0x01ac, 0x0179 },
- { 0x01ae, 0x017d },
- { 0x01af, 0x017b },
- { 0x01b1, 0x0105 },
- { 0x01b2, 0x02db },
- { 0x01b3, 0x0142 },
- { 0x01b5, 0x013e },
- { 0x01b6, 0x015b },
- { 0x01b7, 0x02c7 },
- { 0x01b9, 0x0161 },
- { 0x01ba, 0x015f },
- { 0x01bb, 0x0165 },
- { 0x01bc, 0x017a },
- { 0x01bd, 0x02dd },
- { 0x01be, 0x017e },
- { 0x01bf, 0x017c },
- { 0x01c0, 0x0154 },
- { 0x01c3, 0x0102 },
- { 0x01c5, 0x0139 },
- { 0x01c6, 0x0106 },
- { 0x01c8, 0x010c },
- { 0x01ca, 0x0118 },
- { 0x01cc, 0x011a },
- { 0x01cf, 0x010e },
- { 0x01d0, 0x0110 },
- { 0x01d1, 0x0143 },
- { 0x01d2, 0x0147 },
- { 0x01d5, 0x0150 },
- { 0x01d8, 0x0158 },
- { 0x01d9, 0x016e },
- { 0x01db, 0x0170 },
- { 0x01de, 0x0162 },
- { 0x01e0, 0x0155 },
- { 0x01e3, 0x0103 },
- { 0x01e5, 0x013a },
- { 0x01e6, 0x0107 },
- { 0x01e8, 0x010d },
- { 0x01ea, 0x0119 },
- { 0x01ec, 0x011b },
- { 0x01ef, 0x010f },
- { 0x01f0, 0x0111 },
- { 0x01f1, 0x0144 },
- { 0x01f2, 0x0148 },
- { 0x01f5, 0x0151 },
- { 0x01f8, 0x0159 },
- { 0x01f9, 0x016f },
- { 0x01fb, 0x0171 },
- { 0x01fe, 0x0163 },
- { 0x01ff, 0x02d9 },
- { 0x02a1, 0x0126 },
- { 0x02a6, 0x0124 },
- { 0x02a9, 0x0130 },
- { 0x02ab, 0x011e },
- { 0x02ac, 0x0134 },
- { 0x02b1, 0x0127 },
- { 0x02b6, 0x0125 },
- { 0x02b9, 0x0131 },
- { 0x02bb, 0x011f },
- { 0x02bc, 0x0135 },
- { 0x02c5, 0x010a },
- { 0x02c6, 0x0108 },
- { 0x02d5, 0x0120 },
- { 0x02d8, 0x011c },
- { 0x02dd, 0x016c },
- { 0x02de, 0x015c },
- { 0x02e5, 0x010b },
- { 0x02e6, 0x0109 },
- { 0x02f5, 0x0121 },
- { 0x02f8, 0x011d },
- { 0x02fd, 0x016d },
- { 0x02fe, 0x015d },
- { 0x03a2, 0x0138 },
- { 0x03a3, 0x0156 },
- { 0x03a5, 0x0128 },
- { 0x03a6, 0x013b },
- { 0x03aa, 0x0112 },
- { 0x03ab, 0x0122 },
- { 0x03ac, 0x0166 },
- { 0x03b3, 0x0157 },
- { 0x03b5, 0x0129 },
- { 0x03b6, 0x013c },
- { 0x03ba, 0x0113 },
- { 0x03bb, 0x0123 },
- { 0x03bc, 0x0167 },
- { 0x03bd, 0x014a },
- { 0x03bf, 0x014b },
- { 0x03c0, 0x0100 },
- { 0x03c7, 0x012e },
- { 0x03cc, 0x0116 },
- { 0x03cf, 0x012a },
- { 0x03d1, 0x0145 },
- { 0x03d2, 0x014c },
- { 0x03d3, 0x0136 },
- { 0x03d9, 0x0172 },
- { 0x03dd, 0x0168 },
- { 0x03de, 0x016a },
- { 0x03e0, 0x0101 },
- { 0x03e7, 0x012f },
- { 0x03ec, 0x0117 },
- { 0x03ef, 0x012b },
- { 0x03f1, 0x0146 },
- { 0x03f2, 0x014d },
- { 0x03f3, 0x0137 },
- { 0x03f9, 0x0173 },
- { 0x03fd, 0x0169 },
- { 0x03fe, 0x016b },
- { 0x047e, 0x203e },
- { 0x04a1, 0x3002 },
- { 0x04a2, 0x300c },
- { 0x04a3, 0x300d },
- { 0x04a4, 0x3001 },
- { 0x04a5, 0x30fb },
- { 0x04a6, 0x30f2 },
- { 0x04a7, 0x30a1 },
- { 0x04a8, 0x30a3 },
- { 0x04a9, 0x30a5 },
- { 0x04aa, 0x30a7 },
- { 0x04ab, 0x30a9 },
- { 0x04ac, 0x30e3 },
- { 0x04ad, 0x30e5 },
- { 0x04ae, 0x30e7 },
- { 0x04af, 0x30c3 },
- { 0x04b0, 0x30fc },
- { 0x04b1, 0x30a2 },
- { 0x04b2, 0x30a4 },
- { 0x04b3, 0x30a6 },
- { 0x04b4, 0x30a8 },
- { 0x04b5, 0x30aa },
- { 0x04b6, 0x30ab },
- { 0x04b7, 0x30ad },
- { 0x04b8, 0x30af },
- { 0x04b9, 0x30b1 },
- { 0x04ba, 0x30b3 },
- { 0x04bb, 0x30b5 },
- { 0x04bc, 0x30b7 },
- { 0x04bd, 0x30b9 },
- { 0x04be, 0x30bb },
- { 0x04bf, 0x30bd },
- { 0x04c0, 0x30bf },
- { 0x04c1, 0x30c1 },
- { 0x04c2, 0x30c4 },
- { 0x04c3, 0x30c6 },
- { 0x04c4, 0x30c8 },
- { 0x04c5, 0x30ca },
- { 0x04c6, 0x30cb },
- { 0x04c7, 0x30cc },
- { 0x04c8, 0x30cd },
- { 0x04c9, 0x30ce },
- { 0x04ca, 0x30cf },
- { 0x04cb, 0x30d2 },
- { 0x04cc, 0x30d5 },
- { 0x04cd, 0x30d8 },
- { 0x04ce, 0x30db },
- { 0x04cf, 0x30de },
- { 0x04d0, 0x30df },
- { 0x04d1, 0x30e0 },
- { 0x04d2, 0x30e1 },
- { 0x04d3, 0x30e2 },
- { 0x04d4, 0x30e4 },
- { 0x04d5, 0x30e6 },
- { 0x04d6, 0x30e8 },
- { 0x04d7, 0x30e9 },
- { 0x04d8, 0x30ea },
- { 0x04d9, 0x30eb },
- { 0x04da, 0x30ec },
- { 0x04db, 0x30ed },
- { 0x04dc, 0x30ef },
- { 0x04dd, 0x30f3 },
- { 0x04de, 0x309b },
- { 0x04df, 0x309c },
- { 0x05ac, 0x060c },
- { 0x05bb, 0x061b },
- { 0x05bf, 0x061f },
- { 0x05c1, 0x0621 },
- { 0x05c2, 0x0622 },
- { 0x05c3, 0x0623 },
- { 0x05c4, 0x0624 },
- { 0x05c5, 0x0625 },
- { 0x05c6, 0x0626 },
- { 0x05c7, 0x0627 },
- { 0x05c8, 0x0628 },
- { 0x05c9, 0x0629 },
- { 0x05ca, 0x062a },
- { 0x05cb, 0x062b },
- { 0x05cc, 0x062c },
- { 0x05cd, 0x062d },
- { 0x05ce, 0x062e },
- { 0x05cf, 0x062f },
- { 0x05d0, 0x0630 },
- { 0x05d1, 0x0631 },
- { 0x05d2, 0x0632 },
- { 0x05d3, 0x0633 },
- { 0x05d4, 0x0634 },
- { 0x05d5, 0x0635 },
- { 0x05d6, 0x0636 },
- { 0x05d7, 0x0637 },
- { 0x05d8, 0x0638 },
- { 0x05d9, 0x0639 },
- { 0x05da, 0x063a },
- { 0x05e0, 0x0640 },
- { 0x05e1, 0x0641 },
- { 0x05e2, 0x0642 },
- { 0x05e3, 0x0643 },
- { 0x05e4, 0x0644 },
- { 0x05e5, 0x0645 },
- { 0x05e6, 0x0646 },
- { 0x05e7, 0x0647 },
- { 0x05e8, 0x0648 },
- { 0x05e9, 0x0649 },
- { 0x05ea, 0x064a },
- { 0x05eb, 0x064b },
- { 0x05ec, 0x064c },
- { 0x05ed, 0x064d },
- { 0x05ee, 0x064e },
- { 0x05ef, 0x064f },
- { 0x05f0, 0x0650 },
- { 0x05f1, 0x0651 },
- { 0x05f2, 0x0652 },
- { 0x06a1, 0x0452 },
- { 0x06a2, 0x0453 },
- { 0x06a3, 0x0451 },
- { 0x06a4, 0x0454 },
- { 0x06a5, 0x0455 },
- { 0x06a6, 0x0456 },
- { 0x06a7, 0x0457 },
- { 0x06a8, 0x0458 },
- { 0x06a9, 0x0459 },
- { 0x06aa, 0x045a },
- { 0x06ab, 0x045b },
- { 0x06ac, 0x045c },
- { 0x06ae, 0x045e },
- { 0x06af, 0x045f },
- { 0x06b0, 0x2116 },
- { 0x06b1, 0x0402 },
- { 0x06b2, 0x0403 },
- { 0x06b3, 0x0401 },
- { 0x06b4, 0x0404 },
- { 0x06b5, 0x0405 },
- { 0x06b6, 0x0406 },
- { 0x06b7, 0x0407 },
- { 0x06b8, 0x0408 },
- { 0x06b9, 0x0409 },
- { 0x06ba, 0x040a },
- { 0x06bb, 0x040b },
- { 0x06bc, 0x040c },
- { 0x06be, 0x040e },
- { 0x06bf, 0x040f },
- { 0x06c0, 0x044e },
- { 0x06c1, 0x0430 },
- { 0x06c2, 0x0431 },
- { 0x06c3, 0x0446 },
- { 0x06c4, 0x0434 },
- { 0x06c5, 0x0435 },
- { 0x06c6, 0x0444 },
- { 0x06c7, 0x0433 },
- { 0x06c8, 0x0445 },
- { 0x06c9, 0x0438 },
- { 0x06ca, 0x0439 },
- { 0x06cb, 0x043a },
- { 0x06cc, 0x043b },
- { 0x06cd, 0x043c },
- { 0x06ce, 0x043d },
- { 0x06cf, 0x043e },
- { 0x06d0, 0x043f },
- { 0x06d1, 0x044f },
- { 0x06d2, 0x0440 },
- { 0x06d3, 0x0441 },
- { 0x06d4, 0x0442 },
- { 0x06d5, 0x0443 },
- { 0x06d6, 0x0436 },
- { 0x06d7, 0x0432 },
- { 0x06d8, 0x044c },
- { 0x06d9, 0x044b },
- { 0x06da, 0x0437 },
- { 0x06db, 0x0448 },
- { 0x06dc, 0x044d },
- { 0x06dd, 0x0449 },
- { 0x06de, 0x0447 },
- { 0x06df, 0x044a },
- { 0x06e0, 0x042e },
- { 0x06e1, 0x0410 },
- { 0x06e2, 0x0411 },
- { 0x06e3, 0x0426 },
- { 0x06e4, 0x0414 },
- { 0x06e5, 0x0415 },
- { 0x06e6, 0x0424 },
- { 0x06e7, 0x0413 },
- { 0x06e8, 0x0425 },
- { 0x06e9, 0x0418 },
- { 0x06ea, 0x0419 },
- { 0x06eb, 0x041a },
- { 0x06ec, 0x041b },
- { 0x06ed, 0x041c },
- { 0x06ee, 0x041d },
- { 0x06ef, 0x041e },
- { 0x06f0, 0x041f },
- { 0x06f1, 0x042f },
- { 0x06f2, 0x0420 },
- { 0x06f3, 0x0421 },
- { 0x06f4, 0x0422 },
- { 0x06f5, 0x0423 },
- { 0x06f6, 0x0416 },
- { 0x06f7, 0x0412 },
- { 0x06f8, 0x042c },
- { 0x06f9, 0x042b },
- { 0x06fa, 0x0417 },
- { 0x06fb, 0x0428 },
- { 0x06fc, 0x042d },
- { 0x06fd, 0x0429 },
- { 0x06fe, 0x0427 },
- { 0x06ff, 0x042a },
- { 0x07a1, 0x0386 },
- { 0x07a2, 0x0388 },
- { 0x07a3, 0x0389 },
- { 0x07a4, 0x038a },
- { 0x07a5, 0x03aa },
- { 0x07a7, 0x038c },
- { 0x07a8, 0x038e },
- { 0x07a9, 0x03ab },
- { 0x07ab, 0x038f },
- { 0x07ae, 0x0385 },
- { 0x07af, 0x2015 },
- { 0x07b1, 0x03ac },
- { 0x07b2, 0x03ad },
- { 0x07b3, 0x03ae },
- { 0x07b4, 0x03af },
- { 0x07b5, 0x03ca },
- { 0x07b6, 0x0390 },
- { 0x07b7, 0x03cc },
- { 0x07b8, 0x03cd },
- { 0x07b9, 0x03cb },
- { 0x07ba, 0x03b0 },
- { 0x07bb, 0x03ce },
- { 0x07c1, 0x0391 },
- { 0x07c2, 0x0392 },
- { 0x07c3, 0x0393 },
- { 0x07c4, 0x0394 },
- { 0x07c5, 0x0395 },
- { 0x07c6, 0x0396 },
- { 0x07c7, 0x0397 },
- { 0x07c8, 0x0398 },
- { 0x07c9, 0x0399 },
- { 0x07ca, 0x039a },
- { 0x07cb, 0x039b },
- { 0x07cc, 0x039c },
- { 0x07cd, 0x039d },
- { 0x07ce, 0x039e },
- { 0x07cf, 0x039f },
- { 0x07d0, 0x03a0 },
- { 0x07d1, 0x03a1 },
- { 0x07d2, 0x03a3 },
- { 0x07d4, 0x03a4 },
- { 0x07d5, 0x03a5 },
- { 0x07d6, 0x03a6 },
- { 0x07d7, 0x03a7 },
- { 0x07d8, 0x03a8 },
- { 0x07d9, 0x03a9 },
- { 0x07e1, 0x03b1 },
- { 0x07e2, 0x03b2 },
- { 0x07e3, 0x03b3 },
- { 0x07e4, 0x03b4 },
- { 0x07e5, 0x03b5 },
- { 0x07e6, 0x03b6 },
- { 0x07e7, 0x03b7 },
- { 0x07e8, 0x03b8 },
- { 0x07e9, 0x03b9 },
- { 0x07ea, 0x03ba },
- { 0x07eb, 0x03bb },
- { 0x07ec, 0x03bc },
- { 0x07ed, 0x03bd },
- { 0x07ee, 0x03be },
- { 0x07ef, 0x03bf },
- { 0x07f0, 0x03c0 },
- { 0x07f1, 0x03c1 },
- { 0x07f2, 0x03c3 },
- { 0x07f3, 0x03c2 },
- { 0x07f4, 0x03c4 },
- { 0x07f5, 0x03c5 },
- { 0x07f6, 0x03c6 },
- { 0x07f7, 0x03c7 },
- { 0x07f8, 0x03c8 },
- { 0x07f9, 0x03c9 },
- { 0x08a1, 0x23b7 },
- { 0x08a2, 0x250c },
- { 0x08a3, 0x2500 },
- { 0x08a4, 0x2320 },
- { 0x08a5, 0x2321 },
- { 0x08a6, 0x2502 },
- { 0x08a7, 0x23a1 },
- { 0x08a8, 0x23a3 },
- { 0x08a9, 0x23a4 },
- { 0x08aa, 0x23a6 },
- { 0x08ab, 0x239b },
- { 0x08ac, 0x239d },
- { 0x08ad, 0x239e },
- { 0x08ae, 0x23a0 },
- { 0x08af, 0x23a8 },
- { 0x08b0, 0x23ac },
- { 0x08bc, 0x2264 },
- { 0x08bd, 0x2260 },
- { 0x08be, 0x2265 },
- { 0x08bf, 0x222b },
- { 0x08c0, 0x2234 },
- { 0x08c1, 0x221d },
- { 0x08c2, 0x221e },
- { 0x08c5, 0x2207 },
- { 0x08c8, 0x223c },
- { 0x08c9, 0x2243 },
- { 0x08cd, 0x21d4 },
- { 0x08ce, 0x21d2 },
- { 0x08cf, 0x2261 },
- { 0x08d6, 0x221a },
- { 0x08da, 0x2282 },
- { 0x08db, 0x2283 },
- { 0x08dc, 0x2229 },
- { 0x08dd, 0x222a },
- { 0x08de, 0x2227 },
- { 0x08df, 0x2228 },
- { 0x08ef, 0x2202 },
- { 0x08f6, 0x0192 },
- { 0x08fb, 0x2190 },
- { 0x08fc, 0x2191 },
- { 0x08fd, 0x2192 },
- { 0x08fe, 0x2193 },
- { 0x09e0, 0x25c6 },
- { 0x09e1, 0x2592 },
- { 0x09e2, 0x2409 },
- { 0x09e3, 0x240c },
- { 0x09e4, 0x240d },
- { 0x09e5, 0x240a },
- { 0x09e8, 0x2424 },
- { 0x09e9, 0x240b },
- { 0x09ea, 0x2518 },
- { 0x09eb, 0x2510 },
- { 0x09ec, 0x250c },
- { 0x09ed, 0x2514 },
- { 0x09ee, 0x253c },
- { 0x09ef, 0x23ba },
- { 0x09f0, 0x23bb },
- { 0x09f1, 0x2500 },
- { 0x09f2, 0x23bc },
- { 0x09f3, 0x23bd },
- { 0x09f4, 0x251c },
- { 0x09f5, 0x2524 },
- { 0x09f6, 0x2534 },
- { 0x09f7, 0x252c },
- { 0x09f8, 0x2502 },
- { 0x0aa1, 0x2003 },
- { 0x0aa2, 0x2002 },
- { 0x0aa3, 0x2004 },
- { 0x0aa4, 0x2005 },
- { 0x0aa5, 0x2007 },
- { 0x0aa6, 0x2008 },
- { 0x0aa7, 0x2009 },
- { 0x0aa8, 0x200a },
- { 0x0aa9, 0x2014 },
- { 0x0aaa, 0x2013 },
- { 0x0aae, 0x2026 },
- { 0x0aaf, 0x2025 },
- { 0x0ab0, 0x2153 },
- { 0x0ab1, 0x2154 },
- { 0x0ab2, 0x2155 },
- { 0x0ab3, 0x2156 },
- { 0x0ab4, 0x2157 },
- { 0x0ab5, 0x2158 },
- { 0x0ab6, 0x2159 },
- { 0x0ab7, 0x215a },
- { 0x0ab8, 0x2105 },
- { 0x0abb, 0x2012 },
- { 0x0abc, 0x2329 },
- { 0x0abe, 0x232a },
- { 0x0ac3, 0x215b },
- { 0x0ac4, 0x215c },
- { 0x0ac5, 0x215d },
- { 0x0ac6, 0x215e },
- { 0x0ac9, 0x2122 },
- { 0x0aca, 0x2613 },
- { 0x0acc, 0x25c1 },
- { 0x0acd, 0x25b7 },
- { 0x0ace, 0x25cb },
- { 0x0acf, 0x25af },
- { 0x0ad0, 0x2018 },
- { 0x0ad1, 0x2019 },
- { 0x0ad2, 0x201c },
- { 0x0ad3, 0x201d },
- { 0x0ad4, 0x211e },
- { 0x0ad6, 0x2032 },
- { 0x0ad7, 0x2033 },
- { 0x0ad9, 0x271d },
- { 0x0adb, 0x25ac },
- { 0x0adc, 0x25c0 },
- { 0x0add, 0x25b6 },
- { 0x0ade, 0x25cf },
- { 0x0adf, 0x25ae },
- { 0x0ae0, 0x25e6 },
- { 0x0ae1, 0x25ab },
- { 0x0ae2, 0x25ad },
- { 0x0ae3, 0x25b3 },
- { 0x0ae4, 0x25bd },
- { 0x0ae5, 0x2606 },
- { 0x0ae6, 0x2022 },
- { 0x0ae7, 0x25aa },
- { 0x0ae8, 0x25b2 },
- { 0x0ae9, 0x25bc },
- { 0x0aea, 0x261c },
- { 0x0aeb, 0x261e },
- { 0x0aec, 0x2663 },
- { 0x0aed, 0x2666 },
- { 0x0aee, 0x2665 },
- { 0x0af0, 0x2720 },
- { 0x0af1, 0x2020 },
- { 0x0af2, 0x2021 },
- { 0x0af3, 0x2713 },
- { 0x0af4, 0x2717 },
- { 0x0af5, 0x266f },
- { 0x0af6, 0x266d },
- { 0x0af7, 0x2642 },
- { 0x0af8, 0x2640 },
- { 0x0af9, 0x260e },
- { 0x0afa, 0x2315 },
- { 0x0afb, 0x2117 },
- { 0x0afc, 0x2038 },
- { 0x0afd, 0x201a },
- { 0x0afe, 0x201e },
- { 0x0ba3, 0x003c },
- { 0x0ba6, 0x003e },
- { 0x0ba8, 0x2228 },
- { 0x0ba9, 0x2227 },
- { 0x0bc0, 0x00af },
- { 0x0bc2, 0x22a5 },
- { 0x0bc3, 0x2229 },
- { 0x0bc4, 0x230a },
- { 0x0bc6, 0x005f },
- { 0x0bca, 0x2218 },
- { 0x0bcc, 0x2395 },
- { 0x0bce, 0x22a4 },
- { 0x0bcf, 0x25cb },
- { 0x0bd3, 0x2308 },
- { 0x0bd6, 0x222a },
- { 0x0bd8, 0x2283 },
- { 0x0bda, 0x2282 },
- { 0x0bdc, 0x22a2 },
- { 0x0bfc, 0x22a3 },
- { 0x0cdf, 0x2017 },
- { 0x0ce0, 0x05d0 },
- { 0x0ce1, 0x05d1 },
- { 0x0ce2, 0x05d2 },
- { 0x0ce3, 0x05d3 },
- { 0x0ce4, 0x05d4 },
- { 0x0ce5, 0x05d5 },
- { 0x0ce6, 0x05d6 },
- { 0x0ce7, 0x05d7 },
- { 0x0ce8, 0x05d8 },
- { 0x0ce9, 0x05d9 },
- { 0x0cea, 0x05da },
- { 0x0ceb, 0x05db },
- { 0x0cec, 0x05dc },
- { 0x0ced, 0x05dd },
- { 0x0cee, 0x05de },
- { 0x0cef, 0x05df },
- { 0x0cf0, 0x05e0 },
- { 0x0cf1, 0x05e1 },
- { 0x0cf2, 0x05e2 },
- { 0x0cf3, 0x05e3 },
- { 0x0cf4, 0x05e4 },
- { 0x0cf5, 0x05e5 },
- { 0x0cf6, 0x05e6 },
- { 0x0cf7, 0x05e7 },
- { 0x0cf8, 0x05e8 },
- { 0x0cf9, 0x05e9 },
- { 0x0cfa, 0x05ea },
- { 0x0da1, 0x0e01 },
- { 0x0da2, 0x0e02 },
- { 0x0da3, 0x0e03 },
- { 0x0da4, 0x0e04 },
- { 0x0da5, 0x0e05 },
- { 0x0da6, 0x0e06 },
- { 0x0da7, 0x0e07 },
- { 0x0da8, 0x0e08 },
- { 0x0da9, 0x0e09 },
- { 0x0daa, 0x0e0a },
- { 0x0dab, 0x0e0b },
- { 0x0dac, 0x0e0c },
- { 0x0dad, 0x0e0d },
- { 0x0dae, 0x0e0e },
- { 0x0daf, 0x0e0f },
- { 0x0db0, 0x0e10 },
- { 0x0db1, 0x0e11 },
- { 0x0db2, 0x0e12 },
- { 0x0db3, 0x0e13 },
- { 0x0db4, 0x0e14 },
- { 0x0db5, 0x0e15 },
- { 0x0db6, 0x0e16 },
- { 0x0db7, 0x0e17 },
- { 0x0db8, 0x0e18 },
- { 0x0db9, 0x0e19 },
- { 0x0dba, 0x0e1a },
- { 0x0dbb, 0x0e1b },
- { 0x0dbc, 0x0e1c },
- { 0x0dbd, 0x0e1d },
- { 0x0dbe, 0x0e1e },
- { 0x0dbf, 0x0e1f },
- { 0x0dc0, 0x0e20 },
- { 0x0dc1, 0x0e21 },
- { 0x0dc2, 0x0e22 },
- { 0x0dc3, 0x0e23 },
- { 0x0dc4, 0x0e24 },
- { 0x0dc5, 0x0e25 },
- { 0x0dc6, 0x0e26 },
- { 0x0dc7, 0x0e27 },
- { 0x0dc8, 0x0e28 },
- { 0x0dc9, 0x0e29 },
- { 0x0dca, 0x0e2a },
- { 0x0dcb, 0x0e2b },
- { 0x0dcc, 0x0e2c },
- { 0x0dcd, 0x0e2d },
- { 0x0dce, 0x0e2e },
- { 0x0dcf, 0x0e2f },
- { 0x0dd0, 0x0e30 },
- { 0x0dd1, 0x0e31 },
- { 0x0dd2, 0x0e32 },
- { 0x0dd3, 0x0e33 },
- { 0x0dd4, 0x0e34 },
- { 0x0dd5, 0x0e35 },
- { 0x0dd6, 0x0e36 },
- { 0x0dd7, 0x0e37 },
- { 0x0dd8, 0x0e38 },
- { 0x0dd9, 0x0e39 },
- { 0x0dda, 0x0e3a },
- { 0x0ddf, 0x0e3f },
- { 0x0de0, 0x0e40 },
- { 0x0de1, 0x0e41 },
- { 0x0de2, 0x0e42 },
- { 0x0de3, 0x0e43 },
- { 0x0de4, 0x0e44 },
- { 0x0de5, 0x0e45 },
- { 0x0de6, 0x0e46 },
- { 0x0de7, 0x0e47 },
- { 0x0de8, 0x0e48 },
- { 0x0de9, 0x0e49 },
- { 0x0dea, 0x0e4a },
- { 0x0deb, 0x0e4b },
- { 0x0dec, 0x0e4c },
- { 0x0ded, 0x0e4d },
- { 0x0df0, 0x0e50 },
- { 0x0df1, 0x0e51 },
- { 0x0df2, 0x0e52 },
- { 0x0df3, 0x0e53 },
- { 0x0df4, 0x0e54 },
- { 0x0df5, 0x0e55 },
- { 0x0df6, 0x0e56 },
- { 0x0df7, 0x0e57 },
- { 0x0df8, 0x0e58 },
- { 0x0df9, 0x0e59 },
- { 0x0ea1, 0x3131 },
- { 0x0ea2, 0x3132 },
- { 0x0ea3, 0x3133 },
- { 0x0ea4, 0x3134 },
- { 0x0ea5, 0x3135 },
- { 0x0ea6, 0x3136 },
- { 0x0ea7, 0x3137 },
- { 0x0ea8, 0x3138 },
- { 0x0ea9, 0x3139 },
- { 0x0eaa, 0x313a },
- { 0x0eab, 0x313b },
- { 0x0eac, 0x313c },
- { 0x0ead, 0x313d },
- { 0x0eae, 0x313e },
- { 0x0eaf, 0x313f },
- { 0x0eb0, 0x3140 },
- { 0x0eb1, 0x3141 },
- { 0x0eb2, 0x3142 },
- { 0x0eb3, 0x3143 },
- { 0x0eb4, 0x3144 },
- { 0x0eb5, 0x3145 },
- { 0x0eb6, 0x3146 },
- { 0x0eb7, 0x3147 },
- { 0x0eb8, 0x3148 },
- { 0x0eb9, 0x3149 },
- { 0x0eba, 0x314a },
- { 0x0ebb, 0x314b },
- { 0x0ebc, 0x314c },
- { 0x0ebd, 0x314d },
- { 0x0ebe, 0x314e },
- { 0x0ebf, 0x314f },
- { 0x0ec0, 0x3150 },
- { 0x0ec1, 0x3151 },
- { 0x0ec2, 0x3152 },
- { 0x0ec3, 0x3153 },
- { 0x0ec4, 0x3154 },
- { 0x0ec5, 0x3155 },
- { 0x0ec6, 0x3156 },
- { 0x0ec7, 0x3157 },
- { 0x0ec8, 0x3158 },
- { 0x0ec9, 0x3159 },
- { 0x0eca, 0x315a },
- { 0x0ecb, 0x315b },
- { 0x0ecc, 0x315c },
- { 0x0ecd, 0x315d },
- { 0x0ece, 0x315e },
- { 0x0ecf, 0x315f },
- { 0x0ed0, 0x3160 },
- { 0x0ed1, 0x3161 },
- { 0x0ed2, 0x3162 },
- { 0x0ed3, 0x3163 },
- { 0x0ed4, 0x11a8 },
- { 0x0ed5, 0x11a9 },
- { 0x0ed6, 0x11aa },
- { 0x0ed7, 0x11ab },
- { 0x0ed8, 0x11ac },
- { 0x0ed9, 0x11ad },
- { 0x0eda, 0x11ae },
- { 0x0edb, 0x11af },
- { 0x0edc, 0x11b0 },
- { 0x0edd, 0x11b1 },
- { 0x0ede, 0x11b2 },
- { 0x0edf, 0x11b3 },
- { 0x0ee0, 0x11b4 },
- { 0x0ee1, 0x11b5 },
- { 0x0ee2, 0x11b6 },
- { 0x0ee3, 0x11b7 },
- { 0x0ee4, 0x11b8 },
- { 0x0ee5, 0x11b9 },
- { 0x0ee6, 0x11ba },
- { 0x0ee7, 0x11bb },
- { 0x0ee8, 0x11bc },
- { 0x0ee9, 0x11bd },
- { 0x0eea, 0x11be },
- { 0x0eeb, 0x11bf },
- { 0x0eec, 0x11c0 },
- { 0x0eed, 0x11c1 },
- { 0x0eee, 0x11c2 },
- { 0x0eef, 0x316d },
- { 0x0ef0, 0x3171 },
- { 0x0ef1, 0x3178 },
- { 0x0ef2, 0x317f },
- { 0x0ef3, 0x3181 },
- { 0x0ef4, 0x3184 },
- { 0x0ef5, 0x3186 },
- { 0x0ef6, 0x318d },
- { 0x0ef7, 0x318e },
- { 0x0ef8, 0x11eb },
- { 0x0ef9, 0x11f0 },
- { 0x0efa, 0x11f9 },
- { 0x0eff, 0x20a9 },
-#if 0
- /* FIXME: there is no keysym 0x13a4? But 0x20ac is EuroSign in both
- keysym and Unicode */
- { 0x13a4, 0x20ac },
-#endif
- { 0x13bc, 0x0152 },
- { 0x13bd, 0x0153 },
- { 0x13be, 0x0178 },
- { 0x20ac, 0x20ac },
-
- /* Special function keys. */
-
- { 0xff08, 0x0008 },			/* XK_BackSpace */
- { 0xff09, 0x0009 },			/* XK_Tab */
- { 0xff0a, 0x000a },			/* XK_Linefeed */
- { 0xff0d, 0x000d },			/* XK_Return */
- { 0xff13, 0x0013 },			/* XK_Pause */
- { 0xff1b, 0x001b },			/* XK_Escape */
- { 0xff50, 0x0001 },			/* XK_Home */
- { 0xff51, 0x001c },			/* XK_Left */
- { 0xff52, 0x001e },			/* XK_Up */
- { 0xff53, 0x001d },			/* XK_Right */
- { 0xff54, 0x001f },			/* XK_Down */
- { 0xff55, 0x000b },			/* XK_Prior */
- { 0xff56, 0x000c },			/* XK_Next */
- { 0xff57, 0x0004 },			/* XK_End */
- { 0xff6a, 0x0005 },			/* XK_Help */
- { 0xffff, 0x007f },			/* XK_Delete */
-};
-
-long keysym2ucs(int keysym)
-{
- int min = 0;
- int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
- int mid;
-
- /* first check for Latin-1 characters (1:1 mapping) */
- if ((keysym >= 0x0020 && keysym <= 0x007e) ||
- (keysym >= 0x00a0 && keysym <= 0x00ff))
- return keysym;
-
- /* also check for directly encoded 24-bit UCS characters */
- if ((keysym & 0xff000000) == 0x01000000)
-	return keysym & 0x00ffffff;
-
- /* binary search in table */
- while (max >= min) {
-	mid = (min + max) / 2;
-	if (keysymtabmid.keysym < keysym)
-	 min = mid + 1;
-	else if (keysymtabmid.keysym > keysym)
-	 max = mid - 1;
-	else {
-	 /* found it */
-	 return keysymtabmid.ucs;
-	}
- }
-
- /* no matching Unicode value found */
- return -1;
-}
-
-static int reverse_compare (const void *a, const void *b)
-{
- const struct codepair *ca = a, *cb = b;
-
- return ca->ucs - cb->ucs;
-}
-
-int ucs2keysym(long ucs)
-{
- static struct codepair *reverse_keysymtab;
-
- int min = 0;
- int max = sizeof(keysymtab) / sizeof(struct codepair) - 1;
- int mid;
-
- if (reverse_keysymtab == NULL)
- {
-	reverse_keysymtab = malloc (sizeof (keysymtab));
-	memcpy (reverse_keysymtab, keysymtab, sizeof (keysymtab));
-
-	qsort (reverse_keysymtab,
-	 sizeof (keysymtab) / sizeof (struct codepair),
-	 sizeof (struct codepair),
-	 reverse_compare);
- }
-
- /* first check for Latin-1 characters (1:1 mapping) */
- if ((ucs >= 0x0020 && ucs <= 0x007e) ||
- (ucs >= 0x00a0 && ucs <= 0x00ff))
- return ucs;
-
- /* binary search in table */
- while (max >= min) {
-	mid = (min + max) / 2;
-	if (reverse_keysymtabmid.ucs < ucs)
-	 min = mid + 1;
-	else if (reverse_keysymtabmid.ucs > ucs)
-	 max = mid - 1;
-	else {
-	 /* found it */
-	 return reverse_keysymtabmid.keysym;
-	}
- }
-
- /* finally, assume a directly encoded 24-bit UCS character */
- return ucs | 0x01000000;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/keysym2ucs.h Deleted

@@ -1,36 +0,0 @@
-/* $XFree86$
- * This module converts keysym values into the corresponding ISO 10646
- * (UCS, Unicode) values.
- *
- * The array keysymtab contains pairs of X11 keysym values for graphical
- * characters and the corresponding Unicode value. The function
- * keysym2ucs() maps a keysym onto a Unicode value using a binary search,
- * therefore keysymtab must remain SORTED by keysym value.
- *
- * The keysym -> UTF-8 conversion will hopefully one day be provided
- * by Xlib via XmbLookupString() and should ideally not have to be
- * done in X applications. But we are not there yet.
- *
- * We allow to represent any UCS character in the range U-00000000 to
- * U-00FFFFFF by a keysym value in the range 0x01000000 to 0x01ffffff.
- * This admittedly does not cover the entire 31-bit space of UCS, but
- * it does cover all of the characters up to U-10FFFF, which can be
- * represented by UTF-16, and more, and it is very unlikely that higher
- * UCS codes will ever be assigned by ISO. So to get Unicode character
- * U+ABCD you can directly use keysym 0x0100abcd.
- *
- * Author: Markus G. Kuhn <mkuhn@acm.org>, University of Cambridge, April 2001
- *
- * Special thanks to Richard Verhoeven <river@win.tue.nl> for preparing
- * an initial draft of the mapping table.
- *
- * This software is in the public domain. Share and enjoy!
- */
-
-#ifndef KEYSYM2UCS_H
-#define KEYSYM2UCS_H 1
-
-extern long keysym2ucs(int keysym);
-extern int ucs2keysym(long ucs);
-
-#endif /* KEYSYM2UCS_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/pseudoramiX.c Deleted

@@ -1,426 +0,0 @@
-/*
- * Minimal implementation of PanoramiX/Xinerama
- *
- * This is used in rootless mode where the underlying window server
- * already provides an abstracted view of multiple screens as one
- * large screen area.
- *
- * This code is largely based on panoramiX.c, which contains the
- * following copyright notice:
- */
-/*****************************************************************
-Copyright (c) 1991, 1997 Digital Equipment Corporation, Maynard, Massachusetts.
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-DIGITAL EQUIPMENT CORPORATION BE LIABLE FOR ANY CLAIM, DAMAGES, INCLUDING,
-BUT NOT LIMITED TO CONSEQUENTIAL OR INCIDENTAL DAMAGES, OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of Digital Equipment Corporation
-shall not be used in advertising or otherwise to promote the sale, use or other
-dealings in this Software without prior written authorization from Digital
-Equipment Corporation.
-******************************************************************/
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/pseudoramiX.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
-
-#include "pseudoramiX.h"
-
-#include "extnsionst.h"
-#include "dixstruct.h"
-#include "window.h"
-#include "panoramiXproto.h"
-#include "globals.h"
-
-extern int ProcPanoramiXQueryVersion (ClientPtr client);
-
-static void PseudoramiXResetProc(ExtensionEntry *extEntry);
-
-static int ProcPseudoramiXQueryVersion(ClientPtr client);
-static int ProcPseudoramiXGetState(ClientPtr client);
-static int ProcPseudoramiXGetScreenCount(ClientPtr client);
-static int ProcPseudoramiXGetScreenSize(ClientPtr client);
-static int ProcPseudoramiXIsActive(ClientPtr client);
-static int ProcPseudoramiXQueryScreens(ClientPtr client);
-static int ProcPseudoramiXDispatch(ClientPtr client);
-
-static int SProcPseudoramiXQueryVersion(ClientPtr client);
-static int SProcPseudoramiXGetState(ClientPtr client);
-static int SProcPseudoramiXGetScreenCount(ClientPtr client);
-static int SProcPseudoramiXGetScreenSize(ClientPtr client);
-static int SProcPseudoramiXIsActive(ClientPtr client);
-static int SProcPseudoramiXQueryScreens(ClientPtr client);
-static int SProcPseudoramiXDispatch(ClientPtr client);
-
-
-typedef struct {
- int x;
- int y;
- int w;
- int h;
-} PseudoramiXScreenRec;
-
-static PseudoramiXScreenRec *pseudoramiXScreens = NULL;
-static int pseudoramiXScreensAllocated = 0;
-static int pseudoramiXNumScreens = 0;
-static int pseudoramiXGeneration = -1;
-
-
-// Add a PseudoramiX screen.
-// The rest of the X server will know nothing about this screen.
-// Can be called before or after extension init.
-// Screens must be re-added once per generation.
-void
-PseudoramiXAddScreen(int x, int y, int w, int h)
-{
- PseudoramiXScreenRec *s;
-
- if (noPseudoramiXExtension) return;
-
- if (pseudoramiXNumScreens == pseudoramiXScreensAllocated) {
- pseudoramiXScreensAllocated += pseudoramiXScreensAllocated + 1;
- pseudoramiXScreens = xrealloc(pseudoramiXScreens,
- pseudoramiXScreensAllocated *
- sizeof(PseudoramiXScreenRec));
- }
-
- s = &pseudoramiXScreenspseudoramiXNumScreens++;
- s->x = x;
- s->y = y;
- s->w = w;
- s->h = h;
-}
-
-
-// Initialize PseudoramiX.
-// Copied from PanoramiXExtensionInit
-void PseudoramiXExtensionInit(int argc, char *argv)
-{
- Bool	 	success = FALSE;
- ExtensionEntry 	*extEntry;
-
- if (noPseudoramiXExtension) return;
-
-#if 0
- if (pseudoramiXNumScreens == 1) {
- // Only one screen - disable Xinerama extension.
- noPseudoramiXExtension = TRUE;
- return;
- }
-#endif
-
- // The server must not run the PanoramiX operations.
- noPanoramiXExtension = TRUE;
-
- if (pseudoramiXGeneration != serverGeneration) {
- extEntry = AddExtension(PANORAMIX_PROTOCOL_NAME, 0, 0,
- ProcPseudoramiXDispatch,
- SProcPseudoramiXDispatch,
- PseudoramiXResetProc,
- StandardMinorOpcode);
- if (!extEntry) {
- ErrorF("PseudoramiXExtensionInit(): AddExtension failed\n");
- } else {
- pseudoramiXGeneration = serverGeneration;
- success = TRUE;
- }
- }
-
- if (!success) {
- ErrorF("%s Extension (PseudoramiX) failed to initialize\n",
- PANORAMIX_PROTOCOL_NAME);
- return;
- }
-}
-
-
-static void PseudoramiXResetProc(ExtensionEntry *extEntry)
-{
- pseudoramiXNumScreens = 0;
-}
-
-void PseudoramiXResetScreens (void)
-{
- pseudoramiXNumScreens = 0;
-}
-
-// was PanoramiX
-static int ProcPseudoramiXQueryVersion(ClientPtr client)
-{
- return ProcPanoramiXQueryVersion(client);
-}
-
-
-// was PanoramiX
-static int ProcPseudoramiXGetState(ClientPtr client)
-{
- REQUEST(xPanoramiXGetStateReq);
- WindowPtr pWin;
- xPanoramiXGetStateReply rep;
- register int n;
-
- REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
- pWin = LookupWindow (stuff->window, client);
- if (!pWin)
- return BadWindow;
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- rep.state = !noPseudoramiXExtension;
- if (client->swapped) {
- swaps (&rep.sequenceNumber, n);
- swapl (&rep.length, n);
- swaps (&rep.state, n);
- }
- WriteToClient (client, sizeof (xPanoramiXGetStateReply), (char *) &rep);
- return client->noClientException;
-}
-
-
-// was PanoramiX
-static int ProcPseudoramiXGetScreenCount(ClientPtr client)
-{
- REQUEST(xPanoramiXGetScreenCountReq);
- WindowPtr pWin;
- xPanoramiXGetScreenCountReply rep;
- register int n;
-
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
- pWin = LookupWindow (stuff->window, client);
- if (!pWin)
- return BadWindow;
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- rep.ScreenCount = pseudoramiXNumScreens;
- if (client->swapped) {
- swaps (&rep.sequenceNumber, n);
- swapl (&rep.length, n);
- swaps (&rep.ScreenCount, n);
- }
- WriteToClient (client, sizeof(xPanoramiXGetScreenCountReply), (char *)&rep);
- return client->noClientException;
-}
-
-
-// was PanoramiX
-static int ProcPseudoramiXGetScreenSize(ClientPtr client)
-{
- REQUEST(xPanoramiXGetScreenSizeReq);
- WindowPtr			pWin;
- xPanoramiXGetScreenSizeReply	rep;
- register int			n;
-
- REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
- pWin = LookupWindow (stuff->window, client);
- if (!pWin)
- return BadWindow;
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- /* screen dimensions */
- rep.width = pseudoramiXScreensstuff->screen.w;
- // was panoramiXdataPtrstuff->screen.width;
- rep.height = pseudoramiXScreensstuff->screen.h;
- // was panoramiXdataPtrstuff->screen.height;
- if (client->swapped) {
- swaps (&rep.sequenceNumber, n);
- swapl (&rep.length, n);
- swaps (&rep.width, n);
- swaps (&rep.height, n);
- }
- WriteToClient (client, sizeof(xPanoramiXGetScreenSizeReply), (char *)&rep);
- return client->noClientException;
-}
-
-
-// was Xinerama
-static int ProcPseudoramiXIsActive(ClientPtr client)
-{
- /* REQUEST(xXineramaIsActiveReq); */
- xXineramaIsActiveReply	rep;
-
- REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
-
- rep.type = X_Reply;
- rep.length = 0;
- rep.sequenceNumber = client->sequence;
- rep.state = !noPseudoramiXExtension;
- if (client->swapped) {
-	register int n;
-	swaps (&rep.sequenceNumber, n);
-	swapl (&rep.length, n);
-	swapl (&rep.state, n);
- }
- WriteToClient (client, sizeof (xXineramaIsActiveReply), (char *) &rep);
- return client->noClientException;
-}
-
-
-// was Xinerama
-static int ProcPseudoramiXQueryScreens(ClientPtr client)
-{
- /* REQUEST(xXineramaQueryScreensReq); */
- xXineramaQueryScreensReply	rep;
-
- REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
-
- rep.type = X_Reply;
- rep.sequenceNumber = client->sequence;
- rep.number = noPseudoramiXExtension ? 0 : pseudoramiXNumScreens;
- rep.length = rep.number * sz_XineramaScreenInfo >> 2;
- if (client->swapped) {
-	register int n;
-	swaps (&rep.sequenceNumber, n);
-	swapl (&rep.length, n);
-	swapl (&rep.number, n);
- }
- WriteToClient (client, sizeof (xXineramaQueryScreensReply), (char *) &rep);
-
- if (!noPseudoramiXExtension) {
-	xXineramaScreenInfo scratch;
-	int i;
-
-	for(i = 0; i < pseudoramiXNumScreens; i++) {
-	 scratch.x_org = pseudoramiXScreensi.x;
-	 scratch.y_org = pseudoramiXScreensi.y;
-	 scratch.width = pseudoramiXScreensi.w;
-	 scratch.height = pseudoramiXScreensi.h;
-
-	 if(client->swapped) {
-		register int n;
-		swaps (&scratch.x_org, n);
-		swaps (&scratch.y_org, n);
-		swaps (&scratch.width, n);
-		swaps (&scratch.height, n);
-	 }
-	 WriteToClient (client, sz_XineramaScreenInfo, (char *) &scratch);
-	}
- }
-
- return client->noClientException;
-}
-
-
-// was PanoramiX
-static int ProcPseudoramiXDispatch (ClientPtr client)
-{ REQUEST(xReq);
- switch (stuff->data)
- {
-	case X_PanoramiXQueryVersion:
-	 return ProcPseudoramiXQueryVersion(client);
-	case X_PanoramiXGetState:
-	 return ProcPseudoramiXGetState(client);
-	case X_PanoramiXGetScreenCount:
-	 return ProcPseudoramiXGetScreenCount(client);
-	case X_PanoramiXGetScreenSize:
-	 return ProcPseudoramiXGetScreenSize(client);
-	case X_XineramaIsActive:
-	 return ProcPseudoramiXIsActive(client);
-	case X_XineramaQueryScreens:
-	 return ProcPseudoramiXQueryScreens(client);
- }
- return BadRequest;
-}
-
-
-
-static int
-SProcPseudoramiXQueryVersion (ClientPtr client)
-{
-	REQUEST(xPanoramiXQueryVersionReq);
-	register int n;
-
-	swaps(&stuff->length,n);
-	REQUEST_SIZE_MATCH (xPanoramiXQueryVersionReq);
-	return ProcPseudoramiXQueryVersion(client);
-}
-
-static int
-SProcPseudoramiXGetState(ClientPtr client)
-{
-	REQUEST(xPanoramiXGetStateReq);
-	register int n;
-
- 	swaps (&stuff->length, n);
-	REQUEST_SIZE_MATCH(xPanoramiXGetStateReq);
-	return ProcPseudoramiXGetState(client);
-}
-
-static int
-SProcPseudoramiXGetScreenCount(ClientPtr client)
-{
-	REQUEST(xPanoramiXGetScreenCountReq);
-	register int n;
-
-	swaps (&stuff->length, n);
-	REQUEST_SIZE_MATCH(xPanoramiXGetScreenCountReq);
-	return ProcPseudoramiXGetScreenCount(client);
-}
-
-static int
-SProcPseudoramiXGetScreenSize(ClientPtr client)
-{
-	REQUEST(xPanoramiXGetScreenSizeReq);
-	register int n;
-
-	swaps (&stuff->length, n);
-	REQUEST_SIZE_MATCH(xPanoramiXGetScreenSizeReq);
-	return ProcPseudoramiXGetScreenSize(client);
-}
-
-
-static int
-SProcPseudoramiXIsActive(ClientPtr client)
-{
-	REQUEST(xXineramaIsActiveReq);
-	register int n;
-
-	swaps (&stuff->length, n);
-	REQUEST_SIZE_MATCH(xXineramaIsActiveReq);
-	return ProcPseudoramiXIsActive(client);
-}
-
-
-static int
-SProcPseudoramiXQueryScreens(ClientPtr client)
-{
-	REQUEST(xXineramaQueryScreensReq);
-	register int n;
-
-	swaps (&stuff->length, n);
-	REQUEST_SIZE_MATCH(xXineramaQueryScreensReq);
-	return ProcPseudoramiXQueryScreens(client);
-}
-
-
-static int
-SProcPseudoramiXDispatch (ClientPtr client)
-{ REQUEST(xReq);
- switch (stuff->data)
- {
-	case X_PanoramiXQueryVersion:
-	 return SProcPseudoramiXQueryVersion(client);
-	case X_PanoramiXGetState:
-	 return SProcPseudoramiXGetState(client);
-	case X_PanoramiXGetScreenCount:
-	 return SProcPseudoramiXGetScreenCount(client);
-	case X_PanoramiXGetScreenSize:
-	 return SProcPseudoramiXGetScreenSize(client);
-	case X_XineramaIsActive:
-	 return SProcPseudoramiXIsActive(client);
-	case X_XineramaQueryScreens:
-	 return SProcPseudoramiXQueryScreens(client);
- }
- return BadRequest;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/pseudoramiX.h Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/quartz-audio.c Deleted

@@ -1,342 +0,0 @@
-//
-// QuartzAudio.m
-//
-// X Window bell support using CoreAudio or AppKit.
-// Greg Parker gparker@cs.stanford.edu 19 Feb 2001
-//
-// Info about sine wave sound playback:
-// CoreAudio code derived from macosx-dev posting by Tim Wood
-// http://www.omnigroup.com/mailman/archive/macosx-dev/2000-May/002004.html
-// Smoothing transitions between sounds
-// http://www.wam.umd.edu/~mphoenix/dss/dss.html
-//
-/*
- * Copyright (c) 2001 Greg Parker. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
-
-#include "quartz.h"
-#include "quartz-audio.h"
-
-#include <CoreAudio/CoreAudio.h>
-#include <pthread.h>
-
-#include "inputstr.h"
-#include "extensions/XI.h"
-
-void NSBeep();
-
-typedef struct QuartzAudioRec {
- double frequency;
- double amplitude;
-
- UInt32 curFrame;
- UInt32 remainingFrames;
- UInt32 totalFrames;
- UInt32 bytesPerFrame;
- double sampleRate;
- UInt32 fadeLength;
-
- UInt32 bufferByteCount;
- Boolean playing;
- pthread_mutex_t lock;
-
- // used to fade out interrupted sound and avoid 'pop'
- double prevFrequency;
- double prevAmplitude;
- UInt32 prevFrame; 
-} QuartzAudioRec;
-
-static AudioDeviceID quartzAudioDevice = kAudioDeviceUnknown;
-static QuartzAudioRec data;
-
-
-/*
- * QuartzAudioEnvelope
- * Fade sound in and out to avoid pop.
- * Sounds with shorter duration will never reach full amplitude. Deal.
- */
-static double QuartzAudioEnvelope(
- UInt32 curFrame,
- UInt32 totalFrames,
- UInt32 fadeLength )
-{
- double fadeFrames = min(fadeLength, totalFrames / 2);
- if (fadeFrames < 1) return 0;
-
- if (curFrame < fadeFrames) {
- return curFrame / fadeFrames;
- } else if (curFrame > totalFrames - fadeFrames) {
- return (totalFrames-curFrame) / fadeFrames;
- } else {
- return 1.0;
- }
-}
-
-
-/*
- * QuartzFillBuffer
- * Fill this buffer with data and update the data position.
- * FIXME: this is ugly
- */
-static void QuartzFillBuffer(
- AudioBuffer *audiobuffer,
- QuartzAudioRec *data )
-{
- float *buffer, *b;
- unsigned int frame, frameCount;
- unsigned int bufferFrameCount;
- float multiplier, v;
- int i;
-
- buffer = (float *)audiobuffer->mData;
- bufferFrameCount = audiobuffer->mDataByteSize / data->bytesPerFrame;
-
- frameCount = min(bufferFrameCount, data->remainingFrames);
-
- // Fade out previous sine wave, if any.
- b = buffer;
- if (data->prevFrame) {
- multiplier = 2*M_PI*(data->prevFrequency/data->sampleRate);
- for (frame = 0; frame < data->fadeLength; frame++) {
- v = data->prevAmplitude *
- QuartzAudioEnvelope(frame+data->fadeLength,
- 2*data->fadeLength,
- data->fadeLength) *
- sin(multiplier * (data->prevFrame+frame));
- for (i = 0; i < audiobuffer->mNumberChannels; i++) {
- *b++ = v;
- }
- }
- // no more prev fade
- data->prevFrame = 0;
-
- // adjust for space eaten by prev fade
- buffer += audiobuffer->mNumberChannels*frame;
- bufferFrameCount -= frame;
- frameCount = min(bufferFrameCount, data->remainingFrames);
- }
-
- // Write a sine wave with the specified frequency and amplitude
- multiplier = 2*M_PI*(data->frequency/data->sampleRate);
- for (frame = 0; frame < frameCount; frame++) {
- v = data->amplitude * 
- QuartzAudioEnvelope(data->curFrame+frame, data->totalFrames,
- data->fadeLength) *
- sin(multiplier * (data->curFrame+frame));
- for (i = 0; i < audiobuffer->mNumberChannels; i++) {
- *b++ = v;
- }
- }
-
- // Zero out the rest of the buffer, if any
- memset(b, 0, sizeof(float) * audiobuffer->mNumberChannels *
- (bufferFrameCount-frame));
-
- data->curFrame += frameCount;
- data->remainingFrames -= frameCount;
- if (data->remainingFrames == 0) {
- data->playing = FALSE;
- data->curFrame = 0;
- }
-}
-
-
-/*
- * QuartzAudioIOProc
- * Callback function for audio playback.
- * FIXME: use inOutputTime to correct for skipping
- */
-static OSStatus 
-QuartzAudioIOProc(
- AudioDeviceID inDevice, 
- const AudioTimeStamp *inNow, 
- const AudioBufferList *inInputData, 
- const AudioTimeStamp *inInputTime, 
- AudioBufferList *outOutputData, 
- const AudioTimeStamp *inOutputTime, 
- void *inClientData )
-{
- QuartzAudioRec *data = (QuartzAudioRec *)inClientData;
- int i;
- Boolean wasPlaying;
-
- pthread_mutex_lock(&data->lock);
- wasPlaying = data->playing;
- for (i = 0; i < outOutputData->mNumberBuffers; i++) {
- if (data->playing) {
- QuartzFillBuffer(outOutputData->mBuffers+i, data); 
- }
- else {
- memset(outOutputData->mBuffersi.mData, 0, 
- outOutputData->mBuffersi.mDataByteSize);
- }
- }
- if (wasPlaying && !data->playing) {
- OSStatus err;
- err = AudioDeviceStop(inDevice, QuartzAudioIOProc);
- }
- pthread_mutex_unlock(&data->lock);
- return 0;
-}
-
-
-/*
- * QuartzCoreAudioBell
- * Play a tone using the CoreAudio API
- */
-static void QuartzCoreAudioBell(
- int volume, // volume is % of max
- int pitch, // pitch is Hz
- int duration ) // duration is milliseconds
-{
- if (quartzAudioDevice == kAudioDeviceUnknown) return;
-
- pthread_mutex_lock(&data.lock);
-
- // fade previous sound, if any
- data.prevFrequency = data.frequency;
- data.prevAmplitude = data.amplitude;
- data.prevFrame = data.curFrame;
-
- // set new sound
- data.frequency = pitch;
- data.amplitude = volume / 100.0;
- data.curFrame = 0;
- data.totalFrames = (int)(data.sampleRate * duration / 1000.0);
- data.remainingFrames = data.totalFrames;
-
- if (! data.playing) {
- OSStatus status;
- status = AudioDeviceStart(quartzAudioDevice, QuartzAudioIOProc);
- if (status) {
- ErrorF("QuartzAudioBell: AudioDeviceStart returned %d\n", status);
- } else {
- data.playing = TRUE;
- }
- }
- pthread_mutex_unlock(&data.lock);
-}
-
-
-/*
- * QuartzBell
- * Ring the bell
- */
-void QuartzBell(
- int volume, // volume in percent of max
- DeviceIntPtr pDevice,
- pointer ctrl,
- int class )
-{
- int pitch; // pitch in Hz
- int duration; // duration in milliseconds
-
- if (class == BellFeedbackClass) {
- pitch = ((BellCtrl*)ctrl)->pitch;
- duration = ((BellCtrl*)ctrl)->duration;
- } else if (class == KbdFeedbackClass) {
- pitch = ((KeybdCtrl*)ctrl)->bell_pitch;
- duration = ((KeybdCtrl*)ctrl)->bell_duration; 
- } else {
- ErrorF("QuartzBell: bad bell class %d\n", class);
- return;
- }
-
- if (quartzUseSysBeep) {
- if (volume)
- NSBeep();
- } else {
- QuartzCoreAudioBell(volume, pitch, duration);
- }
-}
-
-
-/*
- * QuartzAudioInit
- * Prepare to play the bell with the CoreAudio API
- */
-void QuartzAudioInit(void) 
-{
- UInt32 propertySize;
- OSStatus status;
- AudioDeviceID outputDevice;
- AudioStreamBasicDescription outputStreamDescription;
- double sampleRate;
-
- // Get the default output device
- propertySize = sizeof(outputDevice);
- status = AudioHardwareGetProperty(
- kAudioHardwarePropertyDefaultOutputDevice, 
- &propertySize, &outputDevice);
- if (status) {
- ErrorF("QuartzAudioInit: AudioHardwareGetProperty returned %d\n",
- status);
- return;
- }
- if (outputDevice == kAudioDeviceUnknown) {
- ErrorF("QuartzAudioInit: No audio output devices available.\n");
- return;
- }
-
- // Get the basic device description
- propertySize = sizeof(outputStreamDescription);
- status = AudioDeviceGetProperty(outputDevice, 0, FALSE, 
- kAudioDevicePropertyStreamFormat, 
- &propertySize, &outputStreamDescription);
- if (status) {
- ErrorF("QuartzAudioInit: GetProperty(stream format) returned %d\n",
- status);
- return;
- }
- sampleRate = outputStreamDescription.mSampleRate;
-
- // Fill in the playback data
- data.frequency = 0;
- data.amplitude = 0;
- data.curFrame = 0;
- data.remainingFrames = 0; 
- data.bytesPerFrame = outputStreamDescription.mBytesPerFrame;
- data.sampleRate = sampleRate;
- // data.bufferByteCount = bufferByteCount;
- data.playing = FALSE;
- data.prevAmplitude = 0;
- data.prevFrame = 0;
- data.prevFrequency = 0;
- data.fadeLength = data.sampleRate / 200;
- pthread_mutex_init(&data.lock, NULL); // fixme error check
-
- // fixme assert fadeLength<framesPerBuffer
-
- // Prepare for playback
- status = AudioDeviceAddIOProc(outputDevice, QuartzAudioIOProc, &data);
- if (status) {
- ErrorF("QuartzAudioInit: AddIOProc returned %d\n", status);
- return;
- }
-
- // success!
- quartzAudioDevice = outputDevice;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/quartz-audio.h Deleted

@@ -1,41 +0,0 @@
-//
-// QuartzAudio.h
-//
-// X Window bell support using CoreAudio or AppKit.
-// Greg Parker   gparker@cs.stanford.edu   19 Feb 2001
-/*
- * Copyright (c) 2001 Greg Parker. All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzAudio.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
-
-#ifndef _QUARTZAUDIO_H
-#define _QUARTZAUDIO_H
-
-#include "input.h"
-
-void QuartzAudioInit(void);
-void QuartzBell(int volume, DeviceIntPtr pDevice, pointer ctrl, int class);
-
-#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/quartz-cursor.c Deleted

@@ -1,357 +0,0 @@
-/**************************************************************
- *
- * Support for using the Quartz Window Manager cursor
- *
- **************************************************************/
-/*
- * Copyright (c) 2001 Torrey T. Lyons and Greg Parker.
- * Copyright (c) 2002 Apple Computer, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/bundle/quartzCursor.c,v 1.15 2001/12/22 05:28:35 torrey Exp $ */
-
-#include "quartz.h"
-#include "quartz-cursor.h"
-#include "Xplugin.h"
-
-#include "mi.h"
-#include "scrnintstr.h"
-#include "cursorstr.h"
-#include "mipointrst.h"
-#include "windowstr.h"
-#include "globals.h"
-#include "servermd.h"
-#include "dixevents.h"
-
-#include <CoreGraphics/CoreGraphics.h>
-
-typedef struct {
- int CursorVisible;
- QueryBestSizeProcPtr QueryBestSize;
- miPointerSpriteFuncPtr spriteFuncs;
-} QuartzCursorScreenRec, *QuartzCursorScreenPtr;
-
-static int darwinCursorScreenIndex = -1;
-static unsigned long darwinCursorGeneration = 0;
-
-static Bool movedCursor = FALSE;
-
-#define CURSOR_PRIV(pScreen) \
- ((QuartzCursorScreenPtr)pScreen->devPrivatesdarwinCursorScreenIndex.ptr)
-
-static Bool
-load_cursor (CursorPtr src, int screen)
-{
- uint32_t *data;
- uint32_t rowbytes;
- int width, height;
- int hot_x, hot_y;
-
- uint32_t fg_color, bg_color;
- uint8_t *srow, *sptr;
- uint8_t *mrow, *mptr;
- uint32_t *drow, *dptr;
- unsigned xcount, ycount;
-
- xp_error err;
-
- width = src->bits->width;
- height = src->bits->height;
- hot_x = src->bits->xhot;
- hot_y = src->bits->yhot;
-
-#ifdef ARGB_CURSOR
- if (src->bits->argb != NULL)
- {
-	rowbytes = src->bits->width * sizeof (CARD32);
-	data = (uint32_t *) src->bits->argb;
- }
- else
-#endif
- {
-	fg_color = 0xFF00 | (src->foreRed >> 8);
-	fg_color <<= 16;
-	fg_color |= src->foreGreen & 0xFF00;
-	fg_color |= src->foreBlue >> 8;
-
-	bg_color = 0xFF00 | (src->backRed >> 8);
-	bg_color <<= 16;
-	bg_color |= src->backGreen & 0xFF00;
-	bg_color |= src->backBlue >> 8;
-
-	fg_color = htonl (fg_color);
-	bg_color = htonl (bg_color);
-
-	/* round up to 8 pixel boundary so we can convert whole bytes */
-	rowbytes = ((src->bits->width * 4) + 31) & ~31;
-	data = alloca (rowbytes * src->bits->height);
-
-	if (!src->bits->emptyMask)
-	{
-	 ycount = src->bits->height;
-	 srow = src->bits->source; mrow = src->bits->mask;
-	 drow = data;
-
-	 while (ycount-- > 0)
-	 {
-		xcount = (src->bits->width + 7) / 8;
-		sptr = srow; mptr = mrow;
-		dptr = drow;
-
-		while (xcount-- > 0)
-		{
-		 uint8_t s, m;
-		 int i;
-
-		 s = *sptr++; m = *mptr++;
-		 for (i = 0; i < 8; i++)
-		 {
-#if BITMAP_BIT_ORDER == MSBFirst
-			if (m & 128)
-			 *dptr++ = (s & 128) ? fg_color : bg_color;
-			else
-			 *dptr++ = 0;
-			s <<= 1; m <<= 1;
-#else
-			if (m & 1)
-			 *dptr++ = (s & 1) ? fg_color : bg_color;
-			else
-			 *dptr++ = 0;
-			s >>= 1; m >>= 1;
-#endif
-		 }
-		}
-
-		srow += BitmapBytePad (src->bits->width);
-		mrow += BitmapBytePad (src->bits->width);
-		drow = (uint32_t *) ((char *) drow + rowbytes);
-	 }
-	}
-	else
-	{
-	 memset (data, 0, src->bits->height * rowbytes);
-	}
- }
-
- err = xp_set_cursor (width, height, hot_x, hot_y, data, rowbytes);
- return err == Success;
-}
-
-/* Convert the X cursor representation to native format if possible. */
-static Bool
-QuartzRealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
-{
- if(pCursor == NULL || pCursor->bits == NULL)
- return FALSE;
-
- /* FIXME: cache ARGB8888 representation? */
-
- return TRUE;
-}
-
-/* Free the storage space associated with a realized cursor. */
-static Bool
-QuartzUnrealizeCursor (ScreenPtr pScreen, CursorPtr pCursor)
-{
- return TRUE;
-}
-
-/* Set the cursor sprite and position. */
-static void
-QuartzSetCursor (ScreenPtr pScreen, CursorPtr pCursor, int x, int y)
-{
- QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
-
- if (!quartzServerVisible)
- return;
-
- if (pCursor == NULL)
- {
-	if (ScreenPriv->CursorVisible)
-	{
-	 xp_hide_cursor ();
-	 ScreenPriv->CursorVisible = FALSE;
-	}
- }
- else
- {
-	load_cursor (pCursor, pScreen->myNum);
-
-	if (!ScreenPriv->CursorVisible)
-	{
-	 xp_show_cursor ();
-	 ScreenPriv->CursorVisible = TRUE;
-	}
- }
-}
-
-/* Move the cursor. This is a noop for us. */
-static void
-QuartzMoveCursor (ScreenPtr pScreen, int x, int y)
-{
-}
-
-static miPointerSpriteFuncRec quartzSpriteFuncsRec = {
- QuartzRealizeCursor,
- QuartzUnrealizeCursor,
- QuartzSetCursor,
- QuartzMoveCursor
-};
-
-static Bool
-QuartzCursorOffScreen (ScreenPtr *pScreen, int *x, int *y)
-{
- return FALSE;
-}
-
-static void
-QuartzCrossScreen (ScreenPtr pScreen, Bool entering)
-{
- return;
-}
-
-/* Change the cursor position without generating an event or motion history.
- The input coordinates (x,y) are in pScreen-local X11 coordinates. */
-static void
-QuartzWarpCursor (ScreenPtr pScreen, int x, int y)
-{
- if (!movedCursor)
- {
- /* Don't move the cursor the first time. This is the
-	 jump-to-center initialization, and it's annoying. */
-
- movedCursor = TRUE;
- return;
- }
-
- if (quartzServerVisible)
- {
-	int sx, sy;
-
-	sx = dixScreenOriginspScreen->myNum.x + darwinMainScreenX;
-	sy = dixScreenOriginspScreen->myNum.y + darwinMainScreenY;
-
-	CGWarpMouseCursorPosition (CGPointMake (sx + x, sy + y));
- }
-
- miPointerWarpCursor (pScreen, x, y);
-}
-
-void
-QuartzIgnoreNextWarpCursor (void)
-{
- movedCursor = FALSE;
-}
-
-static miPointerScreenFuncRec quartzScreenFuncsRec = {
- QuartzCursorOffScreen,
- QuartzCrossScreen,
- QuartzWarpCursor,
- DarwinEnqueuePointerEvent,
-};
-
-/* Handle queries for best cursor size */
-static void
-QuartzCursorQueryBestSize (int class, unsigned short *width,
-			 unsigned short *height, ScreenPtr pScreen)
-{
- QuartzCursorScreenPtr ScreenPriv = CURSOR_PRIV(pScreen);
-
- if (class == CursorShape)
- {
-	/* FIXME: query window server? */
- *width = 32;
- *height = 32;
- }
- else
- {
- (*ScreenPriv->QueryBestSize) (class, width, height, pScreen);
- }
-}
-
-/* Initialize cursor support */
-Bool
-QuartzInitCursor (ScreenPtr pScreen)
-{
- QuartzCursorScreenPtr ScreenPriv;
- miPointerScreenPtr PointPriv;
-
- /* initialize software cursor handling (always needed as backup) */
- if (!miDCInitialize (pScreen, &quartzScreenFuncsRec))
- return FALSE;
-
- /* allocate private storage for this screen's QuickDraw cursor info */
- if (darwinCursorGeneration != serverGeneration)
- {
- if ((darwinCursorScreenIndex = AllocateScreenPrivateIndex ()) < 0)
- return FALSE;
-
- darwinCursorGeneration = serverGeneration;
- }
-
- ScreenPriv = xcalloc (1, sizeof(QuartzCursorScreenRec));
- if (ScreenPriv == NULL)
-	return FALSE;
-
- CURSOR_PRIV (pScreen) = ScreenPriv;
-
- /* override some screen procedures */
- ScreenPriv->QueryBestSize = pScreen->QueryBestSize;
- pScreen->QueryBestSize = QuartzCursorQueryBestSize;
-
- PointPriv = (miPointerScreenPtr) pScreen->devPrivatesmiPointerScreenIndex.ptr;
-
- ScreenPriv->spriteFuncs = PointPriv->spriteFuncs;
- PointPriv->spriteFuncs = &quartzSpriteFuncsRec;
-
- ScreenPriv->CursorVisible = TRUE;
- return TRUE;
-}
-
-/* X server is hiding. Restore the Aqua cursor. */
-void
-QuartzSuspendXCursor (ScreenPtr pScreen)
-{
-}
-
-/* X server is showing. Restore the X cursor. */
-void
-QuartzResumeXCursor (ScreenPtr pScreen)
-{
- WindowPtr pWin;
- CursorPtr pCursor;
- int x, y;
-
- pWin = GetSpriteWindow ();
- if (pWin->drawable.pScreen != pScreen)
-	return;
-
- pCursor = GetSpriteCursor ();
- if (pCursor == NULL)
-	return;
-
- GetSpritePosition (&x, &y);
- QuartzSetCursor (pScreen, pCursor, x, y);
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/quartz-cursor.h Deleted

@@ -1,45 +0,0 @@
-/*
- * quartzCursor.h
- *
- * External interface for Quartz hardware cursor
- */
-/*
- * Copyright (c) 2001 Torrey T. Lyons and Greg Parker.
- * Copyright (c) 2002 Apple Computer, Inc.
- *                 All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartzCursor.h,v 1.1 2002/03/28 02:21:19 torrey Exp $ */
-
-#ifndef QUARTZCURSOR_H
-#define QUARTZCURSOR_H
-
-#include "screenint.h"
-
-Bool QuartzInitCursor(ScreenPtr pScreen);
-void QuartzSuspendXCursor(ScreenPtr pScreen);
-void QuartzResumeXCursor(ScreenPtr pScreen);
-void QuartzIgnoreNextWarpCursor (void);
-
-#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/quartz-server.c Deleted

@@ -1,190 +0,0 @@
-//
-// quartzServer.c
-//
-// This class handles the interaction between CG and the X server thread
-//
-/*
- * Copyright (c) 2001 Andreas Monitzer. All Rights Reserved.
- * Copyright (c) 2002 Torrey T. Lyons. All Rights Reserved.
- * Copyright (c) 2002 Apple Software, Inc. All Rights Reserved.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be included
- * in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the
- * sale, use or other dealings in this Software without prior written
- * authorization.
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/XServer.m,v 1.3 2002/07/15 18:57:44 torrey Exp $ */
-
-#include "quartz.h"
-#include "Xplugin.h"
-#include "X11Controller.h"
-#define _APPLEDRI_SERVER_
-#include "appledri.h"
-#include "dri-surface.h"
-#include "opaque.h"
-#include "globals.h"
-#include <fcntl.h>
-#include <stdarg.h>
-#include <unistd.h>
-
-char **envpGlobal; // argcGlobal and argvGlobal
- // are from dix/globals.c
-
-void
-QuartzMessageMainThread (int type, int argc, ...)
-{
- xEvent xe;
- INT32 *argv;
- int i, max_args;
- va_list args;
-
- memset (&xe, 0, sizeof (xe));
- xe.u.u.type = ClientMessage;
- xe.u.clientMessage.u.l.type = type;
-
- argv = &xe.u.clientMessage.u.l.longs0;
- max_args = 4;
-
- if (argc > 0 && argc <= max_args)
- {
-	va_start (args, argc);
-	for (i = 0; i < argc; i++)
-	 argvi = (int) va_arg (args, int);
-	va_end (args);
- }
-
- DarwinEnqueueEvent (&xe);
-}
-
-static void
-event_handler (unsigned int type, const void *arg,
-	 unsigned int arg_size, void *data)
-{
- switch (type)
- {
- case XP_EVENT_DISPLAY_CHANGED:
-	QuartzMessageMainThread (kXquartzDisplayChanged, 0);
-	break;
-
- case XP_EVENT_WINDOW_STATE_CHANGED:
-	if (arg_size >= sizeof (xp_window_state_event))
-	{
-	 const xp_window_state_event *ws_arg = arg;
-	 QuartzMessageMainThread (kXquartzWindowState, 2,
-				 ws_arg->id, ws_arg->state);
-	}
-	break;
-
- case XP_EVENT_WINDOW_MOVED:
-	if (arg_size == sizeof (xp_window_id))
-	{
-	 xp_window_id id = * (xp_window_id *) arg;
-
-	 QuartzMessageMainThread (kXquartzWindowMoved, 1, id);
-	}
-	break;
-
- case XP_EVENT_SURFACE_DESTROYED:
- case XP_EVENT_SURFACE_CHANGED:
-	if (arg_size == sizeof (xp_surface_id))
-	{
-	 int kind;
-
-	 if (type == XP_EVENT_SURFACE_DESTROYED)
-		kind = AppleDRISurfaceNotifyDestroyed;
-	 else
-		kind = AppleDRISurfaceNotifyChanged;
-
-	 DRISurfaceNotify (*(xp_surface_id *) arg, kind);
-	}
-	break;
- }
-}
-
-static void
-server_thread (void *arg)
-{
- extern int main (int argc, char **argv, char **envp);
-
- /* Xinerama defaults to enabled */
- noPanoramiXExtension = FALSE;
-
- if (xp_init (XP_BACKGROUND_EVENTS | quartzXpluginOptions) != Success)
- {
-	fprintf (stderr, "can't initialize window system\n");
-	exit (1);
- }
-
- xp_select_events (XP_EVENT_DISPLAY_CHANGED
-		 | XP_EVENT_WINDOW_STATE_CHANGED
-		 | XP_EVENT_WINDOW_MOVED
-		 | XP_EVENT_SURFACE_CHANGED
-		 | XP_EVENT_SURFACE_DESTROYED,
-		 event_handler, NULL);
-
- exit (main (argcGlobal, argvGlobal, envpGlobal));
-}
-
-/*
- * DarwinHandleGUI
- * This function is called first from main(). We use it to connect to
- * the cg window server and spawn the the thread that will listen for
- * cg events
- */
-void DarwinHandleGUI(
- int argc,
- char *argv,
- char *envp )
-{
- static Bool here_before;
-
- extern void _InitHLTB (void);
-
- if (here_before)
-	return;
-
- here_before = TRUE;
-
- DarwinInputPreInit ();
-
- // Store command line arguments to pass back to main()
- argcGlobal = argc;
- argvGlobal = argv;
- envpGlobal = envp;
-
- /* Initially I ran the X server on the main thread, and received
- events on the second thread. But now we may be using Carbon,
- that needs to run on the main thread. (Otherwise, when it's
- prebound, it will initialize itself on the wrong thread)
-
- grr.. but doing that means that if the X thread gets scheduled
- before the main thread when we're _not_ prebound, things fail,
- so initialize by hand. */
-
- _InitHLTB ();
-
- X11ControllerMain (argc, argv, server_thread, NULL);
-
- /* not reached */
- exit (1);
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/quartz.c Deleted

@@ -1,683 +0,0 @@
-/**************************************************************
- *
- * Quartz-specific support for the Darwin X Server
- *
- **************************************************************/
-/*
- * Copyright (c) 2001 Greg Parker and Torrey T. Lyons.
- * Copyright (c) 2002 Apple Computer, Inc.
- * All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.c,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
-
-#include "quartz.h"
-#include "darwin.h"
-#include "quartz-audio.h"
-#include "quartz-cursor.h"
-#include "rootless.h"
-#include "rootless-window.h"
-#include "pseudoramiX.h"
-#include "globals.h"
-#include "dri.h"
-#define _APPLEWM_SERVER_
-#include "applewmstr.h"
-#include "X11Application.h"
-
-#include "scrnintstr.h"
-#include "colormapst.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <sys/wait.h>
-
-#include <AvailabilityMacros.h>
-#include <CoreGraphics/CoreGraphics.h>
-
-/* Shared global variables for Quartz modes */
-int quartzEventWriteFD = -1;
-int quartzUseSysBeep = 1;
-int quartzServerVisible = FALSE;
-int quartzDesiredDepth = -1;
-int quartzHasRoot = FALSE, quartzEnableRootless = TRUE;
-int quartzFullscreenDisableHotkeys = TRUE;
-int noPseudoramiXExtension = FALSE;
-int quartzXpluginOptions = 0;
-
-extern char *display;
-
-static CGDirectDisplayID
-display_at_index (int index)
-{
- CGError err;
- CGDisplayCount cnt;
- CGDirectDisplayID dpyindex+1;
-
- err = CGGetActiveDisplayList (index + 1, dpy, &cnt);
- if (err == kCGErrorSuccess && (int) cnt == index + 1)
-	return dpyindex;
- else
-	return kCGNullDirectDisplay;
-}
-
-static CGRect
-display_screen_bounds (CGDirectDisplayID id, Bool remove_menubar)
-{
- CGRect frame;
-
- frame = CGDisplayBounds (id);
-
- if (remove_menubar && !quartzHasRoot
-	&& frame.origin.x == 0 && frame.origin.y == 0)
- {
-	/* Remove Aqua menubar from display bounds. */
-
-	frame.origin.y += 22;
-	frame.size.height -= 22;
- }
-
- return frame;
-}
-
-static void
-addPseudoramiXScreens (int *x, int *y, int *width, int *height)
-{
- CGDisplayCount i, total = 16;	/* FIXME: hardcoded maximum */
- CGRect unionRect = CGRectNull, frame;
- CGDirectDisplayID screenstotal;
-	
- CGGetActiveDisplayList (total, screens, &total);
-
- /* Get the union of all screens */
- for (i = 0; i < total; i++)
- {
-	CGDirectDisplayID dpy = screensi;
-
-	/* we can't remove the menubar from the screen - doing so
-	 would constrain the pointer to the screen, not allowing it
-	 to reach the menubar.. */
-
-	frame = display_screen_bounds (dpy, FALSE);
-	unionRect = CGRectUnion (unionRect, frame);
- }
-
- /* Use unionRect as the screen size for the X server. */
- *x = unionRect.origin.x;
- *y = unionRect.origin.y;
- *width = unionRect.size.width;
- *height = unionRect.size.height;
-
- /* Tell PseudoramiX about the real screens. */
- for (i = 0; i < total; i++)
- {
-	CGDirectDisplayID dpy = screensi;
-
-	frame = display_screen_bounds (dpy, TRUE);
-
-#ifdef DEBUG
-	ErrorF("PseudoramiX screen %d added: %dx%d @ (%d,%d).\n", i,
-	 (int)frame.size.width, (int)frame.size.height,
-	 (int)frame.origin.x, (int)frame.origin.y);
-#endif
-
-	frame.origin.x -= unionRect.origin.x;
-	frame.origin.y -= unionRect.origin.y;
-
-#ifdef DEBUG
-	ErrorF("PseudoramiX screen %d placed at X11 coordinate (%d,%d).\n",
-	 i, (int)frame.origin.x, (int)frame.origin.y);
-#endif
-
-	PseudoramiXAddScreen(frame.origin.x, frame.origin.y,
-			 frame.size.width, frame.size.height);
- }
-}
-
-/* Do mode dependent initialization of each screen for Quartz. */
-Bool
-QuartzAddScreen (int index, ScreenPtr pScreen)
-{
- DarwinFramebufferPtr dfb = SCREEN_PRIV(pScreen);
-
- /* If no specific depth chosen, look for the depth of the main display.
- Else if 16bpp specified, use that. Else use 32bpp. */
-
- dfb->componentCount = 3;
- dfb->bitsPerComponent = 8;
- dfb->bitsPerPixel = 32;
-
- if (quartzDesiredDepth == -1)
- {
-	dfb->bitsPerComponent = CGDisplayBitsPerSample (kCGDirectMainDisplay);
-	dfb->bitsPerPixel = CGDisplayBitsPerPixel (kCGDirectMainDisplay);
- }
- else if (quartzDesiredDepth == 15)
- {
-	dfb->bitsPerComponent = 5;
-	dfb->bitsPerPixel = 16;
- }
- else if (quartzDesiredDepth == 8)
- {
-	dfb->bitsPerComponent = 8;
-	dfb->bitsPerPixel = 8;
-	dfb->componentCount = 1;
- }
-
- if (noPseudoramiXExtension)
- {
- CGDirectDisplayID dpy;
- CGRect frame;
-
-	dpy = display_at_index (index);
-
-	frame = display_screen_bounds (dpy, TRUE);
-
- dfb->x = frame.origin.x;
- dfb->y = frame.origin.y;
- dfb->width = frame.size.width;
- dfb->height = frame.size.height;
- }
- else
- {
-	addPseudoramiXScreens (&dfb->x, &dfb->y, &dfb->width, &dfb->height);
- }
-
- dfb->colorBitsPerPixel = dfb->bitsPerComponent * dfb->componentCount;
-
- /* Passing zero width (pitch) makes miCreateScreenResources set the
- screen pixmap to the framebuffer pointer, i.e. null. We'll take
- it from there.. */
- dfb->pitch = 0;
- dfb->framebuffer = NULL;
-
- DRIScreenInit (pScreen);
-
- return TRUE;
-}
-
-/* Finalize mode specific setup of each screen. */
-Bool
-QuartzSetupScreen (int index, ScreenPtr pScreen)
-{
- // do full screen or rootless specific setup
- if (! RootlessSetupScreen(index, pScreen))
-	return FALSE;
-
- // setup cursor support
- if (! QuartzInitCursor(pScreen))
- return FALSE;
-
- DRIFinishScreenInit (pScreen);
-
- return TRUE;
-}
-
-
-/* Quartz display initialization. */
-void
-QuartzInitOutput (int argc, char **argv)
-{
- static int orig_noPanoramiXExtension;
- int total;
-
- if (serverGeneration == 1) {
-	orig_noPanoramiXExtension = noPanoramiXExtension;
- QuartzAudioInit();
- }
-
- /* +xinerama option sets noPanoramiXExtension variable */
- noPseudoramiXExtension = orig_noPanoramiXExtension;
-
- total = 16;				/* FIXME: hardcoded maximum */
- if (total > 0)
- {
-	CGDirectDisplayID screenstotal;
-	CGGetActiveDisplayList (total, screens, &total);
- }
-
- if (noPseudoramiXExtension)
-	darwinScreensFound = total;
- else
- darwinScreensFound = 1; // only PseudoramiX knows about the rest
-
- if (!quartzEnableRootless)
-	RootlessHideAllWindows ();
-}
-
-/* This function from randr.c */
-extern char	*ConnectionInfo;
-static int padlength4 = {0, 3, 2, 1};
-static void
-RREditConnectionInfo (ScreenPtr pScreen)
-{
- xConnSetup	 *connSetup;
- char	 *vendor;
- xPixmapFormat *formats;
- xWindowRoot	 *root;
- xDepth	 *depth;
- xVisualType	 *visual;
- int		 screen = 0;
- int		 d;
-
- connSetup = (xConnSetup *) ConnectionInfo;
- vendor = (char *) connSetup + sizeof (xConnSetup);
- formats = (xPixmapFormat *) ((char *) vendor +
-				 connSetup->nbytesVendor +
-				 padlengthconnSetup->nbytesVendor & 3);
- root = (xWindowRoot *) ((char *) formats +
-			 sizeof (xPixmapFormat) * screenInfo.numPixmapFormats);
- while (screen != pScreen->myNum)
- {
-	depth = (xDepth *) ((char *) root + 
-			 sizeof (xWindowRoot));
-	for (d = 0; d < root->nDepths; d++)
-	{
-	 visual = (xVisualType *) ((char *) depth +
-				 sizeof (xDepth));
-	 depth = (xDepth *) ((char *) visual +
-				depth->nVisuals * sizeof (xVisualType));
-	}
-	root = (xWindowRoot *) ((char *) depth);
-	screen++;
- }
- root->pixWidth = pScreen->width;
- root->pixHeight = pScreen->height;
- root->mmWidth = pScreen->mmWidth;
- root->mmHeight = pScreen->mmHeight;
-}
-
-static void
-QuartzUpdateScreens (void)
-{
- ScreenPtr pScreen;
- WindowPtr pRoot;
- int x, y, width, height, sx, sy;
- xEvent e;
-
- if (noPseudoramiXExtension || screenInfo.numScreens != 1)
- {
-	/* FIXME: if not using Xinerama, we have multiple screens, and
-	 to do this properly may need to add or remove screens. Which
-	 isn't possible. So don't do anything. Another reason why
-	 we default to running with Xinerama. */
-
-	return;
- }
-
- pScreen = screenInfo.screens0;
-
- PseudoramiXResetScreens ();
- addPseudoramiXScreens (&x, &y, &width, &height);
-
- dixScreenOriginspScreen->myNum.x = x;
- dixScreenOriginspScreen->myNum.y = y;
- pScreen->mmWidth = pScreen->mmWidth * ((double) width / pScreen->width);
- pScreen->mmHeight = pScreen->mmHeight * ((double) height / pScreen->height);
- pScreen->width = width;
- pScreen->height = height;
-
- /* FIXME: should probably do something with RandR here. */
-
- DarwinAdjustScreenOrigins (&screenInfo);
- RootlessRepositionWindows (screenInfo.screens0);
- RootlessUpdateScreenPixmap (screenInfo.screens0);
-
- sx = dixScreenOriginspScreen->myNum.x + darwinMainScreenX;
- sy = dixScreenOriginspScreen->myNum.y + darwinMainScreenY;
-
- /* Adjust the root window. */
-
- pRoot = WindowTablepScreen->myNum;
- pScreen->ResizeWindow (pRoot, x - sx, y - sy, width, height, NULL);
- pScreen->PaintWindowBackground (pRoot, &pRoot->borderClip, PW_BACKGROUND);
- QuartzIgnoreNextWarpCursor ();
- DefineInitialRootWindow (pRoot);
-
- /* Send an event for the root reconfigure */
-
- e.u.u.type = ConfigureNotify;
- e.u.configureNotify.window = pRoot->drawable.id;
- e.u.configureNotify.aboveSibling = None;
- e.u.configureNotify.x = x - sx;
- e.u.configureNotify.y = y - sy;
- e.u.configureNotify.width = width;
- e.u.configureNotify.height = height;
- e.u.configureNotify.borderWidth = wBorderWidth (pRoot);
- e.u.configureNotify.override = pRoot->overrideRedirect;
- DeliverEvents (pRoot, &e, 1, NullWindow);
-
- /* FIXME: what does this do? */
- RREditConnectionInfo (pScreen);
-}
-
-static void
-do_exec (void (*callback) (void *data), void *data)
-{
- /* Do the fork-twice trick to avoid needing to reap zombies */
-
- int child1, child2 = 0;
- int status;
-
- /* we should really try to report errors here.. */
-
- child1 = fork ();
-
- switch (child1)
- {
- case -1:				/* error */
-	break;
-
- case 0:				/* child1 */
-	child2 = fork ();
-
-	switch (child2)
-	{
-	 int max_files, i;
-	 char buf1024, *tem;
-
-	case -1:			/* error */
-	 _exit (1);
-
-	case 0:				/* child2 */
-	 /* close all open files except for standard streams */
-	 max_files = sysconf (_SC_OPEN_MAX);
-	 for (i = 3; i < max_files; i++)
-		close (i);
-
-	 /* ensure stdin is on /dev/null */
-	 close (0);
-	 open ("/dev/null", O_RDONLY);
-
-	 /* cd $HOME */
-	 tem = getenv ("HOME");
-	 if (tem != NULL)
-		chdir (tem);
-
-	 /* Setup environment */
-	 snprintf (buf, sizeof (buf), ":%s", display);
-	 setenv ("DISPLAY", buf, TRUE);
-	 tem = getenv ("PATH");
-	 if (tem != NULL && tem0 != NULL)
-		snprintf (buf, sizeof (buf), "%s:/usr/X11R6/bin", tem);
-	 else
-		snprintf (buf, sizeof (buf), "/bin:/usr/bin:/usr/X11R6/bin");
-	 setenv ("PATH", buf, TRUE);
-
-	 (*callback) (data);
-
-	 _exit (2);
-
-	default:			/* parent (child1) */
-	 _exit (0);
-	}
-	break;
-
- default:				/* parent */
-	waitpid (child1, &status, 0);
- }
-}
-
-static void
-run_client_callback (void *data)
-{
- char **argv = data;
- execvp (argv0, argv);
-}
-
-/* Note that this function is called from both X server and appkit threads */
-void
-QuartzRunClient (const char *command)
-{
- const char *shell;
- const char *argv5;
-
- shell = getenv ("SHELL");
- if (shell == NULL)
-	shell = "/bin/bash";
-
- /* At least bash, tcsh and zsh all work with this syntax. We
- need to use an interactive shell to force it to load the user's
- environment. Otherwise things like fink don't work at all well.. */
-
- argv0 = shell;
- argv1 = "-i";
- argv2 = "-c";
- argv3 = command;
- argv4 = NULL;
-
- do_exec (run_client_callback, argv);
-}
-
-static void
-QuartzSetFullscreen (Bool state)
-{
- if (quartzHasRoot == state)
-	return;
-
- quartzHasRoot = state;
-
- xp_disable_update ();
-
- if (!quartzHasRoot && !quartzEnableRootless)
-	RootlessHideAllWindows ();
-
- RootlessUpdateRooted (quartzHasRoot);
-
- if (quartzHasRoot && !quartzEnableRootless)
-	RootlessShowAllWindows ();
-
- /* Only update screen info when something is visible. Avoids the wm
- moving the windows out from under the menubar when it shouldn't */
-
- if (quartzHasRoot || quartzEnableRootless)
-	QuartzUpdateScreens ();
-
- /* Somehow the menubar manages to interfere with our event stream
- in fullscreen mode, even though it's not visible. */
-
- X11ApplicationShowHideMenubar (!quartzHasRoot);
-
- xp_reenable_update ();
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 1030
- if (quartzFullscreenDisableHotkeys)
-	xp_disable_hot_keys (quartzHasRoot);
-#endif
-}
-
-static void
-QuartzSetRootless (Bool state)
-{
- if (quartzEnableRootless == state)
-	return;
-
- quartzEnableRootless = state;
-
- if (!quartzEnableRootless && !quartzHasRoot)
- {
-	xp_disable_update ();
-	RootlessHideAllWindows ();
-	xp_reenable_update ();
- }
- else if (quartzEnableRootless && !quartzHasRoot)
- {
-	xp_disable_update ();
-	RootlessShowAllWindows ();
-	QuartzUpdateScreens ();
-	xp_reenable_update ();
- }
-}
-
-/* Show the X server on screen. Does nothing if already shown. Restore the
- X clip regions the X server cursor state. */
-static void
-QuartzShow (void)
-{
- int i;
-
- if (quartzServerVisible)
-	return;
-
- quartzServerVisible = TRUE;
-
- for (i = 0; i < screenInfo.numScreens; i++)
- {
-	if (screenInfo.screensi)
-	 QuartzResumeXCursor(screenInfo.screensi);
- }
-
- /* FIXME: not sure about this, it may need to have a preference like
- in XDarwin..? */
-
- if (!quartzEnableRootless)
-	QuartzSetFullscreen (TRUE);
-}
-
-/* Remove the X server display from the screen. Does nothing if already
- hidden. Set X clip regions to prevent drawing, and restore the Aqua
- cursor. */
-static void
-QuartzHide (void)
-{
- int i;
-
- if (!quartzServerVisible)
-	return;
-
- for (i = 0; i < screenInfo.numScreens; i++)
- {
-	if (screenInfo.screensi)
-	 QuartzSuspendXCursor(screenInfo.screensi);
- }
-
- QuartzSetFullscreen (FALSE);
-
- quartzServerVisible = FALSE;
-}
-
-/* Cleanup before X server shutdown. Release the screen and restore the
- Aqua cursor. */
-void
-QuartzGiveUp (void)
-{
- int i;
-
- for (i = 0; i < screenInfo.numScreens; i++) {
- if (screenInfo.screensi) {
- QuartzSuspendXCursor(screenInfo.screensi);
- }
- }
-}
-
-int
-QuartzProcessArgument( int argc, char *argv, int i )
-{
- /* This arg is passed when launched from the Aqua GUI. */
- if (strncmp (argvi, "-psn_", 5) == 0)
- {
- return 1;
- }
-
- if (strcmp (argvi, "-depth") == 0)
- {
-	int arg;
-
-	if (i == argc - 1)
-	 FatalError ("-depth requires an argument\n");
-
-	arg = atoi (argvi + 1);
-	if (arg == 8 || arg == 15 || arg == 24)
-	 quartzDesiredDepth = arg;
-	else
-	 FatalError ("Only 8, 15 and 24 bit color depths are supported.\n");
-
-	return 2;
- }
-
- return 0;
-}
-
-void
-QuartzClientMessage (const xEvent *xe)
-{
- switch (xe->u.clientMessage.u.l.type)
- {
- case kXquartzControllerNotify:
-	AppleWMSendEvent (AppleWMControllerNotify,
-			 AppleWMControllerNotifyMask,
-			 xe->u.clientMessage.u.l.longs0,
-			 xe->u.clientMessage.u.l.longs1);
-	break;
-
- case kXquartzPasteboardNotify:
-	AppleWMSendEvent (AppleWMPasteboardNotify,
-			 AppleWMPasteboardNotifyMask,
-			 xe->u.clientMessage.u.l.longs0,
-			 xe->u.clientMessage.u.l.longs1);
-	break;
-
- case kXquartzActivate:
-	QuartzShow ();
-	AppleWMSendEvent (AppleWMActivationNotify,
-			 AppleWMActivationNotifyMask,
-			 AppleWMIsActive, 0);
-	break;
-
- case kXquartzDeactivate:
-	AppleWMSendEvent (AppleWMActivationNotify,
-			 AppleWMActivationNotifyMask,
-			 AppleWMIsInactive, 0);
-	QuartzHide ();
-	break;
-
- case kXquartzDisplayChanged:
-	QuartzUpdateScreens ();
-	break;
-
- case kXquartzWindowState:
-	RootlessNativeWindowStateChanged (xe->u.clientMessage.u.l.longs0,
-					 xe->u.clientMessage.u.l.longs1);
-	break;
-
- case kXquartzWindowMoved:
-	RootlessNativeWindowMoved (xe->u.clientMessage.u.l.longs0);
-	break;
-
- case kXquartzToggleFullscreen:
-	if (quartzEnableRootless)
-	 QuartzSetFullscreen (!quartzHasRoot);
-	else if (quartzHasRoot)
-	 QuartzHide ();
-	else
-	 QuartzShow ();
-	break;
-
- case kXquartzSetRootless:
-	QuartzSetRootless (xe->u.clientMessage.u.l.longs0);
-	if (!quartzEnableRootless && !quartzHasRoot)
-	 QuartzHide ();
- }
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/quartz.h Deleted

@@ -1,73 +0,0 @@
-/*
- * quartz.h
- *
- * External interface of the Quartz modes seen by the generic, mode
- * independent parts of the Darwin X server.
- */
-/*
- * Copyright (c) 2001 Greg Parker and Torrey T. Lyons.
- * Copyright (c) 2002 Apple Computer, Inc.
- *                 All Rights Reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/quartz.h,v 1.1 2002/03/28 02:21:18 torrey Exp $ */
-
-#ifndef _QUARTZ_H
-#define _QUARTZ_H
-
-#include "darwin.h"
-
-/* Local client message types */
-enum {
-  kXquartzControllerNotify = kXquartzFirstEvent,
-  kXquartzPasteboardNotify,
-  kXquartzActivate,
-  kXquartzDeactivate,
-  kXquartzDisplayChanged,
-  kXquartzWindowState,
-  kXquartzWindowMoved,
-  kXquartzToggleFullscreen,
-  kXquartzSetRootless,
-};
-
-extern int quartzUseSysBeep;
-extern int quartzServerVisible;
-extern int quartzDesiredDepth;
-extern int quartzHasRoot, quartzEnableRootless;
-extern int quartzFullscreenDisableHotkeys;
-extern int quartzXpluginOptions;
-
-int QuartzProcessArgument(int argc, char *argv, int i);
-void QuartzInitOutput(int argc, char **argv);
-void QuartzGiveUp(void);
-
-void QuartzMessageMainThread (int type, int argc, ...);
-void QuartzClientMessage (const struct _xEvent *xe);
-
-void QuartzRunClient (const char *command);
-
-Bool QuartzAddScreen(int index, ScreenPtr pScreen);
-Bool QuartzSetupScreen(int index, ScreenPtr pScreen);
-
-#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/rootless-common.c Deleted

@@ -1,497 +0,0 @@
-/*
- * Common rootless definitions and code
- *
- * Greg Parker gparker@cs.stanford.edu
- */
-
-/* Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/rootlessCommon.c,v 1.6 2002/07/15 19:58:31 torrey Exp $ */
-
-#include "rootless-common.h"
-#include "dri-surface.h"
-#include "fb.h"
-#include "colormapst.h"
-
-RegionRec rootlessHugeRoot = {{-32767, -32767, 32767, 32767}, NULL};
-
-/* Following two macros from miregion.c */
-
-/* true iff two Boxes overlap */
-#define EXTENTCHECK(r1,r2) \
- (!( ((r1)->x2 <= (r2)->x1) || \
- ((r1)->x1 >= (r2)->x2) || \
- ((r1)->y2 <= (r2)->y1) || \
- ((r1)->y1 >= (r2)->y2) ) )
-
-/* true iff Box r1 contains Box r2 */
-#define SUBSUMES(r1,r2) \
- ( ((r1)->x1 <= (r2)->x1) && \
- ((r1)->x2 >= (r2)->x2) && \
- ((r1)->y1 <= (r2)->y1) && \
- ((r1)->y2 >= (r2)->y2) )
-
-int rootlessNoDRIDrawing = 0;
-
-/* Returns the top-level parent of pWindow. The root is the top-level
- parent of itself, even though the root is not otherwise considered
- to be a top-level window. */
-WindowPtr
-TopLevelParent (WindowPtr pWindow)
-{
- WindowPtr top;
-
- if (IsRoot (pWindow))
-	return pWindow;
-
- top = pWindow;
- while (top != NULL && !IsTopLevel (top))
-	top = top->parent;
-
- return top;
-}
-
-/* Returns TRUE if this window is visible inside a frame (e.g. it is
- visible and has a top-level parent) */
-Bool
-IsFramedWindow (WindowPtr pWin)
-{
- WindowPtr top;
-
- if (!pWin->realized)
-	return FALSE;
-
- top = TopLevelParent (pWin);
-
- return top != NULL && WINREC (top) != NULL;
-}
-
-void
-TranslatePixmapBase (PixmapPtr pPix, int dx, int dy)
-{
- unsigned diff;
-
- pPix->devPrivate.ptr = ((char *) pPix->devPrivate.ptr +
-			 ((dx + pPix->drawable.x)
-			 * pPix->drawable.bitsPerPixel / 8 +
-			 dy * pPix->devKind));
-
- if (pPix->drawable.bitsPerPixel != FB_UNIT)
- {
-	diff = ((unsigned) pPix->devPrivate.ptr) & (FB_UNIT / CHAR_BIT - 1);
-	pPix->devPrivate.ptr = ((char *) pPix->devPrivate.ptr) - diff;
-
-	if (pPix->drawable.bitsPerPixel == 16)
-	 pPix->drawable.x = diff / (16 / CHAR_BIT);
-	else if (pPix->drawable.bitsPerPixel == 8)
-	 pPix->drawable.x = diff / (8 / CHAR_BIT);
-	else
-	 pPix->drawable.x = diff / (pPix->drawable.bitsPerPixel / CHAR_BIT);
- }
-}
-
-void
-RootlessDisableUpdate (WindowPtr pWin)
-{
- RootlessWindowRec *winRec = WINREC (pWin);
-
- if (winRec != NULL
-	&& !winRec->is_offscreen
-	&& !winRec->is_reorder_pending
-	&& !winRec->is_update_disabled)
- {
-	xp_disable_update ();
-	winRec->is_update_disabled = TRUE;
- }
-}
-
-void
-RootlessReenableUpdate (WindowPtr pWin)
-{
- RootlessWindowRec *winRec = WINREC (pWin);
-
- if (winRec != NULL && winRec->is_update_disabled)
- {
-	xp_reenable_update ();
-	winRec->is_update_disabled = FALSE;
- }
-}
-
-Bool
-RootlessResolveColormap (ScreenPtr pScreen, int first_color,
-			 int n_colors, uint32_t *colors)
-{
- int last, i;
- ColormapPtr map;
-
- map = RootlessGetColormap (pScreen);
- if (map == NULL || map->class != PseudoColor)
-	return FALSE;
-
- last = MIN (map->pVisual->ColormapEntries, first_color + n_colors);
- for (i = MAX (0, first_color); i < last; i++)
- {
-	Entry *ent = map->red + i;
-	uint16_t red, green, blue;
-
-	if (!ent->refcnt)
-	 continue;
-	if (ent->fShared)
-	{
-	 red = ent->co.shco.red->color;
-	 green = ent->co.shco.green->color;
-	 blue = ent->co.shco.blue->color;
-	}
-	else
-	{
-	 red = ent->co.local.red;
-	 green = ent->co.local.green;
-	 blue = ent->co.local.blue;
-	}
-
-	colorsi - first_color = (0xFF000000UL
-				 | ((uint32_t) red & 0xff00) << 8
-				 | (green & 0xff00)
-				 | (blue >> 8));
- }
-
- return TRUE;
-}
-
-/* Prepare a window for direct access to its backing buffer. Each
- top-level parent has a Pixmap representing its backing store, which
- all of its children inherit. */
-void
-RootlessStartDrawing (WindowPtr pWindow)
-{
- ScreenPtr pScreen = pWindow->drawable.pScreen;
- WindowPtr top = TopLevelParent (pWindow);
- RootlessWindowRec *winRec;
-
- if (!rootlessNoDRIDrawing && DRIStartDrawing (&pWindow->drawable))
- {
-	return;
- }
-
- /* At the top of the stack now. */
-
- if (top == NULL || WINREC (top) == NULL)
-	return;
-
- winRec = WINREC(top);
-
- /* Make sure the window's top-level parent is prepared for drawing. */
-
- if (!winRec->is_drawing)
- {
-	void *data2;
-	unsigned int rowbytes2;
-	xp_error err;
-
- int bw = wBorderWidth (top);
-
-	err = xp_lock_window (winRec->wid, NULL, NULL, data, rowbytes, NULL);
-	if (err != Success)
-	 abort ();			/* FIXME: */
-
-	winRec->data = data0;
-	winRec->rowbytes = rowbytes0;
-
- winRec->pixmap =
- GetScratchPixmapHeader(pScreen, winRec->width, winRec->height,
- winRec->win->drawable.depth,
- winRec->win->drawable.bitsPerPixel,
- winRec->rowbytes, winRec->data);
- TranslatePixmapBase (winRec->pixmap,
-			 - (top->drawable.x - bw),
-			 - (top->drawable.y - bw));
-
- winRec->is_drawing = TRUE;
- }
-
- winRec->oldPixmap = pScreen->GetWindowPixmap (pWindow);
- pScreen->SetWindowPixmap (pWindow, winRec->pixmap);
-}
-
-void
-RootlessFinishedDrawing (WindowPtr pWindow)
-{
- /* Called after each drawing primitive, lets us unlock surfaces
- as often as possible (which is a Good Thing to do.) */
-
- DRIStopDrawing (&pWindow->drawable, FALSE);
-
- /* Also, see if we're due a flush. */
-
- RootlessMayRedisplay (pWindow->drawable.pScreen);
-}
-
-void
-RootlessStopDrawing (WindowPtr pWindow, Bool flush)
-{
- WindowPtr top = TopLevelParent (pWindow);
- RootlessWindowRec *winRec;
-
- if (top == NULL || WINREC (top) == NULL)
-	return;
-
- winRec = WINREC(top);
-
- DRIStopDrawing (&pWindow->drawable, flush);
-
- if (winRec->is_drawing)
- {
- ScreenPtr pScreen = pWindow->drawable.pScreen;
-
-	xp_unlock_window (winRec->wid, flush);
-
- FreeScratchPixmapHeader (winRec->pixmap);
- pScreen->SetWindowPixmap (pWindow, winRec->oldPixmap);
- winRec->pixmap = NULL;
-
- winRec->is_drawing = FALSE;
- }
- else if (flush)
- {
-	xp_flush_window (winRec->wid);
- }
-
- /* FIXME: instead of just checking if we tried to flush (which
- happens every time we block for I/O), I used to check if
- anything was actually marked in the window. But that often
- caused problems with some window managers, and it didn't really
- make any noticeable difference, so... */
-
- if (flush && winRec->is_reorder_pending)
- {
-	winRec->is_reorder_pending = FALSE;
-	RootlessReorderWindow (pWindow);
- }
-
- if (flush && winRec->is_update_disabled)
- {
-	RootlessReenableUpdate (pWindow);
- }
-}
-
-/* pRegion is GLOBAL */
-void
-RootlessDamageRegion (WindowPtr pWindow, RegionPtr pRegion)
-{
- RootlessWindowRec *winRec;
- RegionRec clipped;
- WindowPtr pTop;
- BoxPtr b1, b2;
-
- RL_DEBUG_MSG("Damaged win 0x%x ", pWindow);
-
- pTop = TopLevelParent (pWindow);
- if (pTop == NULL)
-	return;
-
- winRec = WINREC (pTop);
- if (winRec == NULL)
-	return;
-
- if (DRIDamageRegion (&pWindow->drawable, pRegion))
- {
-	return;
- }
-
- /* We need to intersect the drawn region with the clip of the window
- to avoid marking places we didn't actually draw (which can cause
- problems when the window has an extra client-side backing store)
-
- But this is a costly operation and since we'll normally just be
- drawing inside the clip, go to some lengths to avoid the general
- case intersection. */
-
- b1 = REGION_EXTENTS (pScreen, &pWindow->borderClip);
- b2 = REGION_EXTENTS (pScreen, pRegion);
-
- if (EXTENTCHECK (b1, b2))
- {
-	/* Regions may overlap. */
-
-	if (REGION_NUM_RECTS (pRegion) == 1)
-	{
-	 int in;
-
-	 /* Damaged region only has a single rect, so we can
-	 just compare that against the region */
-
-	 in = RECT_IN_REGION (pScreen, &pWindow->borderClip,
-				 REGION_RECTS (pRegion));
-	 if (in == rgnIN)
-	 {
-		/* clip totally contains pRegion */
-
-		xp_mark_window (winRec->wid, REGION_NUM_RECTS (pRegion),
-				REGION_RECTS (pRegion),
-				-winRec->x, -winRec->y);
-
-		RootlessQueueRedisplay (pTop->drawable.pScreen);
-		goto out;
-	 }
-	 else if (in == rgnOUT)
-	 {
-		/* clip doesn't contain pRegion */
-
-		goto out;
-	 }
-	}
-
-	/* clip overlaps pRegion, need to intersect */
-
-	REGION_INIT (pScreen, &clipped, NullBox, 0);
-	REGION_INTERSECT (pScreen, &clipped, &pWindow->borderClip, pRegion);
-
-	xp_mark_window (winRec->wid, REGION_NUM_RECTS (&clipped),
-			REGION_RECTS (&clipped), -winRec->x, -winRec->y);
-
-	REGION_UNINIT (pScreen, &clipped);
-
-	RootlessQueueRedisplay (pTop->drawable.pScreen);
- }
-
-out:
-#ifdef ROOTLESSDEBUG
- {
- BoxRec *box = REGION_RECTS(pRegion), *end;
- int numBox = REGION_NUM_RECTS(pRegion);
-
- for (end = box+numBox; box < end; box++) {
- RL_DEBUG_MSG("Damage rect: %i, %i, %i, %i\n",
- box->x1, box->x2, box->y1, box->y2);
- }
- }
-#endif
- return;
-}
-
-/* pBox is GLOBAL */
-void
-RootlessDamageBox (WindowPtr pWindow, BoxPtr pBox)
-{
- RegionRec region;
-
- REGION_INIT (pWindow->drawable.pScreen, &region, pBox, 1);
-
- RootlessDamageRegion (pWindow, &region);
-
- REGION_UNINIT (pWindow->drawable.pScreen, &region);	/* no-op */
-}
-
-
-/* (x, y, w, h) is in window-local coordinates. */
-void
-RootlessDamageRect(WindowPtr pWindow, int x, int y, int w, int h)
-{
- BoxRec box;
- RegionRec region;
-
- x += pWindow->drawable.x;
- y += pWindow->drawable.y;
-
- box.x1 = x;
- box.x2 = x + w;
- box.y1 = y;
- box.y2 = y + h;
-
- REGION_INIT (pWindow->drawable.pScreen, &region, &box, 1);
-
- RootlessDamageRegion (pWindow, &region);
-
- REGION_UNINIT (pWindow->drawable.pScreen, &region);	/* no-op */
-}
-
-/* Stop drawing and redisplay the damaged region of a window. */
-void
-RootlessRedisplay (WindowPtr pWindow)
-{
- DRISynchronizeDrawable (&pWindow->drawable, TRUE);
- RootlessStopDrawing(pWindow, TRUE);
-}
-
-/* Walk every window on a screen and redisplay the damaged regions. */
-void
-RootlessRedisplayScreen (ScreenPtr pScreen)
-{
- RootlessScreenRec *screenRec = SCREENREC (pScreen);
- WindowPtr root = WindowTablepScreen->myNum;
- WindowPtr win;
-
- if (root != NULL)
- {
- RootlessRedisplay(root);
-
- for (win = root->firstChild; win; win = win->nextSib)
-	{
- if (WINREC (win) != NULL)
- RootlessRedisplay (win);
- }
- }
-
- screenRec->last_redisplay = GetTimeInMillis ();
-}
-
-void
-RootlessRepositionWindows (ScreenPtr pScreen)
-{
- WindowPtr root = WindowTablepScreen->myNum;
- WindowPtr win;
-
- if (root != NULL)
- {
- RootlessRepositionWindow (root);
-
- for (win = root->firstChild; win; win = win->nextSib)
-	{
- if (WINREC (win) != NULL)
- RootlessRepositionWindow (win);
- }
- }
-}
-
-void
-RootlessFlushScreenColormaps (ScreenPtr pScreen)
-{
- WindowPtr root = WindowTablepScreen->myNum;
- WindowPtr win;
-
- if (root != NULL)
- {
- RootlessRepositionWindow (root);
-
- for (win = root->firstChild; win; win = win->nextSib)
-	{
- if (WINREC (win) != NULL)
- RootlessFlushWindowColormap (win);
- }
- }
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/rootless-common.h Deleted

@@ -1,305 +0,0 @@
-/*
- * Common internal rootless definitions and code
- *
- * Greg Parker gparker@cs.stanford.edu
- */
-
-/* Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/rootlessCommon.h,v 1.6 2002/07/24 05:58:33 torrey Exp $ */
-
-#ifndef _ROOTLESSCOMMON_H
-#define _ROOTLESSCOMMON_H
-
-#include "rootless.h"
-
-#include "pixmapstr.h"
-#include "windowstr.h"
-
-#ifdef RENDER
-#include "picturestr.h"
-#endif
-
-/* Debug output, or not. */
-#ifdef ROOTLESSDEBUG
-#define RL_DEBUG_MSG ErrorF
-#else
-#define RL_DEBUG_MSG(a, ...)
-#endif
-
-#undef MIN
-#define MIN(x,y) ((x) < (y) ? (x) : (y))
-#undef MAX
-#define MAX(x,y) ((x) > (y) ? (x) : (y))
-
-/* Global variables */
-extern int rootlessGCPrivateIndex;
-extern int rootlessScreenPrivateIndex;
-extern int rootlessWindowPrivateIndex;
-extern int rootlessNoDRIDrawing;
-
-/* RootlessGCRec: private per-gc data */
-typedef struct {
- GCFuncs *originalFuncs;
- GCOps *originalOps;
-} RootlessGCRec;
-
-/* RootlessWindowRec: private per-window data */
-typedef struct RootlessWindowRec {
- int x, y;
- unsigned int width, height;
- unsigned int borderWidth;
- int level;
-
- xp_window_id wid;
- WindowPtr win;
-
- /* Valid when locked (i.e. is_drawing is set) */
- void *data;
- unsigned int rowbytes;
-
- PixmapPtr pixmap;
- PixmapPtr oldPixmap;
-
- unsigned long unrealize_time;	/* in seconds */
-
- unsigned int is_drawing :1;
- unsigned int is_update_disabled :1;
- unsigned int is_reorder_pending :1;
- unsigned int is_offscreen :1;
- unsigned int is_obscured :1;
-} RootlessWindowRec;
-
-/* RootlessScreenRec: per-screen private data */
-typedef struct {
- ScreenPtr pScreen;
-
- CreateScreenResourcesProcPtr CreateScreenResources;
- CloseScreenProcPtr CloseScreen;
-
- CreateWindowProcPtr CreateWindow;
- DestroyWindowProcPtr DestroyWindow;
- RealizeWindowProcPtr RealizeWindow;
- UnrealizeWindowProcPtr UnrealizeWindow;
- ReparentWindowProcPtr ReparentWindow;
- MoveWindowProcPtr MoveWindow;
- ResizeWindowProcPtr ResizeWindow;
- RestackWindowProcPtr RestackWindow;
- ChangeBorderWidthProcPtr ChangeBorderWidth;
- PositionWindowProcPtr PositionWindow;
- ChangeWindowAttributesProcPtr ChangeWindowAttributes;
-
- CreateGCProcPtr CreateGC;
- PaintWindowBackgroundProcPtr PaintWindowBackground;
- PaintWindowBorderProcPtr PaintWindowBorder;
- CopyWindowProcPtr CopyWindow;
- GetImageProcPtr GetImage;
- SourceValidateProcPtr SourceValidate;
-
- MarkOverlappedWindowsProcPtr MarkOverlappedWindows;
- ValidateTreeProcPtr ValidateTree;
-
-#ifdef SHAPE
- SetShapeProcPtr SetShape;
-#endif
-
-#ifdef RENDER
- CompositeProcPtr Composite;
- GlyphsProcPtr Glyphs;
-#endif
-
- InstallColormapProcPtr InstallColormap;
- UninstallColormapProcPtr UninstallColormap;
- StoreColorsProcPtr StoreColors;
-
- void *pixmap_data;
- unsigned int pixmap_data_size;
-
- ColormapPtr colormap;
-
- void *redisplay_timer;
- CARD32 last_redisplay;
-
- unsigned int redisplay_timer_set :1;
- unsigned int redisplay_queued :1;
- unsigned int redisplay_expired :1;
- unsigned int colormap_changed :1;
-} RootlessScreenRec;
-
-
-/* "Definition of the Porting Layer for the X11 Sample Server" says
- unwrap and rewrap of screen functions is unnecessary, but
- screen->CreateGC changes after a call to cfbCreateGC. */
-
-#define SCREEN_UNWRAP(screen, fn) \
- screen->fn = SCREENREC(screen)->fn;
-
-#define SCREEN_WRAP(screen, fn) \
- SCREENREC(screen)->fn = screen->fn; \
- screen->fn = Rootless##fn
-
-/* Accessors for screen and window privates */
-
-#define SCREENREC(pScreen) \
- ((RootlessScreenRec*)(pScreen)->devPrivatesrootlessScreenPrivateIndex.ptr)
-
-#define WINREC(pWin) \
- ((RootlessWindowRec *)(pWin)->devPrivatesrootlessWindowPrivateIndex.ptr)
-
-/* BoxRec manipulators (Copied from shadowfb) */
-
-#define TRIM_BOX(box, pGC) { \
- BoxPtr extents = &pGC->pCompositeClip->extents;\
- if(box.x1 < extents->x1) box.x1 = extents->x1; \
- if(box.x2 > extents->x2) box.x2 = extents->x2; \
- if(box.y1 < extents->y1) box.y1 = extents->y1; \
- if(box.y2 > extents->y2) box.y2 = extents->y2; \
-}
-
-#define TRANSLATE_BOX(box, pDraw) { \
- box.x1 += pDraw->x; \
- box.x2 += pDraw->x; \
- box.y1 += pDraw->y; \
- box.y2 += pDraw->y; \
-}
-
-#define TRIM_AND_TRANSLATE_BOX(box, pDraw, pGC) { \
- TRANSLATE_BOX(box, pDraw); \
- TRIM_BOX(box, pGC); \
-}
-
-#define BOX_NOT_EMPTY(box) \
- (((box.x2 - box.x1) > 0) && ((box.y2 - box.y1) > 0))
-
-/* We don't want to clip windows to the edge of the screen. HUGE_ROOT
- temporarily makes the root window really big. This is needed as a
- wrapper around any function that calls SetWinSize or SetBorderSize
- which clip a window against its parents, including the root. */
-
-extern RegionRec rootlessHugeRoot;
-
-#define HUGE_ROOT(pWin) 			\
- do { 					\
-	WindowPtr w = pWin; 			\
-	while (w->parent != NULL)		\
-	 w = w->parent; 			\
- saveRoot = w->winSize; 			\
- w->winSize = rootlessHugeRoot; 		\
- } while (0)
-
-#define NORMAL_ROOT(pWin) 		\
- do { 				\
-	WindowPtr w = pWin; 		\
-	while (w->parent != NULL)	\
-	 w = w->parent;		\
-	w->winSize = saveRoot; 		\
- } while (0)
-
-/* Returns TRUE if this window is a top-level window (i.e. child of the root)
- The root is not a top-level window. */
-#define IsTopLevel(pWin) \
- ((pWin) != NULL && (pWin)->parent != NULL && (pWin)->parent->parent == NULL)
-
-/* Returns TRUE if this window is a root window */
-#define IsRoot(pWin) \
- ((pWin) == WindowTable(pWin)->drawable.pScreen->myNum)
-
-/* Returns the top-level parent of pWindow.
- The root is the top-level parent of itself, even though the root is
- not otherwise considered to be a top-level window. */
-extern WindowPtr TopLevelParent (WindowPtr pWindow);
-
-/* Returns TRUE if this window is visible inside a frame (e.g. it is
- visible and has a top-level or root parent) */
-extern Bool IsFramedWindow (WindowPtr pWin);
-
-/* Adjust base address of pixmap by DX,DY */
-extern void TranslatePixmapBase (PixmapPtr pPix, int dx, int dy);
-
-/* Prepare a window for direct access to its backing buffer. */
-extern void RootlessStartDrawing (WindowPtr pWindow);
-
-/* Mark that no more drawing operations will hit the window until ``start
- drawing'' is issued again. */
-extern void RootlessFinishedDrawing (WindowPtr pWindow);
-
-/* Finish drawing to a window's backing buffer. */
-extern void RootlessStopDrawing (WindowPtr pWindow, Bool flush);
-
-/* Routines that cause regions to get redrawn.
- DamageRegion and DamageRect are in global coordinates.
- DamageBox is in window-local coordinates. */
-extern void RootlessDamageRegion (WindowPtr pWindow, RegionPtr pRegion);
-extern void RootlessDamageRect (WindowPtr pWindow, int x, int y, int w, int h);
-extern void RootlessDamageBox (WindowPtr pWindow, BoxPtr pBox);
-extern void RootlessRedisplay (WindowPtr pWindow);
-extern void RootlessRedisplayScreen (ScreenPtr pScreen);
-
-extern void RootlessQueueRedisplay (ScreenPtr pScreen);
-extern Bool RootlessMayRedisplay (ScreenPtr pScreen);
-extern void RootlessScreenExpose (ScreenPtr pScreen);
-
-/* Return the colormap currently installed on the given screen. */
-extern ColormapPtr RootlessGetColormap (ScreenPtr pScreen);
-
-/* Convert colormap to ARGB. */
-extern Bool RootlessResolveColormap (ScreenPtr pScreen, int first_color,
-				 int n_colors, uint32_t *colors);
-
-extern void RootlessFlushWindowColormap (WindowPtr pWin);
-extern void RootlessFlushScreenColormaps (ScreenPtr pScreen);
-
-/* Move windows back to their position relative to the screen origin. */
-extern void RootlessRepositionWindow (WindowPtr pWin);
-extern void RootlessRepositionWindows (ScreenPtr pScreen);
-
-/* Move the window to it's correct place in the physical stacking order */
-extern void RootlessReorderWindow (WindowPtr pWin);
-
-/* Bit mask for alpha channel with a particular number of bits per
- pixel. Note that we only care for 32bpp data. OS X uses planar alpha
- for 16bpp. */
-#define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0)
-
-#ifdef RENDER
-extern void RootlessComposite(CARD8 op, PicturePtr pSrc,
-			 PicturePtr pMask, PicturePtr pDst,
-			 INT16 xSrc, INT16 ySrc,
-			 INT16 xMask, INT16 yMask,
-			 INT16 xDst, INT16 yDst,
-			 CARD16 width, CARD16 height);
-#endif
-
-extern void RootlessNativeWindowStateChanged (xp_window_id id,
-					 unsigned int state);
-
-extern void RootlessEnableRoot (ScreenPtr pScreen);
-extern void RootlessDisableRoot (ScreenPtr pScreen);
-extern void RootlessSetWindowLevel (WindowPtr pWin, int level);
-
-#endif /* _ROOTLESSCOMMON_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/rootless-gc.c Deleted

@@ -1,1526 +0,0 @@
-/*
- * Graphics Context support for Mac OS X rootless X server
- */
-/*
- * Copyright (c) 2001 Greg Parker. All Rights Reserved.
- * Copyright (c) 2002 Torrey T. Lyons. All Rights Reserved.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/rootlessGC.c,v 1.3 2002/07/24 05:58:33 torrey Exp $ */
-
-#include "mi.h"
-#include "scrnintstr.h"
-#include "gcstruct.h"
-#include "pixmapstr.h"
-#include "windowstr.h"
-#include "dixfontstr.h"
-#include "mivalidate.h"
-#include "fb.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "rootless-common.h"
-
-
-// GC functions
-static void 
-RootlessValidateGC(GCPtr pGC, unsigned long changes,
- DrawablePtr pDrawable);
-static void RootlessChangeGC(GCPtr pGC, unsigned long mask);
-static void RootlessCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst);
-static void RootlessDestroyGC(GCPtr pGC);
-static void RootlessChangeClip(GCPtr pGC, int type, pointer pvalue,
- int nrects);
-static void RootlessDestroyClip(GCPtr pGC);
-static void RootlessCopyClip(GCPtr pgcDst, GCPtr pgcSrc);
-
-GCFuncs rootlessGCFuncs = {
- RootlessValidateGC,
- RootlessChangeGC,
- RootlessCopyGC,
- RootlessDestroyGC,
- RootlessChangeClip,
- RootlessDestroyClip,
- RootlessCopyClip,
-};
-
-// GC operations
-static void RootlessFillSpans();
-static void RootlessSetSpans();
-static void RootlessPutImage();
-static RegionPtr RootlessCopyArea();
-static RegionPtr RootlessCopyPlane();
-static void RootlessPolyPoint();
-static void RootlessPolylines();
-static void RootlessPolySegment();
-static void RootlessPolyRectangle();
-static void RootlessPolyArc();
-static void RootlessFillPolygon();
-static void RootlessPolyFillRect();
-static void RootlessPolyFillArc();
-static int RootlessPolyText8();
-static int RootlessPolyText16();
-static void RootlessImageText8();
-static void RootlessImageText16();
-static void RootlessImageGlyphBlt();
-static void RootlessPolyGlyphBlt();
-static void RootlessPushPixels();
-
-static GCOps rootlessGCOps = {
- RootlessFillSpans,
- RootlessSetSpans,
- RootlessPutImage,
- RootlessCopyArea,
- RootlessCopyPlane,
- RootlessPolyPoint,
- RootlessPolylines,
- RootlessPolySegment,
- RootlessPolyRectangle,
- RootlessPolyArc,
- RootlessFillPolygon,
- RootlessPolyFillRect,
- RootlessPolyFillArc,
- RootlessPolyText8,
- RootlessPolyText16,
- RootlessImageText8,
- RootlessImageText16,
- RootlessImageGlyphBlt,
- RootlessPolyGlyphBlt,
- RootlessPushPixels
-#ifdef NEED_LINEHELPER
- , NULL
-#endif
-};
-
-
-Bool
-RootlessCreateGC(GCPtr pGC)
-{
- RootlessGCRec *gcrec;
- RootlessScreenRec *s;
- Bool result;
-
- SCREEN_UNWRAP(pGC->pScreen, CreateGC);
- s = (RootlessScreenRec *) pGC->pScreen->
- devPrivatesrootlessScreenPrivateIndex.ptr;
- result = s->CreateGC(pGC);
- gcrec = (RootlessGCRec *) pGC->devPrivatesrootlessGCPrivateIndex.ptr;
- gcrec->originalOps = NULL; // don't wrap ops yet
- gcrec->originalFuncs = pGC->funcs;
- pGC->funcs = &rootlessGCFuncs;
-
- SCREEN_WRAP(pGC->pScreen, CreateGC);
- return result;
-}
-
-
-// GC func wrapping
-// ValidateGC wraps gcOps iff dest is viewable. All others just unwrap&call.
-
-// GCFUN_UNRAP assumes funcs have been wrapped and 
-// does not assume ops have been wrapped
-#define GCFUNC_UNWRAP(pGC) \
- RootlessGCRec *gcrec = (RootlessGCRec *) \
- (pGC)->devPrivatesrootlessGCPrivateIndex.ptr; \
- (pGC)->funcs = gcrec->originalFuncs; \
- if (gcrec->originalOps) { \
- (pGC)->ops = gcrec->originalOps; \
-}
-
-#define GCFUNC_WRAP(pGC) \
- gcrec->originalFuncs = (pGC)->funcs; \
- (pGC)->funcs = &rootlessGCFuncs; \
- if (gcrec->originalOps) { \
- gcrec->originalOps = (pGC)->ops; \
- (pGC)->ops = &rootlessGCOps; \
-}
-
-/* Turn drawing on the root into a no-op */
-#define GC_IS_ROOT(pDst) ((pDst)->type == DRAWABLE_WINDOW \
-			 && IsRoot ((WindowPtr) (pDst)) \
-			 && WINREC ((WindowPtr) (pDst)) == NULL)
-
-#define GC_SKIP_ROOT(pDst)	\
- do {			\
-	if (GC_IS_ROOT (pDst))	\
-	 return;		\
- } while (0)
-	
-/* Our main problem when drawing is that we have to make sure that
- the alpha channel of the windows we're drawing in is always opaque.
-
- fb makes this harder than it would otherwise be by noticing that a
- planemask of 0x00ffffff includes all bits when depth=24, and so
- "optimizes" the pm to 0xffffffff. We work around that by temporarily
- setting depth=bpp while changing the GC.
-
- Anyway, so the normal situation (in 32 bit mode) is that the
- planemask is 0x00ffffff and thus fb leaves the alpha channel alone
- (and it's opaque initially, so things work out).
-
- But there's a problem with drawing with a planemask that doesn't
- have all bits set - it normally causes fb to fall off its fastest
- paths when blitting and filling.
-
- So my solution to that is to try to recognize when we can relax the
- planemask back to ~0, and do that for the duration of the drawing
- operation, setting the alpha channel in fg/bg pixels to opaque at
- the same time. We can do this when drawing op is GXcopy. We can also
- do it when copying from another window (since its alpha channel must
- also be opaque).
-
- Note that even when we can't set planemask to all ones, fbBlt may
- still choose altivec'd code if it's GXcopy and a forwards copy. This
- is mainly intended for copying from pixmaps to windows. The copy
- operation used sets alpha to opaque.
-
- The three macros below are used to implement this, drawing ops look
- something like this:
-
- OP {
- GC_SAVE (gc);
- GCFUNC_UNWRAP (gc);
-
- ...
-
- if (can_accel_xxx (..) && otherwise-suitable)
-	 GC_UNSET_PM (gc, dst);
-
- gc->funcs->OP (gc, ...);
-
- GC_RESTORE (gc, dst);
- GCFUNC_WRAP (gc);
- }
-
- */
-
-#define GC_SAVE(pGC) 				\
- unsigned long _save_fg = (pGC)->fgPixel;	\
- unsigned long _save_bg = (pGC)->bgPixel;	\
- unsigned long _save_pm = (pGC)->planemask;	\
- Bool _changed = FALSE
-
-#define GC_RESTORE(pGC, pDraw)					\
- do {							\
-	if (_changed) {						\
-	 unsigned int depth = (pDraw)->depth;		\
-	 (pGC)->fgPixel = _save_fg;				\
-	 (pGC)->bgPixel = _save_bg;				\
-	 (pGC)->planemask = _save_pm;			\
-	 (pDraw)->depth = (pDraw)->bitsPerPixel;		\
-	 validate_gc (pGC, GCForeground | GCBackground	\
-			 | GCPlaneMask, pDraw);			\
-	 (pDraw)->depth = depth;				\
-	}							\
- } while (0)
-
-#define GC_UNSET_PM(pGC, pDraw)						\
- do {								\
-	unsigned int mask = RootlessAlphaMask ((pDraw)->bitsPerPixel);	\
-	if (((pGC)->planemask & mask) != mask) {			\
-	 unsigned int depth = (pDraw)->depth;			\
-	 (pGC)->fgPixel |= mask;					\
-	 (pGC)->bgPixel |= mask;					\
-	 (pGC)->planemask |= mask;					\
-	 (pDraw)->depth = (pDraw)->bitsPerPixel;			\
-	 validate_gc (pGC, GCForeground				\
-			 | GCBackground | GCPlaneMask, pDraw);		\
-	 (pDraw)->depth = depth;					\
-	 _changed = TRUE;						\
-	}								\
- } while (0)
-
-static void
-validate_gc (GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
-{
- RootlessGCRec *gcrec = (RootlessGCRec *)
- (pGC)->devPrivatesrootlessGCPrivateIndex.ptr;
-
- pGC->funcs->ValidateGC(pGC, changes, pDrawable);
-
- if (((WindowPtr) pDrawable)->viewable)
- {
-	gcrec->originalOps = pGC->ops;
- }
-}
-
-static RootlessWindowRec *
-can_accel_blit (DrawablePtr pDraw, GCPtr pGC)
-{
- WindowPtr pTop;
- RootlessWindowRec *winRec;
- unsigned int pm;
-
- if (pGC->alu != GXcopy)
-	return NULL;
-
- if (pDraw->type != DRAWABLE_WINDOW)
-	return NULL;
-
- pm = ~RootlessAlphaMask (pDraw->bitsPerPixel);
- if ((pGC->planemask & pm) != pm)
-	return NULL;
-
- pTop = TopLevelParent ((WindowPtr) pDraw);
- if (pTop == NULL)
-	return NULL;
-
- winRec = WINREC(pTop);
- if (winRec == NULL)
-	return NULL;
-
- return winRec;
-}
-
-static inline RootlessWindowRec *
-can_accel_fill (DrawablePtr pDraw, GCPtr pGC)
-{
- if (pGC->fillStyle != FillSolid)
-	return NULL;
-
- return can_accel_blit (pDraw, pGC);
-}
-
-static unsigned int
-box_bytes (DrawablePtr pDraw, BoxRec *box)
-{
- unsigned int pixels;
-
- pixels = (box->x2 - box->x1) * (box->y2 - box->y1);
-
- return pixels * (pDraw->bitsPerPixel >> 3);
-}
-
-static void
-RootlessValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
-{
- GCFUNC_UNWRAP(pGC);
-
- gcrec->originalOps = NULL;
-
- if (pDrawable->type == DRAWABLE_WINDOW)
- {
-	/* Prevent fb relaxing planemask by telling it we use all
-	 bits temporarily. */
-
-	unsigned int depth = pDrawable->depth;
-	pDrawable->depth = pDrawable->bitsPerPixel;
-	pGC->planemask &= ~RootlessAlphaMask (pDrawable->bitsPerPixel);
-	validate_gc (pGC, changes | GCPlaneMask, pDrawable);
-	pDrawable->depth = depth;
- }
- else
- pGC->funcs->ValidateGC(pGC, changes, pDrawable);
-
- GCFUNC_WRAP(pGC);
-}
-
-static void RootlessChangeGC(GCPtr pGC, unsigned long mask)
-{
- GCFUNC_UNWRAP(pGC);
- pGC->funcs->ChangeGC(pGC, mask);
- GCFUNC_WRAP(pGC);
-}
-
-static void RootlessCopyGC(GCPtr pGCSrc, unsigned long mask, GCPtr pGCDst)
-{
- GCFUNC_UNWRAP(pGCDst);
- pGCDst->funcs->CopyGC(pGCSrc, mask, pGCDst);
- GCFUNC_WRAP(pGCDst);
-}
-
-static void RootlessDestroyGC(GCPtr pGC)
-{
- GCFUNC_UNWRAP(pGC);
- pGC->funcs->DestroyGC(pGC);
- GCFUNC_WRAP(pGC);
-}
-
-static void RootlessChangeClip(GCPtr pGC, int type, pointer pvalue, int nrects)
-{
- GCFUNC_UNWRAP(pGC);
- pGC->funcs->ChangeClip(pGC, type, pvalue, nrects);
- GCFUNC_WRAP(pGC);
-}
-
-static void RootlessDestroyClip(GCPtr pGC)
-{
- GCFUNC_UNWRAP(pGC);
- pGC->funcs->DestroyClip(pGC);
- GCFUNC_WRAP(pGC);
-}
-
-static void RootlessCopyClip(GCPtr pgcDst, GCPtr pgcSrc)
-{
- GCFUNC_UNWRAP(pgcDst);
- pgcDst->funcs->CopyClip(pgcDst, pgcSrc);
- GCFUNC_WRAP(pgcDst);
-}
-
-
-// GC ops
-// We can't use shadowfb because shadowfb assumes one pixmap
-// and our root window is a special case.
-// So much of this code is copied from shadowfb.
-
-// assumes both funcs and ops are wrapped
-#define GCOP_UNWRAP(pGC) \
- RootlessGCRec *gcrec = (RootlessGCRec *) \
- (pGC)->devPrivatesrootlessGCPrivateIndex.ptr; \
- GCFuncs *saveFuncs = pGC->funcs; \
- (pGC)->funcs = gcrec->originalFuncs; \
- (pGC)->ops = gcrec->originalOps;
-
-#define GCOP_WRAP(pGC) \
- gcrec->originalOps = (pGC)->ops; \
- (pGC)->funcs = saveFuncs; \
- (pGC)->ops = &rootlessGCOps;
-
-
-static void
-RootlessFillSpans(DrawablePtr dst, GCPtr pGC, int nInit,
- DDXPointPtr pptInit, int *pwidthInit, int sorted)
-{
- GC_SAVE (pGC);
-
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("fill spans start\n");
-
- if (nInit <= 0) {
- pGC->ops->FillSpans(dst, pGC, nInit, pptInit, pwidthInit, sorted);
- } else {
- DDXPointPtr ppt = pptInit;
- int *pwidth = pwidthInit;
- int i = nInit;
- BoxRec box;
-
- box.x1 = ppt->x;
- box.x2 = box.x1 + *pwidth;
- box.y2 = box.y1 = ppt->y;
-
- while(--i) {
- ppt++;
- pwidthInit++;
- if(box.x1 > ppt->x)
- box.x1 = ppt->x;
- if(box.x2 < (ppt->x + *pwidth))
- box.x2 = ppt->x + *pwidth;
- if(box.y1 > ppt->y)
- box.y1 = ppt->y;
- else if(box.y2 < ppt->y)
- box.y2 = ppt->y;
- }
-
- box.y2++;
-
- RootlessStartDrawing((WindowPtr) dst);
-
-	if (can_accel_fill (dst, pGC)
-	 && box_bytes (dst, &box) >= xp_fill_bytes_threshold)
-	{
-	 GC_UNSET_PM (pGC, dst);
-	}
-
- pGC->ops->FillSpans(dst, pGC, nInit, pptInit, pwidthInit, sorted);
-
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
-	RootlessFinishedDrawing ((WindowPtr) dst);
- }
-
- GC_RESTORE (pGC, dst);
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("fill spans end\n");
-}
-
-static void
-RootlessSetSpans(DrawablePtr dst, GCPtr pGC, char *pSrc,
- DDXPointPtr pptInit, int *pwidthInit,
- int nspans, int sorted)
-{
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("set spans start\n");
-
- if (nspans <= 0) {
- pGC->ops->SetSpans(dst, pGC, pSrc, pptInit, pwidthInit,
- nspans, sorted);
- } else {
- DDXPointPtr ppt = pptInit;
- int *pwidth = pwidthInit;
- int i = nspans;
- BoxRec box;
-
- box.x1 = ppt->x;
- box.x2 = box.x1 + *pwidth;
- box.y2 = box.y1 = ppt->y;
-
- while(--i) {
- ppt++;
- pwidth++;
- if(box.x1 > ppt->x)
- box.x1 = ppt->x;
- if(box.x2 < (ppt->x + *pwidth))
- box.x2 = ppt->x + *pwidth;
- if(box.y1 > ppt->y)
- box.y1 = ppt->y;
- else if(box.y2 < ppt->y)
- box.y2 = ppt->y;
- }
-
- box.y2++;
-
- RootlessStartDrawing((WindowPtr) dst);
- pGC->ops->SetSpans(dst, pGC, pSrc, pptInit, pwidthInit,
- nspans, sorted);
-
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
-	RootlessFinishedDrawing ((WindowPtr) dst);
- }
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("set spans end\n");
-}
-
-static void
-RootlessPutImage(DrawablePtr dst, GCPtr pGC,
- int depth, int x, int y, int w, int h,
- int leftPad, int format, char *pBits)
-{
- BoxRec box;
-
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("put image start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
- pGC->ops->PutImage(dst, pGC, depth, x,y,w,h, leftPad, format, pBits);
-
- box.x1 = x + dst->x;
- box.x2 = box.x1 + w;
- box.y1 = y + dst->y;
- box.y2 = box.y1 + h;
-
- TRIM_BOX(box, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("put image end\n");
-}
-
-/* changed area is *dest* rect */
-static RegionPtr
-RootlessCopyArea(DrawablePtr pSrc, DrawablePtr dst, GCPtr pGC,
- int srcx, int srcy, int w, int h,
- int dstx, int dsty)
-{
- RegionPtr result;
- BoxRec box;
- GC_SAVE (pGC);
- Bool src_drawing = FALSE;
-
- if (GC_IS_ROOT (dst) || GC_IS_ROOT (pSrc))
-	return NULL;			/* nothing exposed */
-
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("copy area start (src 0x%x, dst 0x%x)\n", pSrc, dst);
-
- if (pSrc->type == DRAWABLE_WINDOW && IsFramedWindow((WindowPtr)pSrc))
- {
-	unsigned int bytes;
-
-	/* If both source and dest are windows, and we're doing
-	 a simple copy operation, we can remove the alpha-protecting
-	 planemask (since source has opaque alpha as well) */
-
-	bytes = w * h * (pSrc->depth >> 3);
-
-	if (bytes >= xp_copy_bytes_threshold && can_accel_blit (pSrc, pGC))
-	{
-	 GC_UNSET_PM (pGC, dst);
-	}
-
- RootlessStartDrawing((WindowPtr) pSrc);
-	src_drawing = TRUE;
- }
- RootlessStartDrawing((WindowPtr) dst);
- result = pGC->ops->CopyArea(pSrc, dst, pGC, srcx, srcy, w, h, dstx, dsty);
-
- box.x1 = dstx + dst->x;
- box.x2 = box.x1 + w;
- box.y1 = dsty + dst->y;
- box.y2 = box.y1 + h;
-
- TRIM_BOX(box, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
- RootlessFinishedDrawing ((WindowPtr) dst);
- if (src_drawing)
-	RootlessFinishedDrawing ((WindowPtr) pSrc);
-
- GC_RESTORE (pGC, dst);
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("copy area end\n");
- return result;
-}
-
-/* changed area is *dest* rect */
-static RegionPtr RootlessCopyPlane(DrawablePtr pSrc, DrawablePtr dst,
- GCPtr pGC, int srcx, int srcy,
- int w, int h, int dstx, int dsty,
- unsigned long plane)
-{
- RegionPtr result;
- BoxRec box;
- Bool src_drawing = FALSE;
-
- if (GC_IS_ROOT (dst) || GC_IS_ROOT (pSrc))
-	return NULL;			/* nothing exposed */
-
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("copy plane start\n");
-
- if (pSrc->type == DRAWABLE_WINDOW && IsFramedWindow((WindowPtr)pSrc)) {
- RootlessStartDrawing((WindowPtr) pSrc);
-	src_drawing = TRUE;
- }
- RootlessStartDrawing((WindowPtr) dst);
- result = pGC->ops->CopyPlane(pSrc, dst, pGC, srcx, srcy, w, h,
- dstx, dsty, plane);
-
- box.x1 = dstx + dst->x;
- box.x2 = box.x1 + w;
- box.y1 = dsty + dst->y;
- box.y2 = box.y1 + h;
-
- TRIM_BOX(box, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
- RootlessFinishedDrawing ((WindowPtr) dst);
- if (src_drawing)
-	RootlessFinishedDrawing ((WindowPtr) pSrc);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("copy plane end\n");
- return result;
-}
-
-// Options for size of changed area:
-// 0 = box per point
-// 1 = big box around all points
-// 2 = accumulate point in 20 pixel radius
-#define ROOTLESS_CHANGED_AREA 1
-#define abs(a) ((a) > 0 ? (a) : -(a))
-
-/* changed area is box around all points */
-static void RootlessPolyPoint(DrawablePtr dst, GCPtr pGC,
- int mode, int npt, DDXPointPtr pptInit)
-{
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("polypoint start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
- pGC->ops->PolyPoint(dst, pGC, mode, npt, pptInit);
-
- if (npt > 0) {
-#if ROOTLESS_CHANGED_AREA==0
- // box per point
- BoxRec box;
-
- while (npt) {
- box.x1 = pptInit->x;
- box.y1 = pptInit->y;
- box.x2 = box.x1 + 1;
- box.y2 = box.y1 + 1;
-
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
- npt--;
- pptInit++;
- }
-
-#elif ROOTLESS_CHANGED_AREA==1
- // one big box
- BoxRec box;
-
- box.x2 = box.x1 = pptInit->x;
- box.y2 = box.y1 = pptInit->y;
- while(--npt) {
- pptInit++;
- if(box.x1 > pptInit->x)
- box.x1 = pptInit->x;
- else if(box.x2 < pptInit->x)
- box.x2 = pptInit->x;
- if(box.y1 > pptInit->y)
- box.y1 = pptInit->y;
- else if(box.y2 < pptInit->y)
- box.y2 = pptInit->y;
- }
-
- box.x2++;
- box.y2++;
-
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
-#elif ROOTLESS_CHANGED_AREA==2
- // clever(?) method: accumulate point in 20-pixel radius
- BoxRec box;
- int firstx, firsty;
-
- box.x2 = box.x1 = firstx = pptInit->x;
- box.y2 = box.y1 = firsty = pptInit->y;
- while(--npt) {
- pptInit++;
- if (abs(pptInit->x - firstx) > 20 ||
- abs(pptInit->y - firsty) > 20) {
- box.x2++;
- box.y2++;
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
- box.x2 = box.x1 = firstx = pptInit->x;
- box.y2 = box.y1 = firsty = pptInit->y;
- } else {
- if (box.x1 > pptInit->x) box.x1 = pptInit->x;
- else if (box.x2 < pptInit->x) box.x2 = pptInit->x;
- if (box.y1 > pptInit->y) box.y1 = pptInit->y;
- else if (box.y2 < pptInit->y) box.y2 = pptInit->y;
- }
- }
- box.x2++;
- box.y2++;
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-#endif /* ROOTLESS_CHANGED_AREA */
- }
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("polypoint end\n");
-}
-
-#undef ROOTLESS_CHANGED_AREA
-
-/* changed area is box around each line */
-static void RootlessPolylines(DrawablePtr dst, GCPtr pGC,
- int mode, int npt, DDXPointPtr pptInit)
-{
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("poly lines start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
- pGC->ops->Polylines(dst, pGC, mode, npt, pptInit);
-
- if (npt > 0) {
- BoxRec box;
- int extra = pGC->lineWidth >> 1;
-
- box.x2 = box.x1 = pptInit->x;
- box.y2 = box.y1 = pptInit->y;
-
- if(npt > 1) {
- if(pGC->joinStyle == JoinMiter)
- extra = 6 * pGC->lineWidth;
- else if(pGC->capStyle == CapProjecting)
- extra = pGC->lineWidth;
- }
-
- if(mode == CoordModePrevious) {
- int x = box.x1;
- int y = box.y1;
-
- while(--npt) {
- pptInit++;
- x += pptInit->x;
- y += pptInit->y;
- if(box.x1 > x)
- box.x1 = x;
- else if(box.x2 < x)
- box.x2 = x;
- if(box.y1 > y)
- box.y1 = y;
- else if(box.y2 < y)
- box.y2 = y;
- }
- } else {
- while(--npt) {
- pptInit++;
- if(box.x1 > pptInit->x)
- box.x1 = pptInit->x;
- else if(box.x2 < pptInit->x)
- box.x2 = pptInit->x;
- if(box.y1 > pptInit->y)
- box.y1 = pptInit->y;
- else if(box.y2 < pptInit->y)
- box.y2 = pptInit->y;
- }
- }
-
- box.x2++;
- box.y2++;
-
- if(extra) {
- box.x1 -= extra;
- box.x2 += extra;
- box.y1 -= extra;
- box.y2 += extra;
- }
-
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
- }
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("poly lines end\n");
-}
-
-/* changed area is box around each line segment */
-static void RootlessPolySegment(DrawablePtr dst, GCPtr pGC,
- int nseg, xSegment *pSeg)
-{
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("poly segment start (win 0x%x)\n", dst);
-
- RootlessStartDrawing((WindowPtr) dst);
- pGC->ops->PolySegment(dst, pGC, nseg, pSeg);
-
- if (nseg > 0) {
- BoxRec box;
- int extra = pGC->lineWidth;
-
- if(pGC->capStyle != CapProjecting)
- extra >>= 1;
-
- if(pSeg->x2 > pSeg->x1) {
- box.x1 = pSeg->x1;
- box.x2 = pSeg->x2;
- } else {
- box.x2 = pSeg->x1;
- box.x1 = pSeg->x2;
- }
-
- if(pSeg->y2 > pSeg->y1) {
- box.y1 = pSeg->y1;
- box.y2 = pSeg->y2;
- } else {
- box.y2 = pSeg->y1;
- box.y1 = pSeg->y2;
- }
-
- while(--nseg) {
- pSeg++;
- if(pSeg->x2 > pSeg->x1) {
- if(pSeg->x1 < box.x1) box.x1 = pSeg->x1;
- if(pSeg->x2 > box.x2) box.x2 = pSeg->x2;
- } else {
- if(pSeg->x2 < box.x1) box.x1 = pSeg->x2;
- if(pSeg->x1 > box.x2) box.x2 = pSeg->x1;
- }
- if(pSeg->y2 > pSeg->y1) {
- if(pSeg->y1 < box.y1) box.y1 = pSeg->y1;
- if(pSeg->y2 > box.y2) box.y2 = pSeg->y2;
- } else {
- if(pSeg->y2 < box.y1) box.y1 = pSeg->y2;
- if(pSeg->y1 > box.y2) box.y2 = pSeg->y1;
- }
- }
-
- box.x2++;
- box.y2++;
-
- if(extra) {
- box.x1 -= extra;
- box.x2 += extra;
- box.y1 -= extra;
- box.y2 += extra;
- }
-
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
- }
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("poly segment end\n");
-}
-
-/* changed area is box around each line (not entire rects) */
-static void RootlessPolyRectangle(DrawablePtr dst, GCPtr pGC,
-				 int nRects, xRectangle *pRects)
-{
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("poly rectangle start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
- pGC->ops->PolyRectangle(dst, pGC, nRects, pRects);
-
- if (nRects > 0) {
- BoxRec box;
- int offset1, offset2, offset3;
-
- offset2 = pGC->lineWidth;
- if(!offset2) offset2 = 1;
- offset1 = offset2 >> 1;
- offset3 = offset2 - offset1;
-
- while(nRects--) {
- box.x1 = pRects->x - offset1;
- box.y1 = pRects->y - offset1;
- box.x2 = box.x1 + pRects->width + offset2;
- box.y2 = box.y1 + offset2;		
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
- box.x1 = pRects->x - offset1;
- box.y1 = pRects->y + offset3;
- box.x2 = box.x1 + offset2;
- box.y2 = box.y1 + pRects->height - offset2;		
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
- box.x1 = pRects->x + pRects->width - offset1;
- box.y1 = pRects->y + offset3;
- box.x2 = box.x1 + offset2;
- box.y2 = box.y1 + pRects->height - offset2;		
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
- box.x1 = pRects->x - offset1;
- box.y1 = pRects->y + pRects->height - offset1;
- box.x2 = box.x1 + pRects->width + offset2;
- box.y2 = box.y1 + offset2;		
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
- pRects++;
- }
- }
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("poly rectangle end\n");
-}
-
-
-/* changed area is box around each arc (assumes all arcs are 360 degrees) */
-static void RootlessPolyArc(DrawablePtr dst, GCPtr pGC, int narcs, xArc *parcs)
-{
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("poly arc start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
- pGC->ops->PolyArc(dst, pGC, narcs, parcs);
-
- if (narcs > 0) {
- int extra = pGC->lineWidth >> 1;
- BoxRec box;
-
- box.x1 = parcs->x;
- box.x2 = box.x1 + parcs->width;
- box.y1 = parcs->y;
- box.y2 = box.y1 + parcs->height;
-
- /* should I break these up instead ? */
-
- while(--narcs) {
- parcs++;
- if(box.x1 > parcs->x)
- box.x1 = parcs->x;
- if(box.x2 < (parcs->x + parcs->width))
- box.x2 = parcs->x + parcs->width;
- if(box.y1 > parcs->y)
- box.y1 = parcs->y;
- if(box.y2 < (parcs->y + parcs->height))
- box.y2 = parcs->y + parcs->height;
- }
-
- if(extra) {
- box.x1 -= extra;
- box.x2 += extra;
- box.y1 -= extra;
- box.y2 += extra;
- }
-
- box.x2++;
- box.y2++;
-
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
- }
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("poly arc end\n");
-}
-
-
-/* changed area is box around each poly */
-static void RootlessFillPolygon(DrawablePtr dst, GCPtr pGC,
-				int shape, int mode, int count,
-				DDXPointPtr pptInit)
-{
- GC_SAVE (pGC);
-
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("fill poly start (win 0x%x, fillStyle 0x%x)\n", dst,
- pGC->fillStyle);
-
- if (count <= 2) {
- pGC->ops->FillPolygon(dst, pGC, shape, mode, count, pptInit);
- } else {
- DDXPointPtr ppt = pptInit;
- int i = count;
- BoxRec box;
-
- box.x2 = box.x1 = ppt->x;
- box.y2 = box.y1 = ppt->y;
-
- if(mode != CoordModeOrigin) {
- int x = box.x1;
- int y = box.y1;
-
- while(--i) {
- ppt++;
- x += ppt->x;
- y += ppt->y;
- if(box.x1 > x)
- box.x1 = x;
- else if(box.x2 < x)
- box.x2 = x;
- if(box.y1 > y)
- box.y1 = y;
- else if(box.y2 < y)
- box.y2 = y;
- }
- } else {
- while(--i) {
- ppt++;
- if(box.x1 > ppt->x)
- box.x1 = ppt->x;
- else if(box.x2 < ppt->x)
- box.x2 = ppt->x;
- if(box.y1 > ppt->y)
- box.y1 = ppt->y;
- else if(box.y2 < ppt->y)
- box.y2 = ppt->y;
- }
- }
-
- box.x2++;
- box.y2++;
-
- RootlessStartDrawing((WindowPtr) dst);
-
-	if (can_accel_fill (dst, pGC)
-	 && box_bytes (dst, &box) >= xp_fill_bytes_threshold)
-	{
-	 GC_UNSET_PM (pGC, dst);
-	}
-
-	pGC->ops->FillPolygon(dst, pGC, shape, mode, count, pptInit);
-
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
-	RootlessFinishedDrawing ((WindowPtr) dst);
- }
-
- GC_RESTORE (pGC, dst);
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("fill poly end\n");
-}
-
-/* changed area is the rects */
-static void RootlessPolyFillRect(DrawablePtr dst, GCPtr pGC,
-				 int nRectsInit, xRectangle *pRectsInit)
-{
- GC_SAVE (pGC);
-
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("fill rect start (win 0x%x, fillStyle 0x%x)\n", dst,
- pGC->fillStyle);
-
- if (nRectsInit <= 0) {
- pGC->ops->PolyFillRect(dst, pGC, nRectsInit, pRectsInit);
- } else {
- BoxRec box;
- xRectangle *pRects = pRectsInit;
- int nRects = nRectsInit;
-
- box.x1 = pRects->x;
- box.x2 = box.x1 + pRects->width;
- box.y1 = pRects->y;
- box.y2 = box.y1 + pRects->height;
-
- while(--nRects) {
- pRects++;
- if(box.x1 > pRects->x)
- box.x1 = pRects->x;
- if(box.x2 < (pRects->x + pRects->width))
- box.x2 = pRects->x + pRects->width;
- if(box.y1 > pRects->y)
- box.y1 = pRects->y;
- if(box.y2 < (pRects->y + pRects->height))
- box.y2 = pRects->y + pRects->height;
- }
-
- /* cfb messes with the pRectsInit so we have to do our
-	 calculations first */
-
-	RootlessStartDrawing((WindowPtr) dst);
-
-	if (can_accel_fill (dst, pGC)
-	 && box_bytes (dst, &box) >= xp_fill_bytes_threshold)
-	{
-	 GC_UNSET_PM (pGC, dst);
-	}
-
-	pGC->ops->PolyFillRect (dst, pGC, nRectsInit, pRectsInit);
-
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
-	RootlessFinishedDrawing ((WindowPtr) dst);
- }
-
- GC_RESTORE (pGC, dst);
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("fill rect end\n");
-}
-
-
-/* changed area is box around each arc (assuming arcs are all 360 degrees) */
-static void RootlessPolyFillArc(DrawablePtr dst, GCPtr pGC,
-				int narcs, xArc *parcs)
-{
- GC_SAVE (pGC);
-
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("fill arc start\n");
-
- if (narcs > 0) {
- BoxRec box;
-	int i;
-
- box.x1 = parcs->x;
- box.x2 = box.x1 + parcs->width;
- box.y1 = parcs->y;
- box.y2 = box.y1 + parcs->height;
-
- /* should I break these up instead ? */
-
-	for (i = 0; i < narcs; i++)
-	{
- if(box.x1 > parcsi.x)
- box.x1 = parcsi.x;
- if(box.x2 < (parcsi.x + parcsi.width))
- box.x2 = parcsi.x + parcsi.width;
- if(box.y1 > parcsi.y)
- box.y1 = parcsi.y;
- if(box.y2 < (parcsi.y + parcsi.height))
- box.y2 = parcsi.y + parcsi.height;
- }
-
-	RootlessStartDrawing((WindowPtr) dst);
-
-	if (can_accel_fill (dst, pGC)
-	 && box_bytes (dst, &box) >= xp_fill_bytes_threshold)
-	{
-	 GC_UNSET_PM (pGC, dst);
-	}
-
-	pGC->ops->PolyFillArc(dst, pGC, narcs, parcs);
-
- TRIM_AND_TRANSLATE_BOX(box, dst, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
-	RootlessFinishedDrawing ((WindowPtr) dst);
- }
- else
-	pGC->ops->PolyFillArc(dst, pGC, narcs, parcs);
-
- GC_RESTORE (pGC, dst);
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("fill arc end\n");
-}
-
-
-static void RootlessImageText8(DrawablePtr dst, GCPtr pGC,
-			 int x, int y, int count, char *chars)
-{
- GC_SAVE (pGC);
-
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("imagetext8 start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
-
- if (count > 0) {
- int top, bot, Min, Max;
- BoxRec box;
-
- top = max(FONTMAXBOUNDS(pGC->font, ascent), FONTASCENT(pGC->font));
- bot = max(FONTMAXBOUNDS(pGC->font, descent), FONTDESCENT(pGC->font));
-
- Min = count * FONTMINBOUNDS(pGC->font, characterWidth);
- if(Min > 0) Min = 0;
- Max = count * FONTMAXBOUNDS(pGC->font, characterWidth);	
- if(Max < 0) Max = 0;
-
- /* ugh */
- box.x1 = dst->x + x + Min +
- FONTMINBOUNDS(pGC->font, leftSideBearing);
- box.x2 = dst->x + x + Max +
- FONTMAXBOUNDS(pGC->font, rightSideBearing);
-
- box.y1 = dst->y + y - top;
- box.y2 = dst->y + y + bot;
-
-	if (can_accel_fill (dst, pGC)
-	 && box_bytes (dst, &box) >= xp_fill_bytes_threshold)
-	{
-	 GC_UNSET_PM (pGC, dst);
-	}
-
-	pGC->ops->ImageText8(dst, pGC, x, y, count, chars);
-
- TRIM_BOX(box, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
- }
- else
-	pGC->ops->ImageText8(dst, pGC, x, y, count, chars);
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GC_RESTORE (pGC, dst);
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("imagetext8 end\n");
-}
-
-static int RootlessPolyText8(DrawablePtr dst, GCPtr pGC,
- int x, int y, int count, char *chars)
-{
- int width; // the result, sorta
-
- if (GC_IS_ROOT (dst))
-	return 0;			/* FIXME: ok? */
-
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("polytext8 start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
- width = pGC->ops->PolyText8(dst, pGC, x, y, count, chars);
- width -= x;
-
- if(width > 0) {
- BoxRec box;
-
- /* ugh */
- box.x1 = dst->x + x + FONTMINBOUNDS(pGC->font, leftSideBearing);
- box.x2 = dst->x + x + FONTMAXBOUNDS(pGC->font, rightSideBearing);
-
- if(count > 1) {
- if(width > 0) box.x2 += width;
- else box.x1 += width;
- }
-
- box.y1 = dst->y + y - FONTMAXBOUNDS(pGC->font, ascent);
- box.y2 = dst->y + y + FONTMAXBOUNDS(pGC->font, descent);
-
- TRIM_BOX(box, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
- }
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("polytext8 end\n");
- return (width + x);
-}
-
-static void RootlessImageText16(DrawablePtr dst, GCPtr pGC,
- int x, int y, int count, unsigned short *chars)
-{
- GC_SAVE (pGC);
-
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("imagetext16 start\n");
-
- if (count > 0) {
- int top, bot, Min, Max;
- BoxRec box;
-
- top = max(FONTMAXBOUNDS(pGC->font, ascent), FONTASCENT(pGC->font));
- bot = max(FONTMAXBOUNDS(pGC->font, descent), FONTDESCENT(pGC->font));
-
- Min = count * FONTMINBOUNDS(pGC->font, characterWidth);
- if(Min > 0) Min = 0;
- Max = count * FONTMAXBOUNDS(pGC->font, characterWidth);
- if(Max < 0) Max = 0;
-
- /* ugh */
- box.x1 = dst->x + x + Min +
- FONTMINBOUNDS(pGC->font, leftSideBearing);
- box.x2 = dst->x + x + Max +
- FONTMAXBOUNDS(pGC->font, rightSideBearing);
-
- box.y1 = dst->y + y - top;
- box.y2 = dst->y + y + bot;
-
-	RootlessStartDrawing((WindowPtr) dst);
-
-	if (can_accel_fill (dst, pGC)
-	 && box_bytes (dst, &box) >= xp_fill_bytes_threshold)
-	{
-	 GC_UNSET_PM (pGC, dst);
-	}
-
-	pGC->ops->ImageText16(dst, pGC, x, y, count, chars);
-
- TRIM_BOX(box, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
-	RootlessFinishedDrawing ((WindowPtr) dst);
- }
- else
-	pGC->ops->ImageText16(dst, pGC, x, y, count, chars);
-
- GC_RESTORE (pGC, dst);
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("imagetext16 end\n");
-}
-
-static int RootlessPolyText16(DrawablePtr dst, GCPtr pGC,
- int x, int y, int count, unsigned short *chars)
-{
- int width; // the result, sorta
-
- if (GC_IS_ROOT (dst))
-	return 0;			/* FIXME: ok? */
-
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("polytext16 start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
- width = pGC->ops->PolyText16(dst, pGC, x, y, count, chars);
- width -= x;
-
- if (width > 0) {
- BoxRec box;
-
- /* ugh */
- box.x1 = dst->x + x + FONTMINBOUNDS(pGC->font, leftSideBearing);
- box.x2 = dst->x + x + FONTMAXBOUNDS(pGC->font, rightSideBearing);
-
- if(count > 1) {
- if(width > 0) box.x2 += width;
- else box.x1 += width;
- }
-
- box.y1 = dst->y + y - FONTMAXBOUNDS(pGC->font, ascent);
- box.y2 = dst->y + y + FONTMAXBOUNDS(pGC->font, descent);
-
- TRIM_BOX(box, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
- }
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("polytext16 end\n");
- return width + x;
-}
-
-static void RootlessImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
- int x, int y, unsigned int nglyph,
- CharInfoPtr *ppci, pointer unused)
-{
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("imageglyph start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
- pGC->ops->ImageGlyphBlt(dst, pGC, x, y, nglyph, ppci, unused);
-
- if (nglyph > 0) {
- int top, bot, width = 0;
- BoxRec box;
-
- top = max(FONTMAXBOUNDS(pGC->font, ascent), FONTASCENT(pGC->font));
- bot = max(FONTMAXBOUNDS(pGC->font, descent), FONTDESCENT(pGC->font));
-
- box.x1 = ppci0->metrics.leftSideBearing;
- if(box.x1 > 0) box.x1 = 0;
- box.x2 = ppcinglyph - 1->metrics.rightSideBearing -
- ppcinglyph - 1->metrics.characterWidth;
- if(box.x2 < 0) box.x2 = 0;
-
- box.x2 += dst->x + x;
- box.x1 += dst->x + x;
-
- while(nglyph--) {
- width += (*ppci)->metrics.characterWidth;
- ppci++;
- }
-
- if(width > 0)
- box.x2 += width;
- else
- box.x1 += width;
-
- box.y1 = dst->y + y - top;
- box.y2 = dst->y + y + bot;
-
- TRIM_BOX(box, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
- }
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("imageglyph end\n");
-}
-
-static void RootlessPolyGlyphBlt(DrawablePtr dst, GCPtr pGC,
- int x, int y, unsigned int nglyph,
- CharInfoPtr *ppci, pointer pglyphBase)
-{
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("polyglyph start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
- pGC->ops->PolyGlyphBlt(dst, pGC, x, y, nglyph, ppci, pglyphBase);
-
- if (nglyph > 0) {
- BoxRec box;
-
- /* ugh */
- box.x1 = dst->x + x + ppci0->metrics.leftSideBearing;
- box.x2 = dst->x + x + ppcinglyph - 1->metrics.rightSideBearing;
-
- if(nglyph > 1) {
- int width = 0;
-
- while(--nglyph) {
- width += (*ppci)->metrics.characterWidth;
- ppci++;
- }
-
- if(width > 0) box.x2 += width;
- else box.x1 += width;
- }
-
- box.y1 = dst->y + y - FONTMAXBOUNDS(pGC->font, ascent);
- box.y2 = dst->y + y + FONTMAXBOUNDS(pGC->font, descent);
-
- TRIM_BOX(box, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
- }
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("polyglyph end\n");
-}
-
-
-/* changed area is in dest */
-static void
-RootlessPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr dst,
- int dx, int dy, int xOrg, int yOrg)
-{
- BoxRec box;
-
- GC_SKIP_ROOT (dst);
- GCOP_UNWRAP(pGC);
- RL_DEBUG_MSG("push pixels start\n");
-
- RootlessStartDrawing((WindowPtr) dst);
- pGC->ops->PushPixels(pGC, pBitMap, dst, dx, dy, xOrg, yOrg);
-
- box.x1 = xOrg + dst->x;
- box.x2 = box.x1 + dx;
- box.y1 = yOrg + dst->y;
- box.y2 = box.y1 + dy;
-
- TRIM_BOX(box, pGC);
- if(BOX_NOT_EMPTY(box))
- RootlessDamageBox ((WindowPtr) dst, &box);
-
- RootlessFinishedDrawing ((WindowPtr) dst);
-
- GCOP_WRAP(pGC);
- RL_DEBUG_MSG("push pixels end\n");
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/rootless-picture.c Deleted

@@ -1,540 +0,0 @@
-/*
- * Support for RENDER extension with rootless
- */
-/*
- * Copyright (c) 2002 Torrey T. Lyons. All Rights Reserved.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* This file is largely based on fbcompose.c and fbpict.c, which contain
- * the following copyright:
- *
- * Copyright © 2000 Keith Packard, member of The XFree86 Project, Inc.
- */
- /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/aquaPicture.c,v 1.3 2002/09/28 00:00:03 torrey Exp $ */
-
-#define DEFAULT_LOG_FORMATS 0
-
-#ifdef RENDER
-
-#include "fb.h"
-#include "picturestr.h"
-#include "mipict.h"
-#include "fbpict.h"
-#include "rootless.h"
-
-# define mod(a,b)	((b) == 1 ? 0 : (a) >= 0 ? (a) % (b) : (b) - (-a) % (b))
-
-
-// Replacement for fbStore_x8r8g8b8 that sets the alpha channel
-void
-RootlessStore_x8r8g8b8 (FbCompositeOperand *op, CARD32 value)
-{
- FbBits *line = op->u.drawable.line; CARD32 offset = op->u.drawable.offset;
- ((CARD32 *)line)offset >> 5 = (value & 0xffffff) | 0xff000000;
-}
-
-
-// Defined in fbcompose.c
-extern FbCombineFunc fbCombineFuncU;
-extern FbCombineFunc fbCombineFuncC;
-
-void
-RootlessCompositeGeneral(
- CARD8 op,
- PicturePtr pSrc,
- PicturePtr pMask,
- PicturePtr pDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
-{
- FbCompositeOperand	src4,msk4,dst4,*pmsk;
- FbCompositeOperand	*srcPict, *srcAlpha;
- FbCompositeOperand	*dstPict, *dstAlpha;
- FbCompositeOperand	*mskPict = 0, *mskAlpha = 0;
- FbCombineFunc	f;
- int			w;
-
- if (!fbBuildCompositeOperand (pSrc, src, xSrc, ySrc, TRUE, TRUE))
-	return;
- if (!fbBuildCompositeOperand (pDst, dst, xDst, yDst, FALSE, TRUE))
-	return;
-
- // Use Rootless operands for on screen picture formats
- if (pDst->format == PICT_x8r8g8b8) {
- dst0.store = RootlessStore_x8r8g8b8;
- }
-
- if (pSrc->alphaMap)
- {
-	srcPict = &src1;
-	srcAlpha = &src2;
- }
- else
- {
-	srcPict = &src0;
-	srcAlpha = 0;
- }
- if (pDst->alphaMap)
- {
-	dstPict = &dst1;
-	dstAlpha = &dst2;
- }
- else
- {
-	dstPict = &dst0;
-	dstAlpha = 0;
- }
- f = fbCombineFuncUop;
- if (pMask)
- {
-	if (!fbBuildCompositeOperand (pMask, msk, xMask, yMask, TRUE, TRUE))
-	 return;
-	pmsk = msk;
-	if (pMask->componentAlpha)
-	 f = fbCombineFuncCop;
-	if (pMask->alphaMap)
-	{
-	 mskPict = &msk1;
-	 mskAlpha = &msk2;
-	}
-	else
-	{
-	 mskPict = &msk0;
-	 mskAlpha = 0;
-	}
- }
- else
-	pmsk = 0;
- while (height--)
- {
-	w = width;
-	
-	while (w--)
-	{
-	 (*f) (src, pmsk, dst);
-	 (*src->over) (src);
-	 (*dst->over) (dst);
-	 if (pmsk)
-		(*pmsk->over) (pmsk);
-	}
-	(*src->down) (src);
-	(*dst->down) (dst);
-	if (pmsk)
-	 (*pmsk->down) (pmsk);
- }
-}
-
-static int rootless_log_pict_formats = DEFAULT_LOG_FORMATS;
-
-static const char *op_name (int op)
-{
- static const char *ops = {
-	"Clear", "Src", "Dst", "Over", "OverReverse", "In", "InReverse",
-	"Out", "OutReverse", "Atop", "AtopReverse", "Xor", "Add",
-	"Saturate", "Maximum",
-
-	"DisjointClear", "DisjointSrc", "DisjointDst", "DisjointOver",
-	"DisjointOverReverse", "DisjointIn", "DisjointInReverse",
-	"DisjointOut", "DisjointOutReverse", "DisjointAtop",
-	"DisjointAtopReverse", "DisjointXor", "DisjointMaximum",
-
-	"ConjointClear", "ConjointSrc", "ConjointDst", "ConjointOver",
-	"ConjointOverReverse", "ConjointIn", "ConjointInReverse",
-	"ConjointOut", "ConjointOutReverse", "ConjointAtop",
-	"ConjointAtopReverse", "ConjointXor", "ConjointMaximum",
- };
-
- if (op >= 0 && op < (int) (sizeof (ops) / sizeof (ops0)))
-	return opsop;
- else
-	return "Unknown";
-}
-
-static const char *type_name (int type)
-{
- switch (type)
- {
- case PICT_TYPE_OTHER:
-	return "Other";
- case PICT_TYPE_A:
-	return "A";
- case PICT_TYPE_ARGB:
-	return "ARGB";
- case PICT_TYPE_ABGR:
-	return "ABGR";
- case PICT_TYPE_COLOR:
-	return "Color";
- case PICT_TYPE_GRAY:
-	return "Gray";
- default:
-	return "Unknown";
- }
-}
-
-static void log_format (int op, unsigned int src,
-			unsigned int dst, unsigned int mask)
-{
- struct op {
-	int op;
-	unsigned int src, dst, mask;
- };
-
- static struct op *ops;
- static int n_ops, allocated_ops;
-
- int i;
-
- for (i = 0; i < n_ops; i++)
- {
-	if (opsi.op == op && opsi.src == src
-	 && opsi.dst == dst && opsi.mask == mask)
-	{
-	 return;
-	}
- }
-
- if (n_ops == allocated_ops)
- {
-	allocated_ops *= 2;
-	ops = realloc (ops, allocated_ops * sizeof (struct op));
- }
-
- opsn_ops.op = op;
- opsn_ops.src = src;
- opsn_ops.dst = dst;
- opsn_ops.mask = mask;
- n_ops++;
-
- fprintf (stderr,
-	 "op: %s src (%dbpp %s %04x) dst (%dbpp %s %04x) mask (%dbpp %s %04x)\n",
-	 op_name (op), PICT_FORMAT_BPP (src),
-	 type_name (PICT_FORMAT_TYPE (src)),
-	 src & 0xffff, PICT_FORMAT_BPP (dst),
-	 type_name (PICT_FORMAT_TYPE (dst)),
-	 dst & 0xffff, PICT_FORMAT_BPP (mask),
-	 type_name (PICT_FORMAT_TYPE (mask)),
-	 mask & 0xffff);
-}
-
-void
-RootlessComposite(
- CARD8 op,
- PicturePtr pSrc,
- PicturePtr pMask,
- PicturePtr pDst,
- INT16 xSrc,
- INT16 ySrc,
- INT16 xMask,
- INT16 yMask,
- INT16 xDst,
- INT16 yDst,
- CARD16 width,
- CARD16 height)
-{
- RegionRec	 region;
- int		 n;
- BoxPtr	 pbox;
- CompositeFunc func;
- Bool	 srcRepeat = pSrc->repeat;
- Bool	 maskRepeat = FALSE;
- Bool	 srcAlphaMap = pSrc->alphaMap != 0;
- Bool	 maskAlphaMap = FALSE;
- Bool	 dstAlphaMap = pDst->alphaMap != 0;
- int		 x_msk, y_msk, x_src, y_src, x_dst, y_dst;
- int		 w, h, w_this, h_this;
- int		 dstDepth = pDst->pDrawable->depth;
-
- xDst += pDst->pDrawable->x;
- yDst += pDst->pDrawable->y;
- xSrc += pSrc->pDrawable->x;
- ySrc += pSrc->pDrawable->y;
- if (pMask)
- {
-	xMask += pMask->pDrawable->x;
-	yMask += pMask->pDrawable->y;
-	maskRepeat = pMask->repeat;
-	maskAlphaMap = pMask->alphaMap != 0;
- }
-
- if (rootless_log_pict_formats)
- {
-	log_format (op, pSrc->format, pDst->format,
-		 pMask != 0 ? pMask->format : 0);
- }
-
- if (!miComputeCompositeRegion (&region,
-				 pSrc,
-				 pMask,
-				 pDst,
-				 xSrc,
-				 ySrc,
-				 xMask,
-				 yMask,
-				 xDst,
-				 yDst,
-				 width,
-				 height))
-	return;
-
- if (pDst->pDrawable->type == DRAWABLE_WINDOW
-	&& pDst->pDrawable->depth == 24
-	&& pDst->pDrawable->bitsPerPixel == 32)
- {
-	/* fbpict code sets bits above depth to zero. We don't want that! */
-
-	pDst->pDrawable->depth = 32;
- }
-
- func = RootlessCompositeGeneral;
-
- if (!maskAlphaMap && !srcAlphaMap && !dstAlphaMap)
- switch (op) {
- case PictOpOver:
-	if (pMask)
-	{
-	 if (srcRepeat && 
-		pSrc->pDrawable->width == 1 &&
-		pSrc->pDrawable->height == 1)
-	 {
-		srcRepeat = FALSE;
-		if (PICT_FORMAT_COLOR(pSrc->format)) {
-		 switch (pMask->format) {
-		 case PICT_a8:
-			switch (pDst->format) {
-			case PICT_r5g6b5:
-			case PICT_b5g6r5:
-			 func = fbCompositeSolidMask_nx8x0565;
-			 break;
-			case PICT_r8g8b8:
-			case PICT_b8g8r8:
-			 func = fbCompositeSolidMask_nx8x0888;
-			 break;
-			case PICT_a8r8g8b8:
-			case PICT_x8r8g8b8:
-			case PICT_a8b8g8r8:
-			case PICT_x8b8g8r8:
-			 func = fbCompositeSolidMask_nx8x8888;
-			 break;
-			}
-			break;
-		 case PICT_a8r8g8b8:
-			if (pMask->componentAlpha) {
-			 switch (pDst->format) {
-			 case PICT_a8r8g8b8:
-			 case PICT_x8r8g8b8:
-				func = fbCompositeSolidMask_nx8888x8888C;
-				break;
-			 case PICT_r5g6b5:
-				func = fbCompositeSolidMask_nx8888x0565C;
-				break;
-			 }
-			}
-			break;
-		 case PICT_a8b8g8r8:
-			if (pMask->componentAlpha) {
-			 switch (pDst->format) {
-			 case PICT_a8b8g8r8:
-			 case PICT_x8b8g8r8:
-				func = fbCompositeSolidMask_nx8888x8888C;
-				break;
-			 case PICT_b5g6r5:
-				func = fbCompositeSolidMask_nx8888x0565C;
-				break;
-			 }
-			}
-			break;
-		 case PICT_a1:
-			switch (pDst->format) {
-			case PICT_r5g6b5:
-			case PICT_b5g6r5:
-			case PICT_r8g8b8:
-			case PICT_b8g8r8:
-			case PICT_a8r8g8b8:
-			case PICT_x8r8g8b8:
-			case PICT_a8b8g8r8:
-			case PICT_x8b8g8r8:
-			 func = fbCompositeSolidMask_nx1xn;
-			 break;
-			}
-		 }
-		}
-	 }
-	}
-	else
-	{
-	 switch (pSrc->format) {
-	 case PICT_a8r8g8b8:
-	 case PICT_x8r8g8b8:
-		switch (pDst->format) {
-		case PICT_a8r8g8b8:
-		case PICT_x8r8g8b8:
-		 func = fbCompositeSrc_8888x8888;
-		 break;
-		case PICT_r8g8b8:
-		 func = fbCompositeSrc_8888x0888;
-		 break;
-		case PICT_r5g6b5:
-		 func = fbCompositeSrc_8888x0565;
-		 break;
-		}
-		break;
-	 case PICT_a8b8g8r8:
-	 case PICT_x8b8g8r8:
-		switch (pDst->format) {
-		case PICT_a8b8g8r8:
-		case PICT_x8b8g8r8:
-		 func = fbCompositeSrc_8888x8888;
-		 break;
-		case PICT_b8g8r8:
-		 func = fbCompositeSrc_8888x0888;
-		 break;
-		case PICT_b5g6r5:
-		 func = fbCompositeSrc_8888x0565;
-		 break;
-		}
-		break;
-	 case PICT_r5g6b5:
-		switch (pDst->format) {
-		case PICT_r5g6b5:
-		 func = fbCompositeSrc_0565x0565;
-		 break;
-		}
-		break;
-	 case PICT_b5g6r5:
-		switch (pDst->format) {
-		case PICT_b5g6r5:
-		 func = fbCompositeSrc_0565x0565;
-		 break;
-		}
-		break;
-	 }
-	}
-	break;
- case PictOpAdd:
-	if (pMask == 0)
-	{
-	 switch (pSrc->format) {
-	 case PICT_a8r8g8b8:
-		switch (pDst->format) {
-		case PICT_a8r8g8b8:
-		 func = fbCompositeSrcAdd_8888x8888;
-		 break;
-		}
-		break;
-	 case PICT_a8b8g8r8:
-		switch (pDst->format) {
-		case PICT_a8b8g8r8:
-		 func = fbCompositeSrcAdd_8888x8888;
-		 break;
-		}
-		break;
-	 case PICT_a8:
-		switch (pDst->format) {
-		case PICT_a8:
-		 func = fbCompositeSrcAdd_8000x8000;
-		 break;
-		}
-		break;
-	 case PICT_a1:
-		switch (pDst->format) {
-		case PICT_a1:
-		 func = fbCompositeSrcAdd_1000x1000;
-		 break;
-		}
-		break;
-	 }
-	}
-	break;
- }
-
- n = REGION_NUM_RECTS (&region);
- pbox = REGION_RECTS (&region);
- while (n--)
- {
-	h = pbox->y2 - pbox->y1;
-	y_src = pbox->y1 - yDst + ySrc;
-	y_msk = pbox->y1 - yDst + yMask;
-	y_dst = pbox->y1;
-	while (h)
-	{
-	 h_this = h;
-	 w = pbox->x2 - pbox->x1;
-	 x_src = pbox->x1 - xDst + xSrc;
-	 x_msk = pbox->x1 - xDst + xMask;
-	 x_dst = pbox->x1;
-	 if (maskRepeat)
-	 {
-		y_msk = mod (y_msk, pMask->pDrawable->height);
-		if (h_this > pMask->pDrawable->height - y_msk)
-		 h_this = pMask->pDrawable->height - y_msk;
-	 }
-	 if (srcRepeat)
-	 {
-		y_src = mod (y_src, pSrc->pDrawable->height);
-		if (h_this > pSrc->pDrawable->height - y_src)
-		 h_this = pSrc->pDrawable->height - y_src;
-	 }
-	 while (w)
-	 {
-		w_this = w;
-		if (maskRepeat)
-		{
-		 x_msk = mod (x_msk, pMask->pDrawable->width);
-		 if (w_this > pMask->pDrawable->width - x_msk)
-			w_this = pMask->pDrawable->width - x_msk;
-		}
-		if (srcRepeat)
-		{
-		 x_src = mod (x_src, pSrc->pDrawable->width);
-		 if (w_this > pSrc->pDrawable->width - x_src)
-			w_this = pSrc->pDrawable->width - x_src;
-		}
-		(*func) (op, pSrc, pMask, pDst,
-			 x_src, y_src, x_msk, y_msk, x_dst, y_dst,
-			 w_this, h_this);
-		w -= w_this;
-		x_src += w_this;
-		x_msk += w_this;
-		x_dst += w_this;
-	 }
-	 h -= h_this;
-	 y_src += h_this;
-	 y_msk += h_this;
-	 y_dst += h_this;
-	}
-	pbox++;
- }
- REGION_UNINIT (pDst->pDrawable->pScreen, &region);
-
- pDst->pDrawable->depth = dstDepth;
-}
-
-#endif /* RENDER */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/rootless-screen.c Deleted

@@ -1,794 +0,0 @@
-/*
- * Screen routines for Mac OS X rootless X server
- *
- * Greg Parker gparker@cs.stanford.edu
- *
- * February 2001 Created
- * March 3, 2001 Restructured as generic rootless mode
- */
-
-/* Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/rootlessScreen.c,v 1.2 2002/04/03 00:06:32 torrey Exp $ */
-
-
-#include "mi.h"
-#include "scrnintstr.h"
-#include "gcstruct.h"
-#include "pixmapstr.h"
-#include "windowstr.h"
-#include "propertyst.h"
-#include "mivalidate.h"
-#include "picturestr.h"
-#include "os.h"
-#include "servermd.h"
-#include "colormapst.h"
-
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
-
-#include "rootless-common.h"
-#include "rootless-window.h"
-
-/* In milcroseconds */
-#define REDISPLAY_DELAY 10
-#define REDISPLAY_MAX_DELAY 60
-
-extern int RootlessMiValidateTree(WindowPtr pRoot,
-				 WindowPtr pChild, VTKind kind);
-extern Bool RootlessCreateGC(GCPtr pGC);
-
-int rootlessGCPrivateIndex = -1;
-int rootlessScreenPrivateIndex = -1;
-int rootlessWindowPrivateIndex = -1;
-
-void
-RootlessUpdateScreenPixmap (ScreenPtr pScreen)
-{
- RootlessScreenRec *s = SCREENREC(pScreen);
- PixmapPtr pPix;
- unsigned int rowbytes;
-
- pPix = (*pScreen->GetScreenPixmap) (pScreen);
- if (pPix == NULL)
- {
-	pPix = (*pScreen->CreatePixmap) (pScreen, 0, 0, pScreen->rootDepth);
-	(*pScreen->SetScreenPixmap) (pPix);
- }
-
- rowbytes = PixmapBytePad (pScreen->width, pScreen->rootDepth);
-
- if (s->pixmap_data_size < rowbytes)
- {
-	if (s->pixmap_data != NULL)
-	 xfree (s->pixmap_data);
-
-	s->pixmap_data_size = rowbytes;
-	s->pixmap_data = xalloc (s->pixmap_data_size);
-	if (s->pixmap_data == NULL)
-	 return;
-
-	xp_fill_bytes (s->pixmap_data_size, 1, ~0,
-		 s->pixmap_data, s->pixmap_data_size);
-
-	pScreen->ModifyPixmapHeader (pPix, pScreen->width, pScreen->height,
-				 pScreen->rootDepth,
-				 BitsPerPixel (pScreen->rootDepth),
-				 0, s->pixmap_data);
-	/* ModifyPixmapHeader ignores zero arguments, so install rowbytes
-	 by hand. */
-	pPix->devKind = 0;
- }
-}
-
-static Bool
-RootlessCreateScreenResources (ScreenPtr pScreen)
-{
- Bool ret = TRUE;
-
- SCREEN_UNWRAP (pScreen, CreateScreenResources);
-
- if (pScreen->CreateScreenResources != NULL)
-	ret = (*pScreen->CreateScreenResources) (pScreen);
- 
- SCREEN_WRAP(pScreen, CreateScreenResources);
-
- if (!ret)
-	return ret;
-
- /* miCreateScreenResources doesn't like our null framebuffer pointer,
- it leaves the screen pixmap with an uninitialized data pointer. So
- we gave it depth=0,bits=0, which says, leave it the fsck alone.
- So we have some work to do since we need the screen pixmap to be
- valid (e.g. CopyArea from the root window) */
-
- RootlessUpdateScreenPixmap (pScreen);
-
- return ret;
-}
-
-static Bool
-RootlessCloseScreen(int i, ScreenPtr pScreen)
-{
- RootlessScreenRec *s;
-
- s = SCREENREC(pScreen);
-
- /* FIXME: unwrap everything that was wrapped? */
- pScreen->CloseScreen = s->CloseScreen;
-
- if (s->pixmap_data != NULL)
- {
-	xfree (s->pixmap_data);
-	s->pixmap_data = NULL;
-	s->pixmap_data_size = 0;
- }
-
- xfree(s);
- return pScreen->CloseScreen(i, pScreen);
-}
-
-static void
-RootlessGetImage(DrawablePtr pDrawable, int sx, int sy, int w, int h,
- unsigned int format, unsigned long planeMask, char *pdstLine)
-{
- ScreenPtr pScreen = pDrawable->pScreen;
- SCREEN_UNWRAP(pScreen, GetImage);
-
- if (pDrawable->type == DRAWABLE_WINDOW)
- {
-	int x0, y0, x1, y1;
-
-	RootlessWindowRec *winRec;
-
- /* Many apps use GetImage to sync with the visible frame buffer
- FIXME: entire screen or just window or all screens? */
- RootlessRedisplayScreen (pScreen);
-
- /* RedisplayScreen stops drawing, so we need to start it again */
- RootlessStartDrawing ((WindowPtr) pDrawable);
-
-	/* Check that we have some place to read from. */
-	winRec = WINREC (TopLevelParent ((WindowPtr) pDrawable));
-	if (winRec == NULL)
-	 goto out;
-
-	/* Clip to top-level window bounds. */
-
-	x0 = pDrawable->x + sx;
-	y0 = pDrawable->y + sy;
-	x1 = x0 + w;
-	y1 = y0 + h;
-
-	x0 = MAX (x0, winRec->x);
-	y0 = MAX (y0, winRec->y);
-	x1 = MIN (x1, winRec->x + (int) winRec->width);
-	y1 = MIN (y1, winRec->y + (int) winRec->height);
-
-	/* FIXME: if clipped we need to adjust the data returned from
-	 fbGetImage (), since it calculates the destination stride
-	 from the passed in width.. */
-
-	sx = x0 - pDrawable->x;
-	sy = y0 - pDrawable->y;
-	w = x1 - x0;
-	h = y1 - y0;
-
-	if (w <= 0 || h <= 0)
-	 goto out;
- }
-
- pScreen->GetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine);
-
-out:
- SCREEN_WRAP(pScreen, GetImage);
-}
-
-/*
- * RootlessSourceValidate
- * CopyArea and CopyPlane use a GC tied to the destination drawable.
- * StartDrawing/StopDrawing wrappers won't be called if source is
- * a visible window but the destination isn't. So, we call StartDrawing
- * here and leave StopDrawing for the block handler.
- */
-static void
-RootlessSourceValidate(DrawablePtr pDrawable, int x, int y, int w, int h)
-{
- SCREEN_UNWRAP(pDrawable->pScreen, SourceValidate);
- if (pDrawable->type == DRAWABLE_WINDOW) {
- WindowPtr pWin = (WindowPtr)pDrawable;
- RootlessStartDrawing(pWin);
- }
- if (pDrawable->pScreen->SourceValidate) {
- pDrawable->pScreen->SourceValidate(pDrawable, x, y, w, h);
- }
- SCREEN_WRAP(pDrawable->pScreen, SourceValidate);
-}
-
-#ifdef RENDER
-
-static void
-rootlessComposite(CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,
- INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,
- INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)
-{
- ScreenPtr pScreen = pDst->pDrawable->pScreen;
- PictureScreenPtr ps = GetPictureScreen(pScreen);
- WindowPtr srcWin, dstWin, maskWin = NULL;
-
- if (pMask) {
- maskWin = (pMask->pDrawable->type == DRAWABLE_WINDOW) ?
- (WindowPtr)pMask->pDrawable : NULL;
- }
- srcWin = (pSrc->pDrawable->type == DRAWABLE_WINDOW) ?
- (WindowPtr)pSrc->pDrawable : NULL;
- dstWin = (pDst->pDrawable->type == DRAWABLE_WINDOW) ?
- (WindowPtr)pDst->pDrawable : NULL;
-
- ps->Composite = SCREENREC(pScreen)->Composite;
-
- if (srcWin && IsFramedWindow(srcWin)) RootlessStartDrawing(srcWin);
- if (maskWin && IsFramedWindow(maskWin)) RootlessStartDrawing(maskWin);
- if (dstWin && IsFramedWindow(dstWin)) RootlessStartDrawing(dstWin);
-
- ps->Composite(op, pSrc, pMask, pDst,
- xSrc, ySrc, xMask, yMask,
- xDst, yDst, width, height);
-
- if (dstWin && IsFramedWindow(dstWin)) {
- RootlessDamageRect(dstWin, xDst, yDst, width, height);
- }
-
- ps->Composite = RootlessComposite;
-}
-
-static void
-RootlessGlyphs(CARD8 op, PicturePtr pSrc, PicturePtr pDst,
- PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc,
- int nlist, GlyphListPtr list, GlyphPtr *glyphs)
-{
- ScreenPtr pScreen = pDst->pDrawable->pScreen;
- PictureScreenPtr ps = GetPictureScreen(pScreen);
- int x, y;
- int n;
- GlyphPtr glyph;
- WindowPtr srcWin, dstWin;
-
- srcWin = (pSrc->pDrawable->type == DRAWABLE_WINDOW) ?
- (WindowPtr)pSrc->pDrawable : NULL;
- dstWin = (pDst->pDrawable->type == DRAWABLE_WINDOW) ?
- (WindowPtr)pDst->pDrawable : NULL;
-
- if (srcWin && IsFramedWindow(srcWin)) RootlessStartDrawing(srcWin);
- if (dstWin && IsFramedWindow(dstWin)) RootlessStartDrawing(dstWin);
-
- ps->Glyphs = SCREENREC(pScreen)->Glyphs;
- ps->Glyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
- ps->Glyphs = RootlessGlyphs;
-
- if (dstWin && IsFramedWindow(dstWin))
- {
- x = xSrc;
- y = ySrc;
-
-	while (nlist--)
-	{
-	 /* Originally this code called DamageRect for the bounding
-	 box of each glyph. But that was causing way too much
-	 time to be spent in CGSBoundingRegionAddRect. So compute
-	 the union of all glyphs in a list and damage that. It
-	 shouldn't be very different. */
-
- x += list->xOff;
- y += list->yOff;
- n = list->len;
-
-	 if (n > 0)
-	 {
-		BoxRec box;
-
- glyph = *glyphs++;
-
-		box.x1 = x - glyph->info.x;
-		box.y1 = y - glyph->info.y;
-		box.x2 = box.x1 + glyph->info.width;
-		box.y2 = box.y2 + glyph->info.height;
-
-		x += glyph->info.xOff;
-		y += glyph->info.yOff;
-
-		while (--n > 0)
-		{
-		 short x1, y1, x2, y2;
-
-		 glyph = *glyphs++;
-
-		 x1 = x - glyph->info.x;
-		 y1 = y - glyph->info.y;
-		 x2 = x1 + glyph->info.width;
-		 y2 = y1 + glyph->info.height;
-
-		 box.x1 = MAX (box.x1, x1);
-		 box.y1 = MAX (box.y1, y1);
-		 box.x2 = MAX (box.x2, x2);
-		 box.y2 = MAX (box.y2, y2);
-
-		 x += glyph->info.xOff;
-		 y += glyph->info.yOff;
-		}
-
-		RootlessDamageBox (dstWin, &box);
-	 }
-
- list++;
- }
- }
-}
-
-#endif /* RENDER */
-
-/* ValidateTree is modified in two ways:
- - top-level windows don't clip each other
- - windows aren't clipped against root.
- These only matter when validating from the root. */
-static int
-RootlessValidateTree(WindowPtr pParent, WindowPtr pChild, VTKind kind)
-{
- int result;
- RegionRec saveRoot;
- ScreenPtr pScreen = pParent->drawable.pScreen;
-
- SCREEN_UNWRAP(pScreen, ValidateTree);
- RL_DEBUG_MSG("VALIDATETREE start ");
-
- /* Use our custom version to validate from root */
- if (IsRoot(pParent)) {
- RL_DEBUG_MSG("custom ");
- result = RootlessMiValidateTree(pParent, pChild, kind);
- } else {
- HUGE_ROOT(pParent);
- result = pScreen->ValidateTree(pParent, pChild, kind);
- NORMAL_ROOT(pParent);
- }
-
- SCREEN_WRAP(pScreen, ValidateTree);
- RL_DEBUG_MSG("VALIDATETREE end\n");
-
- return result;
-}
-
-/* MarkOverlappedWindows is modified to ignore overlapping top-level
- windows. */
-static Bool
-RootlessMarkOverlappedWindows(WindowPtr pWin, WindowPtr pFirst,
- WindowPtr *ppLayerWin)
-{
- RegionRec saveRoot;
- Bool result;
- ScreenPtr pScreen = pWin->drawable.pScreen;
- SCREEN_UNWRAP(pScreen, MarkOverlappedWindows);
- RL_DEBUG_MSG("MARKOVERLAPPEDWINDOWS start ");
-
- HUGE_ROOT(pWin);
- if (IsRoot(pWin)) {
- /* root - mark nothing */
- RL_DEBUG_MSG("is root not marking ");
- result = FALSE;
- }
- else if (! IsTopLevel(pWin)) {
- /* not top-level window - mark normally */
- result = pScreen->MarkOverlappedWindows(pWin, pFirst, ppLayerWin);
- }
- else {
- /* top-level window - mark children ONLY - NO overlaps with sibs (?)
-	 This code copied from miMarkOverlappedWindows() */
-
- register WindowPtr pChild;
- Bool anyMarked = FALSE;
- void (* MarkWindow)() = pScreen->MarkWindow;
-
- RL_DEBUG_MSG("is top level! ");
- /* single layered systems are easy */
- if (ppLayerWin) *ppLayerWin = pWin;
-
- if (pWin == pFirst) {
- /* Blindly mark pWin and all of its inferiors. This is a slight
- * overkill if there are mapped windows that outside pWin's border,
- * but it's better than wasting time on RectIn checks.
- */
- pChild = pWin;
- while (1) {
- if (pChild->viewable) {
- if (REGION_BROKEN (pScreen, &pChild->winSize))
- SetWinSize (pChild);
- if (REGION_BROKEN (pScreen, &pChild->borderSize))
- SetBorderSize (pChild);
- (* MarkWindow)(pChild);
- if (pChild->firstChild) {
- pChild = pChild->firstChild;
- continue;
- }
- }
- while (!pChild->nextSib && (pChild != pWin))
- pChild = pChild->parent;
- if (pChild == pWin)
- break;
- pChild = pChild->nextSib;
- }
- anyMarked = TRUE;
- pFirst = pFirst->nextSib;
- }
- if (anyMarked)
- (* MarkWindow)(pWin->parent);
- result = anyMarked;
- }
- NORMAL_ROOT(pWin);
- SCREEN_WRAP(pScreen, MarkOverlappedWindows);
- RL_DEBUG_MSG("MARKOVERLAPPEDWINDOWS end\n");
- return result;
-}
-
-static void
-expose_1 (WindowPtr pWin)
-{
- WindowPtr pChild;
-
- if (!pWin->realized)
-	return;
-
- (*pWin->drawable.pScreen->PaintWindowBackground) (pWin, &pWin->borderClip,
-						 PW_BACKGROUND);
-
- /* FIXME: comments in windowstr.h indicate that borderClip doesn't
- include subwindow visibility. But I'm not so sure.. so we may
- be exposing too much.. */
-
- miSendExposures (pWin, &pWin->borderClip,
-		 pWin->drawable.x, pWin->drawable.y);
-
- for (pChild = pWin->firstChild; pChild != NULL; pChild = pChild->nextSib)
-	expose_1 (pChild);
-}
-
-void
-RootlessScreenExpose (ScreenPtr pScreen)
-{
- expose_1 (WindowTablepScreen->myNum);
-}
-
-ColormapPtr
-RootlessGetColormap (ScreenPtr pScreen)
-{
- RootlessScreenRec *s = SCREENREC (pScreen);
-
- return s->colormap;
-}
-
-static void
-RootlessInstallColormap (ColormapPtr pMap)
-{
- ScreenPtr pScreen = pMap->pScreen;
- RootlessScreenRec *s = SCREENREC (pScreen);
-
- SCREEN_UNWRAP(pScreen, InstallColormap);
-
- if (s->colormap != pMap)
- {
-	s->colormap = pMap;
-	s->colormap_changed = TRUE;
-	RootlessQueueRedisplay (pScreen);
- }
-
- pScreen->InstallColormap (pMap);
-
- SCREEN_WRAP (pScreen, InstallColormap);
-}
-
-static void
-RootlessUninstallColormap (ColormapPtr pMap)
-{
- ScreenPtr pScreen = pMap->pScreen;
- RootlessScreenRec *s = SCREENREC (pScreen);
-
- SCREEN_UNWRAP(pScreen, UninstallColormap);
-
- if (s->colormap == pMap)
-	s->colormap = NULL;
-
- pScreen->UninstallColormap (pMap);
-
- SCREEN_WRAP(pScreen, UninstallColormap);
-}
-
-static void
-RootlessStoreColors (ColormapPtr pMap, int ndef, xColorItem *pdef)
-{
- ScreenPtr pScreen = pMap->pScreen;
- RootlessScreenRec *s = SCREENREC (pScreen);
-
- SCREEN_UNWRAP(pScreen, StoreColors);
-
- if (s->colormap == pMap && ndef > 0)
- {
-	s->colormap_changed = TRUE;
-	RootlessQueueRedisplay (pScreen);
- }
-
- pScreen->StoreColors (pMap, ndef, pdef);
-
- SCREEN_WRAP(pScreen, StoreColors);
-}
-
-static CARD32
-redisplay_callback (OsTimerPtr timer, CARD32 time, void *arg)
-{
- RootlessScreenRec *screenRec = arg;
-
- if (!screenRec->redisplay_queued)
- {
-	/* No update needed. Stop the timer. */
-
-	screenRec->redisplay_timer_set = FALSE;
-	return 0;
- }
-
- screenRec->redisplay_queued = FALSE;
-
- /* Mark that we should redisplay before waiting for I/O next time */
- screenRec->redisplay_expired = TRUE;
-
- /* Reinstall the timer immediately, so we get as close to our
- redisplay interval as possible. */
-
- return REDISPLAY_DELAY;
-}
-
-void
-RootlessQueueRedisplay (ScreenPtr pScreen)
-{
- RootlessScreenRec *screenRec = SCREENREC (pScreen);
-
- screenRec->redisplay_queued = TRUE;
-
- if (screenRec->redisplay_timer_set)
-	return;
-
- screenRec->redisplay_timer = TimerSet (screenRec->redisplay_timer,
-					 0, REDISPLAY_DELAY,
-					 redisplay_callback, screenRec);
- screenRec->redisplay_timer_set = TRUE;
-}
-
-/* Call this function when it might be a good idea to flush updates.
- Note that it will unlock window buffers! */
-Bool
-RootlessMayRedisplay (ScreenPtr pScreen)
-{
- RootlessScreenRec *screenRec = SCREENREC (pScreen);
-
- if (!screenRec->redisplay_queued)
-	return FALSE;
-
- /* If the timer has fired, or it's been long enough since the last
- update, redisplay everything now. */
-
- if (!screenRec->redisplay_expired)
- {
-	CARD32 now = GetTimeInMillis ();
-
-	if (screenRec->last_redisplay + REDISPLAY_MAX_DELAY >= now)
-	 return FALSE;
- }
-
- if (screenRec->redisplay_timer_set)
- {
-	TimerCancel (screenRec->redisplay_timer);
-	screenRec->redisplay_timer_set = FALSE;
- }
-
- RootlessRedisplayScreen (screenRec->pScreen);
- screenRec->redisplay_expired = FALSE;
-
- return TRUE;
-}
-
-/* Flush drawing before blocking on select(). */
-static void
-RootlessBlockHandler(pointer pbdata, OSTimePtr pTimeout, pointer pReadmask)
-{
- ScreenPtr pScreen = pbdata;
- RootlessScreenRec *screenRec = SCREENREC (pScreen);
-
- if (screenRec->redisplay_expired)
- {
-	screenRec->redisplay_expired = FALSE;
-
-	if (screenRec->colormap_changed)
-	{
-	 RootlessFlushScreenColormaps (screenRec->pScreen);
-	 screenRec->colormap_changed = FALSE;
-	}
-
-	RootlessRedisplayScreen (screenRec->pScreen);
- }
-}
-
-static void
-RootlessWakeupHandler(pointer data, int i, pointer LastSelectMask)
-{
-}
-
-static Bool
-RootlessAllocatePrivates(ScreenPtr pScreen)
-{
- RootlessScreenRec *s;
- static unsigned int rootlessGeneration = -1;
-
- if (rootlessGeneration != serverGeneration) {
- rootlessScreenPrivateIndex = AllocateScreenPrivateIndex();
- if (rootlessScreenPrivateIndex == -1) return FALSE;
- rootlessGCPrivateIndex = AllocateGCPrivateIndex();
- if (rootlessGCPrivateIndex == -1) return FALSE;
- rootlessWindowPrivateIndex = AllocateWindowPrivateIndex();
- if (rootlessWindowPrivateIndex == -1) return FALSE;
- rootlessGeneration = serverGeneration;
- }
-
- /* no allocation needed for screen privates */
- if (!AllocateGCPrivate(pScreen, rootlessGCPrivateIndex,
- sizeof(RootlessGCRec)))
- return FALSE;
- if (!AllocateWindowPrivate(pScreen, rootlessWindowPrivateIndex, 0))
- return FALSE;
-
- s = xalloc(sizeof(RootlessScreenRec));
- if (! s) return FALSE;
- SCREENREC(pScreen) = s;
-
- s->pixmap_data = NULL;
- s->pixmap_data_size = 0;
-
- s->redisplay_timer = NULL;
- s->redisplay_timer_set = FALSE;
-
- return TRUE;
-}
-
-static void
-RootlessWrap(ScreenPtr pScreen)
-{
- RootlessScreenRec *s = (RootlessScreenRec*)
- pScreen->devPrivatesrootlessScreenPrivateIndex.ptr;
-
-#define WRAP(a) \
- if (pScreen->a) { \
- s->a = pScreen->a; \
- } else { \
- RL_DEBUG_MSG("null screen fn " #a "\n"); \
- s->a = NULL; \
- } \
- pScreen->a = Rootless##a
-
- WRAP(CreateScreenResources);
- WRAP(CloseScreen);
- WRAP(CreateGC);
- WRAP(PaintWindowBackground);
- WRAP(PaintWindowBorder);
- WRAP(CopyWindow);
- WRAP(GetImage);
- WRAP(SourceValidate);
- WRAP(CreateWindow);
- WRAP(DestroyWindow);
- WRAP(RealizeWindow);
- WRAP(UnrealizeWindow);
- WRAP(ReparentWindow);
- WRAP(MoveWindow);
- WRAP(PositionWindow);
- WRAP(ResizeWindow);
- WRAP(RestackWindow);
- WRAP(ChangeBorderWidth);
- WRAP(MarkOverlappedWindows);
- WRAP(ValidateTree);
- WRAP(ChangeWindowAttributes);
- WRAP(InstallColormap);
- WRAP(UninstallColormap);
- WRAP(StoreColors);
-
-#ifdef SHAPE
- WRAP(SetShape);
-#endif
-
-#ifdef RENDER
- {
- /* Composite and Glyphs don't use normal screen wrapping */
- PictureScreenPtr ps = GetPictureScreen(pScreen);
- s->Composite = ps->Composite;
- ps->Composite = rootlessComposite;
- s->Glyphs = ps->Glyphs;
- ps->Glyphs = RootlessGlyphs;
- }
-#endif
-
- // WRAP(ClearToBackground); fixme put this back? useful for shaped wins?
- // WRAP(RestoreAreas); fixme put this back?
-
-#undef WRAP
-}
-
-Bool
-RootlessSetupScreen(int index, ScreenPtr pScreen)
-{
- RootlessScreenRec *s;
-
- /* Add replacements for fb screen functions */
- pScreen->PaintWindowBackground = RootlessPaintWindow;
- pScreen->PaintWindowBorder = RootlessPaintWindow;
-
-#ifdef RENDER
- {
- PictureScreenPtr ps = GetPictureScreen(pScreen);
- ps->Composite = RootlessComposite;
- }
-#endif
-
- if (!RootlessAllocatePrivates(pScreen))
-	return FALSE;
-
- s = ((RootlessScreenRec*)
-	 pScreen->devPrivatesrootlessScreenPrivateIndex.ptr);
-
- s->pScreen = pScreen;
- RootlessWrap(pScreen);
-
- if (!RegisterBlockAndWakeupHandlers (RootlessBlockHandler,
- RootlessWakeupHandler,
- (pointer) pScreen))
- {
- return FALSE;
- }
-
- return TRUE;
-}
-
-void
-RootlessUpdateRooted (Bool state)
-{
- int i;
-
- if (!state)
- {
-	for (i = 0; i < screenInfo.numScreens; i++)
-	 RootlessDisableRoot (screenInfo.screensi);
- }
- else
- {
-	for (i = 0; i < screenInfo.numScreens; i++)
-	 RootlessEnableRoot (screenInfo.screensi);
- }
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/rootless-val-tree.c Deleted

@@ -1,640 +0,0 @@
-/*
- * Calculate window clip lists for rootless mode
- *
- * This file is very closely based on mivaltree.c.
- */
- /* $XFree86: xc/programs/Xserver/hw/darwin/quartz/rootlessValTree.c,v 1.2 2002/06/18 19:43:04 torrey Exp $ */
-
-/*
- * mivaltree.c --
- *	Functions for recalculating window clip lists. Main function
- *	is miValidateTree.
- *
-
-Copyright 1987, 1988, 1989, 1998 The Open Group
-
-All Rights Reserved.
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
- *
- * Copyright 1987, 1988, 1989 by 
- * Digital Equipment Corporation, Maynard, Massachusetts,
- * 
- * All Rights Reserved
- * 
- * Permission to use, copy, modify, and distribute this software and its 
- * documentation for any purpose and without fee is hereby granted, 
- * provided that the above copyright notice appear in all copies and that
- * both that copyright notice and this permission notice appear in 
- * supporting documentation, and that the name of Digital not be
- * used in advertising or publicity pertaining to distribution of the
- * software without specific, written prior permission. 
- * 
- * DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
- * ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
- * DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
- * ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
- * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
- * SOFTWARE.
- * 
- ******************************************************************/
-
-/* The panoramix components contained the following notice */
-/****************************************************************
-* *
-* Copyright (c) Digital Equipment Corporation, 1991, 1997 *
-* *
-* All Rights Reserved. Unpublished rights reserved under *
-* the copyright laws of the United States. *
-* *
-* The software contained on this media is proprietary to *
-* and embodies the confidential technology of Digital *
-* Equipment Corporation. Possession, use, duplication or *
-* dissemination of the software and media is authorized only *
-* pursuant to a valid written license from Digital Equipment *
-* Corporation. *
-* *
-* RESTRICTED RIGHTS LEGEND Use, duplication, or disclosure *
-* by the U.S. Government is subject to restrictions as set *
-* forth in Subparagraph (c)(1)(ii) of DFARS 252.227-7013, *
-* or in FAR 52.227-19, as applicable. *
-* *
-*****************************************************************/
-
- /* 
- * Aug '86: Susan Angebranndt -- original code
- * July '87: Adam de Boor -- substantially modified and commented
- * Summer '89: Joel McCormack -- so fast you wouldn't believe it possible.
- * In particular, much improved code for window mapping and
- * circulating.
- *		Bob Scheifler -- avoid miComputeClips for unmapped windows,
- *				 valdata changes
- */
-#include "X.h"
-#include "scrnintstr.h"
-#include "validate.h"
-#include "windowstr.h"
-#include "mi.h"
-#include "regionstr.h"
-#include "mivalidate.h"
-
-#include "globals.h"
-
-#ifdef SHAPE
-/*
- * Compute the visibility of a shaped window
- */
-int
-RootlessShapedWindowIn (pScreen, universe, bounding, rect, x, y)
- ScreenPtr	pScreen;
- RegionPtr	universe, bounding;
- BoxPtr	rect;
- register int x, y;
-{
- BoxRec box;
- register BoxPtr boundBox;
- int	 nbox;
- Bool someIn, someOut;
- register int t, x1, y1, x2, y2;
-
- nbox = REGION_NUM_RECTS (bounding);
- boundBox = REGION_RECTS (bounding);
- someIn = someOut = FALSE;
- x1 = rect->x1;
- y1 = rect->y1;
- x2 = rect->x2;
- y2 = rect->y2;
- while (nbox--)
- {
-	if ((t = boundBox->x1 + x) < x1)
-	 t = x1;
-	box.x1 = t;
-	if ((t = boundBox->y1 + y) < y1)
-	 t = y1;
-	box.y1 = t;
-	if ((t = boundBox->x2 + x) > x2)
-	 t = x2;
-	box.x2 = t;
-	if ((t = boundBox->y2 + y) > y2)
-	 t = y2;
-	box.y2 = t;
-	if (box.x1 > box.x2)
-	 box.x2 = box.x1;
-	if (box.y1 > box.y2)
-	 box.y2 = box.y1;
-	switch (RECT_IN_REGION(pScreen, universe, &box))
-	{
-	case rgnIN:
-	 if (someOut)
-		return rgnPART;
-	 someIn = TRUE;
-	 break;
-	case rgnOUT:
-	 if (someIn)
-		return rgnPART;
-	 someOut = TRUE;
-	 break;
-	default:
-	 return rgnPART;
-	}
-	boundBox++;
- }
- if (someIn)
-	return rgnIN;
- return rgnOUT;
-}
-#endif
-
-#define HasParentRelativeBorder(w) (!(w)->borderIsPixel && \
-				 HasBorder(w) && \
-				 (w)->backgroundState == ParentRelative)
-
-
-/*
- *-----------------------------------------------------------------------
- * RootlessComputeClips --
- *	Recompute the clipList, borderClip, exposed and borderExposed
- *	regions for pParent and its children. Only viewable windows are
- *	taken into account.
- *
- * Results:
- *	None.
- *
- * Side Effects:
- *	clipList, borderClip, exposed and borderExposed are altered.
- *	A VisibilityNotify event may be generated on the parent window.
- *
- *-----------------------------------------------------------------------
- */
-static void
-RootlessComputeClips (pParent, pScreen, universe, kind, exposed)
- register WindowPtr	pParent;
- register ScreenPtr	pScreen;
- register RegionPtr	universe;
- VTKind		kind;
- RegionPtr		exposed; /* for intermediate calculations */
-{
- int			dx,
-			dy;
- RegionRec		childUniverse;
- register WindowPtr	pChild;
- int 	 	oldVis, newVis;
- BoxRec		borderSize;
- RegionRec		childUnion;
- Bool		overlap;
- RegionPtr		borderVisible;
- Bool		resized;
- /*
- * Figure out the new visibility of this window.
- * The extent of the universe should be the same as the extent of
- * the borderSize region. If the window is unobscured, this rectangle
- * will be completely inside the universe (the universe will cover it
- * completely). If the window is completely obscured, none of the
- * universe will cover the rectangle.
- */
- borderSize.x1 = pParent->drawable.x - wBorderWidth(pParent);
- borderSize.y1 = pParent->drawable.y - wBorderWidth(pParent);
- dx = (int) pParent->drawable.x + (int) pParent->drawable.width + wBorderWidth(pParent);
- if (dx > 32767)
-	dx = 32767;
- borderSize.x2 = dx;
- dy = (int) pParent->drawable.y + (int) pParent->drawable.height + wBorderWidth(pParent);
- if (dy > 32767)
-	dy = 32767;
- borderSize.y2 = dy;
-
- oldVis = pParent->visibility;
- switch (RECT_IN_REGION( pScreen, universe, &borderSize)) 
- {
- case rgnIN:
-	 newVis = VisibilityUnobscured;
-	 break;
-	case rgnPART:
-	 newVis = VisibilityPartiallyObscured;
-#ifdef SHAPE
-	 {
-		RegionPtr pBounding;
-
-		if ((pBounding = wBoundingShape (pParent)))
-		{
-		 switch (RootlessShapedWindowIn (pScreen, universe, 
-						 pBounding, &borderSize,
-						 pParent->drawable.x,
-						 pParent->drawable.y))
-		 {
-		 case rgnIN:
-			newVis = VisibilityUnobscured;
-			break;
-		 case rgnOUT:
-			newVis = VisibilityFullyObscured;
-			break;
-		 }
-		}
-	 }
-#endif
-	 break;
-	default:
-	 newVis = VisibilityFullyObscured;
-	 break;
- }
-
- pParent->visibility = newVis;
- if (oldVis != newVis &&
-	((pParent->eventMask | wOtherEventMasks(pParent)) & VisibilityChangeMask))
-	SendVisibilityNotify(pParent);
-
- dx = pParent->drawable.x - pParent->valdata->before.oldAbsCorner.x;
- dy = pParent->drawable.y - pParent->valdata->before.oldAbsCorner.y;
-
- /*
- * avoid computations when dealing with simple operations
- */
-
- switch (kind) {
- case VTMap:
- case VTStack:
- case VTUnmap:
-	break;
- case VTMove:
-	if ((oldVis == newVis) &&
-	 ((oldVis == VisibilityFullyObscured) ||
-	 (oldVis == VisibilityUnobscured)))
-	{
-	 pChild = pParent;
-	 while (1)
-	 {
-		if (pChild->viewable)
-		{
-		 if (pChild->visibility != VisibilityFullyObscured)
-		 {
-			REGION_TRANSLATE( pScreen, &pChild->borderClip,
-						 dx, dy);
-			REGION_TRANSLATE( pScreen, &pChild->clipList,
-						 dx, dy);
-			pChild->drawable.serialNumber = NEXT_SERIAL_NUMBER;
-			if (pScreen->ClipNotify)
-			 (* pScreen->ClipNotify) (pChild, dx, dy);
-
-		 }
-		 if (pChild->valdata)
-		 {
-			REGION_INIT(pScreen, 
-				 &pChild->valdata->after.borderExposed,
-				 NullBox, 0);
-			if (HasParentRelativeBorder(pChild))
-			 {
-			 REGION_SUBTRACT(pScreen,
-					 &pChild->valdata->after.borderExposed,
-					 &pChild->borderClip,
-					 &pChild->winSize);
-			}
-			REGION_INIT( pScreen, &pChild->valdata->after.exposed,
-						 NullBox, 0);
-		 }
-		 if (pChild->firstChild)
-		 {
-			pChild = pChild->firstChild;
-			continue;
-		 }
-		}
-		while (!pChild->nextSib && (pChild != pParent))
-		 pChild = pChild->parent;
-		if (pChild == pParent)
-		 break;
-		pChild = pChild->nextSib;
-	 }
-	 return;
-	}
-	/* fall through */
- default:
- 	/*
- 	 * To calculate exposures correctly, we have to translate the old
- 	 * borderClip and clipList regions to the window's new location so there
- 	 * is a correspondence between pieces of the new and old clipping regions.
- 	 */
- 	if (dx || dy) 
- 	{
-	 /*
-	 * We translate the old clipList because that will be exposed or copied
-	 * if gravity is right.
-	 */
-	 REGION_TRANSLATE( pScreen, &pParent->borderClip, dx, dy);
-	 REGION_TRANSLATE( pScreen, &pParent->clipList, dx, dy);
- 	} 
-	break;
- case VTBroken:
-	REGION_EMPTY (pScreen, &pParent->borderClip);
-	REGION_EMPTY (pScreen, &pParent->clipList);
-	break;
- }
-
- borderVisible = pParent->valdata->before.borderVisible;
- resized = pParent->valdata->before.resized;
- REGION_INIT( pScreen, &pParent->valdata->after.borderExposed, NullBox, 0);
- REGION_INIT( pScreen, &pParent->valdata->after.exposed, NullBox, 0);
-
- /*
- * Since the borderClip must not be clipped by the children, we do
- * the border exposure first...
- *
- * 'universe' is the window's borderClip. To figure the exposures, remove
- * the area that used to be exposed from the new.
- * This leaves a region of pieces that weren't exposed before.
- */
-
- if (HasBorder (pParent))
- {
- 	if (borderVisible)
- 	{
-	 /*
-	 * when the border changes shape, the old visible portions
-	 * of the border will be saved by DIX in borderVisible --
-	 * use that region and destroy it
-	 */
-	 REGION_SUBTRACT( pScreen, exposed, universe, borderVisible);
-	 REGION_DESTROY( pScreen, borderVisible);
- 	}
- 	else
- 	{
-	 REGION_SUBTRACT( pScreen, exposed, universe, &pParent->borderClip);
- 	}
-	if (HasParentRelativeBorder(pParent) && (dx || dy)) {
-	 REGION_SUBTRACT( pScreen, &pParent->valdata->after.borderExposed,
-				 universe,
-				 &pParent->winSize);
-	} else {
-	 REGION_SUBTRACT( pScreen, &pParent->valdata->after.borderExposed,
-			 exposed, &pParent->winSize);
-	}
-
- 	REGION_COPY( pScreen, &pParent->borderClip, universe);
- 
- 	/*
- 	 * To get the right clipList for the parent, and to make doubly sure
- 	 * that no child overlaps the parent's border, we remove the parent's
- 	 * border from the universe before proceeding.
- 	 */
- 
- 	REGION_INTERSECT( pScreen, universe, universe, &pParent->winSize);
- }
- else
- 	REGION_COPY( pScreen, &pParent->borderClip, universe);
- 
- if ((pChild = pParent->firstChild) && pParent->mapped)
- {
-	REGION_INIT(pScreen, &childUniverse, NullBox, 0);
-	REGION_INIT(pScreen, &childUnion, NullBox, 0);
-	if ((pChild->drawable.y < pParent->lastChild->drawable.y) ||
-	 ((pChild->drawable.y == pParent->lastChild->drawable.y) &&
-	 (pChild->drawable.x < pParent->lastChild->drawable.x)))
-	{
-	 for (; pChild; pChild = pChild->nextSib)
-	 {
-		if (pChild->viewable)
-		 REGION_APPEND( pScreen, &childUnion, &pChild->borderSize);
-	 }
-	}
-	else
-	{
-	 for (pChild = pParent->lastChild; pChild; pChild = pChild->prevSib)
-	 {
-		if (pChild->viewable)
-		 REGION_APPEND( pScreen, &childUnion, &pChild->borderSize);
-	 }
-	}
-	REGION_VALIDATE( pScreen, &childUnion, &overlap);
-
-	for (pChild = pParent->firstChild;
-	 pChild;
-	 pChild = pChild->nextSib)
- 	{
-	 if (pChild->viewable) {
-		/*
-		 * If the child is viewable, we want to remove its extents
-		 * from the current universe, but we only re-clip it if
-		 * it's been marked.
-		 */
-		if (pChild->valdata) {
-		 /*
-		 * Figure out the new universe from the child's
-		 * perspective and recurse.
-		 */
-		 REGION_INTERSECT( pScreen, &childUniverse,
-					 universe,
-					 &pChild->borderSize);
-		 RootlessComputeClips (pChild, pScreen, &childUniverse, 
-					 kind, exposed);
-		}
-		/*
-		 * Once the child has been processed, we remove its extents
-		 * from the current universe, thus denying its space to any
-		 * other sibling.
-		 */
-		if (overlap)
-		 REGION_SUBTRACT( pScreen, universe, universe,
-					 &pChild->borderSize);
-	 }
-	}
-	if (!overlap)
-	 REGION_SUBTRACT( pScreen, universe, universe, &childUnion);
-	REGION_UNINIT( pScreen, &childUnion);
-	REGION_UNINIT( pScreen, &childUniverse);
- } /* if any children */
-
- /*
- * 'universe' now contains the new clipList for the parent window.
- *
- * To figure the exposure of the window we subtract the old clip from the
- * new, just as for the border.
- */
-
- if (oldVis == VisibilityFullyObscured ||
-	oldVis == VisibilityNotViewable)
- {
-	REGION_COPY( pScreen, &pParent->valdata->after.exposed, universe);
- }
- else if (newVis != VisibilityFullyObscured &&
-	 newVis != VisibilityNotViewable)
- {
- 	REGION_SUBTRACT( pScreen, &pParent->valdata->after.exposed,
-			 universe, &pParent->clipList);
- }
-
- /*
- * One last thing: backing storage. We have to try to save what parts of
- * the window are about to be obscured. We can just subtract the universe
- * from the old clipList and get the areas that were in the old but aren't
- * in the new and, hence, are about to be obscured.
- */
- if (pParent->backStorage && !resized)
- {
-	REGION_SUBTRACT( pScreen, exposed, &pParent->clipList, universe);
-	(* pScreen->SaveDoomedAreas)(pParent, exposed, dx, dy);
- }
- 
- /* HACK ALERT - copying contents of regions, instead of regions */
- {
-	RegionRec tmp;
-
-	tmp = pParent->clipList;
-	pParent->clipList = *universe;
-	*universe = tmp;
- }
-
-#ifdef NOTDEF
- REGION_COPY( pScreen, &pParent->clipList, universe);
-#endif
-
- pParent->drawable.serialNumber = NEXT_SERIAL_NUMBER;
-
- if (pScreen->ClipNotify)
-	(* pScreen->ClipNotify) (pParent, dx, dy);
-}
-
-static void
-RootlessTreeObscured(pParent)
- register WindowPtr pParent;
-{
- register WindowPtr pChild;
- register int oldVis;
-
- pChild = pParent;
- while (1)
- {
-	if (pChild->viewable)
-	{
-	 oldVis = pChild->visibility;
-	 if (oldVis != (pChild->visibility = VisibilityFullyObscured) &&
-		((pChild->eventMask | wOtherEventMasks(pChild)) & VisibilityChangeMask))
-		SendVisibilityNotify(pChild);
-	 if (pChild->firstChild)
-	 {
-		pChild = pChild->firstChild;
-		continue;
-	 }
-	}
-	while (!pChild->nextSib && (pChild != pParent))
-	 pChild = pChild->parent;
-	if (pChild == pParent)
-	 break;
-	pChild = pChild->nextSib;
- }
-}
-
-/*
- *-----------------------------------------------------------------------
- * RootlessMiValidateTree --
- *	Recomputes the clip list for pParent and all its inferiors.
- *
- * Results:
- *	Always returns 1.
- *
- * Side Effects:
- *	The clipList, borderClip, exposed, and borderExposed regions for
- *	each marked window are altered.
- *
- * Notes:
- *	This routine assumes that all affected windows have been marked
- *	(valdata created) and their winSize and borderSize regions
- *	adjusted to correspond to their new positions. The borderClip and
- *	clipList regions should not have been touched.
- *
- *	The top-most level is treated differently from all lower levels
- *	because pParent is unchanged. For the top level, we merge the
- *	regions taken up by the marked children back into the clipList
- *	for pParent, thus forming a region from which the marked children
- *	can claim their areas. For lower levels, where the old clipList
- *	and borderClip are invalid, we can't do this and have to do the
- *	extra operations done in miComputeClips, but this is much faster
- *	e.g. when only one child has moved...
- *
- *-----------------------------------------------------------------------
- */
-/* 
- Quartz version: used for validate from root in rootless mode.
- We need to make sure top-level windows don't clip each other, 
- and that top-level windows aren't clipped to the root window.
-*/
-/*ARGSUSED*/
-// fixme this is ugly
-// Xprint/ValTree.c doesn't work, but maybe that method can?
-int
-RootlessMiValidateTree (pRoot, pChild, kind)
- WindowPtr	 	pRoot; /* Parent to validate */
- WindowPtr	 	pChild; /* First child of pRoot that was
-				 * affected */
- VTKind 	 	kind; /* What kind of configuration caused call */
-{
- RegionRec	 	childClip; /* The new borderClip for the current
-				 * child */
- RegionRec		exposed; /* For intermediate calculations */
- register ScreenPtr	pScreen;
- register WindowPtr	pWin;
-
- pScreen = pRoot->drawable.pScreen;
- if (pChild == NullWindow)
-	pChild = pRoot->firstChild;
-
- REGION_INIT(pScreen, &childClip, NullBox, 0);
- REGION_INIT(pScreen, &exposed, NullBox, 0);
-
- if (REGION_BROKEN (pScreen, &pRoot->clipList) &&
-	!REGION_BROKEN (pScreen, &pRoot->borderClip))
- {
- // fixme this might not work, but hopefully doesn't happen anyway.
- kind = VTBroken;
- REGION_EMPTY (pScreen, &pRoot->clipList);
- ErrorF("ValidateTree: BUSTED!\n");
- }
-
- /* 
- * Recursively compute the clips for all children of the root. 
- * They don't clip against each other or the root itself, so 
- * childClip is always reset to that child's size.
- */
-
- for (pWin = pChild;
-	 pWin != NullWindow;
-	 pWin = pWin->nextSib)
- {
- if (pWin->viewable) {
- if (pWin->valdata) {
- REGION_COPY( pScreen, &childClip, &pWin->borderSize);
- RootlessComputeClips (pWin, pScreen, &childClip, kind, &exposed);
- } else if (pWin->visibility == VisibilityNotViewable) {
- RootlessTreeObscured(pWin);
- }
- } else {
- if (pWin->valdata) {
- REGION_EMPTY( pScreen, &pWin->clipList);
- if (pScreen->ClipNotify)
- (* pScreen->ClipNotify) (pWin, 0, 0);
- REGION_EMPTY( pScreen, &pWin->borderClip);
- pWin->valdata = (ValidatePtr)NULL;
- }
- }
- }
-
- REGION_UNINIT( pScreen, &childClip);
-
- /* The root is never clipped by its children, so nothing on the root 
- is ever exposed by moving or mapping its children. */
- REGION_INIT( pScreen, &pRoot->valdata->after.exposed, NullBox, 0);
- REGION_INIT( pScreen, &pRoot->valdata->after.borderExposed, NullBox, 0);
-
- return 1;
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/rootless-window.c Deleted

@@ -1,2056 +0,0 @@
-/*
- * Rootless window management
- */
-/*
- * Copyright (c) 2001 Greg Parker. All Rights Reserved.
- * Copyright (c) 2002 Torrey T. Lyons. All Rights Reserved.
- * Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
- *
- * Except as contained in this notice, the name(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-/* Portions of this file are based on fbwindow.c, which contains the
- * following copyright:
- *
- * Copyright © 1998 Keith Packard
- */
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/rootlessWindow.c,v 1.11 2002/09/28 00:43:39 torrey Exp $ */
-
-#include "rootless-common.h"
-#include "rootless-window.h"
-#include "darwin.h"
-#include "Xplugin.h"
-#include "x-hash.h"
-#include "x-list.h"
-#define _APPLEWM_SERVER_
-#include "applewmstr.h"
-
-#include "fb.h"
-#include "propertyst.h"
-
-#ifdef PANORAMIX
-#include "panoramiX.h"
-#include "panoramiXsrv.h"
-#endif
-
-#include <X11/Xatom.h>
-#include <pthread.h>
-
-#define DEFINE_ATOM_HELPER(func,atom_name)			\
-static Atom func (void) {					\
- static unsigned int generation;				\
- static Atom atom;						\
- if (generation != serverGeneration) {			\
-	generation = serverGeneration;				\
-	atom = MakeAtom (atom_name, strlen (atom_name), TRUE);	\
- }								\
- return atom;						\
-}
-
-DEFINE_ATOM_HELPER (xa_native_screen_origin, "_NATIVE_SCREEN_ORIGIN")
-DEFINE_ATOM_HELPER (xa_native_window_id, "_NATIVE_WINDOW_ID")
-DEFINE_ATOM_HELPER (xa_apple_no_order_in, "_APPLE_NO_ORDER_IN")
-
-/* Maps xp_window_id -> AquaWindowRec */
-static x_hash_table *window_hash;
-static pthread_mutex_t window_hash_mutex;
-
-static Bool no_configure_window;
-static Bool windows_hidden;
-
-static const int normal_window_levelsAppleWMNumWindowLevels+1 = {
- 0, 3, 4, 5, LONG_MIN + 30, LONG_MIN + 29,
-};
-static const int rooted_window_levelsAppleWMNumWindowLevels+1 = {
- 202, 203, 204, 205, 201, 200
-};
-
-static inline xp_error
-configure_window (xp_window_id id, unsigned int mask,
-		 const xp_window_changes *values)
-{
- if (!no_configure_window)
-	return xp_configure_window (id, mask, values);
- else
-	return XP_Success;
-}
-
-static inline unsigned long
-current_time_in_seconds (void)
-{
- unsigned long t = 0;
-
- t += currentTime.milliseconds / 1000;
- t += currentTime.months * 4294967;
-
- return t;
-}
-
-static inline Bool
-rootlessHasRoot (ScreenPtr pScreen)
-{
- return WINREC (WindowTablepScreen->myNum) != NULL;
-}
-
-void
-RootlessNativeWindowStateChanged (xp_window_id id, unsigned int state)
-{
- WindowPtr pWin;
- RootlessWindowRec *winRec;
-
- pWin = RootlessGetXWindow (id);
- if (pWin == NULL)
-	return;
-
- winRec = WINREC (pWin);
- if (winRec == NULL)
-	return;
-
- winRec->is_offscreen = (state & XP_WINDOW_STATE_OFFSCREEN) != 0;
- winRec->is_obscured = (state & XP_WINDOW_STATE_OBSCURED) != 0;
-
-#ifdef ROOTLESS
- pWin->rootlessUnhittable = winRec->is_offscreen;
-#endif
-}
-
-void
-RootlessNativeWindowMoved (xp_window_id id)
-{
- WindowPtr pWin;
- xp_box bounds;
- int sx, sy;
- XID vlist2;
- Mask mask;
- ClientPtr client;
-
- pWin = RootlessGetXWindow (id);
- if (pWin == NULL)
-	return;
-
- if (xp_get_window_bounds (id, &bounds) != Success)
-	return;
-
- sx = dixScreenOriginspWin->drawable.pScreen->myNum.x + darwinMainScreenX;
- sy = dixScreenOriginspWin->drawable.pScreen->myNum.y + darwinMainScreenY;
-
- /* Fake up a ConfigureWindow packet to resize the window to the
- current bounds. */
-
- vlist0 = (INT16) bounds.x1 - sx;
- vlist1 = (INT16) bounds.y1 - sy;
- mask = CWX | CWY;
-
- /* pretend we're the owner of the window! */
- client = LookupClient (pWin->drawable.id, NullClient);
-
- /* Don't want to do anything to the physical window (avoids
- notification-response feedback loops) */
-
- no_configure_window = TRUE;
- ConfigureWindow (pWin, mask, vlist, client);
- no_configure_window = FALSE;
-}
-
-/* Updates the _NATIVE_SCREEN_ORIGIN property on the given root window. */
-static void
-set_screen_origin (WindowPtr pWin)
-{
- long data2;
-
- if (!IsRoot (pWin))
-	return;
-
- /* FIXME: move this to an extension? */
-
- data0 = (dixScreenOriginspWin->drawable.pScreen->myNum.x
-	 + darwinMainScreenX);
- data1 = (dixScreenOriginspWin->drawable.pScreen->myNum.y
-	 + darwinMainScreenY);
-
- ChangeWindowProperty (pWin, xa_native_screen_origin (), XA_INTEGER,
-			 32, PropModeReplace, 2, data, TRUE);
-}
-
-/* For now, don't create a physical window until either the window is
- realized, or we really need it (e.g. to attach VRAM surfaces to).
- Do reset the window size so it's not clipped by the root window. */
-Bool
-RootlessCreateWindow (WindowPtr pWin)
-{
- Bool result;
- RegionRec saveRoot;
-
- SCREEN_UNWRAP (pWin->drawable.pScreen, CreateWindow);
-
- if (!IsRoot (pWin))
- {
- /* win/border size set by DIX, not by wrapped CreateWindow, so
- correct it here. Don't HUGE_ROOT when pWin is the root! */
-
- HUGE_ROOT (pWin);
- SetWinSize (pWin);
- SetBorderSize (pWin);
- }
- else
- {
-	set_screen_origin (pWin);
- }
-
- result = pWin->drawable.pScreen->CreateWindow (pWin);
-
- if (pWin->parent)
- NORMAL_ROOT (pWin);
-
- SCREEN_WRAP (pWin->drawable.pScreen, CreateWindow);
-
- return result;
-}
-
-/* Destroy the physical window associated with the given window */
-static void
-rootlessDestroyFrame (WindowPtr pWin, RootlessWindowRec *winRec)
-{
- RootlessStopDrawing (pWin, FALSE);
-
- pthread_mutex_lock (&window_hash_mutex);
- x_hash_table_remove (window_hash, (void *) winRec->wid);
- pthread_mutex_unlock (&window_hash_mutex);
-
- xp_destroy_window (winRec->wid);
-
- xfree (winRec);
- WINREC (pWin) = NULL;
-}
-
-Bool
-RootlessDestroyWindow (WindowPtr pWin)
-{
- RootlessWindowRec *winRec = WINREC(pWin);
- Bool result;
-
- if (winRec != NULL)
-	rootlessDestroyFrame (pWin, winRec);
-
- /* winRec is gone now */
-
- SCREEN_UNWRAP(pWin->drawable.pScreen, DestroyWindow);
-
- result = pWin->drawable.pScreen->DestroyWindow (pWin);
-
- SCREEN_WRAP(pWin->drawable.pScreen, DestroyWindow);
-
- return result;
-}
-
-#ifdef SHAPE
-static Bool
-RootlessGetShape (WindowPtr pWin, RegionPtr pShape)
-{
- if (wBoundingShape (pWin) == NULL)
-	return FALSE;
-
- /* wBoundingShape is relative to *inner* origin of window.
- Translate by borderWidth to get the outside-relative position. */
-
- REGION_INIT (pScreen, pShape, NullBox, 0);
- REGION_COPY (pScreen, pShape, wBoundingShape (pWin));
- REGION_TRANSLATE (pScreen, pShape, pWin->borderWidth, pWin->borderWidth);
-
- return TRUE;
-}
-
-/* boundingShape = outside border (like borderClip)
- clipShape = inside border (like clipList)
- Both are in window-local coordinates
- We only care about boundingShape (FIXME true?)
-
- RootlessReallySetShape is used in several places other than SetShape.
- Most importantly, SetShape is often called on unmapped windows, so we
- have to wait until the window is mapped to reshape the frame. */
-static void
-rootlessSetShape (WindowPtr pWin)
-{
- RootlessWindowRec *winRec = WINREC (pWin);
-
- RegionRec newShape;
- RegionPtr pShape;
- xp_window_changes wc;
-
- if (winRec == NULL)
-	return;
-
- RootlessStopDrawing (pWin, FALSE);
-
- pShape = RootlessGetShape (pWin, &newShape) ? &newShape : NULL;
-
- RL_DEBUG_MSG("reshaping...");
- RL_DEBUG_MSG("numrects %d, extents %d %d %d %d\n",
- REGION_NUM_RECTS(&newShape),
- newShape.extents.x1, newShape.extents.y1,
- newShape.extents.x2, newShape.extents.y2);
-
- RootlessDisableUpdate (pWin);
-
- if (pShape != NULL)
- {
-	wc.shape_nrects = REGION_NUM_RECTS (pShape);
-	wc.shape_rects = REGION_RECTS (pShape);
- }
- else
- {
-	wc.shape_nrects = -1;
-	wc.shape_rects = NULL;
- }
-
- wc.shape_tx = wc.shape_ty = 0;
-
- configure_window (winRec->wid, XP_SHAPE, &wc);
- 
- if (pShape != NULL)
-	REGION_UNINIT(pScreen, &newShape);
-}
-
-void
-RootlessSetShape (WindowPtr pWin)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- SCREEN_UNWRAP (pScreen, SetShape);
-
- pScreen->SetShape (pWin);
-
- SCREEN_WRAP (pScreen, SetShape);
-
- rootlessSetShape (pWin);
-}
-#endif
-
-/* Disallow ParentRelative background on top-level windows
- because the root window doesn't really have the right background
- and fb will try to draw on the root instead of on the window.
- ParentRelative prevention is also in PaintWindowBackground/Border()
- so it is no longer really needed here. */
-Bool
-RootlessChangeWindowAttributes (WindowPtr pWin, unsigned long vmask)
-{
- Bool result;
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- RL_DEBUG_MSG("change window attributes start\n");
-
- SCREEN_UNWRAP (pScreen, ChangeWindowAttributes);
-
- result = pScreen->ChangeWindowAttributes (pWin, vmask);
-
- SCREEN_WRAP (pScreen, ChangeWindowAttributes);
-
- if (WINREC (pWin) != NULL)
- {
- /* disallow ParentRelative background state */
-
- if (pWin->backgroundState == ParentRelative)
-	{
- XID pixel = 0;
- ChangeWindowAttributes (pWin, CWBackPixel, &pixel, serverClient);
- }
- }
-
- RL_DEBUG_MSG("change window attributes end\n");
- return result;
-}
-
-/* This is a hook for when DIX moves or resizes a window.
- Update the frame position now. (x, y) are *inside* position.
- After this, mi and fb are expecting the pixmap to be at the new location. */
-Bool
-RootlessPositionWindow (WindowPtr pWin, int x, int y)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- RootlessWindowRec *winRec = WINREC (pWin);
- Bool result;
-
- RL_DEBUG_MSG("positionwindow start (win 0x%x)\n", pWin);
-
- if (winRec != NULL)
- {
- if (winRec->is_drawing)
-	{
- /* Reset frame's pixmap and move it to the new position. */
- int bw = wBorderWidth (pWin);
-
- winRec->pixmap->devPrivate.ptr = winRec->data;
- TranslatePixmapBase (winRec->pixmap, - (x - bw), - (y - bw));
- }
- }
-
- SCREEN_UNWRAP (pScreen, PositionWindow);
-
- result = pScreen->PositionWindow (pWin, x, y);
-
- SCREEN_WRAP(pScreen, PositionWindow);
-
- RL_DEBUG_MSG("positionwindow end\n");
- return result;
-}
-
-/* Initialize some basic attributes of the frame. Note that winRec
- may already have valid data in it, so don't overwrite anything
- valuable. */
-static void
-rootlessInitializeFrame (WindowPtr pWin, RootlessWindowRec *winRec)
-{
- DrawablePtr d = &pWin->drawable;
- int bw = wBorderWidth (pWin);
-
- winRec->win = pWin;
-
- winRec->x = d->x - bw;
- winRec->y = d->y - bw;
- winRec->width = d->width + 2*bw;
- winRec->height = d->height + 2*bw;
- winRec->borderWidth = bw;
-}
-
-static void
-rootlessSetNativeProperty (RootlessWindowRec *winRec)
-{
- xp_error err;
- unsigned int native_id;
- long data;
-
- err = xp_get_native_window (winRec->wid, &native_id);
- if (err == Success)
- {
-	/* FIXME: move this to an extension? */
-
-	data = native_id;
-	ChangeWindowProperty (winRec->win, xa_native_window_id (),
-			 XA_INTEGER, 32, PropModeReplace, 1, &data, TRUE);
- }
-}
-
-static xp_error
-rootlessColormapCallback (void *data, int first_color,
-			 int n_colors, uint32_t *colors)
-{
- return (RootlessResolveColormap (data, first_color, n_colors, colors)
-	 ? XP_Success : XP_BadMatch);
-}
-
-/* If the given window doesn't have a physical window associated with it,
- attempt to create one. If that's unsuccessful, return null. */
-static RootlessWindowRec *
-rootlessEnsureFrame (WindowPtr pWin)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- RootlessWindowRec *winRec;
- RegionRec shape;
- RegionPtr pShape = NULL;
-
- xp_window_changes wc;
- unsigned int mask;
- xp_error err;
- int sx, sy;
-
- if (WINREC (pWin) != NULL)
-	return WINREC (pWin);
-
- if (pWin->drawable.class != InputOutput)
-	return NULL;
-
- winRec = xalloc (sizeof(RootlessWindowRec));
-
- if (!winRec)
-	return NULL;
-
- rootlessInitializeFrame (pWin, winRec);
-
- winRec->is_drawing = FALSE;
- winRec->pixmap = NULL;
- winRec->wid = 0;
- winRec->is_update_disabled = FALSE;
- winRec->is_reorder_pending = FALSE;
- winRec->level = !IsRoot (pWin) ? 0 : AppleWMNumWindowLevels;
- WINREC(pWin) = winRec;
-
-#ifdef SHAPE
- if (RootlessGetShape (pWin, &shape))
-	pShape = &shape;
-#endif
-
- sx = dixScreenOriginspScreen->myNum.x + darwinMainScreenX;
- sy = dixScreenOriginspScreen->myNum.y + darwinMainScreenY;
-
- mask = 0;
-
- wc.x = sx + winRec->x;
- wc.y = sy + winRec->y;
- wc.width = winRec->width;
- wc.height = winRec->height;
- wc.bit_gravity = XP_GRAVITY_NONE;
- mask |= XP_BOUNDS;
-
- if (pWin->drawable.depth == 8)
- {
-	wc.depth = XP_DEPTH_INDEX8;
-	wc.colormap = rootlessColormapCallback;
-	wc.colormap_data = pScreen;
-	mask |= XP_COLORMAP;
- }
- else if (pWin->drawable.depth == 15)
-	wc.depth = XP_DEPTH_RGB555;
- else if (pWin->drawable.depth == 24)
-	wc.depth = XP_DEPTH_ARGB8888;
- else
-	wc.depth = XP_DEPTH_NIL;
- mask |= XP_DEPTH;
-
- if (pShape != NULL)
- {
-	wc.shape_nrects = REGION_NUM_RECTS (pShape);
-	wc.shape_rects = REGION_RECTS (pShape);
-	wc.shape_tx = wc.shape_ty = 0;
-	mask |= XP_SHAPE;
- }
-
- if (!rootlessHasRoot (pScreen))
-	wc.window_level = normal_window_levelswinRec->level;
- else
-	wc.window_level = rooted_window_levelswinRec->level;
- mask |= XP_WINDOW_LEVEL;
-
- err = xp_create_window (mask, &wc, &winRec->wid);
-
- if (err != Success)
- {
-	xfree (winRec);
-	return NULL;
- }
-	
- if (window_hash == NULL)
- {
-	window_hash = x_hash_table_new (NULL, NULL, NULL, NULL);
-	pthread_mutex_init (&window_hash_mutex, NULL);
- }
-
- pthread_mutex_lock (&window_hash_mutex);
- x_hash_table_insert (window_hash, (void *) winRec->wid, winRec);
- pthread_mutex_unlock (&window_hash_mutex);
-
- rootlessSetNativeProperty (winRec);
-
- if (pShape != NULL)
-	REGION_UNINIT (pScreen, &shape);
-
- return winRec;
-}
-
-/* The frame is usually created here and not in CreateWindow so that
- windows do not eat memory until they are realized. */
-Bool
-RootlessRealizeWindow(WindowPtr pWin)
-{
- Bool result = FALSE;
- RegionRec saveRoot;
- ScreenPtr pScreen = pWin->drawable.pScreen;
- XID pixel;
-
- RL_DEBUG_MSG("realizewindow start (win 0x%x)\n", pWin);
-
- if (IsTopLevel (pWin) && pWin->drawable.class == InputOutput)
- {
- RootlessWindowRec *winRec;
-
-	winRec = rootlessEnsureFrame (pWin);
-	if (winRec == NULL)
-	 return NULL;
-
-	winRec->is_reorder_pending = TRUE;
-
- /* Disallow ParentRelative background state on top-level windows.
- This might have been set before the window was mapped. */
-
- if (pWin->backgroundState == ParentRelative)
-	{
- pixel = 0;
- ChangeWindowAttributes (pWin, CWBackPixel, &pixel, serverClient);
- }
- }
-
- if (!IsRoot(pWin)) HUGE_ROOT(pWin);
- SCREEN_UNWRAP (pScreen, RealizeWindow);
-
- result = pScreen->RealizeWindow (pWin);
-
- SCREEN_WRAP (pScreen, RealizeWindow);
- if (!IsRoot(pWin)) NORMAL_ROOT(pWin);
-
- RL_DEBUG_MSG("realizewindow end\n");
- return result;
-}
-
-void
-RootlessEnableRoot (ScreenPtr pScreen)
-{
- WindowPtr pRoot;
- pRoot = WindowTablepScreen->myNum;
-
- rootlessEnsureFrame (pRoot);
- (*pScreen->ClearToBackground) (pRoot, 0, 0, 0, 0, TRUE);
- RootlessReorderWindow (pRoot);
-}
-
-void
-RootlessDisableRoot (ScreenPtr pScreen)
-{
- WindowPtr pRoot;
- RootlessWindowRec *winRec;
-
- pRoot = WindowTablepScreen->myNum;
- winRec = WINREC (pRoot);
-
- if (winRec != NULL)
- {
-	rootlessDestroyFrame (pRoot, winRec);
-	DeleteProperty (pRoot, xa_native_window_id ());
- }
-}
-
-void
-RootlessHideAllWindows (void)
-{
- int i;
- ScreenPtr pScreen;
- WindowPtr pWin;
- RootlessWindowRec *winRec;
- xp_window_changes wc;
-
- if (windows_hidden)
-	return;
-
- windows_hidden = TRUE;
-
- for (i = 0; i < screenInfo.numScreens; i++)
- {
-	pScreen = screenInfo.screensi;
-	pWin = WindowTablei;
-	if (pScreen == NULL || pWin == NULL)
-	 continue;
-
-	for (pWin = pWin->firstChild; pWin != NULL; pWin = pWin->nextSib)
-	{
-	 if (!pWin->realized)
-		continue;
-
-	 RootlessStopDrawing (pWin, FALSE);
-
-	 winRec = WINREC (pWin);
-	 if (winRec != NULL)
-	 {
-		wc.stack_mode = XP_UNMAPPED;
-		wc.sibling = 0;
-		configure_window (winRec->wid, XP_STACKING, &wc);
-	 }
-	}
- }
-}
-
-void
-RootlessShowAllWindows (void)
-{
- int i;
- ScreenPtr pScreen;
- WindowPtr pWin;
- RootlessWindowRec *winRec;
-
- if (!windows_hidden)
-	return;
-
- windows_hidden = FALSE;
-
- for (i = 0; i < screenInfo.numScreens; i++)
- {
-	pScreen = screenInfo.screensi;
-	pWin = WindowTablei;
-	if (pScreen == NULL || pWin == NULL)
-	 continue;
-
-	for (pWin = pWin->firstChild; pWin != NULL; pWin = pWin->nextSib)
-	{
-	 if (!pWin->realized)
-		continue;
-
-	 winRec = rootlessEnsureFrame (pWin);
-	 if (winRec == NULL)
-		continue;
-
-	 RootlessReorderWindow (pWin);
-	}
-
-	RootlessScreenExpose (pScreen);
- }
-}
-
-void
-RootlessSetWindowLevel (WindowPtr pWin, int level)
-{
- RootlessWindowRec *winRec;
- xp_window_changes wc;
-
- winRec = WINREC (pWin);
- if (!IsTopLevel (pWin) || winRec == NULL || winRec->level == level)
-	return;
-
- RootlessStopDrawing (pWin, FALSE);
-
- winRec->level = level;
-
- if (!rootlessHasRoot (pWin->drawable.pScreen))
-	wc.window_level = normal_window_levelslevel;
- else
-	wc.window_level = rooted_window_levelslevel;
-
- configure_window (winRec->wid, XP_WINDOW_LEVEL, &wc);
-}
-
-/* Return the id of the physical window displaying the given window. If
- CREATE is true and the window has no frame, attempt to create one. */
-xp_window_id
-RootlessGetPhysicalWindow (WindowPtr pWin, Bool create)
-{
- RootlessWindowRec *winRec;
-
- if (TopLevelParent (pWin) == NULL)
-	return 0;
-
- winRec = WINREC (pWin);
-
- if (winRec == NULL && create && !IsRoot (pWin)
-	&& pWin->drawable.class == InputOutput)
- {
-	rootlessEnsureFrame (pWin);
-	winRec = WINREC (pWin);
- }
-
- if (winRec == NULL)
-	return 0;
-
- return winRec->wid;
-}
-
-/* Given the id of a physical window, try to find the top-level (or root)
- X window that it represents. */
-WindowPtr
-RootlessGetXWindow (xp_window_id wid)
-{
- RootlessWindowRec *winRec;
-
- if (window_hash == NULL)
-	return NULL;
-
- winRec = x_hash_table_lookup (window_hash, (void *) wid, NULL);
-
- return winRec != NULL ? winRec->win : NULL;
-}
-
-/* Number is an appkit window number. Returns true if X is displaying
- a window with that number. */
-int
-RootlessKnowsWindowNumber (int number)
-{
- Bool ret;
- xp_window_id wid;
-
- /* need to lock, since this function can be called by any thread */
-
- if (window_hash == NULL)
-	return FALSE;
-
- pthread_mutex_lock (&window_hash_mutex);
-
- if (xp_lookup_native_window (number, &wid))
-	ret = RootlessGetXWindow (wid) != NULL;
- else
-	ret = FALSE;
-
- pthread_mutex_unlock (&window_hash_mutex);
-
- return ret;
-}
-
-Bool
-RootlessUnrealizeWindow (WindowPtr pWin)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- RootlessWindowRec *winRec = WINREC(pWin);
- xp_window_changes wc;
- Bool result;
-
- RL_DEBUG_MSG("unrealizewindow start\n");
-
- if (winRec != NULL)
- {
-	RootlessStopDrawing (pWin, FALSE);
-
-	wc.stack_mode = XP_UNMAPPED;
-	wc.sibling = 0;
-
-	configure_window (winRec->wid, XP_STACKING, &wc);
-
-	winRec->unrealize_time = current_time_in_seconds ();
-	winRec->is_reorder_pending = FALSE;
-
-	RootlessReenableUpdate (pWin);
- }
-
- SCREEN_UNWRAP (pScreen, UnrealizeWindow);
-
- result = pScreen->UnrealizeWindow (pWin);
-
- SCREEN_WRAP (pScreen, UnrealizeWindow);
-
- RL_DEBUG_MSG ("unrealizewindow end\n");
- return result;
-}
-
-void
-RootlessReparentWindow (WindowPtr pWin, WindowPtr pPriorParent)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- RootlessWindowRec *winRec = WINREC (pWin);
-
- WindowPtr pTopWin;
-
- if (IsRoot (pWin) || IsRoot (pWin->parent)
-	|| IsTopLevel (pWin) || winRec == NULL)
- {
-	return;
- }
-
- /* If the window is moving upwards towards the root has a frame,
- we want to try to move it onto its new toplevel parent. If we
- can't do that, we'll just have to jettison it.. */
-
- pTopWin = TopLevelParent (pWin);
- assert (pTopWin != pWin);
-
- pWin->rootlessUnhittable = FALSE;
-
- DeleteProperty (pWin, xa_native_window_id ());
-
- if (WINREC (pTopWin) != NULL)
- {
-	/* We're screwed. */
-	rootlessDestroyFrame (pWin, winRec);
- }
- else
- {
-	xp_window_changes wc;
-	int sx, sy;
-
-	if (!pTopWin->realized && pWin->realized)
-	{
-	 wc.stack_mode = XP_UNMAPPED;
-	 wc.sibling = 0;
-
-	 RootlessStopDrawing (pWin, FALSE);
-	 configure_window (winRec->wid, XP_STACKING, &wc);
-	}
-
-	/* Switch the frame record from one to the other. */
-
-	WINREC (pWin) = NULL;
-	WINREC (pTopWin) = winRec;
-
-	rootlessInitializeFrame (pTopWin, winRec);
-	rootlessSetShape (pTopWin);
-
-	sx = dixScreenOriginspScreen->myNum.x + darwinMainScreenX;
-	sy = dixScreenOriginspScreen->myNum.y + darwinMainScreenY;
-
-	wc.x = sx + winRec->x;
-	wc.y = sy + winRec->y;
-	wc.width = winRec->width;
-	wc.height = winRec->height;
-	wc.bit_gravity = XP_GRAVITY_NONE;
-
-	RootlessStopDrawing (pWin, FALSE);
-	configure_window (winRec->wid, XP_BOUNDS, &wc);
-
-	rootlessSetNativeProperty (winRec);
-
-	if (pTopWin->realized && !pWin->realized)
-	 winRec->is_reorder_pending = TRUE;
- }
-}
-
-/* Reorder the window associated with the given frame so that it's
- physically above the window below it in the X stacking order. */
-void
-RootlessReorderWindow (WindowPtr pWin)
-{
- RootlessWindowRec *winRec = WINREC (pWin);
-
- if (pWin->realized && winRec != NULL
-	&& !winRec->is_reorder_pending && !windows_hidden)
- {
-	WindowPtr newPrevW;
-	RootlessWindowRec *newPrev;
-	xp_window_changes wc;
-	Atom atom;
-	PropertyPtr prop;
-
-	/* quartz-wm sets the _APPLE_NO_ORDER_IN property on windows
-	 that are being genie-restored from the Dock. We want them to
-	 be mapped but remain ordered-out until the animation
-	 completes (when the Dock will order them in) */
-
-	atom = xa_apple_no_order_in ();
-	for (prop = wUserProps (pWin); prop != NULL; prop = prop->next)
-	{
-	 if (prop->propertyName == atom && prop->type == atom)
-		return;
-	}
-
-	RootlessStopDrawing (pWin, FALSE);
-
-	if (IsRoot (pWin))
-	{
-	 wc.stack_mode = XP_MAPPED_BELOW;
-	 wc.sibling = 0;
-	}
-	else
-	{
-	 /* Find the next window above this one that has a mapped frame. */
-
-	 newPrevW = pWin->prevSib;
-	 while (newPrevW
-		 && (WINREC (newPrevW) == NULL || !newPrevW->realized))
-	 {
-		newPrevW = newPrevW->prevSib;
-	 }
-
-	 newPrev = newPrevW != NULL ? WINREC (newPrevW) : NULL;
-
-	 /* Then either stack ourselves below it if it exists, or raise
-	 ourselves above everything otherwise. */
-
-	 if (newPrev == NULL)
-	 {
-		wc.stack_mode = XP_MAPPED_ABOVE;
-		wc.sibling = 0;
-	 }
-	 else
-	 {
-		if (newPrev->is_reorder_pending)
-		{
-		 newPrev->is_reorder_pending = FALSE;
-		 RootlessReorderWindow (newPrevW);
-		}
-
-		wc.stack_mode = XP_MAPPED_BELOW;
-		wc.sibling = newPrev->wid;
-	 }
-	}
-
-	configure_window (winRec->wid, XP_STACKING, &wc);
- }
-}
-
-void
-RootlessRestackWindow (WindowPtr pWin, WindowPtr pOldNextSib)
-{
- RegionRec saveRoot;
- RootlessWindowRec *winRec = WINREC (pWin);
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- RL_DEBUG_MSG("restackwindow start\n");
- if (winRec != NULL)
-	RL_DEBUG_MSG("restack top level \n");
-
- HUGE_ROOT(pWin);
- SCREEN_UNWRAP(pScreen, RestackWindow);
-
- if (pScreen->RestackWindow != NULL)
-	pScreen->RestackWindow (pWin, pOldNextSib);
-
- SCREEN_WRAP(pScreen, RestackWindow);
- NORMAL_ROOT(pWin);
-
- if (winRec != NULL && pWin->viewable)
-	RootlessReorderWindow (pWin);
-
- RL_DEBUG_MSG("restackwindow end\n");
-}
-
-/*
- * Specialized window copy procedures
- */
-
-/* Globals needed during window resize and move. */
-static pointer gResizeDeathBits = NULL;
-static int gResizeDeathCount;
-static PixmapPtr gResizeDeathPix2;
-static BoxRec gResizeDeathBounds2;
-static CopyWindowProcPtr gResizeOldCopyWindowProc = NULL;
-
-/* CopyWindow () that doesn't do anything. For MoveWindow() of
- top-level windows. */
-static void
-RootlessNoCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-{
- /* Some code expects the region to be translated */
-
- int dx = ptOldOrg.x - pWin->drawable.x;
- int dy = ptOldOrg.y - pWin->drawable.y;
-
- REGION_TRANSLATE (pWin->drawable.pScreen, prgnSrc, -dx, -dy);
-}
-
-/* CopyWindow used during ResizeWindow for gravity moves. (from fbCopyWindow)
- The original always draws on the root pixmap (which we don't have).
- Instead, draw on the parent window's pixmap.
- Resize version: the old location's pixels are in gResizeCopyWindowSource */
-static void
-RootlessResizeCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg,
-			 RegionPtr prgnSrc)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- RegionRec rgnDst;
- int dx, dy;
-
- RL_DEBUG_MSG("resizecopywindowFB start (win 0x%x)\n", pWin);
-
- /* Don't unwrap pScreen->CopyWindow.
- The bogus rewrap with RootlessCopyWindow causes a crash if
- CopyWindow is called again during the same resize. */
-
- if (gResizeDeathCount == 0)
-	return;
-
- RootlessStartDrawing (pWin);
-
- dx = ptOldOrg.x - pWin->drawable.x;
- dy = ptOldOrg.y - pWin->drawable.y;
- REGION_TRANSLATE (pScreen, prgnSrc, -dx, -dy);
- REGION_INIT (pScreen, &rgnDst, NullBox, 0);
- REGION_INTERSECT (pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
-
- if (gResizeDeathCount == 1)
- {
-	/* Simple case, we only have a single source pixmap. */
-
-	fbCopyRegion (&gResizeDeathPix0->drawable,
-		 &pScreen->GetWindowPixmap(pWin)->drawable, 0,
-		 &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
- }
- else
- {
-	int i;
-	RegionRec clip, clipped;
-
-	/* More complex case, N source pixmaps (usually two). So we
-	 intersect the destination with each source and copy those bits. */
-
-	for (i = 0; i < gResizeDeathCount; i++)
-	{
-	 REGION_INIT (pScreen, &clip, gResizeDeathBounds + 0, 1);
-	 REGION_INIT (pScreen, &clipped, NullBox, 0);
-	 REGION_INTERSECT (pScreen, &rgnDst, &clip, &clipped);
-
-	 fbCopyRegion (&gResizeDeathPixi->drawable,
-			 &pScreen->GetWindowPixmap(pWin)->drawable, 0,
-			 &clipped, dx, dy, fbCopyWindowProc, 0, 0);
-
-	 REGION_UNINIT (pScreen, &clipped);
-	 REGION_UNINIT (pScreen, &clip);
-	}
- }
-	
- /* Don't update - resize will update everything */
- REGION_UNINIT (pScreen, &rgnDst);
-
- fbValidateDrawable (&pWin->drawable);
-
- RL_DEBUG_MSG("resizecopywindowFB end\n");
-}
-
-/* Update *new* location of window. Old location is redrawn with
- PaintWindowBackground/Border. Cloned from fbCopyWindow
- The original always draws on the root pixmap (which we don't have).
- Instead, draw on the parent window's pixmap. */
-void
-RootlessCopyWindow (WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- RootlessWindowRec *winRec;
- WindowPtr top;
-
- RegionRec rgnDst;
- int dx, dy;
- BoxPtr extents;
- unsigned int area;
-
- RL_DEBUG_MSG("copywindowFB start (win 0x%x)\n", pWin);
-
- top = TopLevelParent (pWin);
- if (top == NULL)
- {
-	RL_DEBUG_MSG("no parent\n");
-	return;
- }
-
- winRec = WINREC(top);
- if (winRec == NULL)
- {
-	RL_DEBUG_MSG("not framed\n");
-	return;
- }
-
- SCREEN_UNWRAP (pScreen, CopyWindow);
-
- dx = ptOldOrg.x - pWin->drawable.x;
- dy = ptOldOrg.y - pWin->drawable.y;
- REGION_TRANSLATE (pScreen, prgnSrc, -dx, -dy);
-
- REGION_INIT (pScreen, &rgnDst, NullBox, 0);
- REGION_INTERSECT (pScreen, &rgnDst, &pWin->borderClip, prgnSrc);
-
- extents = REGION_EXTENTS (pScreen, &rgnDst);
- area = (extents->x2 - extents->x1) * (extents->y2 - extents->y1);
-
- if (area > xp_scroll_area_threshold)
- {
-	/* Move region to window local coords */
-	REGION_TRANSLATE (pScreen, &rgnDst, -winRec->x, -winRec->y);
-
-	RootlessStopDrawing (pWin, FALSE);
-
-	xp_copy_window (winRec->wid, winRec->wid,
-			REGION_NUM_RECTS (&rgnDst),
-			REGION_RECTS (&rgnDst), dx, dy);
- }
- else
- {
-	RootlessStartDrawing (pWin);
-
- fbCopyRegion ((DrawablePtr) pWin, (DrawablePtr) pWin,
-		 0, &rgnDst, dx, dy, fbCopyWindowProc, 0, 0);
-
-	/* prgnSrc has been translated to dst position */
-	RootlessDamageRegion(pWin, prgnSrc);
- }
-
- REGION_UNINIT (pScreen, &rgnDst);
- fbValidateDrawable (&pWin->drawable);
-	
- SCREEN_WRAP (pScreen, CopyWindow);
-
- RL_DEBUG_MSG("copywindowFB end\n");
-}
-
-/*
- * Window resize procedures
- */
-
-enum {
- WIDTH_SMALLER = 1,
- HEIGHT_SMALLER = 2,
-};
-
-/* Compute which directions the window is resizing in. */
-static inline unsigned int
-resize_code (int oldX, int oldY, int oldW, int oldH,
-	 int newX, int newY, int newW, int newH)
-{
- unsigned int code = 0;
-
- /* These comparisons were chosen to avoid setting bits when the sizes
- are the same. (So the fastest case automatically gets taken when
- dimensions are unchanging.) */
-
- if (newW < oldW)
-	code |= WIDTH_SMALLER;
-
- if (newH < oldH)
-	code |= HEIGHT_SMALLER;
-
- return code;
-}
-
-static inline unsigned int
-resize_weighting (int oldX1, int oldY1, int oldX2, int oldY2, int oldBW,
-		 int newX1, int newY1, int newX2, int newY2, int newBW)
-{
- /* Choose gravity to avoid local copies. Do that by looking for
- a corner that doesn't move _relative to the screen_ */
-
- if (newBW != oldBW)
-	return XP_GRAVITY_NONE;
-
- if (newX1 == oldX1 && newY1 == oldY1)
-	return XP_GRAVITY_NORTH_WEST;
- else if (newX1 == oldX1 && newY2 == oldY2)
-	return XP_GRAVITY_SOUTH_WEST;
- else if (newX2 == oldX2 && newY2 == oldY2)
-	return XP_GRAVITY_SOUTH_EAST;
- else if (newX2 == oldX2 && newY1 == oldY1)
-	return XP_GRAVITY_NORTH_EAST;
- else
-	return XP_GRAVITY_NONE;
-}
-
-/* Resize the given window to its new position and size. */
-static void
-resize_frame (ScreenPtr pScreen, WindowPtr pWin,
-	 RootlessWindowRec *winRec, int gravity)
-{
- int sx, sy;
- xp_window_changes wc;
-
- sx = dixScreenOriginspScreen->myNum.x + darwinMainScreenX;
- sy = dixScreenOriginspScreen->myNum.y + darwinMainScreenY;
-
- wc.x = sx + winRec->x;
- wc.y = sy + winRec->y;
- wc.width = winRec->width;
- wc.height = winRec->height;
- wc.bit_gravity = gravity;
-
- /* It's unlikely that being async will save us anything here.
- But it can't hurt. */
-
- configure_window (winRec->wid, XP_BOUNDS, &wc);
-}
-
-/* Prepare to resize a top-level window. The old window's pixels are
- saved and the implementation is told to change the window size.
- (x,y,w,h) is outer frame of window (outside border) */
-static Bool
-StartFrameResize (WindowPtr pWin, Bool gravity,
-		 int oldX, int oldY, int oldW, int oldH, int oldBW,
-		 int newX, int newY, int newW, int newH, int newBW)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- RootlessWindowRec *winRec = WINREC(pWin);
- Bool need_window_source = FALSE, resize_after = FALSE;
-
- BoxRec rect, copy_rect;
- int oldX2, newX2;
- int oldY2, newY2;
- unsigned int weight;
-
- oldX2 = oldX + oldW, newX2 = newX + newW;
- oldY2 = oldY + oldH, newY2 = newY + newH;
-
- /* Decide which resize weighting to use */
- weight = resize_weighting (oldX, oldY, oldW, oldH, oldBW,
-			 newX, newY, newW, newH, newBW);
-
- /* Compute intersection between old and new rects */
- rect.x1 = max(oldX, newX);
- rect.y1 = max(oldY, newY);
- rect.x2 = min(oldX2, newX2);
- rect.y2 = min(oldY2, newY2);
-
- RL_DEBUG_MSG("RESIZE TOPLEVEL WINDOW with gravity %i ", gravity);
- RL_DEBUG_MSG("%d %d %d %d %d %d %d %d %d %d\n",
- oldX, oldY, oldW, oldH, oldBW,
- newX, newY, newW, newH, newBW);
-
- RootlessDisableUpdate (pWin);
- RootlessRedisplay (pWin);
-
- /* If gravity is true, then we need to have a way of recovering all
- the original bits in the window for when X rearranges the contents
- based on the various gravity settings. The obvious way is to just
- snapshot the entire backing store before resizing it, but that
- it slow on large windows.
- 
- So the optimization here is to use CG's resize weighting options
- to allow us to reason about what is left in the backing store
- after the resize. We can then only copy what won't be there after
- the resize, and do a two-stage copy operation.
-
- Most of these optimizations are only applied when the top-left
- corner of the window is fixed, since that's the common case. They
- could probably be extended with some thought. */
-
- gResizeDeathCount = 0;
-
- if (gravity && weight == XP_GRAVITY_NORTH_WEST)
- {
-	unsigned int code;
-
-	/* Top left corner is anchored. We never need to copy the
-	 entire window. */
-
-	need_window_source = TRUE;
-
-	code = resize_code (oldX, oldY, oldW, oldH,
-			 newX, newY, newW, newH);
-
-	if (((code ^ (code >> 1)) & 1) == 0)
-	{
-	 /* Both dimensions are either getting larger, or both
-	 are getting smaller. No need to copy anything. */
-
-	 if (code == (WIDTH_SMALLER | HEIGHT_SMALLER))
-	 {
-		/* Since the window is getting smaller, we can do gravity
-		 repair on it with it's current size, then resize it
-		 afterwards. */
-
-		resize_after = TRUE;
-	 }
-
-	 gResizeDeathCount = 1;
-	}
-	else
-	{
-	 unsigned int copy_rowbytes, Bpp;
-
-	 /* We can get away with a partial copy. 'rect' is the
-	 intersection between old and new bounds, so copy
-	 everything to the right of or below the intersection. */
-
-	 RootlessStartDrawing (pWin);
-
-	 if (code == WIDTH_SMALLER)
-	 {
-		copy_rect.x1 = rect.x2;
-		copy_rect.y1 = rect.y1;
-		copy_rect.x2 = oldX2;
-		copy_rect.y2 = oldY2;
-	 }
-	 else if (code == HEIGHT_SMALLER)
-	 {
-		copy_rect.x1 = rect.x1;
-		copy_rect.y1 = rect.y2;
-		copy_rect.x2 = oldX2;
-		copy_rect.y2 = oldY2;
-	 }
-	 else
-		abort ();
-
-	 Bpp = winRec->win->drawable.bitsPerPixel / 8;
-	 copy_rowbytes = (((copy_rect.x2 - copy_rect.x1) * Bpp) + 31) & ~31;
-	 gResizeDeathBits = xalloc (copy_rowbytes
-				 * (copy_rect.y2 - copy_rect.y1));
-
-	 xp_copy_bytes ((copy_rect.x2 - copy_rect.x1) * Bpp,
-			 copy_rect.y2 - copy_rect.y1, ((char *) winRec->data)
-			 + ((copy_rect.y1 - oldY) * winRec->rowbytes)
-			 + (copy_rect.x1 - oldX) * Bpp, winRec->rowbytes,
-			 gResizeDeathBits, copy_rowbytes);
-	 
-	 gResizeDeathBounds1 = copy_rect;
-	 gResizeDeathPix1
-		= GetScratchPixmapHeader(pScreen, copy_rect.x2 - copy_rect.x1,
-					 copy_rect.y2 - copy_rect.y1,
-					 winRec->win->drawable.depth,
-					 winRec->win->drawable.bitsPerPixel,
-					 winRec->rowbytes,
-					 (void *) gResizeDeathBits);
-
-	 TranslatePixmapBase (gResizeDeathPix1,
-				 -copy_rect.x1, -copy_rect.y1);
-
-	 gResizeDeathCount = 2;
-	}
- }
- else if (gravity)
- {
-	/* The general case. Just copy everything. */
-
-	RootlessStartDrawing (pWin);
-
- gResizeDeathBits = xalloc(winRec->rowbytes * winRec->height);
-
-	memcpy(gResizeDeathBits, winRec->data,
-	 winRec->rowbytes * winRec->height);
-
-	gResizeDeathBounds0 = (BoxRec) {oldX, oldY, oldX2, oldY2};
-	gResizeDeathPix0
-	 = GetScratchPixmapHeader(pScreen, winRec->width,
-				 winRec->height,
-				 winRec->win->drawable.depth,
-				 winRec->win->drawable.bitsPerPixel,
-				 winRec->rowbytes,
-				 (void *) gResizeDeathBits);
-
-	TranslatePixmapBase (gResizeDeathPix0, -oldX, -oldY);
-	gResizeDeathCount = 1;
- }
-
- RootlessStopDrawing (pWin, FALSE);
-
- winRec->x = newX;
- winRec->y = newY;
- winRec->width = newW;
- winRec->height = newH;
- winRec->borderWidth = newBW;
-
- /* Unless both dimensions are getting smaller, Resize the frame
- before doing gravity repair */
-
- if (!resize_after)
-	resize_frame (pScreen, pWin, winRec, weight);
-
- RootlessStartDrawing(pWin);
-
- /* If necessary, create a source pixmap pointing at the current
- window bits. */
-
- if (need_window_source)
- {
-	gResizeDeathBounds0 = (BoxRec) {oldX, oldY, oldX2, oldY2};
-	gResizeDeathPix0
-	 = GetScratchPixmapHeader (pScreen, oldW, oldH,
-				 winRec->win->drawable.depth,
-				 winRec->win->drawable.bitsPerPixel,
-				 winRec->rowbytes, winRec->data);
-
-	TranslatePixmapBase (gResizeDeathPix0, -oldX, -oldY);
- }
-
- /* Use custom CopyWindow when moving gravity bits around
- ResizeWindow assumes the old window contents are in the same
- pixmap, but here they're in deathPix instead. */
-
- if (gravity)
- {
-	gResizeOldCopyWindowProc = pScreen->CopyWindow;
-	pScreen->CopyWindow = RootlessResizeCopyWindow;
- }
-
- /* If we can't rely on the window server preserving the bits we
- need in the position we need, copy the pixels in the
- intersection from src to dst. ResizeWindow assumes these pixels
- are already present when making gravity adjustments. pWin
- currently has new-sized pixmap but is in old position.
-
- FIXME: border width change! (?) */
-
- if (gravity && weight == XP_GRAVITY_NONE)
- {
- PixmapPtr src, dst;
-
-	assert (gResizeDeathCount == 1);
-
-	src = gResizeDeathPix0;
- dst = pScreen->GetWindowPixmap(pWin);
-
- RL_DEBUG_MSG("Resize copy rect %d %d %d %d\n",
- rect.x1, rect.y1, rect.x2, rect.y2);
-
- /* rect is the intersection of the old location and new location */
- if (BOX_NOT_EMPTY(rect) && src != NULL && dst != NULL)
-	{
-	 int dx, dy;
-
-	 /* The window drawable still has the old frame position, which
-	 means that DST doesn't actually point at the origin of our
-	 physical backing store when adjusted by the drawable.x,y
-	 position. So sneakily adjust it temporarily while copying.. */
-
-	 dx = newX - oldX;
-	 dy = newY - oldY;
-	 TranslatePixmapBase (dst, -dx, -dy);
-
- fbCopyWindowProc(&src->drawable, &dst->drawable, NULL,
-			 &rect, 1, 0, 0, FALSE, FALSE, 0, 0);
-
-	 TranslatePixmapBase (dst, dx, dy);
- }
- }
-
- return resize_after;
-}
-
-static void
-FinishFrameResize (WindowPtr pWin, Bool gravity, int oldX, int oldY,
- unsigned int oldW, unsigned int oldH, unsigned int oldBW,
- int newX, int newY, unsigned int newW, unsigned int newH,
-		 unsigned int newBW, Bool resize_now)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- RootlessWindowRec *winRec = WINREC(pWin);
- BoxRec box;
- int i;
-
- RootlessStopDrawing (pWin, FALSE);
-
- if (resize_now)
- {
-	unsigned int weight;
-
-	/* We didn't resize anything earlier, so do it now, now that
-	 we've finished gravitating the bits. */
-
-	weight = resize_weighting (oldX, oldY, oldW, oldH, oldBW,
-				 newX, newY, newW, newH, newBW);
-
-	resize_frame (pScreen, pWin, winRec, weight);
- }
-
- /* Redraw everything. FIXME: there must be times when we don't need
- to do this. Perhaps when top-left weighting and no gravity? */
-
- box.x1 = 0;
- box.y1 = 0;
- box.x2 = winRec->width;
- box.y2 = winRec->height;
-
- xp_mark_window (winRec->wid, 1, &box, 0, 0);
-
- for (i = 0; i < 2; i++)
- {
-	if (gResizeDeathPixi != NULL)
-	{
-	 FreeScratchPixmapHeader (gResizeDeathPixi);
-	 gResizeDeathPixi = NULL;
-	}
- }
-
- if (gResizeDeathBits != NULL)
- {
-	xfree (gResizeDeathBits);
-	gResizeDeathBits = NULL;
- }
-
- if (gravity)
- pScreen->CopyWindow = gResizeOldCopyWindowProc;
-}
-
-/* If kind==VTOther, window border is resizing (and borderWidth is
- already changed!!@#$) This case works like window resize, not move. */
-void
-RootlessMoveWindow (WindowPtr pWin, int x, int y, WindowPtr pSib, VTKind kind)
-{
- RootlessWindowRec *winRec = WINREC(pWin);
- ScreenPtr pScreen = pWin->drawable.pScreen;
- CopyWindowProcPtr oldCopyWindowProc = NULL;
-
- int oldX = 0, oldY = 0;
- unsigned int oldW = 0, oldH = 0, oldBW = 0;
- int newX = 0, newY = 0;
- unsigned int newW = 0, newH = 0, newBW = 0;
-
- Bool resize_after = FALSE;
- RegionRec saveRoot;
-
- RL_DEBUG_MSG("movewindow start \n");
-
- if (winRec != NULL)
- {
- if (kind == VTMove)
-	{
-	 oldX = winRec->x;
- oldY = winRec->y;
- RootlessRedisplay (pWin);
- RootlessStartDrawing (pWin);
- }
-	else
-	{
- RL_DEBUG_MSG("movewindow border resizing ");
-
- oldBW = winRec->borderWidth;
- oldX = winRec->x;
- oldY = winRec->y;
- oldW = winRec->width;
- oldH = winRec->height;
-
- newBW = wBorderWidth (pWin);
- newX = x;
- newY = y;
- newW = pWin->drawable.width + 2*newBW;
- newH = pWin->drawable.height + 2*newBW;
-
- resize_after = StartFrameResize (pWin, FALSE,
-					 oldX, oldY, oldW, oldH, oldBW,
-					 newX, newY, newW, newH, newBW);
- }
- }
-
- HUGE_ROOT (pWin);
- SCREEN_UNWRAP (pScreen, MoveWindow);
-
- oldCopyWindowProc = pScreen->CopyWindow;
-
- if (winRec != NULL)
- pScreen->CopyWindow = RootlessNoCopyWindow;
-
- pScreen->MoveWindow (pWin, x, y, pSib, kind);
-
- if (winRec != NULL)
- pScreen->CopyWindow = oldCopyWindowProc;
-
- NORMAL_ROOT (pWin);
- SCREEN_WRAP (pScreen, MoveWindow);
-
- if (winRec != NULL)
- {
- if (kind == VTMove)
-	{
-	 xp_window_changes wc;
-	 int sx, sy;
-
- RootlessStopDrawing (pWin, FALSE);
-
-	 winRec->x = x;
-	 winRec->y = y;
-
-	 sx = dixScreenOriginspScreen->myNum.x + darwinMainScreenX;
-	 sy = dixScreenOriginspScreen->myNum.y + darwinMainScreenY;
-
-	 wc.x = sx + winRec->x;
-	 wc.y = sy + winRec->y;
-
-	 configure_window (winRec->wid, XP_ORIGIN, &wc);
- }
-	else
-	{
- FinishFrameResize (pWin, FALSE, oldX, oldY, oldW, oldH, oldBW,
-			 newX, newY, newW, newH, newBW, resize_after);
- }
- }
-
- RL_DEBUG_MSG("movewindow end\n");
-}
-
-
-/* Note: (x, y, w, h) as passed to this procedure don't match the frame
- definition. (x,y) is corner of very outer edge, *outside* border
- w,h is width and height *inside* border, *ignoring* border width
- The rect (x, y, w, h) doesn't mean anything. (x, y, w+2*bw, h+2*bw)
- is total rect (x+bw, y+bw, w, h) is inner rect */
-void
-RootlessResizeWindow (WindowPtr pWin, int x, int y,
-		 unsigned int w, unsigned int h, WindowPtr pSib)
-{
- RootlessWindowRec *winRec = WINREC(pWin);
- ScreenPtr pScreen = pWin->drawable.pScreen;
- RegionRec saveRoot;
-
- int oldX = 0, oldY = 0;
- unsigned int oldW = 0, oldH = 0, oldBW = 0;
- int newX = 0, newY = 0;
- unsigned int newW = 0, newH = 0, newBW = 0;
-
- Bool resize_after = FALSE;
-
- RL_DEBUG_MSG("resizewindow start (win 0x%x)\n", pWin);
-
- if (winRec != NULL)
- {
- oldBW = winRec->borderWidth;
- oldX = winRec->x;
- oldY = winRec->y;
- oldW = winRec->width;
- oldH = winRec->height;
-
- newBW = oldBW;
- newX = x;
- newY = y;
- newW = w + 2*newBW;
- newH = h + 2*newBW;
-
- resize_after = StartFrameResize (pWin, TRUE,
-					 oldX, oldY, oldW, oldH, oldBW,
-					 newX, newY, newW, newH, newBW);
- }
-
- HUGE_ROOT (pWin);
- SCREEN_UNWRAP (pScreen, ResizeWindow);
-
- if (!IsRoot (pWin))
- {
-	pScreen->ResizeWindow (pWin, x, y, w, h, pSib);
- }
- else
- {
-	BoxRec box;
-
-	/* mi won't resize the root. So do it ourselves... */
-
-	pWin->drawable.x = x;
-	pWin->drawable.y = y;
-	pWin->drawable.width = w;
-	pWin->drawable.height = h;
-
-	box.x1 = x; box.y1 = y;
-	box.x2 = x + w; box.y2 = y + h;
-	REGION_UNINIT (pScreen, &pWin->winSize);
-	REGION_INIT (pScreen, &pWin->winSize, &box, 1);
-	REGION_COPY (pScreen, &pWin->borderSize, &pWin->winSize);
-	REGION_COPY (pScreen, &pWin->clipList, &pWin->winSize);
-	REGION_COPY (pScreen, &pWin->borderClip, &pWin->winSize);
-
-	miSendExposures (pWin, &pWin->borderClip,
-			 pWin->drawable.x, pWin->drawable.y);
- }
-
- SCREEN_WRAP (pScreen, ResizeWindow);
- NORMAL_ROOT (pWin);
-
- if (winRec != NULL)
- {
- FinishFrameResize (pWin, TRUE, oldX, oldY, oldW, oldH, oldBW,
-			 newX, newY, newW, newH, newBW, resize_after);
- }
-
- RL_DEBUG_MSG("resizewindow end\n");
-}
-
-void
-RootlessRepositionWindow (WindowPtr pWin)
-{
- RootlessWindowRec *winRec = WINREC (pWin);
- ScreenPtr pScreen = pWin->drawable.pScreen;
- xp_window_changes wc;
- int sx, sy;
-
- if (IsRoot (pWin))
-	set_screen_origin (pWin);
-
- if (winRec == NULL)
-	return;
-
- RootlessStopDrawing (pWin, FALSE);
-
- sx = dixScreenOriginspScreen->myNum.x + darwinMainScreenX;
- sy = dixScreenOriginspScreen->myNum.y + darwinMainScreenY;
-
- wc.x = sx + winRec->x;
- wc.y = sy + winRec->y;
-
- if (!rootlessHasRoot (pScreen))
-	wc.window_level = normal_window_levelswinRec->level;
- else
-	wc.window_level = rooted_window_levelswinRec->level;
-
- configure_window (winRec->wid, XP_ORIGIN | XP_WINDOW_LEVEL, &wc);
-
- RootlessReorderWindow (pWin);
-}
-
-void
-RootlessFlushWindowColormap (WindowPtr pWin)
-{
- RootlessWindowRec *winRec = WINREC (pWin);
- xp_window_changes wc;
-
- if (winRec == NULL)
-	return;
-
- RootlessStopDrawing (pWin, FALSE);
-
- /* This is how we tell xp that the colormap may have changed. */
-
- wc.colormap = rootlessColormapCallback;
- wc.colormap_data = pWin->drawable.pScreen;
-
- configure_window (winRec->wid, XP_COLORMAP, &wc);
-}
-
-/* Set the Pixmaps on all ParentRelative windows up the ancestor chain. */
-static void
-SetPixmapOfAncestors (WindowPtr pWin)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
- WindowPtr topWin = TopLevelParent (pWin);
- RootlessWindowRec *topWinRec = WINREC (topWin);
- XID pixel;
-
- while (pWin->backgroundState == ParentRelative)
- {
- if (pWin == topWin)
-	{
- /* disallow ParentRelative background state on top level */
-
- pixel = 0;
- ChangeWindowAttributes(pWin, CWBackPixel, &pixel, serverClient);
-
- RL_DEBUG_MSG("Cleared ParentRelative on 0x%x.\n", pWin);
- break;
- }
-
- pWin = pWin->parent;
- pScreen->SetWindowPixmap (pWin, topWinRec->pixmap);
- }
-}
-
-/* RootlessPaintWindowBackground
- Paint the window background while filling in the alpha channel
- with all on. */
-void
-RootlessPaintWindowBackground (WindowPtr pWin, RegionPtr pRegion, int what)
-{
- ScreenPtr pScreen = pWin->drawable.pScreen;
-
- SCREEN_UNWRAP (pScreen, PaintWindowBackground);
-
- RL_DEBUG_MSG("paintwindowbackground start (win 0x%x, framed %i)\n",
- pWin, IsFramedWindow(pWin));
-
- if (IsFramedWindow (pWin))
- {
-	/* Don't bother trying to paint the surface background.. */
-	rootlessNoDRIDrawing++;
-
- RootlessStartDrawing (pWin);
- RootlessDamageRegion (pWin, pRegion);
-
- /* For ParentRelative windows, we have to make sure the window
- pixmap is set correctly all the way up the ancestor chain. */
-
- if (pWin->backgroundState == ParentRelative)
-	 SetPixmapOfAncestors (pWin);
-
-	pScreen->PaintWindowBackground (pWin, pRegion, what);
-
-	rootlessNoDRIDrawing--;
- }
-
- SCREEN_WRAP (pScreen, PaintWindowBackground);
-
- RL_DEBUG_MSG("paintwindowbackground end\n");
-}
-
-
-/* RootlessPaintWindowBorder
- Paint the window border while filling in the alpha channel with all on. */
-void
-RootlessPaintWindowBorder (WindowPtr pWin, RegionPtr pRegion, int what)
-{
- SCREEN_UNWRAP (pWin->drawable.pScreen, PaintWindowBorder);
-
- RL_DEBUG_MSG("paintwindowborder start (win 0x%x)\n", pWin);
-
- if (IsFramedWindow (pWin))
- {
- RootlessStartDrawing (pWin);
- RootlessDamageRegion (pWin, pRegion);
-
- /* For ParentRelative windows with tiled borders, we have to make
- sure the window pixmap is set correctly all the way up the
- ancestor chain. */
-
- if (!pWin->borderIsPixel && pWin->backgroundState == ParentRelative)
- SetPixmapOfAncestors (pWin);
- }
-
- pWin->drawable.pScreen->PaintWindowBorder (pWin, pRegion, what);
-
- SCREEN_WRAP (pWin->drawable.pScreen, PaintWindowBorder);
-
- RL_DEBUG_MSG("paintwindowborder end\n");
-}
-
-
-/* FIXME: untested!
- pWin inside corner stays the same; pWin->drawable.xy stays the same
- frame moves and resizes */
-void
-RootlessChangeBorderWidth (WindowPtr pWin, unsigned int width)
-{
- RegionRec saveRoot;
- Bool resize_after = FALSE;
-
- RL_DEBUG_MSG("change border width\n");
-
- if ((int) width != wBorderWidth (pWin))
- {
- RootlessWindowRec *winRec = WINREC(pWin);
-
- int oldX = 0, oldY = 0, newX = 0, newY = 0;
- unsigned int oldW = 0, oldH = 0, oldBW = 0;
- unsigned int newW = 0, newH = 0, newBW = 0;
-
- if (winRec != NULL)
-	{
- oldBW = winRec->borderWidth;
- oldX = winRec->x;
- oldY = winRec->y;
- oldW = winRec->width;
- oldH = winRec->height;
-
- newBW = width;
- newX = pWin->drawable.x - newBW;
- newY = pWin->drawable.y - newBW;
- newW = pWin->drawable.width + 2*newBW;
- newH = pWin->drawable.height + 2*newBW;
-
-	 resize_after = StartFrameResize (pWin, FALSE,
-					 oldX, oldY, oldW, oldH, oldBW,
-					 newX, newY, newW, newH, newBW);
- }
-
- HUGE_ROOT (pWin);
- SCREEN_UNWRAP (pWin->drawable.pScreen, ChangeBorderWidth);
-
- pWin->drawable.pScreen->ChangeBorderWidth (pWin, width);
-
- SCREEN_WRAP (pWin->drawable.pScreen, ChangeBorderWidth);
- NORMAL_ROOT (pWin);
-
- if (winRec != NULL)
-	{
- FinishFrameResize (pWin, FALSE, oldX, oldY, oldW, oldH, oldBW,
-			 newX, newY, newW, newH, newBW, resize_after);
- }
- }
-
- RL_DEBUG_MSG("change border width end\n");
-}
-
-/*
- * RootlessFillRegionTiled
- * Fill using a tile while leaving the alpha channel untouched.
- * Based on fbfillRegionTiled.
- */
-static void
-RootlessFillRegionTiled(
- DrawablePtr pDrawable,
- RegionPtr pRegion,
- PixmapPtr pTile)
-{
- FbBits *dst;
- FbStride dstStride;
- int dstBpp;
- int dstXoff, dstYoff;
- FbBits *tile;
- FbStride tileStride;
- int tileBpp;
- int tileXoff, tileYoff; /* XXX assumed to be zero */
- int tileWidth, tileHeight;
- int n = REGION_NUM_RECTS(pRegion);
- BoxPtr pbox = REGION_RECTS(pRegion);
- int xRot = pDrawable->x;
- int yRot = pDrawable->y;
- FbBits planeMask;
-
-#ifdef PANORAMIX
- if(!noPanoramiXExtension)
- {
- int index = pDrawable->pScreen->myNum;
- if(&WindowTableindex->drawable == pDrawable)
- {
- xRot -= panoramiXdataPtrindex.x;
- yRot -= panoramiXdataPtrindex.y;
- }
- }
-#endif
- fbGetDrawable (pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
- fbGetDrawable (&pTile->drawable, tile, tileStride, tileBpp,
- tileXoff, tileYoff);
- tileWidth = pTile->drawable.width;
- tileHeight = pTile->drawable.height;
- xRot += dstXoff;
- yRot += dstYoff;
- planeMask = FB_ALLONES & ~RootlessAlphaMask(dstBpp);
-
- while (n--)
- {
- fbTile (dst + (pbox->y1 + dstYoff) * dstStride,
- dstStride,
- (pbox->x1 + dstXoff) * dstBpp,
- (pbox->x2 - pbox->x1) * dstBpp,
- pbox->y2 - pbox->y1,
- tile,
- tileStride,
- tileWidth * dstBpp,
- tileHeight,
- GXcopy,
- planeMask,
- dstBpp,
- xRot * dstBpp,
- yRot - pbox->y1);
- pbox++;
- }
-}
-
-/*
- * RootlessPaintWindow
- * Paint the window while filling in the alpha channel with all on.
- * We can't use fbPaintWindow because it zeros the alpha channel.
- */
-void
-RootlessPaintWindow(
- WindowPtr pWin,
- RegionPtr pRegion,
- int what)
-{
- switch (what) {
- case PW_BACKGROUND:
-
- switch (pWin->backgroundState) {
- case None:
- break;
- case ParentRelative:
- do {
- pWin = pWin->parent;
- } while (pWin->backgroundState == ParentRelative);
- (*pWin->drawable.pScreen->PaintWindowBackground)(pWin, pRegion,
- what);
- break;
- case BackgroundPixmap:
- RootlessFillRegionTiled (&pWin->drawable,
-					 pRegion,
-					 pWin->background.pixmap);
- break;
- case BackgroundPixel:
- {
- Pixel pixel = pWin->background.pixel |
- RootlessAlphaMask(pWin->drawable.bitsPerPixel);
- fbFillRegionSolid (&pWin->drawable, pRegion, 0,
- fbReplicatePixel (pixel,
- pWin->drawable.bitsPerPixel));
- break;
- }
- }
- 	break;
- case PW_BORDER:
- if (pWin->borderIsPixel)
- {
- Pixel pixel = pWin->border.pixel |
- RootlessAlphaMask(pWin->drawable.bitsPerPixel);
- fbFillRegionSolid (&pWin->drawable, pRegion, 0,
- fbReplicatePixel (pixel,
- pWin->drawable.bitsPerPixel));
- }
- else
- {
- WindowPtr pBgWin;
- for (pBgWin = pWin; pBgWin->backgroundState == ParentRelative;
- pBgWin = pBgWin->parent);
- 
- RootlessFillRegionTiled (&pBgWin->drawable,
-				 pRegion,
-				 pWin->border.pixmap);
- }
- break;
- }
- fbValidateDrawable (&pWin->drawable);
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/rootless-window.h Deleted

@@ -1,65 +0,0 @@
-/*
- * Rootless window management
- *
- * Greg Parker     gparker@cs.stanford.edu
- */
-
-/* Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
-
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/rootlessWindow.h,v 1.2 2002/04/03 00:06:32 torrey Exp $ */
-
-#ifndef _ROOTLESSWINDOW_H
-#define _ROOTLESSWINDOW_H
-
-#include "rootless-common.h"
-
-Bool RootlessCreateWindow(WindowPtr pWin);
-Bool RootlessDestroyWindow(WindowPtr pWin);
-
-#ifdef SHAPE
-void RootlessSetShape(WindowPtr pWin);
-#endif // SHAPE
-
-Bool RootlessChangeWindowAttributes(WindowPtr pWin, unsigned long vmask);
-Bool RootlessPositionWindow(WindowPtr pWin, int x, int y);
-Bool RootlessRealizeWindow(WindowPtr pWin);
-Bool RootlessUnrealizeWindow(WindowPtr pWin);
-void RootlessReparentWindow(WindowPtr pWin, WindowPtr pPriorParent);
-void RootlessRestackWindow(WindowPtr pWin, WindowPtr pOldNextSib);
-void RootlessCopyWindow(WindowPtr pWin,DDXPointRec ptOldOrg,RegionPtr prgnSrc);
-void RootlessMoveWindow(WindowPtr pWin,int x,int y,WindowPtr pSib,VTKind kind);
-void RootlessResizeWindow(WindowPtr pWin, int x, int y,
-			  unsigned int w, unsigned int h, WindowPtr pSib);
-void RootlessPaintWindowBackground(WindowPtr pWin, RegionPtr pRegion,
-                                   int what);
-void RootlessPaintWindowBorder(WindowPtr pWin, RegionPtr pRegion,
-                               int what);
-void RootlessChangeBorderWidth(WindowPtr pWin, unsigned int width);
-void RootlessPaintWindow(WindowPtr pWin, RegionPtr pRegion, int what);
-
-#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/rootless.h Deleted

@@ -1,61 +0,0 @@
-/*
- * External interface to generic rootless mode
- *
- * Greg Parker     gparker@cs.stanford.edu     March 3, 2001
- */
-
-/* Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
-
-/* $XFree86: xc/programs/Xserver/hw/darwin/quartz/rootless.h,v 1.2 2002/08/28 06:41:26 torrey Exp $ */
-
-#ifndef _ROOTLESS_H
-#define _ROOTLESS_H
-
-#include "mi.h"
-#include "gcstruct.h"
-
-#include "Xplugin.h"
-
-/* Initialize rootless mode on the given screen. */
-extern Bool RootlessSetupScreen(int index, ScreenPtr pScreen);
-
-extern void RootlessUpdateScreenPixmap (ScreenPtr pScreen);
-
-extern xp_window_id RootlessGetPhysicalWindow (WindowPtr pWin, Bool create);
-extern WindowPtr RootlessGetXWindow (xp_window_id wid);
-
-extern int RootlessKnowsWindowNumber (int number);
-
-extern void RootlessDisableUpdate (WindowPtr pWin);
-extern void RootlessReenableUpdate (WindowPtr pWin);
-
-extern void RootlessUpdateRooted (Bool state);
-extern void RootlessHideAllWindows (void);
-extern void RootlessShowAllWindows (void);
-
-#endif /* _ROOTLESS_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/sif_file.icns Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/utils Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/utils/Imakefile Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/utils/README.txt Deleted

@@ -1,111 +0,0 @@
-dumpkeymap - Diagnostic dump and detailed description of .keymapping files
-Version 4
-
-Copyright (C)1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
-Eric Sunshine, 1 December 2000
-
-OVERVIEW
-========
-This package contains the diagnostic utility dumpkeymap, as well as highly
-detailed documentation describing the internal layout of the Apple/NeXT
-.keymapping file.
-
-The dumpkeymap utility displays detailed information about each .keymapping
-file mentioned on the command-line. On Apple and NeXT platforms, if no
-.keymapping files are mentioned on the command-line, then it will instead
-dissect the key mapping currently in use by the WindowServer and AppKit.
-
-Documentation includes a thorough and detailed description of the internal
-layout of the .keymapping file, as well as an explanation of how to interpret
-the output of dumpkeymap.
-
-The complete set of documentation is available for perusal via dumpkeymap's
-manual page (dumpkeymap.1), as well as via the command-line options described
-below.
-
- --help
-	Usage summary.
- --help-keymapping
-	Detailed discussion of the internal format of a .keymapping file.
- --help-output
-	Explanation of dumpkeymap's output.
- --help-files
-	List of key mapping-related files and directories.
- --help-diagnostics
-	Explanation of diagnostic messages.
-
-Once the manual page is been installed, documentation can also be accessed
-with the Unix `man' command:
-
- % man dumpkeymap
-
-
-COMPILATION
-===========
-MacOS/X, Darwin
-
- cc -Wall -o dumpkeymap dumpkeymap.c -framework IOKit
-
-MacOS/X DP4 (Developer Preview 4)
-
- cc -Wall -o dumpkeymap dumpkeymap.c -FKernel -framework IOKit
-
-MacOS/X Server, OpenStep, NextStep
-
- cc -Wall -o dumpkeymap dumpkeymap.c
-
-By default, dumpkeymap is configured to interface with the HID driver (Apple)
-or event-status driver (NeXT), thus allowing it to dump the key mapping which
-is currently in use by the WindowServer and AppKit. However, these facilities
-are specific to Apple/NeXT. In order to build dumpkeymap for non-Apple/NeXT
-platforms, you must define the DUMPKEYMAP_FILE_ONLY flag when compiling the
-program. This flag inhibits use of the HID and event-status drivers and
-configures dumpkeymap to work strictly with raw key mapping files.
-
-For example, to compile for Linux:
-
- gcc -Wall -DDUMPKEYMAP_FILE_ONLY -o dumpkeymap dumpkeymap.c
-
-
-INSTALLATION
-============
-Install the dumpkeymap executable image in a location mentioned in the PATH
-environment variable. Typical locations for executable files are:
-
- /usr/local/bin
- $(HOME)/bin
-
-Install the manual page, dumpkeymap.1, in the `man1' subdirectory one of the
-standard manual page locations or in any other location mentioned by the
-MANPATH environment variable.
-
-Typical locations for manual pages on most Unix platforms are:
-
- /usr/local/man/man1
-
-Typical locations for manual pages on MacOS/X, Darwin, and MacOS/X Server are:
-
- /usr/local/man/man1
- /Local/Documentation/ManPages/man1
- /Network/Documentation/ManPages/man1
-
-Typical locations for manual pages on OpenStep and NextStep are:
-
- /usr/local/man/man1
- /LocalLibrary/Documentation/ManPages/man1
- /LocalDeveloper/Documentation/ManPages/man1
-
-
-CONCLUSION
-==========
-This program and its accompanying documentation were written by Eric Sunshine
-and are copyright (C)1999,2000 by Eric Sunshine <sunshine@sunshineco.com>.
-
-The implementation of dumpkeymap is based upon information gathered on
-September 3, 1997 by Eric Sunshine <sunshine@sunshineco.com> and Paul S.
-McCarthy <zarnuk@zarnuk.com> during an effort to reverse engineer the format
-of the NeXT .keymapping file.
-
-
-
-$XFree86: xc/programs/Xserver/hw/darwin/utils/README.txt,v 1.2 2000/12/05 21:18:34 dawes Exp $

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/utils/dumpkeymap.c Deleted

@@ -1,1453 +0,0 @@
-// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.c,v 1.3 2000/12/05 21:18:34 dawes Exp $
-//=============================================================================
-//
-// Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-// 3. The name of the author may not be used to endorse or promote products
-// derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-// IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-// OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
-// NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-// TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-// LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//=============================================================================
-//-----------------------------------------------------------------------------
-// dumpkeymap.c
-//
-//	Prints a textual representation of each Apple/NeXT .keymapping file
-//	mentioned on the command-line. If no files are mentioned and if the
-//	local machine is an Apple or NeXT installation, then the key mapping
-//	currently in use by the WindowServer and the AppKit is printed
-//	instead.
-//
-//	Invoke dumpkeymap with one of the options listed below in order to
-//	view detailed documentation about .keymapping files and the use of
-//	this program.
-//
-//	--help: Usage summary.
-//	--help-keymapping: Detailed discussion of the internal format of a
-//	 .keymapping file.
-//	--help-output: Explanation of dumpkeymap's output.
-//	--help-files: List of key mapping-related files and directories.
-//	--help-diagnostics: Explanation of diagnostic messages.
-//
-// COMPILATION INSTRUCTIONS
-//
-//	MacOS/X, Darwin
-//	cc -Wall -o dumpkeymap dumpkeymap.c -framework IOKit
-//
-//	MacOS/X DP4 (Developer Preview 4)
-//	cc -Wall -o dumpkeymap dumpkeymap.c -FKernel -framework IOKit
-//
-//	MacOS/X Server, OpenStep, NextStep
-//	cc -Wall -o dumpkeymap dumpkeymap.c
-//
-//	By default, dumpkeymap is configured to interface with the HID driver
-//	(Apple) or event-status driver (NeXT), thus allowing it to dump the
-//	key mapping which is currently in use by the WindowServer and AppKit.
-//	However, these facilities are specific to Apple/NeXT. In order to
-//	build dumpkeymap for non-Apple/NeXT platforms, you must define the
-//	DUMPKEYMAP_FILE_ONLY flag when compiling the program. This flag
-//	inhibits use of the HID and event-status drivers and configures
-//	dumpkeymap to work strictly with raw key mapping files.
-//
-//	For example, to compile for Linux:
-//	gcc -Wall -DDUMPKEYMAP_FILE_ONLY -o dumpkeymap dumpkeymap.c
-//
-// CONCLUSION
-//
-//	This program and its accompanying documentation were written by Eric
-//	Sunshine and are copyright (C)1999,2000 by Eric Sunshine
-//	<sunshine@sunshineco.com>.
-//
-//	The implementation of dumpkeymap is based upon information gathered
-//	on September 3, 1997 by Eric Sunshine <sunshine@sunshineco.com> and
-//	Paul S. McCarthy <zarnuk@zarnuk.com> during an effort to reverse
-//	engineer the format of the NeXT .keymapping file.
-//
-// HISTORY
-//
-//	v4 2000/12/01 Eric Sunshine <sunshine@sunshineco.com>
-//	 Updated manual page to work with `rman', the `man' to `HTML'
-//		translator. Unfortunately, however, rman is missing important
-//		roff features such as diversions, indentation, and tab stops,
-//		and is also hideously buggy, so getting the manual to work with
-//		rman required quite a few work-arounds.
-//	 The manual page has now been tested with nroff (plain text), troff
-//		(PostScript, etc.), groff (PostScript), and rman (HTML, etc.)
-//
-//	v3 2000/11/28 Eric Sunshine <sunshine@sunshineco.com>
-//	 Considerably expanded the documentation.
-//	 Augmented the existing description of .keymapping internals.
-//	 Added these new documentation topics:
-//		- Output: Very important section describing how to interpret
-//		 the output of dumpkeymap.
-//		- Files: Lists files and directories related to key mappings.
-//		- Diagnostics: Explains diagnostic messages issued by
-//		 dumpkeymap.
-//	 Created a manual page (dumpkeymap.1) which contains the complete
-//		set of documentation for key mapping files and dumpkeymap.
-//	 Added command-line options (--help, --help-keymapping,
-//		--help-output, --help-files, --help-diagnostics) which allow
-//		access to all key mapping documentation. Previously the
-//		description of the internal layout of a .keymapping file was
-//		only available as source code comments.
-//	 Added --version option.
-//	 Ported to non-Apple/NeXT platforms. Defining the pre-processor
-//		flag DUMPKEYMAP_FILE_ONLY at compilation time inhibits use of
-//		Apple/NeXT-specific API.
-//	 Added a README file.
-//
-//	v2 2000/11/13 Eric Sunshine <sunshine@sunshineco.com>
-//	 Converted from C++ to plain-C.
-//	 Now parses and takes into account the "number-size" flag stored
-//		with each key map. This flag indicates the size, in bytes, of
-//		all remaining numeric values in the mapping. Updated all code
-//		to respect this flag. (Previously, the purpose of this field
-//		was unknown, and it was thus denoted as
-//		`KeyMapping::fill2'.)
-//	 Updated all documentation; especially the "KEY MAPPING
-//		DESCRIPTION" section. Added discussion of the "number-size"
-//		flag and revamped all structure definitions to use the generic
-//		data type `number' instead of `uchar' or 'byte'. Clarified
-//		several sections of the documentation and added missing
-//		discussions about type definitions and the relationship of
-//		`interface' and `handler_id' to .keymapping and .keyboard
-//		files.
-//	 Updated compilation instructions to include directions for all
-//		platforms on which this program might be built.
-//	 Now published under the formal BSD license rather than a
-//		home-grown license.
-//
-//	v1 1999/09/08 Eric Sunshine <sunshine@sunshineco.com>
-//	 Created.
-//-----------------------------------------------------------------------------
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-#if !defined(DUMPKEYMAP_FILE_ONLY)
-#include <drivers/event_status_driver.h>
-#endif
-
-#define PROG_NAME "dumpkeymap"
-#define PROG_VERSION "4"
-#define AUTHOR_NAME "Eric Sunshine"
-#define AUTHOR_EMAIL "sunshine@sunshineco.com"
-#define AUTHOR_INFO AUTHOR_NAME " <" AUTHOR_EMAIL ">"
-#define COPYRIGHT "Copyright (C) 1999,2000 by " AUTHOR_INFO
-
-typedef unsigned char byte;
-typedef unsigned short word;
-typedef unsigned int natural;
-typedef unsigned long dword;
-typedef dword number;
-
-#define ASCII_SET 0x00
-#define BIND_FUNCTION 0xfe
-#define BIND_SPECIAL 0xff
-
-#define OPT_SWITCH(X) { char const* switched_str__=(X); if (0) {
-#define OPT_CASE(X,Y) } else if (strcmp(switched_str__,(#X)) == 0 || \
- strcmp(switched_str__,(#Y)) == 0) {
-#define OPT_DEFAULT } else {
-#define OPT_SWITCH_END }}
-
-//-----------------------------------------------------------------------------
-// Translation Tables
-//-----------------------------------------------------------------------------
-static char const* const SPECIAL_CODE =
- {
- "sound-up",
- "sound-down",
- "brightness-up",
- "brightness-down",
- "alpha-lock",
- "help",
- "power",
- "secondary-up-arrow",
- "secondary-down-arrow"
- };
-#define N_SPECIAL_CODE (sizeof(SPECIAL_CODE) / sizeof(SPECIAL_CODE0))
-
-static char const* const MODIFIER_CODE =
- {
- "alpha-lock",
- "shift",
- "control",
- "alternate",
- "command",
- "keypad",
- "help"
- };
-#define N_MODIFIER_CODE (sizeof(MODIFIER_CODE) / sizeof(MODIFIER_CODE0))
-
-static char const* const MODIFIER_MASK =
- {
- "-----",	// R = carriage-return
- "----L",	// A = alternate
- "---S-",	// C = control
- "---SL",	// S = shift
- "--C--",	// L = alpha-lock
- "--C-L",
- "--CS-",
- "--CSL",
- "-A---",
- "-A--L",
- "-A-S-",
- "-A-SL",
- "-AC--",
- "-AC-L",
- "-ACS-",
- "-ACSL",
- "R----",
- "R---L",
- "R--S-",
- "R--SL",
- "R-C--",
- "R-C-L",
- "R-CS-",
- "R-CSL",
- "RA---",
- "RA--L",
- "RA-S-",
- "RA-SL",
- "RAC--",
- "RAC-L",
- "RACS-",
- "RACSL",
- };
-#define N_MODIFIER_MASK (sizeof(MODIFIER_MASK) / sizeof(MODIFIER_MASK0))
-
-#define FUNCTION_KEY_FIRST 0x20
-static char const* const FUNCTION_KEY =
- {
- "F1",			// 0x20
- "F2",			// 0x21
- "F3",			// 0x22
- "F4",			// 0x23
- "F5",			// 0x24
- "F6",			// 0x25
- "F7",			// 0x26
- "F8",			// 0x27
- "F9",			// 0x28
- "F10",			// 0x29
- "F11",			// 0x2a
- "F12",			// 0x2b
- "insert",			// 0x2c
- "delete",			// 0x2d
- "home",			// 0x2e
- "end",			// 0x2f
- "page up",			// 0x30
- "page down",		// 0x31
- "print screen",		// 0x32
- "scroll lock",		// 0x33
- "pause",			// 0x34
- "sys-request",		// 0x35
- "break",			// 0x36
- "reset (HIL)",		// 0x37
- "stop (HIL)",		// 0x38
- "menu (HIL)",		// 0x39
- "user (HIL)",		// 0x3a
- "system (HIL)",		// 0x3b
- "print (HIL)",		// 0x3c
- "clear line (HIL)",		// 0x3d
- "clear display (HIL)",	// 0x3e
- "insert line (HIL)",	// 0x3f
- "delete line (HIL)",	// 0x40
- "insert char (HIL)",	// 0x41
- "delete char (HIL)",	// 0x42
- "prev (HIL)",		// 0x43
- "next (HIL)",		// 0x44
- "select (HIL)",		// 0x45
- };
-#define N_FUNCTION_KEY (sizeof(FUNCTION_KEY) / sizeof(FUNCTION_KEY0))
-
-
-//-----------------------------------------------------------------------------
-// Data Stream Object
-//	Can be configured to treat embedded "numbers" as being composed of
-//	either 1, 2, or 4 bytes, apiece.
-//-----------------------------------------------------------------------------
-typedef struct _DataStream
- {
- byte const* data;
- byte const* data_end;
- natural number_size; // Size in bytes of a "number" in the stream.
- } DataStream;
-
-static DataStream* new_data_stream( byte const* data, int size )
- {
- DataStream* s = (DataStream*)malloc( sizeof(DataStream) );
- s->data = data;
- s->data_end = data + size;
- s->number_size = 1; // Default to byte-sized numbers.
- return s;
- }
-
-static void destroy_data_stream( DataStream* s )
- {
- free(s);
- }
-
-static int end_of_stream( DataStream* s )
- {
- return (s->data >= s->data_end);
- }
-
-static void expect_nbytes( DataStream* s, int nbytes )
- {
- if (s->data + nbytes > s->data_end)
-	{
-	fputs( "Insufficient data in keymapping data stream.\n", stderr );
-	exit(-1);
-	}
- }
-
-static byte get_byte( DataStream* s )
- {
- expect_nbytes( s, 1 );
- return *s->data++;
- }
-
-static word get_word( DataStream* s )
- {
- word hi, lo;
- expect_nbytes( s, 2 );
- hi = *s->data++;
- lo = *s->data++;
- return ((hi << 8) | lo);
- }
-
-static dword get_dword( DataStream* s )
- {
- dword b1, b2, b3, b4;
- expect_nbytes( s, 4 );
- b4 = *s->data++;
- b3 = *s->data++;
- b2 = *s->data++;
- b1 = *s->data++;
- return ((b4 << 24) | (b3 << 16) | (b2 << 8) | b1);
- }
-
-static number get_number( DataStream* s )
- {
- switch (s->number_size)
-	{
-	case 4: return get_dword(s);
-	case 2: return get_word(s);
-	default: return get_byte(s);
-	}
- }
-
-
-//-----------------------------------------------------------------------------
-// Translation Utility Functions
-//-----------------------------------------------------------------------------
-static char const* special_code_desc( number n )
- {
- if (n < N_SPECIAL_CODE)
-	return SPECIAL_CODEn;
- else
-	return "invalid";
- }
-
-static char const* modifier_code_desc( number n )
- {
- if (n < N_MODIFIER_CODE)
-	return MODIFIER_CODEn;
- else
-	return "invalid";
- }
-
-static char const* modifier_mask_desc( number n )
- {
- if (n < N_MODIFIER_MASK)
-	return MODIFIER_MASKn;
- else
-	return "?????";
- }
-
-static char const* function_key_desc( number n )
- {
- if (n >= FUNCTION_KEY_FIRST && n < N_FUNCTION_KEY + FUNCTION_KEY_FIRST)
-	return FUNCTION_KEY n - FUNCTION_KEY_FIRST ;
- else
-	return "unknown";
- }
-
-static number bits_set( number mask )
- {
- number n = 0;
- for ( ; mask != 0; mask >>= 1)
-	if ((mask & 0x01) != 0)
-	 n++;
- return n;
- }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a list of Modifier records.
-//-----------------------------------------------------------------------------
-static void unparse_modifiers( DataStream* s )
- {
- number nmod = get_number(s); // Modifier count
- printf( "MODIFIERS %lu\n", nmod );
- while (nmod-- > 0)
-	{
-	number nscan;
-	number const code = get_number(s);
-	printf( "%s:", modifier_code_desc(code) );
-	nscan = get_number(s);
-	while (nscan-- > 0)
-	 printf( " 0x%02x", (natural)get_number(s) );
-	putchar( '\n' );
-	}
- putchar( '\n' );
- }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a list of Character records.
-//-----------------------------------------------------------------------------
-typedef void (*UnparseSpecialFunc)( number code );
-
-static void unparse_char_codes(
- DataStream* s, number ncodes, UnparseSpecialFunc unparse_special )
- {
- if (ncodes != 0)
-	{
-	while (ncodes-- > 0)
-	 {
-	 number const char_set = get_number(s);
-	 number const code = get_number(s);
-	 putchar(' ');
-	 switch (char_set)
-		{
-		case ASCII_SET:
-		 {
-		 int const c = (int)code;
-		 if (isprint(c))
-			printf( "\"%c\"", c );
-		 else if (code < ' ')
-			printf( "\"^%c\"", c + '@' );
-		 else
-			printf( "%02x", c );
-		 break;
-		 }
-		case BIND_FUNCTION:
-		 printf( "%s", function_key_desc(code) );
-		 break;
-		case BIND_SPECIAL:
-		 unparse_special( code );
-		 break;
-		default:
-		 printf( "%02x/%02x", (natural)char_set, (natural)code );
-		 break;
-		}
-	 }
-	}
- }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a list of scan code bindings.
-//-----------------------------------------------------------------------------
-static void unparse_key_special( number code )
- {
- printf( "{seq#%lu}", code );
- }
-
-static void unparse_characters( DataStream* s )
- {
- number const NOT_BOUND = 0xff;
- number const nscans = get_number(s);
- number scan;
- printf( "CHARACTERS %lu\n", nscans );
- for (scan = 0; scan < nscans; scan++)
-	{
-	number const mask = get_number(s);
-	printf( "scan 0x%02x: ", (natural)scan );
-	if (mask == NOT_BOUND)
-	 fputs( "not-bound\n", stdout );
-	else
-	 {
-	 number const bits = bits_set( mask );
-	 number const codes = 1 << bits;
-	 printf( "%s ", modifier_mask_desc(mask) );
-	 unparse_char_codes( s, codes, unparse_key_special );
-	 putchar( '\n' );
-	 }
-	}
- putchar( '\n' );
- }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a list of key sequences.
-//-----------------------------------------------------------------------------
-static void unparse_sequence_special( number code )
- {
- printf( "{%s}", (code == 0 ? "unmodify" : modifier_code_desc(code)) );
- }
-
-static void unparse_sequences( DataStream* s )
- {
- number const nseqs = get_number(s);
- number seq;
- printf( "SEQUENCES %lu\n", nseqs );
- for (seq = 0; seq < nseqs; seq++)
-	{
-	number const nchars = get_number(s);
-	printf( "sequence %lu:", seq );
-	unparse_char_codes( s, nchars, unparse_sequence_special );
-	putchar( '\n' );
-	}
- putchar( '\n' );
- }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a list of special keys.
-//-----------------------------------------------------------------------------
-static void unparse_specials( DataStream* s )
- {
- number nspecials = get_number(s);
- printf( "SPECIALS %lu\n", nspecials );
- while (nspecials-- > 0)
-	{
-	number const special = get_number(s);
-	number const scan = get_number(s);
-	printf( "%s: 0x%02x\n", special_code_desc(special), (natural)scan );
-	}
- putchar( '\n' );
- }
-
-
-//-----------------------------------------------------------------------------
-// Unparse the number-size flag.
-//-----------------------------------------------------------------------------
-static void unparse_numeric_size( DataStream* s )
- {
- word const numbers_are_shorts = get_word(s);
- s->number_size = numbers_are_shorts ? 2 : 1;
- }
-
-
-//-----------------------------------------------------------------------------
-// Unparse an entire key map.
-//-----------------------------------------------------------------------------
-static void unparse_keymap_data( DataStream* s )
- {
- unparse_numeric_size(s);
- unparse_modifiers(s);
- unparse_characters(s);
- unparse_sequences(s);
- unparse_specials(s);
- }
-
-
-//-----------------------------------------------------------------------------
-// Unparse the active key map.
-//-----------------------------------------------------------------------------
-#if !defined(DUMPKEYMAP_FILE_ONLY)
-static int unparse_active_keymap( void )
- {
- int rc = 1;
- NXEventHandle const h = NXOpenEventStatus();
- if (h == 0)
-	fputs( "Unable to open event status driver.\n", stderr );
- else
-	{
-	NXKeyMapping km;
-	km.size = NXKeyMappingLength(h);
-	if (km.size <= 0)
-	 fprintf( stderr, "Bad key mapping length (%d).\n", km.size );
-	else
-	 {
-	 km.mapping = (char*)malloc( km.size );
-	 if (NXGetKeyMapping( h, &km ) == 0)
-		fputs( "Unable to get current key mapping.\n", stderr );
-	 else
-		{
-		DataStream* stream =
-		 new_data_stream( (byte const*)km.mapping, km.size );
-		fputs( "=============\nACTIVE KEYMAP\n=============\n\n",
-		 stdout);
-		unparse_keymap_data( stream );
-		destroy_data_stream( stream );
-		rc = 0;
-		}
-	 free( km.mapping );
-	 }
-	NXCloseEventStatus(h);
-	}
- return rc;
- }
-#endif
-
-
-//-----------------------------------------------------------------------------
-// Unparse one key map from a keymapping file.
-//-----------------------------------------------------------------------------
-static void unparse_keymap( DataStream* s )
- {
- dword const interface = get_dword(s);
- dword const handler_id = get_dword(s);
- dword const map_size = get_dword(s);
- printf( "interface: 0x%02lx\nhandler_id: 0x%02lx\nmap_size: %lu bytes\n\n",
-	interface, handler_id, map_size );
- unparse_keymap_data(s);
- }
-
-
-//-----------------------------------------------------------------------------
-// Check the magic number of a keymapping file.
-//-----------------------------------------------------------------------------
-static int check_magic_number( DataStream* s )
- {
- return (get_byte(s) == 'K' &&
-	 get_byte(s) == 'Y' &&
-	 get_byte(s) == 'M' &&
-	 get_byte(s) == '1');
- }
-
-
-//-----------------------------------------------------------------------------
-// Unparse all key maps within a keymapping file.
-//-----------------------------------------------------------------------------
-static int unparse_keymaps( DataStream* s )
- {
- int rc = 0;
- if (check_magic_number(s))
-	{
-	int n = 1;
-	while (!end_of_stream(s))
-	 {
-	 printf( "---------\nKEYMAP #%d\n---------\n", n++ );
-	 unparse_keymap(s);
-	 }
-	}
- else
-	{
-	fputs( "Bad magic number.\n", stderr );
-	rc = 1;
-	}
- return rc;
- }
-
-
-//-----------------------------------------------------------------------------
-// Unparse a keymapping file.
-//-----------------------------------------------------------------------------
-static int unparse_keymap_file( char const* const path )
- {
- int rc = 1;
- FILE* file;
- printf( "===========\nKEYMAP FILE\n===========\n%s\n\n", path );
- file = fopen( path, "rb" );
- if (file == 0)
-	perror( "Unable to open key mapping file" );
- else
-	{
-	struct stat st;
-	if (fstat( fileno(file), &st ) != 0)
-	 perror( "Unable to determine key mapping file size" );
-	else
-	 {
-	 byte* buffer = (byte*)malloc( st.st_size );
-	 if (fread( buffer, st.st_size, 1, file ) != 1)
-		perror( "Unable to read key mapping file" );
-	 else
-		{
-		DataStream* stream = new_data_stream(buffer, (int)st.st_size);
-		fclose( file ); file = 0;
-		rc = unparse_keymaps( stream );
-		destroy_data_stream( stream );
-		}
-	 free( buffer );
-	 }
-	if (file != 0)
-	 fclose( file );
-	}
- return rc;
- }
-
-
-//-----------------------------------------------------------------------------
-// Handle the case when no documents are mentioned on the command-line. For
-// Apple/NeXT platforms, dump the currently active key mapping; else display
-// an error message.
-//-----------------------------------------------------------------------------
-static int handle_empty_document_list( void )
- {
-#if !defined(DUMPKEYMAP_FILE_ONLY)
- return unparse_active_keymap();
-#else
- fputs( "ERROR: Must specify at least one .keymapping file.\n\n", stderr );
- return 1;
-#endif
- }
-
-
-//-----------------------------------------------------------------------------
-// Print a detailed description of the internal layout of a key mapping.
-//-----------------------------------------------------------------------------
-static void print_internal_layout_info( FILE* f )
- {
- fputs(
-"What follows is a detailed descriptions of the internal layout of an\n"
-"Apple/NeXT .keymapping file.\n"
-"\n"
-"Types and Data\n"
-"--------------\n"
-"The following type definitions are employed throughout this discussion:\n"
-"\n"
-" typedef unsigned char byte;\n"
-" typedef unsigned short word;\n"
-" typedef unsigned long dword;\n"
-"\n"
-"Additionally, the type definition `number' is used generically to indicate\n"
-"a numeric value. The actual size of the `number' type may be one or two\n"
-"bytes depending upon how the data is stored in the key map. Although most\n"
-"key maps use byte-sized numeric values, word-sized values are also allowed.\n"
-"\n"
-"Multi-byte values in a key mapping file are stored in big-endian byte\n"
-"order.\n"
-"\n"
-"Key Mapping File and Device Mapping\n"
-"-----------------------------------\n"
-"A key mapping file begins with a magic-number and continues with a variable\n"
-"number of device-specific key mappings.\n"
-"\n"
-" struct KeyMappingFile {\n"
-" char magic_number4; // `KYM1'\n"
-" DeviceMapping maps...; // Variable number of maps\n"
-" };\n"
-"\n"
-" struct DeviceMapping {\n"
-" dword interface; // Interface type\n"
-" dword handler_id; // Interface subtype\n"
-" dword map_size; // Byte count of `map' (below)\n"
-" KeyMapping map;\n"
-" };\n"
-"\n"
-"The value of `interface' represents a family of keyboard device types\n"
-"(such as Intel PC, ADB, NeXT, Sun Type5, etc.), and is generally\n"
-"specified as one of the constant values NX_EVS_DEVICE_INTERFACE_ADB,\n"
-"NX_EVS_DEVICE_INTERFACE_ACE, etc., which are are defined in IOHIDTypes.h on\n"
-"MacOS/X and Darwin, and in ev_types.h on MacOS/X Server, OpenStep, and\n"
-"NextStep.\n"
-"\n"
-"The value of `handler_id' represents a specific keyboard layout within the\n"
-"much broader `interface' family. For instance, for a 101-key Intel PC\n"
-"keyboard (of type NX_EVS_DEVICE_INTERFACE_ACE) the `handler_id' is '0',\n"
-"whereas for a 102-key keyboard it is `1'.\n"
-"\n"
-"Together, `interface' and `handler_id' identify the exact keyboard hardware\n"
-"to which this mapping applies. Programs which display a visual\n"
-"representation of a keyboard layout, match `interface' and `handler_id'\n"
-"from the .keymapping file against the `interface' and `handler_id' values\n"
-"found in each .keyboard file.\n"
-"\n"
-"Key Mapping\n"
-"-----------\n"
-"A key mapping completely defines the relationship of all scan codes with\n"
-"their associated functionality. A KeyMapping structure is embedded within\n"
-"the DeviceMapping structure in a KeyMappingFile. The key mapping currently\n"
-"in use by the WindowServer and AppKit is also represented by a KeyMapping\n"
-"structure, and can be referred to directly by calling NXGetKeyMapping() and\n"
-"accessing the `mapping' data member of the returned NXKeyMapping structure.\n"
-"\n"
-" struct KeyMapping {\n"
-" word number_size; // 0=1 byte, non-zero=2 bytes\n"
-" number num_modifier_groups; // Modifier groups\n"
-" ModifierGroup modifier_groups...;\n"
-" number num_scan_codes; // Scan groups\n"
-" ScanGroup scan_table...;\n"
-" number num_sequence_lists; // Sequence lists\n"
-" Sequence sequence_lists...;\n"
-" number num_special_keys; // Special keys\n"
-" SpecialKey special_key...;\n"
-" };\n"
-"\n"
-"The `number_size' flag determines the size, in bytes, of all remaining\n"
-"numeric values (denoted by the type definition `number') within the key\n"
-"mapping. If its value is zero, then numbers are represented by a single\n"
-"byte. If it is non-zero, then numbers are represented by a word (two\n"
-"bytes).\n"
-"\n"
-"Modifier Group\n"
-"--------------\n"
-"A modifier group defines all scan codes which map to a particular type of\n"
-"modifier, such as `shift', `control', etc.\n"
-"\n"
-" enum Modifier {\n"
-" ALPHALOCK = 0,\n"
-" SHIFT,\n"
-" CONTROL,\n"
-" ALTERNATE,\n"
-" COMMAND,\n"
-" KEYPAD,\n"
-" HELP\n"
-" };\n"
-"\n"
-" struct ModifierGroup {\n"
-" number modifier; // A Modifier constant\n"
-" number num_scan_codes;\n"
-" number scan_codes...; // Variable number of scan codes\n"
-" };\n"
-"\n"
-"The scan_codes array contains a list of all scan codes which map to the\n"
-"specified modifier. The `shift', `command', and `alternate' modifiers are\n"
-"frequently mapped to two different scan codes, apiece, since these\n"
-"modifiers often appear on both the left and right sides of the keyboard.\n"
-"\n"
-"Scan Group\n"
-"----------\n"
-"There is one ScanGroup for each scan code generated by the given keyboard.\n"
-"This number is given by KeyMapping::num_scan_codes. The first scan group\n"
-"represents hardware scan code 0, the second represents scan code 1, etc.\n"
-"\n"
-" enum ModifierMask {\n"
-" ALPHALOCK_MASK = 1 << 0,\n"
-" SHIFT_MASK = 1 << 1,\n"
-" CONTROL_MASK = 1 << 2,\n"
-" ALTERNATE_MASK = 1 << 3,\n"
-" CARRIAGE_RETURN_MASK = 1 << 4\n"
-" };\n"
-" #define NOT_BOUND 0xff\n"
-"\n"
-" struct ScanGroup {\n"
-" number mask;\n"
-" Character characters...;\n"
-" };\n"
-"\n"
-"For each scan code, `mask' defines which modifier combinations generate\n"
-"characters. If `mask' is NOT_BOUND (0xff) then then this scan code does\n"
-"not generate any characters ever, and its characters array is zero\n"
-"length. Otherwise, the characters array contains one Character record\n"
-"for each modifier combination.\n"
-"\n"
-"The number of records in characters is determined by computing (1 <<\n"
-"bits_set_in_mask). In other words, if mask is zero, then zero bits are\n"
-"set, so characters contains only one record. If `mask' is (SHIFT_MASK |\n"
-"CONTROL_MASK), then two bits are set, so characters contains four\n"
-"records.\n"
-"\n"
-"The first record always represents the character which is generated by that\n"
-"key when no modifiers are active. The remaining records represent\n"
-"characters generated by the various modifier combinations. Using the\n"
-"example with the `shift' and `control' masks set, record two would\n"
-"represent the character with the `shift' modifier active; record three, the\n"
-"`control' modifier active; and record four, both the `shift' and `control'\n"
-"modifiers active.\n"
-"\n"
-"As a special case, ALPHALOCK_MASK implies SHIFT_MASK, though only\n"
-"ALPHALOCK_MASK appears in `mask'. In this case the same character is\n"
-"generated for both the `shift' and `alpha-lock' modifiers, but only needs\n"
-"to appear once in the characters array.\n"
-"\n"
-"CARRIAGE_RETURN_MASK does not actually refer to a modifier key. Instead,\n"
-"it is used to distinguish the scan code which is given the special\n"
-"pseudo-designation of `carriage return' key. Typically, this mask appears\n"
-"solo in a ScanGroup record and only the two Character records for control-M\n"
-"and control-C follow. This flag may be a throwback to an earlier time or\n"
-"may be specially interpreted by the low-level keyboard driver, but its\n"
-"purpose is otherwise enigmatic.\n"
-"Character\n"
-"---------\n"
-"Each Character record indicates the character generated when this key is\n"
-"pressed, as well as the character set which contains the character. Well\n"
-"known character sets are `ASCII' and `Symbol'. The character set can also\n"
-"be one of the meta values FUNCTION_KEY or KEY_SEQUENCE. If it is\n"
-"FUNCTION_KEY then `char_code' represents a generally well-known function\n"
-"key such as those enumerated by FunctionKey. If the character set is\n"
-"KEY_SEQUENCE then `char_code' represents a zero-base index into\n"
-"KeyMapping::sequence_lists.\n"
-"\n"
-" enum CharacterSet {\n"
-" ASCII = 0x00,\n"
-" SYMBOL = 0x01,\n"
-" ...\n"
-" FUNCTION_KEY = 0xfe,\n"
-" KEY_SEQUENCE = 0xff\n"
-" };\n"
-"\n"
-" struct Character {\n"
-" number set; // CharacterSet of generated character\n"
-" number char_code; // Actual character generated\n"
-" };\n"
-"\n"
-" enum FunctionKey {\n"
-" F1 = 0x20, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12,\n"
-" INSERT, DELETE, HOME, END, PAGE_UP, PAGE_DOWN, PRINT_SCREEN,\n"
-" SCROLL_LOCK, PAUSE, SYS_REQUEST, BREAK, RESET, STOP, MENU, USER,\n"
-" SYSTEM, PRINT, CLEAR_LINE, CLEAR_DISPLAY, INSERT_LINE,\n"
-" DELETE_LINE, INSERT_CHAR, DELETE_CHAR, PREV, NEXT, SELECT\n"
-" };\n"
-"\n"
-"Sequence\n"
-"--------\n"
-"When Character::set contains the meta value KEY_SEQUENCE, the scan code is\n"
-"bound to a sequence of keys rather than a single character. A sequence is\n"
-"a series of modifiers and characters which are automatically generated when\n"
-"the associated key is depressed.\n"
-"\n"
-" #define MODIFIER_KEY 0xff\n"
-"\n"
-" struct Sequence {\n"
-" number num_chars;\n"
-" Character characters...;\n"
-" };\n"
-"\n"
-"Each generated Character is represented as previously described, with the\n"
-"exception that MODIFIER_KEY may appear in place of KEY_SEQUENCE. When the\n"
-"value of Character::set is MODIFIER_KEY then Character::char_code\n"
-"represents a modifier key rather than an actual character. If the modifier\n"
-"represented by `char_code' is non-zero, then it indicates that the\n"
-"associated modifier key has been depressed. In this case, the value is one\n"
-"of the constants enumerated by Modifier (SHIFT, CONTROL, ALTERNATE, etc.).\n"
-"If the value is zero then it means that the modifier keys have been\n"
-"released.\n"
-"\n"
-"Special Key\n"
-"-----------\n"
-"A special key is one which is scanned directly by the Mach kernel rather\n"
-"than by the WindowServer. In general, events are not generated for special\n"
-"keys.\n"
-"\n"
-" enum SpecialKeyType {\n"
-" VOLUME_UP = 0,\n"
-" VOLUME_DOWN,\n"
-" BRIGHTNESS_UP,\n"
-" BRIGHTNESS_DOWN,\n"
-" ALPHA_LOCK,\n"
-" HELP,\n"
-" POWER,\n"
-" SECONDARY_ARROW_UP,\n"
-" SECONDARY_ARROW_DOWN\n"
-" };\n"
-"\n"
-" struct SpecialKey {\n"
-" number type; // A SpecialKeyType constant\n"
-" number scan_code; // Actual scan code\n"
-" };\n"
-"\n", f );
- }
-
-
-//-----------------------------------------------------------------------------
-// Print an explanation of the output generated by this program.
-//-----------------------------------------------------------------------------
-static void print_output_info( FILE* f )
- {
- fputs(
-"What follows is an explanation and description of the various pieces of\n"
-"information emitted by dumpkeymap.\n"
-"\n"
-"For a more thorough discussion of any particular piece of information\n"
-"described here, refer to the detailed description of the internal layout of\n"
-"a key mapping given by the --help-layout option.\n"
-"\n"
-"Conventions\n"
-"-----------\n"
-"Depending upon context, some numeric values are displayed in decimal\n"
-"notation, whereas others are displayed in hexadecimal notation.\n"
-"Hexadecimal numbers are denoted by a `0x' prefix (for instance, `0x7b'),\n"
-"except when explicitly noted otherwise.\n"
-"\n"
-"Key Mapping Source\n"
-"------------------\n"
-"The first piece of information presented about a particular key mapping is\n"
-"the source from which the data was gleaned. For a .keymapping file, the\n"
-"title `KEYMAP FILE' is emitted along with the path and name of the file in\n"
-"question. For the key mapping currently in use by the WindowServer and\n"
-"AppKit, the title `ACTIVE KEYMAP' is emitted instead.\n"
-"\n"
-"Device Information\n"
-"------------------\n"
-"Each .keymapping file may contain one or more raw key mappings. For\n"
-"example, a file which maps keys to a Dvorak-style layout might contain raw\n"
-"mappings for Intel PC, ADB, NeXT, and Sun Type5 keyboards.\n"
-"\n"
-"For each raw mapping, the following information is emitted:\n"
-"\n"
-" o The title `KEYMAP' along with the mapping's relative position in the\n"
-" .keymapping file.\n"
-" o The `interface' identifier.\n"
-" o The `handler_id' sub-identifier.\n"
-" o The size of the raw mapping resource counted in bytes.\n"
-"\n"
-"The `interface' and `handler_id' values, taken together, define a specific\n"
-"keyboard device. A .keyboard file, which describes the visual layout of a\n"
-"keyboard, also contains `interface' and `handler_id' identifiers. The\n"
-".keyboard file corresponding to a particular key mapping can be found by\n"
-"matching the `interface' and `handler_id' values from each resource.\n"
-"\n"
-"Modifiers\n"
-"---------\n"
-"Each mapping may contain zero or more modifier records which associate\n"
-"hardware scan codes with modifier descriptions such as `shift', `control',\n"
-"`alternate', etc. The title `MODIFIERS' is printed along with the count of\n"
-"modifier records which follow. For each modifier record, the modifier's\n"
-"name is printed along with a list of scan codes, in hexadecimal format,\n"
-"which generate that modifier value. For example:\n"
-"\n"
-" MODIFIERS 4\n"
-" alternate: 0x1d 0x60\n"
-" control: 0x3a\n"
-" keypad: 0x52 0x53 ... 0x63 0x62\n"
-" shift: 0x2a 0x36\n"
-"\n"
-"Characters\n"
-"----------\n"
-"Each mapping may contain zero or more character records which associate\n"
-"hardware scan codes with the actual characters generated by those scan\n"
-"codes in the presence or absence of various modifier combinations. The\n"
-"title `CHARACTERS' is printed along with the count of character records\n"
-"which follow. Here is a highly abbreviated example:\n"
-"\n"
-" CHARACTERS 9\n"
-" scan 0x00: -AC-L \"a\" \"A\" \"^A\" \"^A\" ca c7 \"^A\" \"^A\"\n"
-" scan 0x07: -AC-L \"x\" \"X\" \"^X\" \"^X\" 01/b4 01/ce \"^X\" \"^X\"\n"
-" scan 0x0a: ---S- \"<\" \">\"\n"
-" scan 0x13: -ACS- \"2\" \"@\" \"^@\" \"^@\" b2 b3 \"^@\" \"^@\"\n"
-" scan 0x24: R---- \"^M\" \"^C\"\n"
-" scan 0x3e: ----- F4\n"
-" scan 0x4a: ----- page up\n"
-" scan 0x60: ----- {seq#3}\n"
-" scan 0x68: not-bound\n"
-"\n"
-"For each record, the hexadecimal value of the hardware scan code is\n"
-"printed, followed by a list of modifier flag combinations and the actual\n"
-"characters generated by this scan code with and without modifiers applied.\n"
-"\n"
-"The modifier flags field is composed of a combination of single letter\n"
-"representations of the various modifier types. The letters stand for:\n"
-"\n"
-" L - alpha-lock\n"
-" S - shift\n"
-" C - control\n"
-" A - alternate\n"
-" R - carriage-return\n"
-"\n"
-"As a special case, the `alpha-lock' flag also implies the `shift' flag, so\n"
-"these two flags never appear together in the same record.\n"
-"\n"
-"The combination of modifier flags determines the meaning and number of\n"
-"fields which follow. The first field after the modifier flags always\n"
-"represents the character that will be generated if no modifier keys are\n"
-"depressed. The remaining fields represent characters generated by the\n"
-"various modifier combinations. The order of the fields follows this\n"
-"general pattern:\n"
-"\n"
-" o The character generated by this scan code when no modifiers are in\n"
-" effect is listed first.\n"
-"\n"
-" o If the `L' or `S' flag is active, then the shifted character\n"
-" generated by this scan code is listed next.\n"
-"\n"
-" o If the `C' flag is active, then the control-character generated by\n"
-" this scan code is listed next. Furthermore, if the `L' or `S' flag\n"
-" is also active, then the shifted control-character is listed after\n"
-" that.\n"
-"\n"
-" o If the `A' flag is active, then the alternate-character generated by\n"
-" this scan code is listed next. Furthermore, if the `L' or `S' flag\n"
-" is active, then the shifted alternate-character is listed after that.\n"
-" If the `C' flag is also active, then the alternate-control-character\n"
-" is listed next. Finally, if the `C' and `L' or `C' and `S' flags are\n"
-" also active, then the shifted alternate-control-character is listed.\n"
-"\n"
-"The `R' flag does not actually refer to a modifier key. Instead, it is\n"
-"used to distinguish the scan code which is given the special\n"
-"pseudo-designation of `carriage return' key. Typically, this mask appears\n"
-"solo and only the two fields for control-M and control-C follow. This flag\n"
-"may be a throwback to an earlier time or may be specially interpreted by\n"
-"the low-level keyboard driver, but its purpose is otherwise enigmatic.\n"
-"\n"
-"Recalling the example from above, the following fields can be identified:\n"
-"\n"
-" scan 0x00: -AC-L \"a\" \"A\" \"^A\" \"^A\" ca c7 \"^A\" \"^A\"\n"
-"\n"
-" o Lower-case `a' is generated when no modifiers are active.\n"
-" o Upper-case `A' is generated when `shift' or `alpha-lock' are active.\n"
-" o Control-A is generated when `control' is active.\n"
-" o Control-A is generated when `control' and `shift' are active.\n"
-" o The character represented by the hexadecimal code 0xca is generated\n"
-" when `alternate' is active.\n"
-" o The character represented by 0xc7 is generated when `alternate' and\n"
-" `shift' (or `alpha-lock') are active.\n"
-" o Control-A is generated when `alternate' and `control' are active.\n"
-" o Control-A is generated when `alternate', `control' and `shift' (or\n"
-" `alpha-lock') are active.\n"
-"\n"
-"The notation used to represent a particular generated character varies.\n"
-"\n"
-" o Printable ASCII characters are quoted, as in \"x\" or \"X\".\n"
-"\n"
-" o Control-characters are quoted and prefixed with `^', as in \"^X\".\n"
-"\n"
-" o Characters with values greater than 127 (0x7f) are displayed as\n"
-" hexadecimal values without the `0x' prefix.\n"
-"\n"
-" o Characters in a non-ASCII character set (such as `Symbol') are\n"
-" displayed as two hexadecimal numbers separated by a slash, as in\n"
-" `01/4a'. The first number is the character set's identification code\n"
-" (such as `01' for the `Symbol' set), and the second number is the\n"
-" value of the generated character.\n"
-"\n"
-" o Non-printing special function characters are displayed with the\n"
-" function's common name enclosed in brackets, as in `page up' or\n"
-" `F4'.\n"
-"\n"
-" o If the binding represents a key sequence rather than a single\n"
-" character, then the sequence's identification number is enclosed in\n"
-" braces, as in `{seq#3}'.\n"
-"\n"
-"Recalling a few examples from above, the following interpretations can be\n"
-"made:\n"
-"\n"
-" scan 0x07: -AC-L \"x\" \"X\" \"^X\" \"^X\" 01/b4 01/ce \"^X\" \"^X\"\n"
-" scan 0x3e: ----- F4\n"
-" scan 0x4a: ----- page up\n"
-" scan 0x60: ----- {seq#3}\n"
-"\n"
-" o \"x\" and \"X\" are printable ASCII characters.\n"
-" o \"^X\" is a control-character.\n"
-" o `01/b4' and `01/ce' represent the character codes 0xb4 and 0xce in\n"
-" the `Symbol' character set.\n"
-" o Scan code 0x3e generates function-key `F4', and scan code 0x4a\n"
-" generates function-key `page up'.\n"
-" o Scan code 0x60 is bound to key sequence #3.\n"
-"\n"
-"Finally, if a scan code is not bound to any characters, then it is\n"
-"annotated with the label `not-bound', as with example scan code 0x68 from\n"
-"above.\n"
-"\n"
-"Sequences\n"
-"---------\n"
-"A scan code (modified and unmodified) can be bound to a key sequence rather\n"
-"than generating a single character or acting as a modifier. When it is\n"
-"bound to a key sequence, a series of character invocations and modifier\n"
-"actions are automatically generated rather than a single keystroke.\n"
-"\n"
-"Each mapping may contain zero or more key sequence records. The title\n"
-"`SEQUENCES' is printed along with the count of sequence records which\n"
-"follow. For example:\n"
-"\n"
-" SEQUENCES 3\n"
-" sequence 0: \"f\" \"o\" \"o\"\n"
-" sequence 1: {alternate} \"b\" \"a\" \"r\" {unmodify}\n"
-" sequence 2: home \"b\" \"a\" \"z\"\n"
-"\n"
-"The notation used to represent the sequence of generated characters is\n"
-"identical to the notation already described in the `Characters' section\n"
-"above, with the exception that modifier actions may be interposed between\n"
-"generated characters. Such modifier actions are represented by the\n"
-"modifier's name enclosed in braces. The special name `{unmodify}'\n"
-"indicates the release of the modifier keys.\n"
-"\n"
-"Thus, the sequences in the above example can be interpreted as follows:\n"
-"\n"
-" o Sequence #0 generates `foo'.\n"
-" o Sequence #1 invokes the `alternate' modifier, generates `bar', and\n"
-" then releases `alternate'.\n"
-" o Sequence #2 invokes the `home' key and then generates `baz'. In a\n"
-" text editor, this would probably result in `baz' being prepended to\n"
-" the line of text on which the cursor resides.\n"
-"\n"
-"Special Keys\n"
-"------------\n"
-"Certain keyboards feature keys which perform some type of special purpose\n"
-"function rather than generating a character or acting as a modifier. For\n"
-"instance, Apple keyboards often contain a `power' key, and NeXT keyboards\n"
-"have historically featured screen brightness and volume control keys.\n"
-"\n"
-"Each mapping may contain zero or more special-key records which associate\n"
-"hardware scan codes with such special purpose functions. The title\n"
-"`SPECIALS' is printed along with the count of records which follow. For\n"
-"each record, the special function's name is printed along with a list of\n"
-"scan codes, in hexadecimal format, which are bound to that function. For\n"
-"example:\n"
-"\n"
-" SPECIALS 6\n"
-" alpha-lock: 0x39\n"
-" brightness-down: 0x79\n"
-" brightness-up: 0x74\n"
-" power: 0x7f\n"
-" sound-down: 0x77\n"
-" sound-up: 0x73\n"
-"\n", f );
- }
-
-
-//-----------------------------------------------------------------------------
-// Print a summary of the various files and directories which are related to
-// key mappings.
-//-----------------------------------------------------------------------------
-static void print_files_info( FILE* f )
- {
- fputs(
-"This is a summary of the various files and directories which are related to\n"
-"key mappings.\n"
-"\n"
-"*.keymapping\n"
-" A key mapping file which precisely defines the relationship of all\n"
-" hardware-specific keyboard scan-codes with their associated\n"
-" functionality.\n"
-"\n"
-"*.keyboard\n"
-" A file describing the physical layout of keys on a particular type of\n"
-" keyboard. Each `key' token in this file defines the position and shape\n"
-" of the key on the keyboard, as well as the associated scan code which\n"
-" that key generates. A .keymapping file, on the other hand, defines the\n"
-" characters which are generated by a particular scan code depending upon\n"
-" the state of the various modifier keys (such as shift, control, etc.).\n"
-" The `interface' and `handler_id' values from a .keymapping file are\n"
-" matched against those in each .keyboard file in order to associate a\n"
-" particular .keyboard file with a key mapping. Various GUI programs use\n"
-" the .keyboard file to display a visual representation of a keyboard for\n"
-" the user. Since these files are just plain text, they can be easily\n"
-" viewed and interpreted without the aid of a specialized program, thus\n"
-" dumpkeymap leaves these files alone.\n"
-"\n"
-"/System/Library/Keyboards\n"
-"/Network/Library/Keyboards\n"
-"/Local/Library/Keyboards\n"
-"/Library/Keyboards\n"
-" Repositories for .keymapping and .keyboard files for MacOS/X, Darwin,\n"
-" and MacOS/X Server.\n"
-"\n"
-"/NextLibrary/Keyboards\n"
-"/LocalLibrary/Keyboards\n"
-" Repositories for .keymapping and .keyboard files for OpenStep and\n"
-" NextStep.\n"
-"\n"
-"$(HOME)/Library/Keyboards\n"
-" Repository for personal .keymapping and .keyboard files.\n"
-"\n", f );
- }
-
-
-//-----------------------------------------------------------------------------
-// Print a list of the various diagnostic messages which may be emitted.
-//-----------------------------------------------------------------------------
-static void print_diagnostics_info( FILE* f )
- {
- fputs(
-"The following diagnostic messages may be issued to the standard error\n"
-"stream.\n"
-"\n"
-"Unrecognized option.\n"
-" An unrecognized option was specified on the command-line. Invoke\n"
-" dumpkeymap with the --help option to view a list of valid options.\n"
-"\n"
-"Insufficient data in keymapping data stream.\n"
-" The key mapping file or data stream is corrupt. Either the file has\n"
-" been incorrectly truncated or a field, such as those which indicates\n"
-" the number of variable records which follow, contains a corrupt value.\n"
-"\n"
-"The following diagnostic messages have significance only when trying to\n"
-"print .keymapping files mentioned on the command-line.\n"
-"\n"
-"Bad magic number.\n"
-" The mentioned file is not a .keymapping file. The file's content does\n"
-" not start with the string `KYM1'.\n"
-"\n"
-"Unable to open key mapping file.\n"
-" The call to fopen() failed; probably because the specified path is\n"
-" invalid or dumpkeymap does not have permission to read the file.\n"
-"\n"
-"Unable to determine key mapping file size.\n"
-" The call to fstat() failed, thus memory can not be allocated for\n"
-" loading the file.\n"
-"\n"
-"Unable to read key mapping file.\n"
-" The call to fread() failed.\n"
-"\n"
-"The following diagnostic messages have significance only when trying to\n"
-"print the currently active key mapping when no .keymapping files have been\n"
-"mentioned on the command-line.\n"
-"\n"
-"Unable to open event status driver.\n"
-" The call to NXOpenEventStatus() failed.\n"
-"\n"
-"Bad key mapping length.\n"
-" The call to NXKeyMappingLength() returned a bogus value.\n"
-"\n"
-"Unable to get current key mapping.\n"
-" The call to NXGetKeyMapping() failed.\n"
-"\n"
-"The following diagnostic messages have significance only when using\n"
-"dumpkeymap on a non-Apple/NeXT platform.\n"
-"\n"
-"Must specify at least one .keymapping file.\n"
-" No .keymapping files were mentioned on the command-line. On\n"
-" non-Apple/NeXT platforms, there is no concept of a currently active\n"
-" .keymapping file, so at least one file must be mentioned on the\n"
-" command-line.\n"
-"\n", f );
- }
-
-
-//-----------------------------------------------------------------------------
-// Print warranty.
-//-----------------------------------------------------------------------------
-static void print_warranty( FILE* f )
- {
- fputs(
-"This software is provided by the author `AS IS' and any express or implied\n"
-"WARRANTIES, including, but not limited to, the implied warranties of\n"
-"MERCHANTABILITY and FITNESS FOR A PARTICULAR PURPOSE are DISCLAIMED. In NO\n"
-"EVENT shall the author be LIABLE for any DIRECT, INDIRECT, INCIDENTAL,\n"
-"SPECIAL, EXEMPLARY, or CONSEQUENTIAL damages (including, but not limited\n"
-"to, procurement of substitute goods or services; loss of use, data, or\n"
-"profits; or business interruption) however caused and on any theory of\n"
-"liability, whether in contract, strict liability, or tort (including\n"
-"negligence or otherwise) arising in any way out of the use of this\n"
-"software, even if advised of the possibility of such damage.\n"
-"\n", f );
- }
-
-
-//-----------------------------------------------------------------------------
-// Print this program's version number.
-//-----------------------------------------------------------------------------
-static void print_version( FILE* f )
- {
- fputs( "Version " PROG_VERSION " (built " __DATE__ ")\n\n", f );
- }
-
-
-//-----------------------------------------------------------------------------
-// Print a usage summary.
-//-----------------------------------------------------------------------------
-static void print_usage( FILE* f )
- {
- fputs(
-"Usage: dumpkeymap options - file ...\n"
-"\n"
-"Prints a textual representation of each Apple/NeXT .keymapping file\n"
-"mentioned on the command-line. If no files are mentioned and if the local\n"
-"machine is an Apple or NeXT installation, then the key mapping currently in\n"
-"use by the WindowServer and the AppKit is printed instead.\n"
-"\n"
-"Options:\n"
-" -h --help\n"
-" Display general program instructions and option summary.\n"
-"\n"
-" -k --help-keymapping\n"
-" Display a detailed description of the internal layout of a\n"
-" .keymapping file.\n"
-"\n"
-" -o --help-output\n"
-" Display an explanation of the output generated by dumpkeymap when\n"
-" dissecting a .keymapping file.\n"
-"\n"
-" -f --help-files\n"
-" Display a summary of the various files and directories which are\n"
-" related to key mappings.\n"
-"\n"
-" -d --help-diagnostics\n"
-" Display a list of the various diagnostic messages which may be\n"
-" emitted by dumpkeymap.\n"
-"\n"
-" -v --version\n"
-" Display the dumpkeymap version number and warranty information.\n"
-"\n"
-" - --\n"
-" Inhibit processing of options at this point in the argument list.\n"
-" An occurrence of `-' or `--' in the argument list causes all\n"
-" following arguments to be treated as file names even if an argument\n"
-" begins with a `-' character.\n"
-"\n", f );
- }
-
-
-//-----------------------------------------------------------------------------
-// Print an informational banner.
-//-----------------------------------------------------------------------------
-static void print_banner( FILE* f )
- {
- fputs( "\n" PROG_NAME " v" PROG_VERSION " by " AUTHOR_INFO "\n"
-	COPYRIGHT "\n\n", f );
- }
-
-
-//-----------------------------------------------------------------------------
-// Process command-line arguments. Examine options first; collecting files
-// along the way. If all is well, process collected file list.
-//-----------------------------------------------------------------------------
-int main( int const argc, char const* const argv )
- {
- int rc = 0, i, nfiles = 0, more_options = 1, process_files = 1;
- int* files = (int*)calloc( argc - 1, sizeof(int) );
- print_banner( stdout );
-
- for (i = 1; i < argc; i++)
-	{
-	char const* const s = argvi;
-	if (!more_options || *s != '-')
-	 files nfiles++ = i;
-	else
-	 {
-	 OPT_SWITCH(s)
-		OPT_CASE(-,--)
-		 more_options = 0;
-		OPT_CASE(-h,--help)
-		 print_usage( stdout );
-		 process_files = 0;
-		OPT_CASE(-k,--help-keymapping)
-		 print_internal_layout_info( stdout );
-		 process_files = 0;
-		OPT_CASE(-o,--help-output)
-		 print_output_info( stdout );
-		 process_files = 0;
-		OPT_CASE(-f,--help-files)
-		 print_files_info( stdout );
-		 process_files = 0;
-		OPT_CASE(-d,--help-diagnostics)
-		 print_diagnostics_info( stdout );
-		 process_files = 0;
-		OPT_CASE(-v,--version)
-		 print_version( stdout );
-		 print_warranty( stdout );
-		 process_files = 0;
-		OPT_DEFAULT
-		 fprintf( stderr, "ERROR: Unrecognized option: %s\n\n", s );
-		 process_files = 0;
-		 rc = 1;
-	 OPT_SWITCH_END
-	 }
-	}
-
- if (process_files)
-	{
-	if (nfiles == 0)
-	 rc = handle_empty_document_list();
-	else
-	 for (i = 0; i < nfiles; i++)
-		rc |= unparse_keymap_file( argvfilesi );
-	}
-
- free( files );
- return rc;
- }

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/utils/dumpkeymap.man Deleted

@@ -1,1004 +0,0 @@
-.ig
-//=============================================================================
-//
-// Manual page for `dumpkeymap'.
-//
-// Copyright (C) 1999,2000 by Eric Sunshine <sunshine@sunshineco.com>
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// 2. Redistributions in binary form must reproduce the above copyright
-// notice, this list of conditions and the following disclaimer in the
-// documentation and/or other materials provided with the distribution.
-// 3. The name of the author may not be used to endorse or promote products
-// derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
-// WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
-// EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-// OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-// OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-//=============================================================================
-//
-// $XFree86: xc/programs/Xserver/hw/darwin/utils/dumpkeymap.man,v 1.2 2000/12/05 21:18:34 dawes Exp $
-//
-..
-.ig
-//-----------------------------------------------------------------------------
-// Local identification information.
-//-----------------------------------------------------------------------------
-..
-.nr VE 4 \" Version number
-.TH DUMPKEYMAP 1 "v\n(VE \-\- 1 December 2000" "Version \n(VE"
-.de UP
-1 December 2000
-..
-.ig
-//-----------------------------------------------------------------------------
-// Annotation Macros
-// -----------------
-//	Facilitate creation of annotated, non-filled blocks of text. An
-//	annotated block is initiated with the `AS' macro. Each annotated,
-//	non-filled line within the block must be introduced with the `AN' macro
-//	which takes three arguments. The first argument is the detail text to
-//	be annotated. The second is a string of spaces used to align the
-//	annotations by certain (broken) roff interpreters which fail to
-//	implement the proper set of roff commands (such as diversions,
-//	indentation, and tab stops). It is assumed that the spaces will be
-//	used with fixed-point font. The third argument is the annotation
-//	itself. The block should be terminated with the `AE' macro. For all
-//	roff interpreters which properly implement diversions, indentation, and
-//	tab stops, all annotations within the block are automatically aligned at
-//	the same horizontal position. This position is guaranteed to be just
-//	to the right of the widest `AN' detail line. For broken roff
-//	interpreters, such as `rman', the string of spaces from the second
-//	argument are used to align the annotations. Finally, the `AZ' macro,
-//	which takes a single argument, can be used to to insert a non-annotated
-//	line into the block which does not play a part in the calculation of
-//	the horizontal annotation alignment.
-//
-// Implementation Notes
-// --------------------
-// *1*	These macros utilize a diversion (named `AD'). Since the prevailing
-//	indentation is stored along with the diverted text, we must muck with
-//	the indentation level in order to prevent the indentation from being
-//	applied to the text a second time when `AD' is finally emitted.
-//
-// *2*	Unfortunately, `.if' strips leading whitespace from following text, so
-//	`AN' uses \& to preserve the whitespace.
-//
-// *3*	This manual page has been tested for proper formatting with troff,
-//	groff, nroff and rman (the `man' to `HTML' converter). Unfortunately,
-//	rman fails to implement many useful features such as diversions,
-//	indentation, and tab stops, and is also hideously buggy. Furthermore
-//	it identifies itself as nroff and fails to provide any further
-//	identification, so there is no way to create macros which specifically
-//	work around its limitations. Following is a list of several bugs in
-//	rman which the implementation of these macros must avoid:
-//	 o Fails with multi-line conditionals within macros.
-//	 o Fails on macro definition within multi-line conditionals.
-//	 o Fails when macro arguments are not delimited by exactly 1 space.
-//	 o String definition `.ds' ignores the value; uses empty "" instead.
-//	As a consequence of these problems, the following macros are written
-//	using a series of ugly single-line `.if' conditionals rather than the
-//	more natural multi-line `.if' and `.ie' conditionals. Also, rman fails
-//	to understand the common idiom of `.\"' to introduce a comment, which
-//	is why all comments in this file are wrapped in ignore `.ig' blocks.
-//-----------------------------------------------------------------------------
-..
-.de AS
-.if t .nr AW 0
-.if t .nr AI \\n(.i
-.if t .in -\\n(AI
-.nf
-..
-.de AN
-.if t .if \w'\\$1'>\\n(AW .nr AW \w'\\$1'
-.if t .da AD
-.if t \\&\\$1\\t\\$3
-.if t .da
-.if n \\&\\$1 \\$2\\$3
-..
-.de AZ
-.if t .da AD
-\\$1
-.if t .da
-..
-.de AE
-.if t .in +\\n(AIu
-.if t .if \\n(AW .ta \\n(AWu+\w'\\(em'u
-.if t .AD
-.if t .DT
-.if t .rm AD
-.if t .rm AW
-.fi
-..
-.ig
-//-----------------------------------------------------------------------------
-// Bulleted list macros -- `BG' begins a bulleted list; `BU' delimits
-//	bulleted entries; `BE' ends a bulleted list.
-//-----------------------------------------------------------------------------
-..
-.de BG
-.PP
-.RS
-..
-.de BU
-.HP
-\\(bu\\ \\c
-..
-.de BE
-.RE
-.PP
-..
-.ig
-//-----------------------------------------------------------------------------
-// Indented paragraph with stylized hanging tag macro. `TG' takes a single
-//	argument and treats it as the hanging tag of the indented paragraph.
-//	The tag is italicized in troff but not in nroff.
-//-----------------------------------------------------------------------------
-..
-.de TG
-.TP
-.ie t .I "\\$1"
-.el \\$1
-..
-.ig
-//-----------------------------------------------------------------------------
-// Manual page for `dumpkeymap'.
-//-----------------------------------------------------------------------------
-..
-.SH NAME
-dumpkeymap \- Diagnostic dump of a .keymapping file
-.SH SYNOPSIS
-.B dumpkeymap
-.RI options " - " file "..."
-.SH DESCRIPTION
-.I dumpkeymap
-prints a textual representation of each Apple/\c
-.SM NeXT
-.I .keymapping
-file mentioned on the command-line. If no files are mentioned and if the
-local machine is an Apple or
-.SM NeXT
-installation, then the key mapping currently in use by the WindowServer and the
-AppKit is printed instead.
-.SH OPTIONS
-.TP
-.B "\-h \-\^\-help"
-Display general program instructions and option summary.
-.TP
-.B "\-k \-\^\-help\-keymapping"
-Display a detailed description of the internal layout of a
-.I .keymapping
-file. This is the same information as that presented in the
-.I "Key Mapping Description"
-section of this document.
-.TP
-.B "\-o \-\^\-help\-output"
-Display an explanation of the output generated by
-.I dumpkeymap
-when dissecting a
-.I .keymapping
-file. This is the same information as that presented in the
-.I "Output Description"
-section of this document.
-.TP
-.B "\-f \-\^\-help\-files"
-Display a summary of the various files and directories which are related to
-key mappings. This is the same information as that presented in the
-.I "Files"
-section of this document.
-.TP
-.B "\-d \-\^\-help\-diagnostics"
-Display a list of the various diagnostic messages which may be emitted by
-.I dumpkeymap.
-This is the same information as that presented in the
-.I "Diagnostics"
-section of this document.
-.TP
-.B "\-v \-\^\-version"
-Display the
-.I dumpkeymap
-version number and warranty information.
-.TP
-.B "\- \-\^\-"
-Inhibit processing of options at this point in the argument list. An
-occurrence of `\-' or `\-\^\-' in the argument list causes all following
-arguments to be treated as file names even if an argument begins with a `\-'
-character.
-.SH "KEY MAPPING DESCRIPTION"
-The following sections describe, in complete detail, the format of a raw key
-mapping resource, as well as the format of the
-.I .keymapping
-file which encapsulates one or more raw mappings.
-.SH "Types and Data"
-The following type definitions are employed throughout this discussion:
-.PP
-.RS
-.AS
-.AZ "typedef unsigned char byte;"
-.AZ "typedef unsigned short word;"
-.AZ "typedef unsigned long dword;"
-.AE
-.RE
-.PP
-Additionally, the type definition
-.RI ` number '
-is used generically to
-indicate a numeric value. The actual size of the
-.RI ` number '
-type may be one or two bytes depending upon how the data is stored in the key
-map. Although most key maps use byte-sized numeric values, word-sized values
-are also allowed.
-.PP
-Multi-byte values in a key mapping file are stored in big-endian byte order.
-.SH "Key Mapping File and Device Mapping"
-A key mapping file begins with a magic-number and continues with a
-variable number of device-specific key mappings.
-.PP
-.RS
-.AS
-.AZ "struct KeyMappingFile {"
-.AN " char magic_number4;" " " "// `KYM1'"
-.AN " DeviceMapping maps...;" "" "// Variable number of maps"
-.AZ };
-.AE
-.PP
-.AS
-.AZ "struct DeviceMapping {"
-.AN " dword interface;" " " "// Interface type"
-.AN " dword handler_id;" "" "// Interface subtype"
-.AN " dword map_size;" " " "// Byte count of `map' (below)"
-.AN " KeyMapping map;"
-.AZ };
-.AE
-.RE
-.PP
-The value of `interface' represents a family of keyboard device types
-(such as Intel
-.SM "PC, ADB, NeXT,"
-Sun Type5, etc.), and is generally specified as one of the constant values
-.SM "NX_EVS_DEVICE_INTERFACE_ADB, NX_EVS_DEVICE_INTERFACE_ACE,"
-etc., which are are defined in IOHIDTypes.h on MacOS/X and Darwin, and in
-ev_types.h on MacOS/X Server, OpenStep, and NextStep.
-.PP
-The value of `handler_id' represents a specific keyboard layout within the
-much broader `interface' family. For instance, for a 101-key Intel
-.SM PC
-keyboard (of type
-.SM NX_EVS_DEVICE_INTERFACE_ACE\c
-) the `handler_id' is '0', whereas for a 102-key keyboard it is `1'.
-.PP
-Together, `interface' and `handler_id' identify the exact keyboard hardware to
-which this mapping applies. Programs which display a visual representation of
-a keyboard layout, match `interface' and `handler_id' from the
-.I .keymapping
-file against the `interface' and `handler_id' values found in each
-.I .keyboard
-file.
-.SH "Key Mapping"
-A key mapping completely defines the relationship of all scan codes with their
-associated functionality. A
-.I KeyMapping
-structure is embedded within the
-.I DeviceMapping
-structure in a
-.IR KeyMappingFile .
-The key mapping currently in use by the WindowServer and AppKit is also
-represented by a
-.I KeyMapping
-structure, and can be referred to directly by calling NXGetKeyMapping() and
-accessing the `mapping' data member of the returned
-.I NXKeyMapping
-structure.
-.PP
-.RS
-.AS
-.AZ "struct KeyMapping {"
-.AN " word number_size;" " " "// 0=1 byte, non-zero=2 bytes"
-.AN " number num_modifier_groups;" "" "// Modifier groups"
-.AZ " ModifierGroup modifier_groups...;"
-.AN " number num_scan_codes;" " " "// Scan groups"
-.AN " ScanGroup scan_table...;"
-.AN " number num_sequence_lists;" " " "// Sequence lists"
-.AN " Sequence sequence_lists...;"
-.AN " number num_special_keys;" " " "// Special keys"
-.AN " SpecialKey special_key...;"
-.AZ };
-.AE
-.RE
-.PP
-The `number_size' flag determines the size, in bytes, of all remaining numeric
-values (denoted by the type definition
-.RI ` number ')
-within the
-key mapping. If its value is zero, then numbers are represented by a single
-byte. If it is non-zero, then numbers are represented by a word (two bytes).
-.SH "Modifier Group"
-A modifier group defines all scan codes which map to a particular type of
-modifier, such as
-.IR shift ,
-.IR control ,
-etc.
-.PP
-.RS
-.AS
-.AZ "enum Modifier {"
-.AZ " ALPHALOCK = 0,"
-.AZ " SHIFT,"
-.AZ " CONTROL,"
-.AZ " ALTERNATE,"
-.AZ " COMMAND,"
-.AZ " KEYPAD,"
-.AZ " HELP"
-.AZ };
-.AE
-.PP
-.AS
-.AZ "struct ModifierGroup {"
-.AN " number modifier;" " " "// A Modifier constant"
-.AN " number num_scan_codes;"
-.AN " number scan_codes...;" "" "// Variable number of scan codes"
-.AZ };
-.AE
-.RE
-.PP
-The scan_codes array contains a list of all scan codes which map to the
-specified modifier. The
-.IR shift ", " command ", and " alternate
-modifiers are frequently mapped to two different scan codes, apiece,
-since these modifiers often appear on both the left and right sides of
-the keyboard.
-.SH "Scan Group"
-There is one
-.I ScanGroup
-for each scan code generated by the given keyboard. This number is given by
-KeyMapping::num_scan_codes. The first scan group represents hardware scan
-code 0, the second represents scan code 1, etc.
-.PP
-.RS
-.AS
-.AZ "enum ModifierMask {"
-.AN " ALPHALOCK_MASK" " " "= 1 << 0,"
-.AN " SHIFT_MASK" " " "= 1 << 1,"
-.AN " CONTROL_MASK" " " "= 1 << 2,"
-.AN " ALTERNATE_MASK" " " "= 1 << 3,"
-.AN " CARRIAGE_RETURN_MASK" "" "= 1 << 4"
-.AZ };
-.AZ "#define NOT_BOUND 0xff"
-.AE
-.PP
-.AS
-.AZ "struct ScanGroup {"
-.AN " number mask;"
-.AN " Character characters...;"
-.AZ };
-.AE
-.RE
-.PP
-For each scan code, `mask' defines which modifier combinations generate
-characters. If `mask' is
-.SM NOT_BOUND
-(0xff) then then this scan code does not generate any characters ever, and its
-characters array is zero length. Otherwise, the characters array contains
-one
-.I Character
-record for each modifier combination.
-.PP
-The number of records in characters is determined by computing (1 <<
-bits_set_in_mask). In other words, if mask is zero, then zero bits are set,
-so characters contains only one record. If `mask' is
-.SM "(SHIFT_MASK | CONTROL_MASK),"
-then two bits are set, so characters contains four records.
-.PP
-The first record always represents the character which is generated by that
-key when no modifiers are active. The remaining records represent characters
-generated by the various modifier combinations. Using the example with the
-.I shift
-and
-.I control
-masks set, record two would represent the character with the
-.I shift
-modifier active; record three, the
-.I control
-modifier active; and record four, both the
-.I shift
-and
-.I control
-modifiers active.
-.PP
-As a special case,
-.SM ALPHALOCK_MASK
-implies
-.SM SHIFT_MASK,
-though only
-.SM ALPHALOCK_MASK
-appears in `mask'. In this case the same character is generated for both the
-.I shift
-and
-.I alpha-lock
-modifiers, but only needs to appear once in the characters array.
-.PP
-.SM CARRIAGE_RETURN_MASK
-does not actually refer to a modifier key. Instead, it is used to
-distinguish the scan code which is given the special pseudo-designation of
-.I "carriage return"
-key. Typically, this mask appears solo in a
-.I ScanGroup
-record and only the two
-.I Character
-records for control-M and control-C follow. This flag may be a throwback to
-an earlier time or may be specially interpreted by the low-level keyboard
-driver, but its purpose is otherwise enigmatic.
-.SH Character
-Each
-.I Character
-record indicates the character generated when this key is pressed, as well as
-the character set which contains the character. Well known character sets are
-.SM `ASCII'
-and `Symbol'. The character set can also be one of the meta values
-.SM FUNCTION_KEY
-or
-.SM KEY_SEQUENCE.
-If it is
-.SM FUNCTION_KEY
-then `char_code' represents a generally well-known function key such as those
-enumerated by
-.I FunctionKey.
-If the character set is
-.SM KEY_SEQUENCE
-then `char_code' represents is a zero-base index into
-KeyMapping::sequence_lists.
-.PP
-.RS
-.AS
-.AZ "enum CharacterSet {"
-.AN " ASCII" " " "= 0x00,"
-.AN " SYMBOL" " " "= 0x01,"
-.AN " ..."
-.AN " FUNCTION_KEY" "" "= 0xfe,"
-.AN " KEY_SEQUENCE" "" "= 0xff"
-.AZ };
-.AE
-.PP
-.AS
-.AZ "struct Character {"
-.AN " number set;" " " "// CharacterSet of generated character"
-.AN " number char_code;" "" "// Actual character generated"
-.AZ };
-.AE
-.PP
-.AS
-.AZ "enum FunctionKey {"
-.AZ " F1 = 0x20, F2, F3, F4, F5, F6, F7, F8, F9, F10, F11, F12,"
-.AZ " INSERT, DELETE, HOME, END, PAGE_UP, PAGE_DOWN, PRINT_SCREEN,"
-.AZ " SCROLL_LOCK, PAUSE, SYS_REQUEST, BREAK, RESET, STOP, MENU,"
-.AZ " USER, SYSTEM, PRINT, CLEAR_LINE, CLEAR_DISPLAY, INSERT_LINE,"
-.AZ " DELETE_LINE, INSERT_CHAR, DELETE_CHAR, PREV, NEXT, SELECT"
-.AZ };
-.AE
-.RE
-.SH Sequence
-When Character::set contains the meta value
-.SM KEY_SEQUENCE,
-the scan code is bound to a sequence of keys rather than a single character.
-A sequence is a series of modifiers and characters which are automatically
-generated when the associated key is depressed.
-.PP
-.RS
-.AS
-.AZ "#define MODIFIER_KEY 0xff"
-.AE
-.PP
-.AS
-.AZ "struct Sequence {"
-.AN " number num_chars;"
-.AN " Character characters...;"
-.AZ };
-.AE
-.RE
-.PP
-Each generated
-.I Character
-is represented as previously described, with the exception that
-.SM MODIFIER_KEY
-may appear in place of
-.SM KEY_SEQUENCE.
-When the value of Character::set is
-.SM MODIFIER_KEY
-then Character::char_code represents a modifier key rather than an actual
-character. If the modifier represented by `char_code' is non-zero, then it
-indicates that the associated modifier key has been depressed. In this case,
-the value is one of the constants enumerated by
-.I Modifier
-(\c
-.SM "SHIFT, CONTROL, ALTERNATE,"
-etc.). If the value is zero then it means that the modifier keys have been
-released.
-.SH "Special Key"
-A special key is one which is scanned directly by the Mach kernel rather than
-by the WindowServer. In general, events are not generated for special keys.
-.PP
-.RS
-.AS
-.AZ "enum SpecialKeyType {"
-.AZ " VOLUME_UP = 0,"
-.AZ " VOLUME_DOWN,"
-.AZ " BRIGHTNESS_UP,"
-.AZ " BRIGHTNESS_DOWN,"
-.AZ " ALPHA_LOCK,"
-.AZ " HELP,"
-.AZ " POWER,"
-.AZ " SECONDARY_ARROW_UP,"
-.AZ " SECONDARY_ARROW_DOWN"
-.AZ };
-.AE
-.PP
-.AS
-.AZ "struct SpecialKey {"
-.AN " number type;" " " "// A SpecialKeyType constant"
-.AN " number scan_code;" "" "// Actual scan code"
-.AZ };
-.AE
-.RE
-.SH OUTPUT
-What follows is an explanation and description of the various pieces of
-information emitted by
-.I dumpkeymap.
-.PP
-For a more thorough discussion of any particular piece of information described
-here, refer to the detailed description of the internal layout of a key mapping
-provided by the
-.I "Key Mapping Description"
-section above.
-.SH Conventions
-Depending upon context, some numeric values are displayed in decimal
-notation, whereas others are displayed in hexadecimal notation.
-Hexadecimal numbers are denoted by a `0x' prefix (for instance, `0x7b'),
-except when explicitly noted otherwise.
-.SH "Key Mapping Source"
-The first piece of information presented about a particular key mapping is the
-source from which the data was gleaned. For a
-.I .keymapping
-file, the title
-.SM "`KEYMAP FILE'"
-is emitted along with the path and name of the file in question. For the key
-mapping currently in use by the WindowServer and AppKit, the title
-.SM "`ACTIVE KEYMAP'"
-is emitted instead.
-.SH "Device Information"
-Each
-.I .keymapping
-file may contain one or more raw key mappings. For example, a file which maps
-keys to a Dvorak-style layout might contain raw mappings for Intel
-.SM "PC, ADB, NeXT,"
-and Sun Type5 keyboards.
-.PP
-For each raw mapping, the following information is emitted:
-.BG
-.BU
-The title
-.SM `KEYMAP'
-along with the mapping's relative position in the
-.I .keymapping
-file.
-.BU
-The `interface' identifier.
-.BU
-The `handler_id' sub-identifier.
-.BU
-The size of the raw mapping resource counted in bytes.
-.BE
-The `interface' and `handler_id' values, taken together, define a specific
-keyboard device. A
-.I .keyboard
-file, which describes the visual layout of a keyboard, also contains
-`interface' and `handler_id' identifiers. The
-.I .keyboard
-file corresponding to a particular key mapping can be found by matching the
-`interface' and `handler_id' values from each resource.
-.SH Modifiers
-Each mapping may contain zero or more modifier records which associate hardware
-scan codes with modifier descriptions such as
-.I "shift, control, alternate,"
-etc. The title
-.SM `MODIFIERS'
-is printed along with the count of modifier records which follow. For each
-modifier record, the modifier's name is printed along with a list of scan
-codes, in hexadecimal format, which generate that modifier value. For example:
-.PP
-.RS
-.nf
-MODIFIERS 4
-alternate: 0x1d 0x60
-control: 0x3a
-keypad: 0x52 0x53 ... 0x63 0x62
-shift: 0x2a 0x36
-.fi
-.RE
-.SH Characters
-Each mapping may contain zero or more character records which associate
-hardware scan codes with the actual characters generated by those scan
-codes in the presence or absence of various modifier combinations. The
-title
-.SM `CHARACTERS'
-is printed along with the count of character records which follow. Here is a
-highly abbreviated example:
-.PP
-.RS
-.nf
-CHARACTERS 9
-scan 0x00: -AC-L "a" "A" "^A" "^A" ca c7 "^A" "^A"
-scan 0x07: -AC-L "x" "X" "^X" "^X" 01/b4 01/ce "^X" "^X"
-scan 0x0a: ---S- "<" ">"
-scan 0x13: -ACS- "2" "@" "^@" "^@" b2 b3 "^@" "^@"
-scan 0x24: R---- "^M" "^C"
-scan 0x3e: ----- F4
-scan 0x4a: ----- page up
-scan 0x60: ----- {seq#3}
-scan 0x68: not-bound
-.fi
-.RE
-.PP
-For each record, the hexadecimal value of the hardware scan code is printed,
-followed by a list of modifier flag combinations and the actual characters
-generated by this scan code with and without modifiers applied.
-.PP
-The modifier flags field is composed of a combination of single letter
-representations of the various modifier types. The letters stand for:
-.PP
-.RS
-.nf
-L \- alpha-lock
-S \- shift
-C \- control
-A \- alternate
-R \- carriage-return
-.fi
-.RE
-.PP
-As a special case, the
-.I alpha-lock
-flag also implies the
-.I shift
-flag, so these two flags never appear together in the same record.
-.PP
-The combination of modifier flags determines the meaning and number of fields
-which follow. The first field after the modifier flags always represents the
-character that will be generated if no modifier keys are depressed. The
-remaining fields represent characters generated by the various modifier
-combinations. The order of the fields follows this general pattern:
-.BG
-.BU
-The character generated by this scan code when no modifiers are in effect is
-listed first.
-.BU
-If the `L' or `S' flag is active, then the shifted character generated by this
-scan code is listed next.
-.BU
-If the `C' flag is active, then the control-character generated by this scan
-code is listed next. Furthermore, if the `L' or `S' flag is also active, then
-the shifted control-character is listed after that.
-.BU
-If the `A' flag is active, then the alternate-character generated by this scan
-code is listed next. Furthermore, if the `L' or `S' flag is active, then the
-shifted alternate-character is listed after that. If the `C' flag is also
-active, then the alternate-control-character is listed next. Finally, if the
-`C' and `L' or `C' and `S' flags are also active, then the shifted
-alternate-control-character is listed.
-.BE
-The `R' flag does not actually refer to a modifier key. Instead, it is used to
-distinguish the scan code which is given the special pseudo-designation of
-.I "carriage return"
-key. Typically, this mask appears solo and only the two fields for control-M
-and control-C follow. This flag may be a throwback to an earlier time or may
-be specially interpreted by the low-level keyboard driver, but its purpose is
-otherwise enigmatic.
-.PP
-Recalling the example from above, the following fields can be identified:
-.PP
-.RS
-.nf
-scan 0x00: -AC-L "a" "A" "^A" "^A" ca c7 "^A" "^A"
-.fi
-.RE
-.BG
-.BU
-Lower-case `a' is generated when no modifiers are active.
-.BU
-Upper-case `A' is generated when
-.IR shift " or " alpha-lock
-are active.
-.BU
-Control-A is generated when
-.I control
-is active.
-.BU
-Control-A is generated when
-.IR control " and " shift
-are active.
-.BU
-The character represented by the hexadecimal code 0xca is generated when
-.I alternate
-is active.
-.BU
-The character represented by 0xc7 is generated when
-.IR alternate " and " shift " (or " alpha-lock ") are active."
-.BU
-Control-A is generated when
-.IR alternate " and " control
-are active.
-.BU
-Control-A is generated when
-.IR "alternate, control" " and " shift " (or " alpha-lock ") are active."
-.BE
-The notation used to represent a particular generated character varies.
-.BG
-.BU
-Printable
-.SM ASCII
-characters are quoted, as in "x" or "X".
-.BU
-Control-characters are quoted and prefixed with `^', as in "^X".
-.BU
-Characters with values greater than 127 (0x7f) are displayed as hexadecimal
-values without the `0x' prefix.
-.BU
-Characters in a non-\c
-.SM ASCII
-character set (such as `Symbol') are displayed as two hexadecimal numbers
-separated by a slash, as in `01/4a'. The first number is the character set's
-identification code (such as `01' for the `Symbol' set), and the second number
-is the value of the generated character.
-.BU
-Non-printing special function characters are displayed with the function's
-common name enclosed in brackets, as in `page up' or `F4'.
-.BU
-If the binding represents a key sequence rather than a single character, then
-the sequence's identification number is enclosed in braces, as in `{seq#3}'.
-.BE
-Recalling a few examples from above, the following interpretations can be made:
-.PP
-.RS
-.nf
-scan 0x07: -AC-L "x" "X" "^X" "^X" 01/b4 01/ce "^X" "^X"
-scan 0x3e: ----- F4
-scan 0x4a: ----- page up
-scan 0x60: ----- {seq#3}
-.fi
-.RE
-.BG
-.BU
-"x" and "X" are printable
-.SM ASCII
-characters.
-.BU
-"^X" is a control-character.
-.BU
-`01/b4' and `01/ce' represent the character codes 0xb4 and 0xce in the `Symbol'
-character set.
-.BU
-Scan code 0x3e generates function-key `F4', and scan code 0x4a generates
-function-key `page up'.
-.BU
-Scan code 0x60 is bound to key sequence #3.
-.BE
-Finally, if a scan code is not bound to any characters, then it is annotated
-with the label `not-bound', as with example scan code 0x68 from above.
-.SH Sequences
-A scan code (modified and unmodified) can be bound to a key sequence rather
-than generating a single character or acting as a modifier. When it is bound
-to a key sequence, a series of character invocations and modifier actions are
-automatically generated rather than a single keystroke.
-.PP
-Each mapping may contain zero or more key sequence records. The title
-.SM `SEQUENCES'
-is printed along with the count of sequence records which follow. For example:
-.PP
-.RS
-.nf
-SEQUENCES 3
-sequence 0: "f" "o" "o"
-sequence 1: {alternate} "b" "a" "r" {unmodify}
-sequence 2: home "b" "a" "z"
-.fi
-.RE
-.PP
-The notation used to represent the sequence of generated characters is
-identical to the notation already described in the
-.I Characters
-section above, with the exception that modifier actions may be interposed
-between generated characters. Such modifier actions are represented by the
-modifier's name enclosed in braces. The special name `{unmodify}' indicates
-the release of the modifier keys.
-.PP
-Thus, the sequences in the above example can be interpreted as follows:
-.BG
-.BU
-Sequence\ #0 generates `foo'.
-.BU
-Sequence\ #1 invokes the
-.I alternate
-modifier, generates `bar', and then releases
-.I alternate.
-.BU
-Sequence\ #2 invokes the
-.I home
-key and then generates `baz'. In a text editor, this would probably result in
-`baz' being prepended to the line of text on which the cursor resides.
-.BE
-.SH Special Keys
-Certain keyboards feature keys which perform some type of special purpose
-function rather than generating a character or acting as a modifier. For
-instance, Apple keyboards often contain a
-.I power
-key, and
-.SM NeXT
-keyboards have historically featured screen brightness and volume control keys.
-.PP
-Each mapping may contain zero or more special-key records which associate
-hardware scan codes with such special purpose functions. The title
-.SM `SPECIALS'
-is printed along with the count of records which follow. For each record, the
-special function's name is printed along with a list of scan codes, in
-hexadecimal format, which are bound to that function. For example:
-.PP
-.RS
-.nf
-SPECIALS 6
-alpha-lock: 0x39
-brightness-down: 0x79
-brightness-up: 0x74
-power: 0x7f
-sound-down: 0x77
-sound-up: 0x73
-.fi
-.RE
-.SH FILES
-.IP *.keymapping
-A key mapping file which precisely defines the relationship of all
-hardware-specific keyboard scan-codes with their associated functionality.
-.IP *.keyboard
-A file describing the physical layout of keys on a particular type of
-keyboard. Each `key' token in this file defines the position and shape of the
-key on the keyboard, as well as the associated scan code which that key
-generates. A
-.I .keymapping
-file, on the other hand, defines the characters which are generated by a
-particular scan code depending upon the state of the various modifier keys
-(such as
-.I shift,
-.I control,
-etc.). The `interface' and `handler_id' values from a
-.I .keymapping
-file are matched against those in each
-.I .keyboard
-file in order to associate a particular
-.I .keyboard
-file with a key mapping. Various
-.SM GUI
-programs use the
-.I .keyboard
-file to display a visual representation of a keyboard for the user. Since
-these files are just plain text, they can be easily viewed and interpreted
-without the aid of a specialized program, thus
-.I dumpkeymap
-leaves these files alone.
-.PP
-/System/Library/Keyboards
-.br
-/Network/Library/Keyboards
-.br
-/Local/Library/Keyboards
-.br
-/Library/Keyboards
-.RS
-Repositories for
-.I .keymapping
-and
-.I .keyboard
-files for MacOS/X, Darwin, and MacOS/X Server.
-.RE
-.PP
-/NextLibrary/Keyboards
-.br
-/LocalLibrary/Keyboards
-.RS
-Repositories for
-.I .keymapping
-and
-.I .keyboard
-files for OpenStep and NextStep.
-.RE
-.IP $(HOME)/Library/Keyboards
-Repository for personal
-.I .keymapping
-and
-.I .keyboard
-files.
-.SH DIGANOSTICS
-The following diagnostic messages may be issued to the standard error stream.
-.TG "Unrecognized option."
-An unrecognized option was specified on the command-line. Invoke
-.I dumpkeymap
-with the
-.B "\-\^\-help"
-option to view a list of valid options.
-.TG "Insufficient data in keymapping data stream."
-The key mapping file or data stream is corrupt. Either the file has been
-incorrectly truncated or a field, such as those which indicates the number of
-variable records which follow, contains a corrupt value.
-.PP
-The following diagnostic messages have significance only when trying to print
-.I .keymapping
-files mentioned on the command-line.
-.TG "Bad magic number."
-The mentioned file is not a
-.I .keymapping
-file. The file's content does not start with the string `KYM1'.
-.TG "Unable to open key mapping file."
-The call to fopen() failed; probably because the specified path is invalid or
-.I dumpkeymap
-does not have permission to read the file.
-.TG "Unable to determine key mapping file size."
-The call to fstat() failed, thus memory can not be allocated for loading the
-file.
-.TG "Unable to read key mapping file."
-The call to fread() failed.
-.PP
-The following diagnostic messages have significance only when trying to print
-the currently active key mapping when no
-.I .keymapping
-files have been mentioned on the command-line.
-.TG "Unable to open event status driver."
-The call to NXOpenEventStatus() failed.
-.TG "Bad key mapping length."
-The call to NXKeyMappingLength() returned a bogus value.
-.TG "Unable to get current key mapping."
-The call to NXGetKeyMapping() failed.
-.PP
-The following diagnostic messages have significance only when using
-.I dumpkeymap
-on a non-Apple/\c
-.SM NeXT
-platform.
-.TG "Must specify at least one .keymapping file."
-No
-.I .keymapping
-files were mentioned on the command-line. On non-Apple/\c
-.SM NeXT
-platforms, there is no concept of a currently active
-.I .keymapping
-file, so at least one file must be mentioned on the command-line.
-.SH AUTHOR
-Eric Sunshine <sunshine@sunshineco.com> wrote
-.I dumpkeymap
-and this document, the
-.I "dumpkeymap user's manual."
-Both
-.I dumpkeymap
-and this document are copyright \(co1999,2000 by Eric Sunshine
-<sunshine@sunshineco.com>. All rights reserved.
-.PP
-The implementation of
-.I dumpkeymap
-is based upon information gathered on September 3, 1997 by Eric Sunshine
-<sunshine@sunshineco.com> and Paul S. McCarthy <zarnuk@zarnuk.com> during an
-effort to reverse engineer the format of the
-.SM NeXT
-.I .keymapping
-file.
-.if n .PP
-.if n Version \n(VE \-\-
-.if n .UP

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/voria.icns Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/x-hash.c Deleted

@@ -1,340 +0,0 @@
-/* x-hash.c - basic hash tables
- $Id: x-hash.c,v 1.7 2003/07/17 05:25:44 jharper Exp $
-
- Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-#include "x-hash.h"
-#include "x-list.h"
-#include <stdlib.h>
-#include <assert.h>
-
-struct x_hash_table_struct {
- unsigned int bucket_index;
- unsigned int total_keys;
- x_list **buckets;
-
- x_hash_fun *hash_key;
- x_compare_fun *compare_keys;
- x_destroy_fun *destroy_key;
- x_destroy_fun *destroy_value;
-};
-
-#define ITEM_NEW(k, v) X_PFX (list_prepend) ((x_list *) (k), v)
-#define ITEM_FREE(i) X_PFX (list_free_1) (i)
-#define ITEM_KEY(i) ((void *) (i)->next)
-#define ITEM_VALUE(i) ((i)->data)
-
-#define SPLIT_THRESHOLD_FACTOR 2
-
-/* http://planetmath.org/?op=getobj&from=objects&name=GoodHashTablePrimes */
-static const unsigned int bucket_sizes = {
- 29, 53, 97, 193, 389, 769, 1543, 3079, 6151, 12289, 24593, 49157,
- 98317, 196613, 393241, 786433, 1572869, 3145739, 6291469, 12582917,
- 25165843, 50331653, 100663319, 201326611, 402653189, 805306457,
- 1610612741
-};
-
-#define N_BUCKET_SIZES (sizeof (bucket_sizes) / sizeof (bucket_sizes0))
-
-static inline unsigned int
-hash_table_total_buckets (x_hash_table *h)
-{
- return bucket_sizesh->bucket_index;
-}
-
-static inline void
-hash_table_destroy_item (x_hash_table *h, void *k, void *v)
-{
- if (h->destroy_key != 0)
-	(*h->destroy_key) (k);
-
- if (h->destroy_value != 0)
-	(*h->destroy_value) (v);
-}
-
-static inline unsigned int
-hash_table_hash_key (x_hash_table *h, void *k)
-{
- if (h->hash_key != 0)
-	return (*h->hash_key) (k);
- else
-	return (unsigned int) k;
-}
-
-static inline int
-hash_table_compare_keys (x_hash_table *h, void *k1, void *k2)
-{
- if (h->compare_keys == 0)
-	return k1 == k2;
- else
-	return (*h->compare_keys) (k1, k2) == 0;
-}
-
-static void
-hash_table_split (x_hash_table *h)
-{
- x_list **new, **old;
- x_list *node, *item, *next;
- int new_size, old_size;
- unsigned int b;
- int i;
-
- if (h->bucket_index == N_BUCKET_SIZES - 1)
-	return;
-
- old_size = hash_table_total_buckets (h);
- old = h->buckets;
-
- h->bucket_index++;
-
- new_size = hash_table_total_buckets (h);
- new = calloc (new_size, sizeof (x_list *));
-
- if (new == 0)
- {
-	h->bucket_index--;
-	return;
- }
-
- for (i = 0; i < old_size; i++)
- {
-	for (node = oldi; node != 0; node = next)
-	{
-	 next = node->next;
-	 item = node->data;
-
-	 b = hash_table_hash_key (h, ITEM_KEY (item)) % new_size;
-
-	 node->next = newb;
-	 newb = node;
-	}
- }
-
- h->buckets = new;
- free (old);
-}
-
-X_EXTERN x_hash_table *
-X_PFX (hash_table_new) (x_hash_fun *hash,
-			x_compare_fun *compare,
-			x_destroy_fun *key_destroy,
-			x_destroy_fun *value_destroy)
-{
- x_hash_table *h;
-
- h = calloc (1, sizeof (x_hash_table));
- if (h == 0)
-	return 0;
-
- h->bucket_index = 0;
- h->buckets = calloc (hash_table_total_buckets (h), sizeof (x_list *));
-
- if (h->buckets == 0)
- {
-	free (h);
-	return 0;
- }
- 
- h->hash_key = hash;
- h->compare_keys = compare;
- h->destroy_key = key_destroy;
- h->destroy_value = value_destroy;
-
- return h;
-}
-
-X_EXTERN void
-X_PFX (hash_table_free) (x_hash_table *h)
-{
- int n, i;
- x_list *node, *item;
-
- assert (h != NULL);
-
- n = hash_table_total_buckets (h);
-
- for (i = 0; i < n; i++)
- {
-	for (node = h->bucketsi; node != 0; node = node->next)
-	{
-	 item = node->data;
-	 hash_table_destroy_item (h, ITEM_KEY (item), ITEM_VALUE (item));
-	 ITEM_FREE (item);
-	}
-	X_PFX (list_free) (h->bucketsi);
- }
-
- free (h->buckets);
- free (h);
-}
-
-X_EXTERN unsigned int
-X_PFX (hash_table_size) (x_hash_table *h)
-{
- assert (h != NULL);
-
- return h->total_keys;
-}
-
-static void
-hash_table_modify (x_hash_table *h, void *k, void *v, int replace)
-{
- unsigned int hash_value;
- x_list *node, *item;
-
- assert (h != NULL);
-
- hash_value = hash_table_hash_key (h, k);
-
- for (node = h->bucketshash_value % hash_table_total_buckets (h);
-	 node != 0; node = node->next)
- {
-	item = node->data;
-
-	if (hash_table_compare_keys (h, ITEM_KEY (item), k))
-	{
-	 if (replace)
-	 {
-		hash_table_destroy_item (h, ITEM_KEY (item),
-					 ITEM_VALUE (item));
-		ITEM_KEY (item) = k;
-		ITEM_VALUE (item) = v;
-	 }
-	 else
-	 {
-		hash_table_destroy_item (h, k, ITEM_VALUE (item));
-		ITEM_VALUE (item) = v;
-	 }
-	 return;
-	}
- }
-
- /* Key isn't already in the table. Insert it. */
-
- if (h->total_keys + 1
-	> hash_table_total_buckets (h) * SPLIT_THRESHOLD_FACTOR)
- {
-	hash_table_split (h);
- }
-
- hash_value = hash_value % hash_table_total_buckets (h);
- h->bucketshash_value = X_PFX (list_prepend) (h->bucketshash_value,
-						 ITEM_NEW (k, v));
- h->total_keys++;
-}
-
-X_EXTERN void
-X_PFX (hash_table_insert) (x_hash_table *h, void *k, void *v)
-{
- hash_table_modify (h, k, v, 0);
-}
-
-X_EXTERN void
-X_PFX (hash_table_replace) (x_hash_table *h, void *k, void *v)
-{
- hash_table_modify (h, k, v, 1);
-}
-
-X_EXTERN void
-X_PFX (hash_table_remove) (x_hash_table *h, void *k)
-{
- unsigned int hash_value;
- x_list **ptr, *item;
-
- assert (h != NULL);
-
- hash_value = hash_table_hash_key (h, k);
-
- for (ptr = &h->bucketshash_value % hash_table_total_buckets (h);
-	 *ptr != 0; ptr = &((*ptr)->next))
- {
-	item = (*ptr)->data;
-
-	if (hash_table_compare_keys (h, ITEM_KEY (item), k))
-	{
-	 hash_table_destroy_item (h, ITEM_KEY (item), ITEM_VALUE (item));
-	 ITEM_FREE (item);
-	 item = *ptr;
-	 *ptr = item->next;
-	 X_PFX (list_free_1) (item);
-	 h->total_keys--;
-	 return;
-	}
- }
-}
-
-X_EXTERN void *
-X_PFX (hash_table_lookup) (x_hash_table *h, void *k, void **k_ret)
-{
- unsigned int hash_value;
- x_list *node, *item;
-
- assert (h != NULL);
-
- hash_value = hash_table_hash_key (h, k);
-
- for (node = h->bucketshash_value % hash_table_total_buckets (h);
-	 node != 0; node = node->next)
- {
-	item = node->data;
-
-	if (hash_table_compare_keys (h, ITEM_KEY (item), k))
-	{
-	 if (k_ret != 0)
-		*k_ret = ITEM_KEY (item);
-
-	 return ITEM_VALUE (item);
-	}
- }
-
- if (k_ret != 0)
-	*k_ret = 0;
-
- return 0;
-}
-
-X_EXTERN void
-X_PFX (hash_table_foreach) (x_hash_table *h,
-			 x_hash_foreach_fun *fun, void *data)
-{
- int i, n;
- x_list *node, *item;
-
- assert (h != NULL);
-
- n = hash_table_total_buckets (h);
-
- for (i = 0; i < n; i++)
- {
-	for (node = h->bucketsi; node != 0; node = node->next)
-	{
-	 item = node->data;
-	 (*fun) (ITEM_KEY (item), ITEM_VALUE (item), data);
-	}
- }
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/x-hash.h Deleted

@@ -1,61 +0,0 @@
-/* x-hash.h -- basic hash table class
-   $Id: x-hash.h,v 1.4 2003/04/16 00:42:14 jharper Exp $
-
-   Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
-
-#ifndef X_HASH_H
-#define X_HASH_H 1
-
-typedef struct x_hash_table_struct x_hash_table;
-
-typedef int (x_compare_fun) (const void *a, const void *b);
-typedef unsigned int (x_hash_fun) (const void *k);
-typedef void (x_destroy_fun) (void *x);
-typedef void (x_hash_foreach_fun) (void *k, void *v, void *data);
-
-/* for X_PFX and X_EXTERN */
-#include "x-list.h"
-
-X_EXTERN x_hash_table *X_PFX (hash_table_new) (x_hash_fun *hash,
-					       x_compare_fun *compare,
-					       x_destroy_fun *key_destroy,
-					       x_destroy_fun *value_destroy);
-X_EXTERN void X_PFX (hash_table_free) (x_hash_table *h);
-
-X_EXTERN unsigned int X_PFX (hash_table_size) (x_hash_table *h);
-
-X_EXTERN void X_PFX (hash_table_insert) (x_hash_table *h, void *k, void *v);
-X_EXTERN void X_PFX (hash_table_replace) (x_hash_table *h, void *k, void *v);
-X_EXTERN void X_PFX (hash_table_remove) (x_hash_table *h, void *k);
-X_EXTERN void *X_PFX (hash_table_lookup) (x_hash_table *h,
-					  void *k, void **k_ret);
-X_EXTERN void X_PFX (hash_table_foreach) (x_hash_table *h,
-					  x_hash_foreach_fun *fun,
-					  void *data);
-
-#endif /* X_HASH_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/x-hook.c Deleted

@@ -1,105 +0,0 @@
-/* x-hook.c
- $Id: x-hook.c,v 1.2 2003/04/16 00:42:14 jharper Exp $
-
- Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-#include "x-hook.h"
-#include <stdlib.h>
-#include <assert.h>
-
-#define CELL_NEW(f,d) X_PFX (list_prepend) ((x_list *) (f), (d))
-#define CELL_FREE(c) X_PFX (list_free_1) (c)
-#define CELL_FUN(c) ((x_hook_function *) ((c)->next))
-#define CELL_DATA(c) ((c)->data)
-
-X_EXTERN x_list *
-X_PFX (hook_add) (x_list *lst, x_hook_function *fun, void *data)
-{
- return X_PFX (list_prepend) (lst, CELL_NEW (fun, data));
-}
-
-X_EXTERN x_list *
-X_PFX (hook_remove) (x_list *lst, x_hook_function *fun, void *data)
-{
- x_list *node, *cell;
- x_list *to_delete = NULL;
-
- for (node = lst; node != NULL; node = node->next)
- {
-	cell = node->data;
-	if (CELL_FUN (cell) == fun && CELL_DATA (cell) == data)
-	 to_delete = X_PFX (list_prepend) (to_delete, cell);
- }
-
- for (node = to_delete; node != NULL; node = node->next)
- {
-	cell = node->data;
-	lst = X_PFX (list_remove) (lst, cell);
-	CELL_FREE (cell);
- }
-
- X_PFX (list_free) (to_delete);
-}
-
-X_EXTERN void
-X_PFX (hook_run) (x_list *lst, void *arg)
-{
- x_list *node, *cell;
- x_hook_function **fun;
- void **data;
- int length, i;
-
- length = X_PFX (list_length) (lst);
- fun = alloca (sizeof (x_hook_function *) * length);
- data = alloca (sizeof (void *) * length);
-
- for (i = 0, node = lst; node != NULL; node = node->next, i++)
- {
-	cell = node->data;
-	funi = CELL_FUN (cell);
-	datai = CELL_DATA (cell);
- }
-
- for (i = 0; i < length; i++)
- {
-	(*funi) (arg, datai);
- }
-}
-
-X_EXTERN void
-X_PFX (hook_free) (x_list *lst)
-{
- x_list *node;
-
- for (node = lst; node != NULL; node = node->next)
- {
-	CELL_FREE (node->data);
- }
-
- X_PFX (list_free) (lst);
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/x-hook.h Deleted

@@ -1,43 +0,0 @@
-/* x-hook.h -- lists of function,data pairs to call.
-   $Id: x-hook.h,v 1.2 2003/04/16 00:42:14 jharper Exp $
-
-   Copyright (c) 2003 Apple Computer, Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
-
-#ifndef X_HOOK_H
-#define X_HOOK_H 1
-
-#include "x-list.h"
-
-typedef void x_hook_function (void *arg, void *data);
-
-X_EXTERN x_list *X_PFX (hook_add) (x_list *lst, x_hook_function *fun, void *data);
-X_EXTERN x_list *X_PFX (hook_remove) (x_list *lst, x_hook_function *fun, void *data);
-X_EXTERN void X_PFX (hook_run) (x_list *lst, void *arg);
-X_EXTERN void X_PFX (hook_free) (x_list *lst);
-
-#endif /* X_HOOK_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/x-list.c Deleted

@@ -1,334 +0,0 @@
-/* x-list.c
- $Id: x-list.c,v 1.16 2003/07/18 00:52:19 jharper Exp $
-
- Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
- Permission is hereby granted, free of charge, to any person
- obtaining a copy of this software and associated documentation files
- (the "Software"), to deal in the Software without restriction,
- including without limitation the rights to use, copy, modify, merge,
- publish, distribute, sublicense, and/or sell copies of the Software,
- and to permit persons to whom the Software is furnished to do so,
- subject to the following conditions:
-
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
-
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
- HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
- Except as contained in this notice, the name(s) of the above
- copyright holders shall not be used in advertising or otherwise to
- promote the sale, use or other dealings in this Software without
- prior written authorization. */
-
-#include "x-list.h"
-#include <stdlib.h>
-#include <assert.h>
-#include <pthread.h>
-
-/* Allocate in ~4k blocks */
-#define NODES_PER_BLOCK 508
-
-typedef struct x_list_block_struct x_list_block;
-
-struct x_list_block_struct {
- x_list lNODES_PER_BLOCK;
-};
-
-static x_list *freelist;
-
-static pthread_mutex_t freelist_lock = PTHREAD_MUTEX_INITIALIZER;
-
-static inline void
-list_free_1 (x_list *node)
-{
- node->next = freelist;
- freelist = node;
-}
-
-X_EXTERN void
-X_PFX (list_free_1) (x_list *node)
-{
- assert (node != NULL);
-
- pthread_mutex_lock (&freelist_lock);
-
- list_free_1 (node);
-
- pthread_mutex_unlock (&freelist_lock);
-}
-
-X_EXTERN void
-X_PFX (list_free) (x_list *lst)
-{
- x_list *next;
-
- pthread_mutex_lock (&freelist_lock);
-
- for (; lst != NULL; lst = next)
- {
-	next = lst->next;
-	list_free_1 (lst);
- }
-
- pthread_mutex_unlock (&freelist_lock);
-}
-
-X_EXTERN x_list *
-X_PFX (list_prepend) (x_list *lst, void *data)
-{
- x_list *node;
-
- pthread_mutex_lock (&freelist_lock);
-
- if (freelist == NULL)
- {
-	x_list_block *b;
-	int i;
-
-	b = malloc (sizeof (x_list_block));
-
-	for (i = 0; i < NODES_PER_BLOCK - 1; i++)
-	 b->li.next = &(b->li+1);
-	b->li.next = NULL;
-
-	freelist = b->l;
- }
-
- node = freelist;
- freelist = node->next;
-
- pthread_mutex_unlock (&freelist_lock);
-
- node->next = lst;
- node->data = data;
-
- return node;
-}
-
-X_EXTERN x_list *
-X_PFX (list_append) (x_list *lst, void *data)
-{
- x_list *head = lst;
-
- if (lst == NULL)
-	return X_PFX (list_prepend) (NULL, data);
-
- while (lst->next != NULL)
-	lst = lst->next;
-
- lst->next = X_PFX (list_prepend) (NULL, data);
-
- return head;
-}
-
-X_EXTERN x_list *
-X_PFX (list_reverse) (x_list *lst)
-{
- x_list *head = NULL, *next;
- 
- while (lst != NULL)
- {
-	next = lst->next;
-	lst->next = head;
-	head = lst;
-	lst = next;
- }
-
- return head;
-}
-
-X_EXTERN x_list *
-X_PFX (list_find) (x_list *lst, void *data)
-{
- for (; lst != NULL; lst = lst->next)
- {
-	if (lst->data == data)
-	 return lst;
- }
-
- return NULL;
-}
-
-X_EXTERN x_list *
-X_PFX (list_nth) (x_list *lst, int n)
-{
- while (n-- > 0 && lst != NULL)
-	lst = lst->next;
-
- return lst;
-}
-
-X_EXTERN x_list *
-X_PFX (list_pop) (x_list *lst, void **data_ret)
-{
- void *data = NULL;
-
- if (lst != NULL)
- {
-	x_list *tem = lst;
-	data = lst->data;
-	lst = lst->next;
-	X_PFX (list_free_1) (tem);
- }
-	
- if (data_ret != NULL)
-	*data_ret = data;
-
- return lst;
-}
-
-X_EXTERN x_list *
-X_PFX (list_filter) (x_list *lst,
-		 int (*pred) (void *item, void *data), void *data)
-{
- x_list *ret = NULL, *node;
-
- for (node = lst; node != NULL; node = node->next)
- {
-	if ((*pred) (node->data, data))
-	 ret = X_PFX (list_prepend) (ret, node->data);
- }
-
- return X_PFX (list_reverse) (ret);
-}
-
-X_EXTERN x_list *
-X_PFX (list_map) (x_list *lst,
-		 void *(*fun) (void *item, void *data), void *data)
-{
- x_list *ret = NULL, *node;
-
- for (node = lst; node != NULL; node = node->next)
- {
-	X_PFX (list_prepend) (ret, fun (node->data, data));
- }
-
- return X_PFX (list_reverse) (ret);
-}
-
-X_EXTERN x_list *
-X_PFX (list_copy) (x_list *lst)
-{
- x_list *copy = NULL;
-
- for (; lst != NULL; lst = lst->next)
- {
-	copy = X_PFX (list_prepend) (copy, lst->data);
- }
-
- return X_PFX (list_reverse) (copy);
-}
-
-X_EXTERN x_list *
-X_PFX (list_remove) (x_list *lst, void *data)
-{
- x_list **ptr, *node;
-
- for (ptr = &lst; *ptr != NULL;)
- {
-	node = *ptr;
-
-	if (node->data == data)
-	{
-	 *ptr = node->next;
-	 X_PFX (list_free_1) (node);
-	}
-	else
-	 ptr = &((*ptr)->next);
- }
-
- return lst;
-}
-
-X_EXTERN unsigned int
-X_PFX (list_length) (x_list *lst)
-{
- unsigned int n;
-
- n = 0;
- for (; lst != NULL; lst = lst->next)
-	n++;
-
- return n;
-}
-
-X_EXTERN void
-X_PFX (list_foreach) (x_list *lst,
-		 void (*fun) (void *data, void *user_data),
-		 void *user_data)
-{
- for (; lst != NULL; lst = lst->next)
- {
-	(*fun) (lst->data, user_data);
- }
-}
-
-static x_list *
-list_sort_1 (x_list *lst, int length,
-	 int (*less) (const void *, const void *))
-{
- x_list *mid, *ptr;
- x_list *out_head, *out;
- int mid_point, i;
-
- /* This is a standard (stable) list merge sort */
-
- if (length < 2)
-	return lst;
-
- /* Calculate the halfway point. Split the list into two sub-lists. */
-
- mid_point = length / 2;
- ptr = lst;
- for (i = mid_point - 1; i > 0; i--)
- ptr = ptr->next;
- mid = ptr->next;
- ptr->next = NULL;
-
- /* Sort each sub-list. */
-
- lst = list_sort_1 (lst, mid_point, less);
- mid = list_sort_1 (mid, length - mid_point, less);
-
- /* Then merge them back together. */
-
- assert (lst != NULL && mid != NULL);
-
- if ((*less) (mid->data, lst->data))
-	out = out_head = mid, mid = mid->next;
- else
-	out = out_head = lst, lst = lst->next;
-
- while (lst != NULL && mid != NULL)
- {
- if ((*less) (mid->data, lst->data))
-	 out = out->next = mid, mid = mid->next;
- else
-	 out = out->next = lst, lst = lst->next;
- }
-
- if (lst != NULL)
- out->next = lst;
- else
- out->next = mid;
-
- return out_head;
-}
-
-X_EXTERN x_list *
-X_PFX (list_sort) (x_list *lst, int (*less) (const void *, const void *))
-{
- int length;
-
- length = X_PFX (list_length) (lst);
-
- return list_sort_1 (lst, length, less);
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-osx/launcher/x-list.h Deleted

@@ -1,78 +0,0 @@
-/* x-list.h -- simple list type
-   $Id: x-list.h,v 1.10 2003/07/18 00:52:19 jharper Exp $
-
-   Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-
-   Permission is hereby granted, free of charge, to any person
-   obtaining a copy of this software and associated documentation files
-   (the "Software"), to deal in the Software without restriction,
-   including without limitation the rights to use, copy, modify, merge,
-   publish, distribute, sublicense, and/or sell copies of the Software,
-   and to permit persons to whom the Software is furnished to do so,
-   subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be
-   included in all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-   EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-   MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-   NONINFRINGEMENT.  IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT
-   HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
-
-   Except as contained in this notice, the name(s) of the above
-   copyright holders shall not be used in advertising or otherwise to
-   promote the sale, use or other dealings in this Software without
-   prior written authorization. */
-
-#ifndef X_LIST_H
-#define X_LIST_H 1
-
-/* This is just a cons. */
-
-typedef struct x_list_struct x_list;
-
-struct x_list_struct {
-    void *data;
-    x_list *next;
-};
-
-#ifndef X_PFX
-# define X_PFX(x) x_ ## x
-#endif
-
-#ifndef X_EXTERN
-# define X_EXTERN __private_extern__
-#endif
-
-X_EXTERN void X_PFX (list_free_1) (x_list *node);
-X_EXTERN x_list *X_PFX (list_prepend) (x_list *lst, void *data);
-
-X_EXTERN x_list *X_PFX (list_append) (x_list *lst, void *data);
-X_EXTERN x_list *X_PFX (list_remove) (x_list *lst, void *data);
-X_EXTERN void X_PFX (list_free) (x_list *lst);
-X_EXTERN x_list *X_PFX (list_pop) (x_list *lst, void **data_ret);
-
-X_EXTERN x_list *X_PFX (list_copy) (x_list *lst);
-X_EXTERN x_list *X_PFX (list_reverse) (x_list *lst);
-X_EXTERN x_list *X_PFX (list_find) (x_list *lst, void *data);
-X_EXTERN x_list *X_PFX (list_nth) (x_list *lst, int n);
-X_EXTERN x_list *X_PFX (list_filter) (x_list *src,
-				      int (*pred) (void *item, void *data),
-				      void *data);
-X_EXTERN x_list *X_PFX (list_map) (x_list *src,
-				   void *(*fun) (void *item, void *data),
-				   void *data);
-
-X_EXTERN unsigned int X_PFX (list_length) (x_list *lst);
-X_EXTERN void X_PFX (list_foreach) (x_list *lst, void (*fun)
-				    (void *data, void *user_data),
-				    void *user_data);
-
-X_EXTERN x_list *X_PFX (list_sort) (x_list *lst, int (*less) (const void *,
-							    const void *));
-
-#endif /* X_LIST_H */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/build_tools/Makefile.am Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/build_tools/autorevision.sh Deleted

@@ -1,80 +0,0 @@
-#!/bin/sh
-
-# Copyright 2008 Paul Wise
-# Copyright 2009 Konstantin Dmitriev
-#
-# This file is part of Synfig.
-#
-# Synfig is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# Synfig is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Synfig. If not, see <https://www.gnu.org/licenses/>.
-
-get_git_id(){
-	export SCM=git
-	export REVISION_ID=`cd "$1"; git log --no-color -1 | head -n 1 | cut -f 2 -d ' ' | cut -c -7`
-	export BRANCH="`cd "$1"; git branch -a --no-color --contains HEAD | sed -e s/\*\ // | sed -e s/$no\ branch$// | tr '\n' ' ' | tr -s ' ' | sed s/^' '//`"
-	if ( echo $BRANCH | egrep origin/master > /dev/null ); then
-		#give a priority to master branch
-		BRANCH='master'
-	else
-		BRANCH=`echo $BRANCH | cut -d ' ' -f 1`
-		BRANCH=${BRANCH##*/}
-	fi
-	export REVISION=`git show --pretty=format:%ci HEAD | head -c 10 | tr -d '-'`
-	export COMPARE=`git rev-parse --git-dir`
-	# The extra * at the end is for Modified
-	#REVISION="$REVISION"`cd "$1"; $(git status 2> /dev/null | tail -n1) != "nothing to commit (working directory clean)" && echo "*"`
-}
-
-
-HEADER="$2/autorevision.h"
-SCM=none
-
-
-if ! -f "$HEADER" ; then
-	touch -t 197001010101 "$HEADER"
-fi
-
-
-# Extract the revision from git
-if git rev-parse --git-dir > /dev/null 2>&1 ; then
-	get_git_id "."
-fi
-
-
-# Allow overriding both REVISION and DEVEL_VERSION
-if -f "$2/autorevision.conf" ; then
-	SCM=manual
-	. "$2/autorevision.conf"
-fi
-
-
-# Abort if the header is newer
-if "$COMPARE" -ot "$HEADER" ; then exit; fi
-
-# Set the development version string
-if x = "x$DEVEL_VERSION" ; then
-	if x != "x$REVISION" ; then
-		if $SCM = git ; then
-			DEVEL_VERSION="Revision: ${REVISION}\\\\nBranch: ${BRANCH}\\\\nRevision ID: ${REVISION_ID}"
-		elif $SCM = manual ; then
-			DEVEL_VERSION="$REVISION (manually configured)"
-		fi
-	fi
-fi
-
-
-# Output the header
-if x != "x$DEVEL_VERSION" ; then
-	printf "#define SHOW_EXTRA_INFO\n" > "$HEADER"
-	printf "#define DEVEL_VERSION \"$DEVEL_VERSION\"\n" >> "$HEADER"
-fi

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/build_tools/sif2ico.sh Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/config/ltmain.patch Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/config/package Deleted

@@ -1,293 +0,0 @@
-#! /bin/csh -ef
-# this file was originally distributed by Apple in the Developer Tools package 
-#it is distributed under the Apple Open Source License
-set version=0.2
-set prog = `/usr/bin/basename $0`
-set usage = "Usage: $prog -f root-dir info-file tiff-file -d dest-dir -r resource-dir -traditional | -gnutar -bzip"
-set noglob
-
-if (-x /usr/bin/mkbom) then
- set mkbom=/usr/bin/mkbom
- set lsbom=/usr/bin/lsbom
-else
- set mkbom=/usr/etc/mkbom
- set lsbom=/usr/etc/lsbom
-endif
-
-if (-x /usr/bin/awk) then
- set awk=/usr/bin/awk
-else
- set awk=/bin/awk
-endif
-set bzip2=`which bzip2`
-set gnutar=/usr/bin/gnutar
-set tar=/usr/bin/tar
-set pax=/bin/pax
-
-# gather parameters
-if ($#argv == 0) then
- echo $usage
- exit(1)
-endif
-unset usebzip
-while ( $#argv > 0 )
- switch ( $argv1 )
-	case -d:
-	 if ( $?destDir ) then
-		echo ${prog}: dest-dir parameter already set to ${destDir}.
-		echo $usage
-		exit(1)
-	 else if ( $#argv < 2 ) then
-		echo ${prog}: -d option requires destination directory.
-		echo $usage
-		exit(1)
-	 else
-		set destDir = $argv2
-		shift; shift
-		breaksw
-	 endif
-	case -f:
-	 if ( $?rootDir ) then
-		echo ${prog}: root-dir parameter already set to ${rootDir}.
-		echo $usage
-		exit(1)
-	 else if ( $#argv < 2 ) then
-		echo ${prog}: -f option requires package root directory.
-		echo $usage
-		exit(1)
-	 else
-		set rootDir = $argv2
-		set fflag
-		shift; shift
-		breaksw
-	 endif
-	case -r:
-	 if ( $?resDir ) then
-		echo ${prog}: resource-dir parameter already set to ${resDir}.
-		echo $usage
-		exit(1)
-	 else if ( $#argv < 2 ) then
-		echo ${prog}: -r option requires package resource directory.
-		echo $usage
-		exit(1)
-	 else
-		set resDir = $argv2
-		shift; shift
-		breaksw
-	 endif
-	case -traditional:
- echo using standard tar
-	 set usetar
- unset usegnutar
-	 unset usepax
-	 breaksw
- case -gnutar:
-	 echo using gnutar
-	 set usegnutar
- unset usepax
-	 unset usetar
- shift
-	case -bzip:
-	 if (-x $bzip2) then
-	 	set usebzip
- echo using bzip compression
-	 else
-		echo COMPRESSION ERROR: You can not use BZIP2 you do not have it installed
-		exit(1)
-	 endif
- shift
- breaksw
-	case -*:
-	 echo ${prog}: Unknown option: $argv1
-	 echo $usage
-	 exit(1)
-	case *.info:
-	 if ( $?info ) then
-		echo ${prog}: info-file parameter already set to ${info}.
-		echo $usage
-		exit(1)
-	 else
-		set info = "$argv1"
-		shift
-		breaksw
-	 endif
-	case *.tiff:
-	 if ( $?tiff ) then
-		echo ${prog}: tiff-file parameter already set to ${tiff}.
-		echo $usage
-		exit(1)
-	 else
-		set tiff = "$argv1"
-		shift
-		breaksw
-	 endif
-	default:
-	 if ( $?rootDir ) then
-		echo ${prog}: unrecognized parameter: $argv1
-		echo $usage
-		exit(1)
-	 else
-		set rootDir = "$argv1"
-		shift
-		breaksw
-	 endif
- endsw
-end
-
-# check for mandatory parameters
-if ( ! $?rootDir ) then
- echo ${prog}: missing root-dir parameter.
- echo $usage
- exit(1)
-else if ( ! $?info) then
- echo ${prog}: missing info-file parameter.
- echo $usage
- exit(1)
-endif
-
-# destDir gets default value if unset on command line
-if ( $?destDir ) then
- /bin/mkdir -p $destDir
-else
- set destDir = .
-endif
-
-# derive the root name for the package from the root name of the info file
-set root = `/usr/bin/basename $info .info`
-
-# create package directory
-set pkg = ${destDir}/${root}.pkg
-echo Generating Installer package $pkg ...
-if ( -e $pkg ) /bin/rm -rf $pkg
-/bin/mkdir -p -m 755 $pkg
-/bin/mkdir -p -m 755 $pkg/Contents
-/bin/mkdir -p -m 755 $pkg/Contents/Resources
-/bin/mkdir -p -m 755 $pkg/Contents/Resources/English.lproj/
-echo "gxpmpkg2" >$pkg/Contents/PkgInfo
-chmod 755 $pkg/Contents/PkgInfo
-# (gnu)tar/pax and compress root directory to package archive
-echo -n "	creating package archive ... "
-if ( $?fflag ) then
- set pkgTop = ${rootDir:t}
- set parent = ${rootDir:h}
- if ( "$parent" == "$pkgTop" ) set parent = "."
-else
- set parent = $rootDir
- set pkgTop = . 
-endif
-if ( $?usetar ) then
- set pkgArchive = $pkg/Contents/Resources/$root.tar.Z
- (cd $parent; $tar -w $pkgTop) | /usr/bin/tar -f -c > $pkgArchive
-else if ( $?usegnutar ) then
- if ( $?usebzip ) then
- set pkgArchive = $pkg/Contents/Resources/$root.tar.bz2
- (cd $parent; $gnutar c $pkgTop) | $bzip2 -f -c > $pkgArchive
- else 
- set pkgArchive = $pkg/Contents/Resources/$root.tar.gz
- (cd $parent; $gnutar zcf $pkgArchive $pkgTop)
- endif
-else
- set pkgArchive = $pkg/Contents/Resources/$root.pax.gz
- (cd $parent; $pax -w -z -x cpio $pkgTop) > $pkgArchive
-endif
-/bin/chmod 755 $pkgArchive
-echo done.
-
-# copy info file to package
-set pkgInfo = $pkg/Contents/Resources/English.lproj/$root.info
-echo -n "	copying ${info:t} ... "
-/bin/cp $info $pkgInfo
-/bin/chmod 755 $pkgInfo
-echo done.
-
-# copy tiff file to package
-if ( $?tiff ) then
- set pkgTiff = $pkg/$root.tiff
- echo -n "	copying ${tiff:t} ... "
- /bin/cp $tiff $pkgTiff
- /bin/chmod 444 $pkgTiff
- echo done.
-endif
-
-# copy resources to package
-if ( $?resDir ) then
- echo -n "	copying ${resDir:t} ... "
-
- # don't want to see push/pop output
- pushd $resDir > /dev/null
-	# get lists of resources. We'll want to change
-	# permissions on just these things later.
- set directoriesInResDir = `find . -type d | grep -v -e .git`
- set filesInResDir = `find . -type f | grep -v -e .git`
- popd > /dev/null
-
- # copy the resource directory contents into the package directory
- foreach resFile (`cd $resDir && find . | grep -v -e .git`)
-
-	cp -fr "$resDir/$resFile" "$pkg/Contents/Resources"
- end
-
- pushd $pkg/Contents/Resources > /dev/null
-	# Change all directories to +r+x, except the package
-	# directory itself
- foreach resFileItem ($directoriesInResDir)
- if ( $resFileItem != "." ) then
- chmod 755 "$resFileItem"
- endif
- end
-	# change all flat files to read only
- foreach resFileItem ($filesInResDir)
- if ( $resFileItem != "./.DS_Store" ) then
- chmod 755 "$resFileItem"
-	 endif
- end
- popd > /dev/null
-
- echo done.
-endif
-
-# generate bom file
-set pkgBom = $pkg/Contents/Resources/$root.bom
-echo -n "	generating bom file ... "
-/bin/rm -f $pkgBom
-if ( $?fflag ) then
- $mkbom $parent $pkgBom >& /dev/null
-else
- $mkbom $rootDir $pkgBom >& /dev/null
-endif
-/bin/chmod 444 $pkgArchive
-echo done.
-	
-# generate sizes file
-set pkgSizes = $pkg/Contents/Resources/$root.sizes
-echo -n "	generating sizes file ... "
-
-# compute number of files in package
-set numFiles = `$lsbom -s $pkgBom | /usr/bin/wc -l`
-
-# compute package size when compressed
-@ compressedSize = `/usr/bin/du -k -s $pkg | $awk '{print $1}'`
-@ compressedSize += 3		# add 1KB each for sizes, location, status files
-
-@ infoSize = `/bin/ls -s $pkgInfo | $awk '{print $1}'`
-@ bomSize = `/bin/ls -s $pkgBom | $awk '{print $1}'`
-if ( $?tiff ) then
- @ tiffSize = `/bin/ls -s $pkgTiff | $awk '{print $1}'`
-else
- @ tiffSize = 0
-endif 
-
-@ installedSize = `/usr/bin/du -k -s $rootDir | $awk '{print $1}'`
-@ installedSize += $infoSize + $bomSize + $tiffSize + 3
-
-# echo size parameters to sizes file
-echo NumFiles $numFiles > $pkgSizes
-echo InstalledSize $installedSize >> $pkgSizes
-echo CompressedSize $compressedSize >> $pkgSizes
-echo done.
-echo " ... finished generating $pkg."
-
-exit(0)
-
-# end package
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/configure.ac Deleted

@@ -1,263 +0,0 @@
-# -- I N I T --------------------------------------------------
-
-AC_PREREQ(2.60)
-AC_INIT(Synfig Studio,1.5.3,https://github.com/synfig/synfig/issues,synfigstudio)
-AC_REVISION()
-
-AM_SILENT_RULES(yes)
-
-AM_CONDITIONAL(DEVELOPMENT_SNAPSHOT, true)
-
-AC_CONFIG_AUX_DIR(config)
-AC_CONFIG_HEADERS(config.h)
-AC_CANONICAL_HOST
-
-AM_INIT_AUTOMAKE(subdir-objects)
-AM_MAINTAINER_MODE
-
-LT_INIT(dlopen, win32-dll, disable-static)
-AC_SUBST(LIBTOOL_DEPS)
-
-# -- V A R I A B L E S ----------------------------------------
-
-API_VERSION=1.0
-
-imageext=png
-synfig_datadir="${datadir}/synfig"
-
-GETTEXT_PACKAGE=synfigstudio
-LOCALEDIR=${datadir}/locale
-
-# -- P R O G R A M S ------------------------------------------
-
-AC_PROG_CC
-AC_PROG_CXX
-AC_PROG_CPP
-AC_PROG_CXXCPP
-AC_PROG_INSTALL
-AC_LANG(C++)
-AX_CXX_COMPILE_STDCXX(11, noext)
-CXXFLAGS="$CXXFLAGS -std=gnu++11"
-
-AC_ARG_OPTIMIZATION
-AC_ARG_DEBUG
-
-if test "x$debug" == "xyes"; then
-    AC_DEFINE(SHOW_EXTRA_INFO,,Show extra info in the about dialog)
-fi
-
-AC_ARG_WARNINGS
-AC_ARG_PROFILE_ARCS
-AC_ARG_BRANCH_PROBABILITIES
-AC_ARG_PROFILING
-
-AC_WIN32_QUIRKS
-
-## AM_GLIB_GNU_GETTEXT(external)
-IT_PROG_INTLTOOL(0.35.0)
-AC_SUBST(GETTEXT_PACKAGE)
-AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
-                     The domain to use with gettext)
-AC_SUBST(LOCALEDIR)
-AM_GNU_GETTEXT(external)
-# This is here so autoreconf will run autopoint
-AM_GNU_GETTEXT_VERSION(0.15)
-
-case "$host" in
-    *mingw* | *cygwin*)
-        AM_CONDITIONAL(WIN32_PKG, true)
-        AM_CONDITIONAL(MACOSX_PKG, false)
-    ;;
-    *darwin*)
-        AM_CONDITIONAL(WIN32_PKG, false)
-        AM_CONDITIONAL(MACOSX_PKG, true)
-    ;;
-    *)
-        AM_CONDITIONAL(WIN32_PKG, false)
-        AM_CONDITIONAL(MACOSX_PKG, false)
-    ;;
-esac
-
-# -- L I B R A R I E S ----------------------------------------
-
-# Gtk compatibility hacks:
-# Since 3.14 some our hacks for GUI decorations works in other way
-# Since 3.14 for checkboxes STATE_FLAG_ACTIVE replaced with STATE_FLAG_CHECKED
-# Since 3.18 changed bahavor of Gtk::Adjustment (in new version signals emits automatically)
-# Since 3.20 Gdk::Seat has been introduced that supersedes Gdk::DeviceManager
-# Since 3.22 To fix artefacts with widgets placement we use new CSS fields: min-width, min-height
-PKG_CHECK_MODULES(GTKMM, gtkmm-3.0,,
-    AC_MSG_ERROR( ** You need to install Gtkmm-3.0 )
-)
-AC_SUBST(GTKMM_CFLAGS)
-AC_SUBST(GTKMM_LIBS)
-
-PKG_CHECK_MODULES(SYNFIG, synfig >= 1.5.3 ETL >= 1.5.3 sigc++-2.0,,
-    AC_MSG_ERROR( ** Unable to set up dependent libraries (synfig >= 1.5.3, ETL >= 1.5.3, sigc++-2.0) )
-)
-AC_SUBST(SYNFIG_CFLAGS)
-AC_SUBST(SYNFIG_LIBS)
-
-AC_ARG_ENABLE(jack,
-    AS_HELP_STRING(--enable-jack,
-            Enable experimental JACK transport support experimental ),
-    ,
-    enable_jack=auto
-)
-
-if test "x$enable_jack" != "xno"; then
-    PKG_CHECK_MODULES(JACK,
-        jack,
-            AC_SUBST(JACK_CFLAGS)
-            AC_SUBST(JACK_LIBS)
-            AC_DEFINE(WITH_JACK,,JACK support enabled.)
-            AC_MSG_RESULT(yes)
-            AC_MSG_RESULT( ** JACK support enabled.)
-            enable_jack=yes
-        ,
-            if test "x$enable_jack" == "xyes"; then
-                AC_MSG_RESULT(no)
-                AC_MSG_ERROR( ** Please install JACK to enable JACK support )
-            else
-                AC_MSG_RESULT(no)
-                enable_jack=no
-            fi
-        
-    )
-fi
-
-AC_ARG_WITH(userdir,
-  --with-userdir=(dirname)         Relative path to user directory,
-    AC_DEFINE_UNQUOTED(SYNFIG_USER_APP_DIR,"$with_userdir",Synfig User Data Directory)
-,)
-
-# -- H E A D E R S --------------------------------------------
-
-# Headers for gui/ipc.cpp and gui/app.cpp
-AC_CHECK_HEADERS(unistd.h fcntl.h)
-AC_CHECK_HEADERS(sys/types.h sys/stat.h sys/errno.h)
-
-# -- T Y P E S & S T R U C T S --------------------------------
-
-# -- F U N C T I O N S ----------------------------------------
-
-# -- A R G U M E N T S ----------------------------------------
-
-# -- O U T P U T ----------------------------------------------
-
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(CXXFLAGS)
-AC_SUBST(LDFLAGS)
-
-AC_SUBST(API_VERSION)
-
-AC_SUBST(imageext)
-AC_SUBST(imagedir)
-AC_SUBST(synfig_datadir)
-
-AC_PATH_PROG(UPDATE_MIME_DATABASE, update-mime-database, no)
-AC_ARG_ENABLE(update-mimedb,
-   AS_HELP_STRING(--disable-update-mimedb,
-                   disable the update-mime-database after install default=no),,
-    enable_update_mimedb=yes)
-AM_CONDITIONAL(ENABLE_UPDATE_MIMEDB, (test x$enable_update_mimedb = xyes) && (test x$UPDATE_MIME_DATABASE != xno))
-
-AC_ARG_WITH(images,
-    AS_HELP_STRING(--without-images, skip building images),
-    ,
-    with_images=yes
-)
-
-AM_CONDITIONAL(WITH_IMAGES, test "x$with_images" != "xno")
-
-
-# FONTCONFIG CHECK--------------------
-
-AC_ARG_WITH(fontconfig,
-	AS_HELP_STRING(--without-fontconfig, do not support fontconfig (default=auto)),
-,
-	with_fontconfig="yes"
-)
-
-if test $with_fontconfig != "no" ; then {
-	PKG_CHECK_MODULES(FONTCONFIG, fontconfig,
-		with_fontconfig="yes"
-		CONFIG_DEPS="$CONFIG_DEPS fontconfig"
-	,
-		with_fontconfig="no"
-	)
-} ; fi
-
-if test $with_fontconfig = "yes" ; then {
-	AC_DEFINE(WITH_FONTCONFIG,,enable fontconfig support)
-	AM_CONDITIONAL(WITH_FONTCONFIG,true)
-} else {
-	AM_CONDITIONAL(WITH_FONTCONFIG,false)
-} ; fi
-
-
-AC_CONFIG_FILES(
-    Makefile
-    build_tools/Makefile
-    doxygen.cfg
-    po/Makefile.in
-    synfigstudio.mime
-    synfigstudio.keys
-    org.synfig.SynfigStudio.xml
-    synfigstudio-thumbnailer.schemas
-    brushes/Makefile
-    brushes/CD_concept/Makefile
-    src/Makefile
-    src/gui/Makefile
-    src/gui/resources/Makefile
-    src/gui/resources/css/Makefile
-    src/gui/resources/ui/Makefile
-    src/synfigapp/Makefile
-    src/player/Makefile
-    images/Makefile
-    pkg-info/macosx/synfig-studio.info
-    plugins/Makefile
-    plugins/add-skeleton-simple/Makefile
-    plugins/view-unhide-all-layers/Makefile
-    plugins/lottie-exporter/Makefile
-    plugins/lottie-exporter/common/Makefile
-    plugins/lottie-exporter/effects/Makefile
-    plugins/lottie-exporter/helpers/Makefile
-    plugins/lottie-exporter/layers/Makefile
-    plugins/lottie-exporter/properties/Makefile
-    plugins/lottie-exporter/properties/shapePropKeyframe/Makefile
-    plugins/lottie-exporter/shapes/Makefile
-    plugins/lottie-exporter/sources/Makefile
-    plugins/lottie-exporter/synfig/Makefile
-    sounds/Makefile
-    test/Makefile
-)
-AC_OUTPUT
-
-# -- S U M M A R Y --------------------------------------------
-
-echo "
-$PACKAGE_NAME v.$VERSION
-Configuration Summary
-- - - - - - - - - - - - - - - - - -
-
-Install Prefix -------------------> $prefix
-Host Platform --------------------> $host
-Icon Format ----------------------> $imageext
-Debug Mode -----------------------> $debug
-Profiling Mode -------------------> $profiling
-Optimizations --------------------> $optimization
-JACK Enabled ---------------------> $enable_jack
-Build images ---------------------> $with_images
-
-"'$'"CXX ------------------------------> '$CXX'
-"'$'"CXXFLAGS -------------------------> '$CXXFLAGS'
-"'$'"LDFLAGS --------------------------> '$LDFLAGS'
-"'$'"SYNFIG_CFLAGS --------------------> '$SYNFIG_CFLAGS'
-"'$'"SYNFIG_LIBS ----------------------> '$SYNFIG_LIBS'
-"'$'"GTKMM_CFLAGS ---------------------> '$GTKMM_CFLAGS'
-"'$'"GTKMM_LIBS -----------------------> '$GTKMM_LIBS'
-"'$'"JACK_CFLAGS ----------------------> '$JACK_CFLAGS'
-"'$'"JACK_LIBS ------------------------> '$JACK_LIBS'
-"

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/studio-resources Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/studio-resources/Description.plist Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/studio-resources/English.lproj Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/studio-resources/English.lproj/InstallationCheck.strings Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/studio-resources/ReadMe.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/studio-resources/Welcome.txt Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/studio-resources/install.sh Deleted

@@ -1,61 +0,0 @@
-#!/bin/sh
-# finish up the installation
-# this script should be executed using the sudo command
-# this file is copied to synfig-devel.post_install and synfig-devel.post_upgrade
-# inside the .pkg bundle
-LOGFILE="~/synfig-core_install.log"
-
-/usr/X11R6/bin/fc-cache
-/usr/X11R6/bin/fc-list
-
-exit 0
-
-
-umask 022
-
-RESOURCE_DIR=`dirname $0`
-PREFIX=/usr/local
-
-cd $RESOURCE_DIR
-
-echo "Creating synfig-config script"
- -d $PREFIX || mkdir $PREFIX
- -d $PREFIX/bin || mkdir $PREFIX/bin
- -d $PREFIX/include || mkdir $PREFIX/include
- -d $PREFIX/lib || mkdir $PREFIX/lib
- -d $PREFIX/sbin || mkdir $PREFIX/sbin
-
-echo "Cleaning up any previous installation"
- -d $PREFIX/include/synfig && rm -fr $PREFIX/include/synfig
-ln -s /Library/Frameworks/synfig.framework/Headers $PREFIX/include/synfig
-
-sed '
-s:@exec_prefix@:/usr/local:g;
-s:@prefix@:/usr/local:g;
-s:@bindir@:$exec_prefix/bin:g;
-s:@libdir@:$exec_prefix/lib:g;
-s:@includedir@:$prefix/include:g;
-s:@VERSION@:@_VERSION_@:g;
-s:@PACKAGE@:@_PACKAGE_@:g;
-s:@LIBS@::g;
-s:@VERSION@:@_VERSION_@:;
-s:@PACKAGE@:@_PACKAGE_@:;
-s:@CONFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@synfig_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@CONFIG_CFLAGS@:-framework synfig:;
-' < $RESOURCE_DIR/synfig-config.in > $PREFIX/bin/synfig-config
-chmod 775 $PREFIX/bin/synfig-config
-
-echo "Precompiling Headers"
-#/usr/bin/c++ -precomp /Library/Frameworks/synfig.framework/Headers/synfig.h -o /Library/Frameworks/synfig.framework/Headers/synfig.p
-
-echo "Moving synfig tool"
-cp $RESOURCE_DIR/synfig $PREFIX/bin || exit 1
-
-echo "Done with shell script"
-
-
-exit 0
-
-
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/studio-resources/synfig-studio.post_install Deleted

@@ -1,61 +0,0 @@
-#!/bin/sh
-# finish up the installation
-# this script should be executed using the sudo command
-# this file is copied to synfig-devel.post_install and synfig-devel.post_upgrade
-# inside the .pkg bundle
-LOGFILE="~/synfig-core_install.log"
-
-/usr/X11R6/bin/fc-cache
-/usr/X11R6/bin/fc-list
-
-exit 0
-
-
-umask 022
-
-RESOURCE_DIR=`dirname $0`
-PREFIX=/usr/local
-
-cd $RESOURCE_DIR
-
-echo "Creating synfig-config script"
- -d $PREFIX || mkdir $PREFIX
- -d $PREFIX/bin || mkdir $PREFIX/bin
- -d $PREFIX/include || mkdir $PREFIX/include
- -d $PREFIX/lib || mkdir $PREFIX/lib
- -d $PREFIX/sbin || mkdir $PREFIX/sbin
-
-echo "Cleaning up any previous installation"
- -d $PREFIX/include/synfig && rm -fr $PREFIX/include/synfig
-ln -s /Library/Frameworks/synfig.framework/Headers $PREFIX/include/synfig
-
-sed '
-s:@exec_prefix@:/usr/local:g;
-s:@prefix@:/usr/local:g;
-s:@bindir@:$exec_prefix/bin:g;
-s:@libdir@:$exec_prefix/lib:g;
-s:@includedir@:$prefix/include:g;
-s:@VERSION@:@_VERSION_@:g;
-s:@PACKAGE@:@_PACKAGE_@:g;
-s:@LIBS@::g;
-s:@VERSION@:@_VERSION_@:;
-s:@PACKAGE@:@_PACKAGE_@:;
-s:@CONFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@synfig_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@CONFIG_CFLAGS@:-framework synfig:;
-' < $RESOURCE_DIR/synfig-config.in > $PREFIX/bin/synfig-config
-chmod 775 $PREFIX/bin/synfig-config
-
-echo "Precompiling Headers"
-#/usr/bin/c++ -precomp /Library/Frameworks/synfig.framework/Headers/synfig.h -o /Library/Frameworks/synfig.framework/Headers/synfig.p
-
-echo "Moving synfig tool"
-cp $RESOURCE_DIR/synfig $PREFIX/bin || exit 1
-
-echo "Done with shell script"
-
-
-exit 0
-
-
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/studio-resources/synfig-studio.post_upgrade Deleted

@@ -1,61 +0,0 @@
-#!/bin/sh
-# finish up the installation
-# this script should be executed using the sudo command
-# this file is copied to synfig-devel.post_install and synfig-devel.post_upgrade
-# inside the .pkg bundle
-LOGFILE="~/synfig-core_install.log"
-
-/usr/X11R6/bin/fc-cache
-/usr/X11R6/bin/fc-list
-
-exit 0
-
-
-umask 022
-
-RESOURCE_DIR=`dirname $0`
-PREFIX=/usr/local
-
-cd $RESOURCE_DIR
-
-echo "Creating synfig-config script"
- -d $PREFIX || mkdir $PREFIX
- -d $PREFIX/bin || mkdir $PREFIX/bin
- -d $PREFIX/include || mkdir $PREFIX/include
- -d $PREFIX/lib || mkdir $PREFIX/lib
- -d $PREFIX/sbin || mkdir $PREFIX/sbin
-
-echo "Cleaning up any previous installation"
- -d $PREFIX/include/synfig && rm -fr $PREFIX/include/synfig
-ln -s /Library/Frameworks/synfig.framework/Headers $PREFIX/include/synfig
-
-sed '
-s:@exec_prefix@:/usr/local:g;
-s:@prefix@:/usr/local:g;
-s:@bindir@:$exec_prefix/bin:g;
-s:@libdir@:$exec_prefix/lib:g;
-s:@includedir@:$prefix/include:g;
-s:@VERSION@:@_VERSION_@:g;
-s:@PACKAGE@:@_PACKAGE_@:g;
-s:@LIBS@::g;
-s:@VERSION@:@_VERSION_@:;
-s:@PACKAGE@:@_PACKAGE_@:;
-s:@CONFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@synfig_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@CONFIG_CFLAGS@:-framework synfig:;
-' < $RESOURCE_DIR/synfig-config.in > $PREFIX/bin/synfig-config
-chmod 775 $PREFIX/bin/synfig-config
-
-echo "Precompiling Headers"
-#/usr/bin/c++ -precomp /Library/Frameworks/synfig.framework/Headers/synfig.h -o /Library/Frameworks/synfig.framework/Headers/synfig.p
-
-echo "Moving synfig tool"
-cp $RESOURCE_DIR/synfig $PREFIX/bin || exit 1
-
-echo "Done with shell script"
-
-
-exit 0
-
-
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/studio-resources/upgrade.sh Deleted

@@ -1,61 +0,0 @@
-#!/bin/sh
-# finish up the installation
-# this script should be executed using the sudo command
-# this file is copied to synfig-devel.post_install and synfig-devel.post_upgrade
-# inside the .pkg bundle
-LOGFILE="~/synfig-core_install.log"
-
-/usr/X11R6/bin/fc-cache
-/usr/X11R6/bin/fc-list
-
-exit 0
-
-
-umask 022
-
-RESOURCE_DIR=`dirname $0`
-PREFIX=/usr/local
-
-cd $RESOURCE_DIR
-
-echo "Creating synfig-config script"
- -d $PREFIX || mkdir $PREFIX
- -d $PREFIX/bin || mkdir $PREFIX/bin
- -d $PREFIX/include || mkdir $PREFIX/include
- -d $PREFIX/lib || mkdir $PREFIX/lib
- -d $PREFIX/sbin || mkdir $PREFIX/sbin
-
-echo "Cleaning up any previous installation"
- -d $PREFIX/include/synfig && rm -fr $PREFIX/include/synfig
-ln -s /Library/Frameworks/synfig.framework/Headers $PREFIX/include/synfig
-
-sed '
-s:@exec_prefix@:/usr/local:g;
-s:@prefix@:/usr/local:g;
-s:@bindir@:$exec_prefix/bin:g;
-s:@libdir@:$exec_prefix/lib:g;
-s:@includedir@:$prefix/include:g;
-s:@VERSION@:@_VERSION_@:g;
-s:@PACKAGE@:@_PACKAGE_@:g;
-s:@LIBS@::g;
-s:@VERSION@:@_VERSION_@:;
-s:@PACKAGE@:@_PACKAGE_@:;
-s:@CONFIG_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@synfig_LIBS@:-F/Library/Frameworks/synfig.framework:;
-s:@CONFIG_CFLAGS@:-framework synfig:;
-' < $RESOURCE_DIR/synfig-config.in > $PREFIX/bin/synfig-config
-chmod 775 $PREFIX/bin/synfig-config
-
-echo "Precompiling Headers"
-#/usr/bin/c++ -precomp /Library/Frameworks/synfig.framework/Headers/synfig.h -o /Library/Frameworks/synfig.framework/Headers/synfig.p
-
-echo "Moving synfig tool"
-cp $RESOURCE_DIR/synfig $PREFIX/bin || exit 1
-
-echo "Done with shell script"
-
-
-exit 0
-
-
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/pkg-info/macosx/synfig-studio.info.in Deleted

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/dials/zoomdial.cpp Deleted

@@ -1,150 +0,0 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file zoomdial.cpp
-**	\brief Zoom widget
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2016 caryoscelus
-**
-**	This file is part of Synfig.
-**
-**	Synfig is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 2 of the License, or
-**	(at your option) any later version.
-**
-**	Synfig is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with Synfig. If not, see <https://www.gnu.org/licenses/>.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === H E A D E R S ======================================================= */
-
-#ifdef USING_PCH
-#	include "pch.h"
-#else
-#ifdef HAVE_CONFIG_H
-#	include <config.h>
-#endif
-
-#include "zoomdial.h"
-#include <gtkmm/image.h>
-#include <gtkmm/stock.h>
-
-#include <gui/exception_guard.h>
-#include <gui/localization.h>
-
-#endif
-
-/* === U S I N G =========================================================== */
-
-using namespace synfig;
-using namespace studio;
-
-/* === M A C R O S ========================================================= */
-
-/* === G L O B A L S ======================================================= */
-
-/* === P R O C E D U R E S ================================================= */
-
-/* === M E T H O D S ======================================================= */
-
-ZoomDial::ZoomDial(Gtk::IconSize & size):
-	Gtk::Grid()
-{
-	zoom_in = create_icon(size, "zoom-in", _("Zoom In"));
-	zoom_out = create_icon(size, "zoom-out", _("Zoom Out"));
-	zoom_fit = create_icon(size, "zoom-fit-best", _("Zoom to Fit"));
-	zoom_norm = create_icon(size, "zoom-original", _("Zoom to 100%"));
-
-	current_zoom = manage(new Gtk::Entry());
-	set_zoom(1.0);
-	current_zoom->set_max_length(10);
-	current_zoom->set_editable(true);
-	current_zoom->set_width_chars(6);
-	current_zoom->add_events(Gdk::SCROLL_MASK);
-	current_zoom->signal_event().connect(
-		sigc::mem_fun(*this, &ZoomDial::current_zoom_event) );
-	current_zoom->show();
-	// select everything except for % sign after user clicks widget
-	// using release event here instead of grab_focus because the latter
-	// is emitted before gtk sets cursor selection gets nullified
-	current_zoom->signal_event_after().connect(
-		sigc::mem_fun(*this, &ZoomDial::after_event) );
-
-	attach(*zoom_out, 0, 0, 1, 1);
-	attach(*current_zoom, 1, 0, 1, 1);
-	attach(*zoom_in, 2, 0, 1, 1);
-	attach(*zoom_norm, 3, 0, 1, 1);
-	attach(*zoom_fit, 4, 0, 1, 1);
-}
-
-void
-ZoomDial::after_event(GdkEvent *event)
-{
-	SYNFIG_EXCEPTION_GUARD_BEGIN()
-	if (event->type == GDK_BUTTON_RELEASE)
-		current_zoom->select_region(0, current_zoom->get_text_length()-1);
-	SYNFIG_EXCEPTION_GUARD_END()
-}
-
-bool
-ZoomDial::current_zoom_event(GdkEvent* event)
-{
-	SYNFIG_EXCEPTION_GUARD_BEGIN()
-	if (event->type == GDK_SCROLL)
-	{
-		if(event->scroll.direction==GDK_SCROLL_DOWN || event->scroll.direction==GDK_SCROLL_LEFT)
-			zoom_out->clicked();
-		else
-		if(event->scroll.direction==GDK_SCROLL_UP || event->scroll.direction==GDK_SCROLL_RIGHT)
-			zoom_in->clicked();
-		return true;
-	}
-	return false;
-	SYNFIG_EXCEPTION_GUARD_END_BOOL(true)
-}
-
-
-Gtk::Button *
-ZoomDial::create_icon(Gtk::IconSize size, const std::string & icon_name,
-		const char * tooltip)
-{
-	Gtk::Button *button = manage(new class Gtk::Button());
-	button->set_image_from_icon_name(icon_name, size);
-	button->set_tooltip_text(tooltip);
-	auto icon = button->get_image();
-	icon->set_margin_start(0);
-	icon->set_margin_end(0);
-	icon->set_margin_top(0);
-	icon->set_margin_bottom(0);
-	button->set_relief(Gtk::RELIEF_NONE);
-	button->show();
-
-	return button;
-}
-
-void
-ZoomDial::set_zoom(synfig::Real value)
-{
-	current_zoom->set_text(synfig::strprintf("%.1lf%%", value*100.0));
-}
-
-synfig::Real
-ZoomDial::get_zoom(synfig::Real default_value)
-{
-	std::string s = current_zoom->get_text();
-	char buffer10 = "";
-	synfig::Real value = 0.0;
-	sscanf(s.c_str(), "%lf%9s", &value, buffer);
-
-	if (std::string(buffer) == "%") value *= 0.01;
-	return approximate_greater(value, 0.0) ? value : default_value;
-}
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/dials/zoomdial.h Deleted

@@ -1,80 +0,0 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file zoomdial.h
-**	\brief Zoom widget
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**	Copyright (c) 2008 Chris Moore
-**	Copyright (c) 2016 caryoscelus
-**
-**	This file is part of Synfig.
-**
-**	Synfig is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 2 of the License, or
-**	(at your option) any later version.
-**
-**	Synfig is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with Synfig. If not, see <https://www.gnu.org/licenses/>.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === S T A R T =========================================================== */
-
-#ifndef __SYNFIG_STUDIO_ZOOMDIAL_H
-#define __SYNFIG_STUDIO_ZOOMDIAL_H
-
-/* === H E A D E R S ======================================================= */
-
-#include <gtkmm/button.h>
-#include <gtkmm/entry.h>
-#include <gtkmm/grid.h>
-
-#include <synfig/real.h>
-
-/* === M A C R O S ========================================================= */
-
-/* === T Y P E D E F S ===================================================== */
-
-/* === C L A S S E S & S T R U C T S ======================================= */
-
-namespace studio
-{
-
-class ZoomDial : public Gtk::Grid
-{
-	Gtk::Button *zoom_in;
-	Gtk::Button *zoom_out;
-	Gtk::Button *zoom_fit;
-	Gtk::Button *zoom_norm;
-	Gtk::Entry *current_zoom;
-
-	Gtk::Button *create_icon(Gtk::IconSize size, const std::string& icon_name,
-			const char * tooltip);
-	void after_event(GdkEvent *event);
-	bool current_zoom_event(GdkEvent* event);
-
-public:
-	ZoomDial(Gtk::IconSize &size);
-
-	Glib::SignalProxy0<void> signal_zoom_in() { return zoom_in->signal_clicked(); }
-	Glib::SignalProxy0<void> signal_zoom_out() { return zoom_out->signal_clicked(); }
-	Glib::SignalProxy0<void> signal_zoom_fit() { return zoom_fit->signal_clicked(); }
-	Glib::SignalProxy0<void> signal_zoom_norm() { return zoom_norm->signal_clicked(); }
-	Glib::SignalProxy0<void> signal_zoom_edit() { return current_zoom->signal_activate(); }
-
-	void set_zoom(synfig::Real value);
-	synfig::Real get_zoom(synfig::Real default_value = 0.0);
-}; // END of class ZoomDial
-
-}; // END of namespace studio
-
-/* === E N D =============================================================== */
-
-#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/actions/layerparamdisconnect.cpp Deleted

@@ -1,181 +0,0 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file layerparamdisconnect.cpp
-**	\brief Template File
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**
-**	This file is part of Synfig.
-**
-**	Synfig is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 2 of the License, or
-**	(at your option) any later version.
-**
-**	Synfig is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with Synfig. If not, see <https://www.gnu.org/licenses/>.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === H E A D E R S ======================================================= */
-
-#ifdef USING_PCH
-#	include "pch.h"
-#else
-#ifdef HAVE_CONFIG_H
-#	include <config.h>
-#endif
-
-#include <synfig/general.h>
-
-#include "layerparamdisconnect.h"
-#include <synfigapp/canvasinterface.h>
-#include <synfig/valuenodes/valuenode_dynamiclist.h>
-
-#include <synfigapp/localization.h>
-
-#endif
-
-using namespace synfig;
-using namespace synfigapp;
-using namespace Action;
-
-/* === M A C R O S ========================================================= */
-
-ACTION_INIT(Action::LayerParamDisconnect);
-ACTION_SET_NAME(Action::LayerParamDisconnect,"LayerParamDisconnect");
-ACTION_SET_LOCAL_NAME(Action::LayerParamDisconnect,N_("Disconnect Layer Parameter"));
-ACTION_SET_TASK(Action::LayerParamDisconnect,"disconnect");
-ACTION_SET_CATEGORY(Action::LayerParamDisconnect,Action::CATEGORY_LAYER|Action::CATEGORY_VALUENODE);
-ACTION_SET_PRIORITY(Action::LayerParamDisconnect,0);
-ACTION_SET_VERSION(Action::LayerParamDisconnect,"0.0");
-
-/* === G L O B A L S ======================================================= */
-
-/* === P R O C E D U R E S ================================================= */
-
-/* === M E T H O D S ======================================================= */
-
-Action::LayerParamDisconnect::LayerParamDisconnect():
-	time(0)
-{
-
-}
-
-Action::ParamVocab
-Action::LayerParamDisconnect::get_param_vocab()
-{
-	ParamVocab ret(Action::CanvasSpecific::get_param_vocab());
-
-	ret.push_back(ParamDesc("layer",Param::TYPE_LAYER)
-		.set_local_name(_("Layer"))
-	);
-
-	ret.push_back(ParamDesc("param",Param::TYPE_STRING)
-		.set_local_name(_("Param"))
-	);
-
-	ret.push_back(ParamDesc("time",Param::TYPE_STRING)
-		.set_local_name(_("Time"))
-		.set_optional()
-	);
-
-	return ret;
-}
-
-bool
-Action::LayerParamDisconnect::is_candidate(const ParamList &x)
-{
-	return candidate_check(get_param_vocab(),x);
-}
-
-bool
-Action::LayerParamDisconnect::set_param(const synfig::String& name, const Action::Param &param)
-{
-	if(name=="layer" && param.get_type()==Param::TYPE_LAYER)
-	{
-		layer=param.get_layer();
-
-		return true;
-	}
-
-	if(name=="param" && param.get_type()==Param::TYPE_STRING)
-	{
-		param_name=param.get_string();
-
-		return true;
-	}
-
-	if(name=="time" && param.get_type()==Param::TYPE_TIME)
-	{
-		time=param.get_time();
-
-		return true;
-	}
-
-	return Action::CanvasSpecific::set_param(name,param);
-}
-
-bool
-Action::LayerParamDisconnect::is_ready()const
-{
-	if(!layer || param_name.empty())
-		return false;
-	return Action::CanvasSpecific::is_ready();
-}
-
-void
-Action::LayerParamDisconnect::perform()
-{
-	if(!layer->dynamic_param_list().count(param_name))
-		throw Error(_("Layer Parameter is not connected to anything"));
-
-	old_value_node=layer->dynamic_param_list().find(param_name)->second;
-	layer->disconnect_dynamic_param(param_name);
-
-	if(new_value_node || ValueNode_DynamicList::Handle::cast_dynamic(old_value_node))
-	{
-		if(!new_value_node)
-			new_value_node=old_value_node->clone(get_canvas());
-		layer->connect_dynamic_param(param_name,new_value_node);
-	}
-	else
-		layer->set_param(param_name,(*old_value_node)(time));
-
-	layer->changed();
-	old_value_node->changed();
-
-	set_dirty(false);
-
-	if(get_canvas_interface())
-	{
-		get_canvas_interface()->signal_layer_param_changed()(layer,param_name);
-	}
-}
-
-void
-Action::LayerParamDisconnect::undo()
-{
-	layer->connect_dynamic_param(param_name,old_value_node);
-
-/*	if(layer->active() && get_canvas()->get_time()!=time)
-		set_dirty(true);
-	else
-		set_dirty(false);
-*/
-	layer->changed();
-	old_value_node->changed();
-
-	set_dirty(false);
-
-	if(get_canvas_interface())
-	{
-		get_canvas_interface()->signal_layer_param_changed()(layer,param_name);
-	}
-}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/actions/layerparamdisconnect.h Deleted

@@ -1,81 +0,0 @@
-/* === S Y N F I G ========================================================= */
-/*!	\file layerparamdisconnect.h
-**	\brief Template File
-**
-**	\legal
-**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
-**
-**	This file is part of Synfig.
-**
-**	Synfig is free software: you can redistribute it and/or modify
-**	it under the terms of the GNU General Public License as published by
-**	the Free Software Foundation, either version 2 of the License, or
-**	(at your option) any later version.
-**
-**	Synfig is distributed in the hope that it will be useful,
-**	but WITHOUT ANY WARRANTY; without even the implied warranty of
-**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-**	GNU General Public License for more details.
-**
-**	You should have received a copy of the GNU General Public License
-**	along with Synfig. If not, see <https://www.gnu.org/licenses/>.
-**	\endlegal
-*/
-/* ========================================================================= */
-
-/* === S T A R T =========================================================== */
-
-#ifndef __SYNFIG_APP_ACTION_LAYERPARAMDISCONNECT_H
-#define __SYNFIG_APP_ACTION_LAYERPARAMDISCONNECT_H
-
-/* === H E A D E R S ======================================================= */
-
-#include <synfig/layer.h>
-#include <synfigapp/action.h>
-
-/* === M A C R O S ========================================================= */
-
-/* === T Y P E D E F S ===================================================== */
-
-/* === C L A S S E S & S T R U C T S ======================================= */
-
-namespace synfigapp {
-
-class Instance;
-
-namespace Action {
-
-class LayerParamDisconnect :
-	public Undoable,
-	public CanvasSpecific
-{
-private:
-
-	synfig::Layer::Handle layer;
-	synfig::String	param_name;
-	synfig::ValueNode::Handle	old_value_node;
-	synfig::ValueNode::Handle	new_value_node;
-	synfig::Time time;
-
-public:
-
-	LayerParamDisconnect();
-
-	static ParamVocab get_param_vocab();
-	static bool is_candidate(const ParamList &x);
-
-	virtual bool set_param(const synfig::String& name, const Param &);
-	virtual bool is_ready()const;
-
-	virtual void perform();
-	virtual void undo();
-
-	ACTION_MODULE_EXT
-};
-
-}; // END of namespace action
-}; // END of namespace studio
-
-/* === E N D =============================================================== */
-
-#endif

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/adwaita-icon-theme Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/adwaita-icon-theme/portfile.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/adwaita-icon-theme/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/cairomm Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/cairomm/portfile.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/cairomm/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gdk-pixbuf Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gdk-pixbuf/fix_build_error_windows.patch Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gdk-pixbuf/portfile.cmake Deleted

@@ -1,87 +0,0 @@
-# adapted from vcpkg's own gdk-pixbuf port
-
-set(GDK_PIXBUF_VERSION 2.42)
-set(GDK_PIXBUF_PATCH 8)
-
-vcpkg_from_gitlab(
-    GITLAB_URL https://gitlab.gnome.org/
-    OUT_SOURCE_PATH SOURCE_PATH
-    REPO GNOME/gdk-pixbuf
-    REF "${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}"
-    SHA512 ea3b7d47f2ef3dbb88f640629e03eb4fab4a371da2545c199274d75b993b176af0c69ea72b46d5fadf58f82dff9a809fe1e0a4802ad1f1f13eaa9d757ebfeb4c
-    HEAD_REF master
-    PATCHES
-        fix_build_error_windows.patch
-)
-
-if(VCPKG_TARGET_IS_WINDOWS)
-    #list(APPEND OPTIONS -Dnative_windows_loaders=true) # Use Windows system components to handle BMP, EMF, GIF, ICO, JPEG, TIFF and WMF images, overriding jpeg and tiff.  To build this into gdk-pixbuf, pass in windows" with the other loaders to build in or use "all" with the builtin_loaders option
-endif()
-vcpkg_configure_meson(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -Dman=false                 # Whether to generate man pages (requires xlstproc)
-        -Dgtk_doc=false             # Whether to generate the API reference (requires GTK-Doc)
-        -Ddocs=false
-        -Dpng=enabled               # Enable PNG loader (requires libpng)
-        -Dtiff=enabled              # Enable TIFF loader (requires libtiff), disabled on Windows if "native_windows_loaders" is used
-        -Djpeg=enabled              # Enable JPEG loader (requires libjpeg), disabled on Windows if "native_windows_loaders" is used
-        -Dintrospection=disabled    # Whether to generate the API introspection data (requires GObject-Introspection)
-        -Drelocatable=true          # Whether to enable application bundle relocation support
-        -Dinstalled_tests=false
-        -Dgio_sniffing=false        # Perform file type detection using GIO (Unused on MacOS and Windows)
-        -Dbuiltin_loaders=all       # since it is unclear where loadable plugins should be located;
-                                    # Comma-separated list of loaders to build into gdk-pixbuf, or "none", or "all" to build all buildable loaders into gdk-pixbuf
-    ADDITIONAL_NATIVE_BINARIES glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources'
-                               glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-                               glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
-    ADDITIONAL_CROSS_BINARIES  glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources'
-                               glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-                               glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
-        )
-vcpkg_install_meson(ADD_BIN_TO_PATH)
-
-# Fix paths in pc file.
-set(_file "${CURRENT_PACKAGES_DIR}/debug/lib/pkgconfig/gdk-pixbuf-2.0.pc")
-if(EXISTS "${_file}")
-    file(READ "${_file}" _contents)
-    string(REPLACE ${bindir} "\${bindir}/../../tools/${PORT}" _contents "${_contents}")
-
-    # Essam: This is the problematic part
-    # gdk_pixbuf_binarydir is erroneously set to ${libdir}/../gdk-pixbuf-2.0
-    # although it is installed in ${libdir}/gdk-pixbuf-2.0
-
-    # string(REPLACE gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0 "gdk_pixbuf_binarydir=\${libdir}/../gdk-pixbuf-2.0/2.10.0" _contents "${_contents}")
-    file(WRITE "${_file}" "${_contents}")
-endif()
-set(_file "${CURRENT_PACKAGES_DIR}/lib/pkgconfig/gdk-pixbuf-2.0.pc")
-if(EXISTS "${_file}")
-    file(READ "${_file}" _contents)
-    string(REPLACE ${bindir} "\${bindir}/../tools/${PORT}" _contents "${_contents}")
-    # string(REPLACE gdk_pixbuf_binarydir=${libdir}/gdk-pixbuf-2.0/2.10.0 "gdk_pixbuf_binarydir=\${libdir}/../gdk-pixbuf-2.0/2.10.0" _contents "${_contents}")
-    file(WRITE "${_file}" "${_contents}")
-endif()
-
-vcpkg_fixup_pkgconfig()
-
-set(TOOL_NAMES gdk-pixbuf-csource gdk-pixbuf-pixdata gdk-pixbuf-query-loaders gdk-pixbuf-thumbnailer)
-
-# gdk-pixbuf-thumbnailer is not compiled for cross-compiling
-set(IS_NEED_REMOVE_THUMBNAILER ${VCPKG_CROSSCOMPILING})
-# This adjusting logic might be place in vcpkg_common_definitions.cmake.
-if(VCPKG_TARGET_IS_WINDOWS)
-    if(VCPKG_TARGET_ARCHITECTURE MATCHES "(x|X)86" OR VCPKG_TARGET_ARCHITECTURE MATCHES "(amd|AMD|x|X)64")
-        set(IS_NEED_REMOVE_THUMBNAILER false)
-    endif()
-endif()
-if(IS_NEED_REMOVE_THUMBNAILER)
-    list(REMOVE_ITEM TOOL_NAMES gdk-pixbuf-thumbnailer)
-endif()
-
-vcpkg_copy_pdbs()
-vcpkg_copy_tools(TOOL_NAMES ${TOOL_NAMES} AUTO_CLEAN)
-
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gdk-pixbuf/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/glibmm Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/glibmm/portfile.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/glibmm/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gtk3 Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gtk3/0001-build.patch Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gtk3/fix_ninja_build.py Deleted

@@ -1,38 +0,0 @@
-import os
-import sys
-import fileinput
-import shlex
-
-
-def fix_ninja_build(build_folder):
-    for line in fileinput.input(os.path.join(build_folder, "build.ninja"), inplace=True):
-        # the command response file for linking gtk exceeds msvc linker limit
-        # this hack fixes this by removing duplicates in the link arguments
-        # inside the build.ninja file
-        # see https://docs.microsoft.com/en-us/cpp/error-messages/tool-errors/linker-tools-error-lnk1170?view=msvc-170
-        idx = line.find("LINK_ARGS =")
-        if idx >= 0:
-            parts = shlex.split(lineidx + len("LINK_ARGS ="):)
-            print("{} {}".format(
-                line: idx + len("LINK_ARGS ="),
-                " ".join((f'"{v}"' for v in dict.fromkeys(parts)))), end='')
-            continue
-
-        # in windows, ninja uses CreateProcess which has a limit of 32767 chars
-        # gnome.mkenums uses absolute paths, which increases the command length
-        # see: https://github.com/mesonbuild/meson/issues/6710
-        # this hack replaces all absolute paths of the build subfolder
-        # with relative paths to decrease the length of the command
-        idx = line.find("COMMAND = ")
-        if idx >= 0:
-            parts = shlex.split(lineidx + len("COMMAND ="):)
-            print("{} {}".format(
-                line: idx + len("COMMAND ="),
-                " ".join((f'"{v.replace(build_folder, ".")}"' for v in parts))))
-            continue
-
-        print(line, end='')
-
-
-if __name__ == "__main__":
-    fix_ninja_build(sys.argv1)

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gtk3/portfile.cmake Deleted

@@ -1,98 +0,0 @@
-# adapted from the work of Max Khon (https://github.com/mkhon)
-# from the following PR: https://github.com/microsoft/vcpkg/pull/22201
-
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
-vcpkg_from_gitlab(
-    OUT_SOURCE_PATH SOURCE_PATH
-    GITLAB_URL https://gitlab.gnome.org
-    REPO GNOME/gtk
-    REF 3.24.34
-    SHA512 20a91e30a89070461af06b33829bc723b348806b4a785d0743af8bd4789b55dade24686e08bf1b2f0335240463aacc040134babb0605b809186b15de9cf261e4
-    PATCHES
-        0001-build.patch
-)
-
-vcpkg_find_acquire_program(PKGCONFIG)
-get_filename_component(PKGCONFIG_DIR "${PKGCONFIG}" DIRECTORY )
-vcpkg_add_to_path("${PKGCONFIG_DIR}") # Post install script runs pkg-config so it needs to be on PATH
-vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib/")
-vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gdk-pixbuf")
-vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gettext/bin")
-
-vcpkg_configure_meson(
-    SOURCE_PATH "${SOURCE_PATH}"
-    OPTIONS
-        -Dwayland_backend=false
-        -Ddemos=false
-        -Dexamples=false
-        -Dtests=false
-        -Dgtk_doc=false
-        -Dman=false
-        -Dxinerama=no               # Enable support for the X11 Xinerama extension
-        -Dcloudproviders=false      # Enable the cloudproviders support
-        -Dprofiler=false            # include tracing support for sysprof
-        -Dtracker3=false            # Enable Tracker3 filechooser search
-        -Dcolord=no                 # Build colord support for the CUPS printing backend
-        -Dintrospection=false
-    ADDITIONAL_NATIVE_BINARIES
-        glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-        glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
-        glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-        gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen'
-        glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-    ADDITIONAL_CROSS_BINARIES
-        glib-genmarshal='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-genmarshal'
-        glib-mkenums='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-mkenums'
-        glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-        gdbus-codegen='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/gdbus-codegen'
-        glib-compile-schemas='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-schemas${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-)
-
-vcpkg_find_acquire_program(PYTHON3)
-set(buildtypes)
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "debug")
-    set(buildname "DEBUG")
-    vcpkg_list(APPEND buildtypes ${buildname})
-    set(path_suffix_${buildname} "debug/")
-    set(suffix_${buildname} "dbg")
-endif()
-if(NOT DEFINED VCPKG_BUILD_TYPE OR VCPKG_BUILD_TYPE STREQUAL "release")
-    set(buildname "RELEASE")
-    vcpkg_list(APPEND buildtypes ${buildname})
-    set(path_suffix_${buildname} "")
-    set(suffix_${buildname} "rel")
-endif()
-foreach(buildtype IN LISTS buildtypes)
-    vcpkg_execute_required_process(
-        COMMAND "${PYTHON3}" "${CMAKE_CURRENT_LIST_DIR}/fix_ninja_build.py"
-           "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}"
-        WORKING_DIRECTORY "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-${suffix_${buildtype}}"
-        LOGNAME fix_ninja_build-${TARGET_TRIPLET}
-    )
-endforeach()
-
-vcpkg_install_meson()
-
-vcpkg_copy_pdbs()
-
-vcpkg_fixup_pkgconfig()
-
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
-
-set(GTK_TOOLS
-    gtk-builder-tool
-    gtk-encode-symbolic-svg
-    gtk-launch
-    gtk-query-immodules-3.0
-    gtk-query-settings
-    gtk-update-icon-cache
-)
-vcpkg_copy_tools(TOOL_NAMES ${GTK_TOOLS} AUTO_CLEAN)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/etc")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
-    file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
-endif()

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gtk3/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gtkmm3 Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gtkmm3/portfile.cmake Deleted

@@ -1,38 +0,0 @@
-vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
-
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://download.gnome.org/sources/gtkmm/3.24/gtkmm-3.24.6.tar.xz"
-    FILENAME "gtkmm-3.24.6.tar.xz"
-    SHA512 D6FC2D0689BACA2B968820D1AF86CC0B175B6F38F720D315BC50663D30BD0A841DA57AC4336ABEC236542FB2893B28B2DE84087419B73ABA58B41F07568D4D93
-)
-
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE}
-)
-
-# gkmm uses glib-compile-resources which uses gdk-pixbuf-pixdata, so it has to
-# be in the path and it's not enough to add it in ADDITIONAL_*_BINARIES in meson
-vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gdk-pixbuf/")
-
-vcpkg_configure_meson(
-    SOURCE_PATH ${SOURCE_PATH}
-    OPTIONS
-        -Dmsvc14x-parallel-installable=false
-        -Dbuild-documentation=false
-        -Dbuild-atkmm-api=false
-        -Dbuild-x11-api=false
-        -Dbuild-demos=false
-        -Dbuild-tests=false
-        -Dbuild-documentation=false
-    ADDITIONAL_NATIVE_BINARIES
-        glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-    ADDITIONAL_CROSS_BINARIES
-        glib-compile-resources='${CURRENT_HOST_INSTALLED_DIR}/tools/glib/glib-compile-resources${VCPKG_HOST_EXECUTABLE_SUFFIX}'
-)
-
-vcpkg_install_meson()
-vcpkg_fixup_pkgconfig()
-vcpkg_copy_pdbs()
-
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/gtkmm3/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/hicolor-icon-theme Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/hicolor-icon-theme/portfile.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/hicolor-icon-theme/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imagemagick Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imagemagick/disable_complex_fftw.patch Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imagemagick/dont_include_win32config.patch Deleted

@@ -1,89 +0,0 @@
-commit 6050ff9e4c3f5f6bf4138ad01cb5e58300c08928
-Author: Hesham Essam <hesham.essam.mail@gmail.com>
-Date: Sun Jul 3 23:24:52 2022 +0200
-
- Don't include win32config.h
- 
- vcpkg doesn't export libxml2's win32config.h, and it is not needed
- for successful compilation
-
-diff --git a/MagickCore/magick.c b/MagickCore/magick.c
-index 956af5e70..86d416531 100644
---- a/MagickCore/magick.c
-+++ b/MagickCore/magick.c
-@@ -94,11 +94,6 @@
- #include "MagickCore/utility-private.h"
- #include "MagickCore/xwindow-private.h"
- #if defined(MAGICKCORE_XML_DELEGATE)
--# if defined(MAGICKCORE_WINDOWS_SUPPORT)
--# if !defined(__MINGW32__)
--# include <win32config.h>
--# endif
--# endif
- # include <libxml/parser.h>
- #endif
- &#xc;
-diff --git a/MagickCore/profile.c b/MagickCore/profile.c
-index bed2bfb4b..e5f2b944b 100644
---- a/MagickCore/profile.c
-+++ b/MagickCore/profile.c
-@@ -78,11 +78,6 @@
- #endif
- #endif
- #if defined(MAGICKCORE_XML_DELEGATE)
--# if defined(MAGICKCORE_WINDOWS_SUPPORT)
--# if !defined(__MINGW32__)
--# include <win32config.h>
--# endif
--# endif
- # include <libxml/parser.h>
- # include <libxml/tree.h>
- #endif
-diff --git a/coders/msl.c b/coders/msl.c
-index 513c7cf09..04de629a6 100644
---- a/coders/msl.c
-+++ b/coders/msl.c
-@@ -93,11 +93,6 @@
- #include "MagickCore/utility.h"
- #include "MagickCore/visual-effects.h"
- #if defined(MAGICKCORE_XML_DELEGATE)
--# if defined(MAGICKCORE_WINDOWS_SUPPORT)
--# if !defined(__MINGW32__)
--# include <win32config.h>
--# endif
--# endif
- # include <libxml/xmlmemory.h>
- # include <libxml/parserInternals.h>
- # include <libxml/xmlerror.h>
-diff --git a/coders/svg.c b/coders/svg.c
-index e52e009a5..3376280d0 100644
---- a/coders/svg.c
-+++ b/coders/svg.c
-@@ -79,11 +79,6 @@
- #include "coders/coders-private.h"
- 
- #if defined(MAGICKCORE_XML_DELEGATE)
--# if defined(MAGICKCORE_WINDOWS_SUPPORT)
--# if !defined(__MINGW32__)
--# include <win32config.h>
--# endif
--# endif
- # include <libxml/xmlmemory.h>
- # include <libxml/parserInternals.h>
- # include <libxml/xmlerror.h>
-diff --git a/coders/url.c b/coders/url.c
-index 2adfd89de..bf0031446 100644
---- a/coders/url.c
-+++ b/coders/url.c
-@@ -58,11 +58,6 @@
- #include "MagickCore/string_.h"
- #include "MagickCore/utility.h"
- #if defined(MAGICKCORE_XML_DELEGATE)
--# if defined(MAGICKCORE_WINDOWS_SUPPORT)
--# if !defined(__MINGW32__)
--# include <win32config.h>
--# endif
--# endif
- # include <libxml/parser.h>
- # include <libxml/xmlmemory.h>
- #if defined(LIBXML_FTP_ENABLED)

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imagemagick/fix_make_dependency.patch Deleted

@@ -1,23 +0,0 @@
-commit ac12794e733dc463255c01d0e41a9a254061a1ff
-Author: Hesham Essam <hesham.essam.mail@gmail.com>
-Date: Fri Jul 15 15:06:48 2022 +0200
-
- Fix make dependency
- 
- the target "install-exec-local-utilities" depends on "install-binPROGRAMS"
- it happens to work when using one job (make install -j1), as it executes
- "install-binPROGRAMS" first, but it isn't guaranteed when using multiple jobs
-
-diff --git a/Makefile.in b/Makefile.in
-index 51f0a5fc1..d46feef9b 100644
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -13724,7 +13724,7 @@ uninstall-man: uninstall-man1
- @MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@$(libMagickCore_threshold_target): MagickCore/threshold-map.h
- @MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@MagickCore/threshold-map.h: config/thresholds.xml Makefile
- @MAGICKCORE_ZERO_CONFIGURATION_SUPPORT_TRUE@	$(AM_V_GEN){ printf '%s\n %s=\n' 'static const char *const' BuiltinMap; sed -e 's/"/\\"/g; s/^.*$$/ "&\\n"/; $$s/$$/;/' $<; } >$@
--install-exec-local-utilities:
-+install-exec-local-utilities: install-binPROGRAMS
- 	$(mkinstalldirs) $(DESTDIR)$(bindir)
- 	cd $(DESTDIR)$(bindir) ; \
- 	magick=`echo "magick" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imagemagick/fix_ssize_t_undefined.patch Deleted

@@ -1,42 +0,0 @@
-commit 99e40404c1ebace2cedb443fb26ae0a3b4153658
-Author: Hesham Essam <hesham.essam.mail@gmail.com>
-Date: Fri Jul 15 15:54:00 2022 +0200
-
- Fix ssize_t not defined in msvc
-
-diff --git a/config/config.h.in b/config/config.h.in
-index 4d902e626..70b306d4b 100644
---- a/config/config.h.in
-+++ b/config/config.h.in
-@@ -1,5 +1,31 @@
- /* config/config.h.in. Generated from configure.ac by autoheader. */
- 
-+/*
-+ Visual C++ does not define double_t, float_t, or ssize_t by default.
-+*/
-+#ifdef _MSC_VER
-+ #if !defined(double_t)
-+ #define MAGICKCORE_HAVE_DOUBLE_T
-+ #if !defined(__MINGW32__)
-+ typedef double double_t;
-+ #endif
-+ #endif
-+ #if !defined(float_t)
-+ #define MAGICKCORE_HAVE_FLOAT_T
-+ #if !defined(__MINGW32__)
-+ typedef float float_t;
-+ #endif
-+ #endif
-+ #if !defined(ssize_t) && !defined(__MINGW32__)
-+ #define MAGICKCORE_HAVE_SSIZE_T
-+ #if defined(_WIN64)
-+ typedef __int64 ssize_t;
-+ #else
-+ typedef long ssize_t;
-+ #endif
-+ #endif
-+#endif
-+
- /* Define if building universal (internal helper macro) */
- #undef AC_APPLE_UNIVERSAL_BUILD
-

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imagemagick/portfile.cmake Deleted

@@ -1,64 +0,0 @@
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://github.com/ImageMagick/ImageMagick/archive/refs/tags/7.1.0-39.tar.gz"
-    FILENAME "ImageMagick-7.1.0-39.tar.gz"
-    SHA512 A655DA17BE5E7B1A9CA95960DD29261ACD21222A2087BB187E9A06B29446F3755CF305B86185FED9D8B4BA30F46D1D679159B4670089ECCF93153A6A7FA63160
-)
-
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE "${ARCHIVE}"
-    PATCHES
-      disable_complex_fftw.patch
-      dont_include_win32config.patch
-      fix_make_dependency.patch
-      fix_ssize_t_undefined.patch
-)
-
-vcpkg_configure_make(
-  SOURCE_PATH "${SOURCE_PATH}"
-  DETERMINE_BUILD_TRIPLET
-  USE_WRAPPERS
-  OPTIONS
-    --with-fftw
-    --with-fontconfig
-    --with-freetype
-    --with-jpeg
-    --with-lzma
-    --with-pango
-    --with-png
-    --with-xml
-    --with-zlib
-    --with-zstd
-    --with-openexr
-    # FIXME (gdi32 is used in MagickCore which is a C project, while gdi32 is c++)
-    # msvc automatically uses C mode when compiling files with extension "c"
-    --without-gdi32
-    --disable-docs
-)
-
-vcpkg_install_make()
-vcpkg_fixup_pkgconfig()
-vcpkg_copy_tools(
-  TOOL_NAMES
-    animate
-    compare
-    composite
-    conjure
-    convert
-    display
-    identify
-    import
-    magick
-    magick-script
-    mogrify
-    montage
-    stream
-  AUTO_CLEAN
-  SEARCH_DIR "${CURRENT_PACKAGES_DIR}/tools/imagemagick/bin"
-)
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/imagemagick/bin")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/tools/imagemagick/debug")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imagemagick/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imath Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imath/define_dll.patch Deleted

@@ -1,29 +0,0 @@
-Author: Hesham Essam <hesham.essam.mail@gmail.com>
-Date: Sun Jul 31 01:18:42 2022 +0200
-
- Define IMATH_DLL macro in the pkgconfig file
-
-diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt
-index d51c25b..f9a84f6 100644
---- a/config/CMakeLists.txt
-+++ b/config/CMakeLists.txt
-@@ -40,6 +40,9 @@ if(IMATH_INSTALL_PKG_CONFIG)
- string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
- set(LIB_SUFFIX_DASH ${IMATH_LIB_SUFFIX}${CMAKE_${uppercase_CMAKE_BUILD_TYPE}_POSTFIX})
- string(REPLACE ".in" "" pcout ${pcinfile})
-+ if(BUILD_SHARED_LIBS)
-+ set(IMATH_CFLAGS "-DIMATH_DLL")
-+ endif()
- configure_file(${pcinfile} ${CMAKE_CURRENT_BINARY_DIR}/${pcout} @ONLY)
- install(
- FILES ${CMAKE_CURRENT_BINARY_DIR}/${pcout}
-diff --git a/config/Imath.pc.in b/config/Imath.pc.in
-index df11cfd..b90aecb 100644
---- a/config/Imath.pc.in
-+++ b/config/Imath.pc.in
-@@ -14,4 +14,4 @@ Version: @IMATH_VERSION@
- Requires:
- Conflicts:
- Libs: -L${libdir} -lImath${libsuffix}
--Cflags: -I${includedir} -I${includedir}/Imath
-+Cflags: -I${includedir} -I${includedir}/Imath @IMATH_CFLAGS@

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imath/portfile.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/imath/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libcroco Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libcroco/portfile.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libcroco/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/librsvg Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/librsvg/portfile.cmake Deleted

@@ -1,39 +0,0 @@
-vcpkg_download_distfile(ARCHIVE
-    URLS "https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.20.tar.xz"
-    FILENAME "librsvg-2.40.20.tar.xz"
-    SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
-)
-
-vcpkg_extract_source_archive_ex(
-    OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE "${ARCHIVE}"
-    PATCHES
-      use_unix_path.patch
-      remove_lm_from_pkgconfig.patch
-)
-
-vcpkg_find_acquire_program(PYTHON3)
-get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
-# this is bad!
-# glib-mkenums has #!/bin/env python3
-file (COPY_FILE ${PYTHON3} "${PYTHON3_DIR}/python3.exe")
-
-vcpkg_add_to_path("${PYTHON3_DIR}")
-vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/gdk-pixbuf")
-vcpkg_add_to_path("${CURRENT_HOST_INSTALLED_DIR}/tools/glib")
-
-vcpkg_configure_make(
-  SOURCE_PATH "${SOURCE_PATH}"
-  DETERMINE_BUILD_TRIPLET
-  USE_WRAPPERS
-  OPTIONS
-    --disable-gtk-doc
-    --enable-introspection=no
-    --enable-pixbuf-loader
-)
-
-vcpkg_install_make()
-vcpkg_fixup_pkgconfig()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/librsvg/remove_lm_from_pkgconfig.patch Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/librsvg/use_unix_path.patch Deleted

@@ -1,24 +0,0 @@
-Author: Hesham Essam <hesham.essam.mail@gmail.com>
-Date: Fri Jul 22 11:08:00 2022 +0200
-
- Use unix-style path
-
-diff --git a/configure b/configure
-index c940852..736ae22 100644
---- a/configure
-+++ b/configure
-@@ -14741,10 +14741,10 @@ test -n "$GDK_PIXBUF_QUERYLOADERS" || GDK_PIXBUF_QUERYLOADERS="none"
- fi
- 
- # First try the standalone gdk-pixbuf
-- gdk_pixbuf_binary_version="`$PKG_CONFIG --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0`"
-- gdk_pixbuf_binarydir="`$PKG_CONFIG --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0`"
-- gdk_pixbuf_moduledir=`$PKG_CONFIG --variable gdk_pixbuf_moduledir gdk-pixbuf-2.0`
-- gdk_pixbuf_cache_file=`$PKG_CONFIG --variable gdk_pixbuf_cache_file gdk-pixbuf-2.0`
-+ gdk_pixbuf_binary_version="/`$PKG_CONFIG --variable=gdk_pixbuf_binary_version gdk-pixbuf-2.0 | sed 's/://'`"
-+ gdk_pixbuf_binarydir="/`$PKG_CONFIG --variable=gdk_pixbuf_binarydir gdk-pixbuf-2.0 | sed 's/://'`"
-+ gdk_pixbuf_moduledir="/`$PKG_CONFIG --variable gdk_pixbuf_moduledir gdk-pixbuf-2.0 | sed 's/://'`"
-+ gdk_pixbuf_cache_file="/`$PKG_CONFIG --variable gdk_pixbuf_cache_file gdk-pixbuf-2.0 | sed 's/://'`"
- fi
- 
-

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/librsvg/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libsigcpp-2 Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libsigcpp-2/portfile.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libsigcpp-2/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libtool Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libtool/dirent_fix.patch Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libtool/portfile.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libtool/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libxmlpp Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libxmlpp/portfile.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/libxmlpp/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/openexr Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/openexr/portfile.cmake Deleted

@@ -1,46 +0,0 @@
-if (VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
-  message(FATAL_ERROR "UWP build not supported")
-endif()
-
-vcpkg_from_github(
-  OUT_SOURCE_PATH SOURCE_PATH
-  REPO openexr/openexr
-  REF 420da6a57a3ecaeab481b993dd590eeec8fe0c52
-  SHA512 5D8A5B0111394385AAACBDC6225C7CE75FA4E0126555B77A290EA51CABBE92D7C9AD41EBDDDC779E9018651262E4777D3A07166D862FEEFC57AC8BD3460DC76A
-  HEAD_REF master
-)
-
-vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH}
-  PREFER_NINJA
-  OPTIONS
-    -DCMAKE_DEBUG_POSTFIX=_d
-    -DOPENEXR_INSTALL_PKG_CONFIG=TRUE
-)
-
-vcpkg_install_cmake()
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/OpenEXR)
-vcpkg_fixup_pkgconfig()
-
-vcpkg_copy_tools(
-  TOOL_NAMES
-    exr2aces
-    exrenvmap
-    exrheader
-    exrinfo
-    exrmakepreview
-    exrmaketiled
-    exrmultipart
-    exrmultiview
-    exrstdattr
-  AUTO_CLEAN
-)
-vcpkg_copy_pdbs()
-
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
-file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
-
-if (VCPKG_CMAKE_SYSTEM_NAME OR VCPKG_LIBRARY_LINKAGE STREQUAL static)
-  file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/bin ${CURRENT_PACKAGES_DIR}/debug/bin)
-endif()
-
-file(INSTALL ${SOURCE_PATH}/LICENSE.md DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/openexr/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/pangomm Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/pangomm/portfile.cmake Deleted

_service:obs_scm:synfig-1.5.3.obscpio/vcpkg-ports/pangomm/vcpkg.json Deleted

_service:obs_scm:synfig-1.5.3.obscpio/ETL/ETL/_handle.h -> _service:obs_scm:synfig-1.5.4.obscpio/ETL/ETL/_handle.h Changed

@@ -53,13 +53,24 @@
 template <class T> class loose_handle;
 template <class T> class rhandle;
 
-
-// ========================================================================
-/*!	\class	shared_object _handle.h	ETL/handle
-**	\brief	Shared Object Base Class
-**	\see handle, loose_handle
-**	\writeme
-*/
+/**
+ * A shared object, i.e. it stores a reference counter.
+ *
+ * It is a base class for object lifetime management to avoid memory leak
+ * and use after free (not freeing if being used/referenced somewhere else.
+ *
+ * Instances are expected to be pointers, not regular variables.
+ * As soon as the reference counter reaches back to zero (by unref()),
+ * the object is freed.
+ *
+ * Initial reference count is 0.
+ * In current code base, it is expected a shared_object to be wrapped in
+ * handle or rhandle objects, that increase the reference count.
+ *
+ * This class dates back 2005, when there were not std::shared_ptr<> and alike
+ *
+ * @see handle, loose_handle
+ */
 class shared_object
 {
 private:
@@ -75,36 +86,54 @@
 	virtual ~shared_object() { }
 
 public:
+	/** Increase the reference counter */
 	virtual void ref() const noexcept
 	{
 		++refcount;
 	}
 
-	//! Returns \c false if object needs to be deleted
+	/**
+	 * Decreases the reference counter and destroy itself if it reaches 0.
+	 *
+	 * It should be called only in objects in dynamic storage (heap allocation)
+	 */
 	virtual void unref() const
 	{
-		--refcount;
-		if (refcount == 0)
+		if (--refcount == 0)
 			delete this;
 	}
 
-	//! Decrease reference counter without deletion of object
-	//! Returns \c false if references exceed and object should be deleted
+	/**
+	 * Decreases the reference counter.
+	 *
+	 * It does not try to destroy itself. Use it carefully.
+	 */
 	virtual void unref_inactive() const noexcept
 	{
 		--refcount;
 	}
 
+	/** The current reference count */
 	int use_count() const noexcept { return refcount; }
 
 }; // END of class shared_object
 
-// ========================================================================
-/*!	\class	handle _handle.h	ETL/handle
-**	\brief	Object Handle
-**	\see shared_object, loose_handle
-**	\writeme
-*/
+/**
+ * A smart pointer that stores objects that have ref() and unref() methods.
+ *
+ * This class dates back 2005, when there were not std::shared_ptr<> and alike.
+ * It is somewhat similar to std::shared_ptr<>, but only works for objects
+ * that manages its reference count and lifetime by ref() and unref() methods.
+ *
+ * When it wraps an object, it makes sure its reference count is increase.
+ * As long as any handle for that same object exists, the object won't be
+ * destroyed.
+ *
+ * The stored object can be accessed transparently as if handle were an
+ * ordinary pointer.
+ *
+ * @see shared_object, loose_handle
+ */
 template <class T>
 class handle
 {
@@ -119,31 +148,37 @@
 	typedef int size_type;
 
 protected:
-	value_type *obj;		//!< Pointer to object
+	/** The pointer to the owned object */
+	value_type* obj;
 
 public:
 
-	//! Default constructor - empty handle
+	/** Default constructor - empty handle */
 	handle() noexcept : obj(nullptr) { }
 
-	//! Constructor that constructs from a pointer to new object
+	/** Constructor with pointer to the managed object */
 	handle(pointer x):obj(x)
 	{
 		if(obj)
 			obj->ref();
 	}
 
-	//! Default copy constructor
+	/** Copy constructor */
 	handle(const handle<value_type>& x) noexcept : obj(x.get())
 	{
 		if(obj)
 			obj->ref();
 	}
 
-	//! Handle is released on deletion
+	/** Move constructor */
+	handle(handle<value_type>&& x) noexcept : obj(x.get())
+	{
+		x.obj = nullptr;
+	}
+
 	~handle() { reset(); }
 
-	//! Assignment operator
+	/** Copy assignment operator */
 	handle<value_type>&
 	operator=(const handle<value_type>& x) noexcept
 	{
@@ -157,7 +192,23 @@
 		return *this;
 	}
 
-	//! Swaps the values of two handles without reference counts
+	/** Move assignment operator */
+	handle<value_type>&
+	operator=(handle<value_type>&& x) noexcept
+	{
+		if (this == &x || obj == x.get())
+			return *this;
+
+		if (obj)
+			obj->unref();
+
+		obj = x.get();
+		x.obj = nullptr;
+
+		return *this;
+	}
+
+	/** Swaps the values of two handles without touching the reference counts */
 	handle<value_type>&
 	swap(handle<value_type>& x) noexcept
 	{
@@ -167,8 +218,11 @@
 		return *this;
 	}
 
-	//! Handle detach procedure
-	/*! unref()'s the object and sets the internal object pointer to \c nullptr */
+	/**
+	 * Handle detach procedure
+	 *
+	 * unref() the object and sets the internal object pointer to @c nullptr
+	 */
 	void
 	reset() noexcept
 	{
@@ -178,34 +232,48 @@
 			xobj->unref();
 	}
 
+	/** Check if it does not own any object. @see operator bool() */
 	bool empty() const noexcept { return !obj; }
 
-	//! Creates a new instance of a T object and puts it in the handle.
-	/*! Uses the default constructor */
+	/**
+	 * Creates a new instance of a @c T object and puts it in the handle.
+	 *
+	 * Uses the default constructor
+	 */
 	void spawn() { operator=(handle(new T())); }
 
-	//! Returns a constant handle to our object
+	/** Returns a constant handle to owned object */
 	handle<const value_type> constant()const { assert(obj); return *this; }
 
-	//! Returns number of instances
+	/**
+	 * Returns number of instances/references of the owned object.
+	 *
+	 * Not reliable in a multithread environment.
+	 */
 	count_type
 	use_count() const noexcept
 		{ return obj ? obj->use_count() : 0; }
 
-	//! Returns true if there is only one instance of the object
+	/**
+	 * Checks if there is only one instance/reference of the owned object.
+	 *
+	 * Not reliable in a multithread environment.
+	 */
 	bool
 	unique() const noexcept
 		{ /* assert(obj); */ return use_count() == 1; }
 
+	/** Dereference the owned object pointer. */
 	reference
 	operator*() const noexcept
 		{ assert(obj); return *obj; }
 
+	/** Pointer to the owned object. */
 	pointer
 	operator->() const noexcept
 		{ assert(obj); return obj; }
 
-	//! More explicit bool cast
+	/** Explicit bool cast to check if it has an object pointer. @see empty() */
 	explicit operator bool() const noexcept
 		{ return obj != nullptr; }
 
@@ -236,18 +304,32 @@
 	template <class U> static handle<T> cast_const		(U* x);
 	template <class U> static handle<T> cast_reinterpret(U* x);
 
-	//! Returns pointer to the object that is being wrapped
+	/** Returns pointer to the owned object */
 	pointer get() const noexcept { return obj; }
 
-	//! static_cast<> overload -- Useful for implicit casts
+	/** static_cast<> overload -- Useful for implicit casts */
 	template <class U>
 	operator handle()const
 	{ return handle(obj); }
 
+	/**
+	 * Check the type of owned object.
+	 *
+	 * @code{.cpp}
+	 * h.type_is<MyType>()
+	 * @endcode
+	 */
 	template<typename U>
 	bool type_is() const
 	{ return dynamic_cast<const U*>(obj); }
 
+	/**
+	 * Cast the pointer of owned object to other type.
+	 *
+	 * @code{.cpp}
+	 * MyType* p = h.type_pointer<MyType>()
+	 * @endcode
+	 */
 	template<typename U>
 	U* type_pointer() const
 	{ return dynamic_cast<U*>(obj); }
@@ -257,12 +339,23 @@
 	{ return typeid(*obj) == typeid(U); }
 }; // END of template class handle
 
-// ========================================================================
-/*!	\class	rshared_object _handle.h	ETL/handle
-**	\brief	Replaceable Shared Object Base Class
-**	\see rhandle
-**	\writeme
-*/
+/**
+ * A replaceable shared object.
+ *
+ * Besides having its lifetime management, special smart pointers -
+ * called rhandles - that store this object are able to point to other
+ * object, if desired.
+ * In other words, rhandles that points to object A can be changed
+ * to point, all of them, to object B.
+ *
+ * This class is basically meant to be the base for ValueNodes, that
+ * can be replaced when connecting or linking value nodes, for example.
+ *
+ * The stored object can be accessed transparently as if handle were an
+ * ordinary pointer.
+ *
+ * @see rhandle, loose_handle, shared_object
+ */
 class rshared_object : public shared_object
 {
 	template<class T> friend class rhandle;
@@ -294,12 +387,29 @@
 		{ return rrefcount; }
 }; // END of class rshared_object
 
-// ========================================================================
-/*!	\class	rhandle _handle.h	ETL/handle
-**	\brief	Replaceable Object Handle
-**	\see rshared_object, handle, loose_handle
-**	\writeme
-*/
+/**
+ * A smart pointer that is able to replace all others that store the same object
+ *
+ * Likewise handle class, this class dates back 2005, when C++ had not
+ * several of current standards.
+ * However, unlike handle class that is somehow similar to std::shared_ptr,
+ * rhandle does not have any equivalent on current C++ standard libraries.
+ *
+ * rhandle stands for "replaceable handle". It is a smart pointer, i.e. it
+ * manages a raw pointer, its lifetime via a reference counter.
+ * Additionally, it tracks all others rhandles that point to the same object
+ * in order to, if desired - by calling replace() - all rhandle smart pointers
+ * that manages that same object are changed all together to point to other
+ * object.
+ *
+ * This class expects a rshared_object to point to and it is aimed to deal
+ * with Synfig value nodes as layer parameters.
+ *
+ * The stored object can be accessed transparently as if handle were an
+ * ordinary pointer.
+ *
+ * @see rshared_object, handle, loose_handle
+ */
 template <class T>
 class rhandle : public handle<T>
 {
@@ -371,30 +481,53 @@
 
 public:
 
-	//! Default constructor - empty handle
-	rhandle() noexcept {}
+	/** Default constructor - empty handle */
+	rhandle() noexcept
+		: handle<T>(), prev_(nullptr), next_(nullptr)
+	{ }
 
-	//! Constructor that constructs from a pointer to new object
-	rhandle(pointer x):handle<T>(x)
+	/** Constructor that constructs from a pointer to new object */
+	rhandle(pointer x)
+		: handle<T>(x), prev_(nullptr), next_(nullptr)
 	{
 		if(obj)add_to_rlist();
 	}
 
-	rhandle(const handle<value_type> &x):handle<T>(x)
+	rhandle(const handle<value_type> &x)
+		: handle<T>(x), prev_(nullptr), next_(nullptr)
 	{
 		if(obj)add_to_rlist();
 	}
 
-	//! Default copy constructor
-	rhandle(const rhandle<value_type> &x):handle<T>(x)
+	/** Copy constructor */
+	rhandle(const rhandle<value_type> &x)
+		: handle<T>(x), prev_(nullptr), next_(nullptr)
 	{
 		if(obj)add_to_rlist();
 	}
 
-	//! Handle is released on deletion
+	/** Move constructor */
+	rhandle(rhandle<value_type>&& x) noexcept
+	{
+		obj = x.obj;
+		prev_ = x.prev_;
+		next_ = x.next_;
+		if (prev_)
+			prev_->next_ = this;
+		if (next_)
+			next_->prev_ = this;
+		if (obj) {
+			if (!obj->front_ || obj->front_ == &x)
+				obj->front_ = this;
+			if (!obj->back_ || obj->back_ == &x)
+				obj->back_ = this;
+		}
+		x.obj = nullptr;
+	}
+
 	~rhandle() { reset(); }
 
-	//! Assignment operator
+	/** Copy assignment operator */
 	rhandle<value_type> &
 	operator=(const rhandle<value_type> &x)
 	{
@@ -446,35 +579,76 @@
 		return *this;
 	}
 
-	//! Handle release procedure
-	/*! unref()'s the object and sets the internal object pointer to \c nullptr */
+	/** Move assignment operator */
+	rhandle<value_type>&
+	operator=(rhandle<value_type>&& x) noexcept
+	{
+		if (x.get() == obj)
+			return *this;
+
+		reset();
+
+		obj = x.obj;
+		prev_ = x.prev_;
+		next_ = x.next_;
+		if (prev_)
+			prev_->next_ = this;
+		if (next_)
+			next_->prev_ = this;
+		if (obj) {
+			if (!obj->front_ || obj->front_ == &x)
+				obj->front_ = this;
+			if (!obj->back_ || obj->back_ == &x)
+				obj->back_ = this;
+		}
+		x.obj = nullptr;
+
+		return *this;
+	}
+
+	/**
+	 * Handle release procedure
+	 * unref()'s the object and sets the internal object pointer to @c nullptr
+	 */
 	void
 	reset() noexcept
 	{
 		if(obj)del_from_rlist();
 		handle<value_type>::reset();
 		obj = nullptr;
+		prev_ = nullptr;
+		next_ = nullptr;
 	}
 
-	//! Creates a new instance of a T object and puts it in the handle.
-	/*! Uses the default constructor */
+	/**
+	 * Creates a new instance of a T object and puts it in the rhandle.
+	 *
+	 * Uses the default constructor
+	 */
 	void spawn() { operator=(handle<value_type>(new T())); }
 
-	//! Returns number of reversible instances
+	/** Returns number of replaceable instances */
 	count_type
 	rcount() const noexcept
 	{
 		return obj?obj->rcount():0;
 	}
 
-	//! Returns true if there is only one instance of the object
+	/** Returns true if there is only one instance of the object */
 	bool
 	runique() const noexcept
 	{
 		assert(obj); return obj->front_==obj->back_;
 	}
 
-	//! \writeme
+	/**
+	 * Replace the object pointer of this and all other 'sibbling' rhandle objects.
+	 *
+	 * By 'sibbling' we mean rhandle that points to same rshared_object.
+	 *
+	 * @param x the new object this rhandle and its sibblings shall point to.
+	 * @return the number of replacements done
+	 */
 	int replace(const handle<value_type> &x)
 	{
 		assert(obj);
@@ -508,19 +682,28 @@
 		return i;
 	}
 
-	//! Swaps the values of two handles without reference counts
-	/*!	\warning not yet implemented. \writeme */
+	/**
+	 * Swaps the values of two handles without reference counts
+	 * @warning not yet implemented.
+	 */
 	handle<value_type> &
 	swap(handle<value_type> &x);
 }; // END of template class rhandle
 
-
-// ========================================================================
-/*!	\class	loose_handle _handle.h	ETL/handle
-**	\brief	Loose Object Handle
-**	\see shared_object, handle
-**	\writeme
-*/
+/**
+ * A not-smart pointer to objects that have use_count() method.
+ *
+ * This class does not own a pointer, just stores it without any
+ * lifetime management or reference count deal. The object pointer
+ * is just wrapped to provide some convenient methods.
+ *
+ * It isn't like std::weak_ptr in 'modern' C++, it is way more simpler.
+ *
+ * The pointed object can be accessed transparently as if handle were an
+ * ordinary pointer.
+ *
+ * @see shared_object, handle
+ */
 template <class T>
 class loose_handle
 {
@@ -535,21 +718,27 @@
 	typedef int size_type;
 
 protected:
-	value_type *obj;		//!< Pointer to object
+	/** The pointer to the owned object */
+	value_type* obj;
 
 public:
 
-	//! Default constructor - empty handle
+	/** Default constructor - empty handle */
 	loose_handle() noexcept : obj(nullptr) { }
 
-	//! Constructor that constructs from a pointer to new object
+	/** Constructor that constructs from a pointer to new object */
 	loose_handle(pointer x) noexcept : obj(x) { }
 
-	//! Default copy constructor
+	/** Copy constructor */
 	loose_handle(const loose_handle<value_type>& x) noexcept : obj(x.get()) { }
 
+	/** Move constructor */
+	loose_handle(loose_handle<value_type>&& x) noexcept : obj(x.get()) { }
+
 	loose_handle(const handle<value_type> &x) noexcept : obj(x.get()) { }
 
+	~loose_handle() {}
+
 	template <class U> const loose_handle<value_type>&
 	operator=(const handle& x) noexcept
 	{
@@ -570,7 +759,7 @@
 		return *this;
 	}
 
-	//! Assignment operator
+	/** Copy assignment operator */
 	const loose_handle<value_type>&
 	operator=(const loose_handle<value_type>& x) noexcept
 	{
@@ -581,7 +770,18 @@
 		return *this;
 	}
 
-	//! Swaps the values of two handles without reference counts
+	/** Move assignment operator */
+	const loose_handle<value_type>&
+	operator=(loose_handle<value_type>&& x) noexcept
+	{
+		if (x.get() == obj)
+			return *this;
+
+		obj = x.get();
+		return *this;
+	}
+
+	/** Swaps the values of two handles without reference counts */
 	loose_handle<value_type>&
 	swap(loose_handle<value_type>& x) noexcept
 	{
@@ -591,31 +791,35 @@
 		return *this;
 	}
 
-	//! Handle release procedure
+	/** Handle release procedure */
 	void reset() noexcept
 	{
 		obj = nullptr;
 	}
 
+	/** Check if it does not own any object. @see operator bool() */
 	bool empty() const noexcept { return !obj; }
 
-	//! Returns a constant handle to our object
+	/** Returns a constant handle to our object */
 	loose_handle<const value_type> constant()const { return *this; }
 
-	//! Returns number of instances
+	/** The current reference count */
 	count_type
 	use_count() const noexcept
 		{ return obj ? obj->use_count() : 0; }
 
+
+	/** Dereference the owned object pointer. */
 	reference
 	operator*() const noexcept
 		{ assert(obj); return *obj; }
 
+	/** Pointer to the owned object. */
 	pointer
 	operator->() const noexcept
 		{ assert(obj); return obj; }
 
-	//! static_cast<> overload (for consts)
+	/** static_cast<> overload (for consts) */
 	operator loose_handle<const value_type>()const
 	{ return loose_handle<const value_type>(static_cast<const_pointer>(obj)); }
 
@@ -625,17 +829,31 @@
 	operator rhandle<value_type>()const
 	{ return rhandle<value_type>(obj); }
 
-	//! Returns pointer to the object that is being wrapped
+	/** Returns pointer to the owned object */
 	pointer get() const noexcept { return obj; }
 
-	//! More explicit bool cast
+	/** Explicit bool cast to check if it has an object pointer. @see empty() */
 	explicit operator bool() const noexcept
 		{ return obj != nullptr; }
 
+	/**
+	 * Check the type of owned object.
+	 *
+	 * @code{.cpp}
+	 * h.type_is<MyType>()
+	 * @endcode
+	 */
 	template<typename U>
 	bool type_is() const
 	{ return dynamic_cast<const U*>(obj); }
 
+	/**
+	 * Cast the pointer of owned object to other type.
+	 *
+	 * @code{.cpp}
+	 * MyType* p = h.type_pointer<MyType>()
+	 * @endcode
+	 */
 	template<typename U>
 	U* type_pointer() const
 	{ return dynamic_cast<U*>(obj); }

_service:obs_scm:synfig-1.5.3.obscpio/ETL/m4/ETL.m4 -> _service:obs_scm:synfig-1.5.4.obscpio/ETL/m4/ETL.m4 Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/bootstrap.sh -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/bootstrap.sh Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/m4/ETL.m4 -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/m4/ETL.m4 Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/po/POTFILES.in -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/po/POTFILES.in Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_freetype/lyr_freetype.cpp Changed

@@ -314,23 +314,45 @@
 		return *static_cast<FaceMetaData*>(face->generic.data);
 	}
 
-	void
-	add_to_face(FT_Face face)
+	static void
+	add_to_face(FT_Face face, filesystem::Path path)
 	{
 		if (face->generic.data)
 			face->generic.finalizer(face);
-		face->generic.data = this;
+		face->generic.data = new FaceMetaData{path};
 		face->generic.finalizer = FaceMetaData::self_destroy;
 	}
 
+#if HAVE_HARFBUZZ
+	static void
+	add_to_face(FT_Face face, const filesystem::Path& path, hb_font_t* font)
+	{
+		if (face->generic.data)
+			face->generic.finalizer(face);
+		face->generic.data = new FaceMetaData{path, font};
+		face->generic.finalizer = FaceMetaData::self_destroy;
+	}
+#endif
 private:
+	explicit FaceMetaData(filesystem::Path path)
+		: path(path)
+	{ }
+
+#if HAVE_HARFBUZZ
+	FaceMetaData(filesystem::Path path, hb_font_t* font)
+		: path(path), font(font)
+	{ }
+#endif
+
 	static void
 	self_destroy(void* object)
 	{
 		FT_Face face = static_cast<FT_Face>(object);
 		FaceMetaData* meta_data = static_cast<FaceMetaData*>(face->generic.data);
 face->generic.data = nullptr;
+#if HAVE_HARFBUZZ
 		hb_font_destroy(meta_data->font);
+#endif
 		delete meta_data;
 	}
 };
@@ -580,6 +602,7 @@
 		if (!font_path_from_canvas)
 			meta.canvas_path.clear();
 		face_cache.put(meta, face);
+		need_sync |= SYNC_FONT;
 	};
 
 	if (has_valid_font_extension(font_fam_))
@@ -673,12 +696,11 @@
 bool
 Layer_Freetype::new_face(const String &newfont)
 {
-	synfig::String font=param_font.get(synfig::String());
 	int error = 0;
 	FT_Long face_index=0;
 
 	// If we are already loaded, don't bother reloading.
-	if(face && font==newfont)
+	if (face && param_font.get(synfig::String()) == newfont)
 		return true;
 
 	if(face)
@@ -698,18 +720,20 @@
 		auto face_ptr = face_cache.get(absolute_path);
 		if (face_ptr) {
 			face = face_ptr;
+#if HAVE_HARFBUZZ
+			font = FaceMetaData::get_from_face(face).font;
+#endif
 			break;
 		}
 		error = FT_New_Face(ft_library, path.c_str(), face_index, &face);
 		if (!error) {
 			face_cache.put(absolute_path, face);
-			FaceMetaData* data = new FaceMetaData();
-			data->path = path;
 #if HAVE_HARFBUZZ
-			data->font = hb_ft_font_create(face, nullptr);
-			this->font = data->font;
+			font = hb_ft_font_create(face, nullptr);
+			FaceMetaData::add_to_face(face, path, font);
+#else
+			FaceMetaData::add_to_face(face, path);
 #endif
-			data->add_to_face(face);
 			font_path_from_canvas = !canvas_path.empty() && path.compare(0, canvas_path.size(), canvas_path) == 0;
 			break;
 		}
@@ -721,9 +745,6 @@
 		return false;
 	}
 
-	// ???
-	font=newfont;
-
 	need_sync |= SYNC_FONT;
 	return true;
 }
@@ -924,6 +945,7 @@
 
 	ret.push_back(ParamDesc("family")
 		.set_local_name(_("Font Family"))
+		.set_description(_("You can select or type a font family name or the font file path"))
 		.set_hint("font_family")
 	);

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_freetype/lyr_freetype.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_freetype/lyr_freetype.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_std/bevel.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_std/bevel.cpp Changed

@@ -40,22 +40,29 @@
 
 #include <synfig/blur.h>
 #include <synfig/context.h>
+#include <synfig/rendering/software/task/tasksw.h>
+#include <synfig/rendering/software/function/blur.h>
+
 
 #endif
 
+/* === U S I N G =========================================================== */
+
 using namespace synfig;
 using namespace modules;
 using namespace lyr_std;
 
-/* -- G L O B A L S --------------------------------------------------------- */
+/* === G L O B A L S ======================================================= */
 
 SYNFIG_LAYER_INIT(Layer_Bevel);
 SYNFIG_LAYER_SET_NAME(Layer_Bevel,"bevel");
 SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Bevel,N_("Bevel"));
 SYNFIG_LAYER_SET_CATEGORY(Layer_Bevel,N_("Stylize"));
-SYNFIG_LAYER_SET_VERSION(Layer_Bevel,"0.2");
+SYNFIG_LAYER_SET_VERSION(Layer_Bevel,"0.3");
+
+/* === P R O C E D U R E S ================================================= */
 
-/* -- F U N C T I O N S ----------------------------------------------------- */
+/* === M E T H O D S ======================================================= */
 
 Layer_Bevel::Layer_Bevel():
 	Layer_CompositeFork(0.75,Color::BLEND_ONTO),
@@ -160,35 +167,35 @@
 	return Color::blend(shade,context.get_color(pos),get_amount(),get_blend_method());
 }
 
-RendDesc
-Layer_Bevel::get_sub_renddesc_vfunc(const RendDesc &renddesc) const
+void
+TaskBevel::set_coords_sub_tasks()
 {
-	Real softness=param_softness.get(Real());
-	int type=param_type.get(int());
+	if (!sub_task(0)) {
+		trunc_to_zero();
+		return;
+	}
+	if (!is_valid_coords()) {
+		sub_task(0)->set_coords_zero();
+		return;
+	}
 
-	const int	w = renddesc.get_w(),
-				h = renddesc.get_h();
-	const Real	pw = renddesc.get_pw(),
-				ph = renddesc.get_ph();
-	const Vector size(softness,softness);
+	const int w = target_rect.get_width();
+	const int h = target_rect.get_height();
+	const Real pw = get_units_per_pixel()0;
+	const Real ph = get_units_per_pixel()1;
 
-	RendDesc workdesc(renddesc);
+	const Vector size(softness,softness);
 
 	//expand the working surface to accommodate the blur
 
 	//the expanded size = 1/2 the size in each direction rounded up
 	int	halfsizex = (int) (std::fabs(size0*.5/pw) + 3),
-		halfsizey = (int) (std::fabs(size1*.5/ph) + 3);
+		halfsizey = (int) (std::fabs(size1*.5/(ph)) + 3);
 
-	int offset_u(round_to_int(offset0/pw)),offset_v(round_to_int(offset1/ph));
-	int offset_w(w+std::abs(offset_u)*2),offset_h(h+std::abs(offset_v)*2);
-
-	workdesc.set_subwindow(
-		-std::abs(offset_u),
-		-std::abs(offset_v),
-		w+std::abs(offset_u),
-		h+std::abs(offset_v)
-	);
+	const int offset_u(round_to_int(offset0/pw));
+	const int offset_v(round_to_int(offset1/(ph)));
+	const int offset_w(w+std::abs(offset_u)*2);
+	const int offset_h(h+std::abs(offset_v)*2);
 
 	//expand by 1/2 size in each direction on either side
 	switch(type)
@@ -205,8 +212,6 @@
 		case Blur::GAUSSIAN:
 		{
 		#define GAUSSIAN_ADJUSTMENT		(0.05)
-			Real pw = workdesc.get_pw();
-			Real ph = workdesc.get_ph();
 
 			Real pw2 = pw * pw;
 			Real ph2 = ph * ph;
@@ -220,164 +225,163 @@
 		}
 	}
 
-	workdesc.set_subwindow( -halfsizex, -halfsizey, offset_w + 2*halfsizex, offset_h + 2*halfsizey );
-	return workdesc;
-}
+	Real delta_x = -std::abs(offset_u) - halfsizex;
+	Real delta_y = -std::abs(offset_v) - halfsizey;
+	Real new_w = offset_w + 2*halfsizex;
+	Real new_h = offset_h + 2*halfsizey;
 
-bool
-Layer_Bevel::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
-{
-	RENDER_TRANSFORMED_IF_NEED(__FILE__, __LINE__)
+	Rect new_sub_source_rect(source_rect.minx + pw*delta_x, source_rect.miny + ph*delta_y, source_rect.minx + pw*delta_x + pw*new_w, source_rect.miny + ph*delta_y + ph*new_h);
 
-	Real softness=param_softness.get(Real());
-	int type=param_type.get(int());
-	Color color1=param_color1.get(Color());
-	Color color2=param_color2.get(Color());
-	bool use_luma=param_use_luma.get(bool());
-	bool solid=param_solid.get(bool());
 
-	int x,y;
-	SuperCallback stageone(cb,0,5000,10000);
-	SuperCallback stagetwo(cb,5000,10000,10000);
+	sub_task(0)->set_coords(new_sub_source_rect, VectorInt(new_w, new_h));
+}
 
-	RendDesc	workdesc = get_sub_renddesc(renddesc);
-	Surface		worksurface;
-	synfig::surface<float> alpha_surface, blurred;
+Rect
+TaskBevel::calc_bounds() const
+{
+	if (!sub_task(0))
+		return Rect::zero();
+
+	Rect bounds = sub_task(0)->get_bounds();
+	Vector size = Vector(softness,softness) * rendering::software::Blur::get_extra_size(rendering::Blur::Type(type));
+	size0 = fabs(size0) + 1.0;
+	size1 = fabs(size1) + 1.0;
+	bounds.minx -= size0;
+	bounds.miny -= size1;
+	bounds.maxx += size0;
+	bounds.maxy += size1;
 
-	const Real	pw = renddesc.get_pw(),
-				ph = renddesc.get_ph();
-	const Vector size(softness,softness);
+	return bounds;
+}
 
-	int	halfsizex = (int) (std::fabs(size0*.5/pw) + 3),
-		halfsizey = (int) (std::fabs(size1*.5/ph) + 3);
+SYNFIG_EXPORT rendering::Task::Token TaskBevel::token(
+	DescAbstract<TaskBevel>("Bevel") );
 
-	int offset_u(round_to_int(offset0/pw)),offset_v(round_to_int(offset1/ph));
+class TaskBevelSW : public TaskBevel, public synfig::rendering::TaskSW
+{
+public:
+	typedef etl::handle<TaskBevel> Handle;
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
 
-	//callbacks depend on how long the blur takes
-	if(size0 || size1)
-	{
-		if(type == Blur::DISC)
-		{
-			stageone = SuperCallback(cb,0,5000,10000);
-			stagetwo = SuperCallback(cb,5000,10000,10000);
-		}
-		else
-		{
-			stageone = SuperCallback(cb,0,9000,10000);
-			stagetwo = SuperCallback(cb,9000,10000,10000);
-		}
-	}
-	else
-	{
-		stageone = SuperCallback(cb,0,9999,10000);
-		stagetwo = SuperCallback(cb,9999,10000,10000);
-	}
+	bool run(RunParams&) const override {
+		if (!is_valid())
+			return true;
+		if (!sub_task(0))
+			return false;
 
-	switch(type)
-	{
-		case Blur::GAUSSIAN:
-		{
-			Real pw = workdesc.get_pw();
-			Real ph = workdesc.get_ph();
+		Rect common_source_rect;
+		rect_set_intersect(common_source_rect, source_rect, sub_task(0)->source_rect);
+		if (!common_source_rect.is_valid())
+			return false;
 
-			Real pw2 = pw * pw;
-			Real ph2 = ph * ph;
+		LockWrite la(this);
+		if (!la)
+			return false;
 
-			halfsizex = (int)(size0*GAUSSIAN_ADJUSTMENT/std::fabs(pw2) + 0.5);
-			halfsizey = (int)(size1*GAUSSIAN_ADJUSTMENT/std::fabs(ph2) + 0.5);
+		synfig::surface<float> blurred;
 
-			halfsizex = (halfsizex + 1)/2;
-			halfsizey = (halfsizey + 1)/2;
+		const Vector size(softness,softness);
 
-			break;
+		{
+			synfig::surface<float> alpha_surface;
+			get_alpha_surface(alpha_surface);
+			//blur the image
+			Blur(size, type)(alpha_surface, sub_task(0)->source_rect.get_size(), blurred);
 		}
-	}
-
-	//render the background onto the expanded surface
-	if(!context.accelerated_render(&worksurface,quality,workdesc,&stageone))
-		return false;
 
-	// Copy over the alpha
-	alpha_surface.set_wh(worksurface.get_w(), worksurface.get_h());
-	if(!use_luma)
-	{
-		for(int j=0;j<worksurface.get_h();j++)
-			for(int i=0;i<worksurface.get_w();i++)
-			{
-				alpha_surfaceji = worksurfaceji.get_a();
-			}
-	}
-	else
-	{
-		for(int j=0;j<worksurface.get_h();j++)
-			for(int i=0;i<worksurface.get_w();i++)
-			{
-				alpha_surfaceji = worksurfaceji.get_a() * worksurfaceji.get_y();
+		const Vector ppu = get_pixels_per_unit();
+		const Real pw = 1/ppu0;
+		const Real ph = 1/ppu1;
+		const int halfsizex = (int) (std::fabs(size0*.5/pw) + 3);
+		const int halfsizey = (int) (std::fabs(size1*.5/ph) + 3);
+
+		const int offset_u(round_to_int(offset0/pw)),offset_v(round_to_int(offset1/ph));
+
+		const float u0(offset0/pw), v0(offset1/ph);
+		const float u1(offset450/pw), v1(offset451/ph);
+
+		// convert vector-coordinates to raster-coordinates (i.e. source rect to target rect)
+		Matrix transformation_matrix;
+		transformation_matrix.m00 = ppu0;
+		transformation_matrix.m11 = ppu1;
+		transformation_matrix.m20 = target_rect.minx - source_rect.minx*ppu0;
+		transformation_matrix.m21 = target_rect.miny - source_rect.miny*ppu1;
+
+		const Point ftarget_min = transformation_matrix.get_transformed(source_rect.get_min());
+		const Point ftarget_max = transformation_matrix.get_transformed(source_rect.get_max());
+		const PointInt target_min = {round_to_int(ftarget_min0), round_to_int(ftarget_min1)};
+		const PointInt target_max = {round_to_int(ftarget_max0), round_to_int(ftarget_max1)};
+		int v = halfsizey+std::abs(offset_v) + target_min1;
+		for (int iy = target_min1; iy < target_max1; ++iy, ++v) {
+			int u = halfsizex+std::abs(offset_u) + target_min0;
+			for (int ix = target_min0; ix < target_max0; ++ix, ++u) {
+
+				Real alpha(0);
+				Color shade;
+
+				alpha += -blurred.linear_sample(u+u0, v+v0);
+				alpha -= -blurred.linear_sample(u-u0, v-v0);
+				alpha += -blurred.linear_sample(u+u1, v+v1)*0.5f;
+				alpha += -blurred.linear_sample(u+v1, v-u1)*0.5f;
+				alpha -= -blurred.linear_sample(u-u1, v-v1)*0.5f;
+				alpha -= -blurred.linear_sample(u-v1, v+u1)*0.5f;
+
+				if(solid)
+				{
+					alpha/=4.0f;
+					alpha+=0.5f;
+					shade=Color::blend(color1,color2,alpha,Color::BLEND_STRAIGHT);
+				}
+				else
+				{
+					alpha/=2;
+					if(alpha>0)
+						shade=color1,shade.set_a(shade.get_a()*alpha);
+					else
+						shade=color2,shade.set_a(shade.get_a()*-alpha);
+				}
+
+				if (shade.get_a())
+					la->get_surface()iyix = shade;
+				else
+					la->get_surface()iyix = Color::alpha();
 			}
+		}
+		return true;
 	}
 
-	//blur the image
-	Blur(size, type, &stagetwo)(alpha_surface, workdesc.get_br()-workdesc.get_tl(), blurred);
-
-	//be sure the surface is of the correct size
-	surface->set_wh(renddesc.get_w(),renddesc.get_h());
-
-	const float u0(offset0/pw), v0(offset1/ph);
-	const float u1(offset450/pw), v1(offset451/ph);
-
-	const float amount = get_amount();
-	const Color::BlendMethod blend_method = get_blend_method();
-
-	int v = halfsizey+std::abs(offset_v);
-	for(y=0;y<renddesc.get_h();y++,v++)
+private:
+	bool get_alpha_surface(synfig::surface<float>& output) const
 	{
-		int u = halfsizex+std::abs(offset_u);
-		for(x=0;x<renddesc.get_w();x++,u++)
-		{
-			Real alpha(0);
-			Color shade;
-
-			alpha += -blurred.linear_sample(u+u0, v+v0);
-			alpha -= -blurred.linear_sample(u-u0, v-v0);
-			alpha += -blurred.linear_sample(u+u1, v+v1)*0.5f;
-			alpha += -blurred.linear_sample(u+v1, v-u1)*0.5f;
-			alpha -= -blurred.linear_sample(u-u1, v-v1)*0.5f;
-			alpha -= -blurred.linear_sample(u-v1, v+u1)*0.5f;
-
-			if(solid)
-			{
-				alpha/=4.0f;
-				alpha+=0.5f;
-				shade=Color::blend(color1,color2,alpha,Color::BLEND_STRAIGHT);
-			}
-			else
-			{
-				alpha/=2;
-				if(alpha>0)
-					shade=color1,shade.set_a(shade.get_a()*alpha);
-				else
-					shade=color2,shade.set_a(shade.get_a()*-alpha);
+		LockRead lb(sub_tasks0);
+		if (!lb)
+			return false;
+
+		const Surface& context = lb->get_surface();
+		synfig::surface<float>& alpha_surface = output;
+		alpha_surface.set_wh(context.get_w(), context.get_h());
+		if (!use_luma) {
+			for (int y = 0; y < context.get_h(); ++y) {
+				for (int x = 0; x < context.get_w(); ++x) {
+					alpha_surfaceyx = contextyx.get_a();
+				}
 			}
-
-
-
-			if(shade.get_a())
-			{
-				(*surface)yx = Color::blend(shade, worksurfacevu, amount, blend_method);
+		} else {
+			for (int y = 0; y < context.get_h(); ++y) {
+				for (int x = 0; x < context.get_w(); ++x) {
+					const auto& value = contextyx;
+					alpha_surfaceyx = value.get_a() * value.get_y();
+				}
 			}
-			else (*surface)yx = worksurfacevu;
 		}
-	}
 
-	if(cb && !cb->amount_complete(10000,10000))
-	{
-		//if(cb)cb->error(strprintf(__FILE__"%d: Accelerated Renderer Failure",__LINE__));
-		return false;
+		return true;
 	}
+};
 
-	return true;
-}
-
+SYNFIG_EXPORT rendering::Task::Token TaskBevelSW::token(
+	DescReal<TaskBevelSW, TaskBevel>("BevelSW") );
 
 ////
 
@@ -454,5 +458,20 @@
 }
 
 rendering::Task::Handle
-Layer_Bevel::build_rendering_task_vfunc(Context context) const
-	{ return Layer::build_rendering_task_vfunc(context); }
+Layer_Bevel::build_composite_fork_task_vfunc(ContextParams /*context_params*/, rendering::Task::Handle sub_task) const
+{
+	TaskBevel::Handle task_bevel(new TaskBevel());
+	task_bevel->softness = param_softness.get(Real());
+	task_bevel->type = param_type.get(int());
+	task_bevel->color1 = param_color1.get(Color());
+	task_bevel->color2 = param_color2.get(Color());
+	task_bevel->use_luma = param_use_luma.get(bool());
+	task_bevel->solid = param_solid.get(bool());
+
+	task_bevel->offset = offset;
+	task_bevel->offset45 = offset45;
+
+	task_bevel->sub_task(0) = sub_task->clone_recursive();
+
+	return task_bevel;
+}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_std/bevel.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_std/bevel.h Changed

@@ -61,11 +61,10 @@
 	ValueBase param_use_luma;
 	//!Parameter: (bool) solid
 	ValueBase param_solid;
-	
+
 	Vector	offset;
 	Vector	offset45;
 
-
 	void calc_offset();
 public:
 	Layer_Bevel();
@@ -76,17 +75,37 @@
 
 	Color get_color(Context context, const Point& pos) const override;
 
-	bool accelerated_render(Context context, Surface* surface, int quality, const RendDesc& renddesc, ProgressCallback* cb) const override;
-
 	Rect get_full_bounding_rect(Context context) const override;
 	Vocab get_param_vocab() const override;
 	bool reads_context() const override { return true; }
 
 protected:
-	RendDesc get_sub_renddesc_vfunc(const RendDesc& renddesc) const override;
-	rendering::Task::Handle build_rendering_task_vfunc(Context context) const override;
+	rendering::Task::Handle build_composite_fork_task_vfunc(ContextParams, rendering::Task::Handle sub_task) const override;
 }; // END of class Layer_Bevel
 
+// TaskBevel performs Blur internally, and the behavior of
+// applying skew transformation before or after the blur is not the same.
+// Therefore, we can't inherit synfig::rendering::TaskInterfaceTransformationPass here
+class TaskBevel: public rendering::Task//, rendering::TaskInterfaceTransformationPass
+{
+public:
+	typedef etl::handle<TaskBevel> Handle;
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
+
+	Real softness;
+	int type;
+	Color color1;
+	Color color2;
+	bool use_luma;
+	bool solid;
+
+	Vector offset, offset45;
+
+	void set_coords_sub_tasks() override;
+	Rect calc_bounds() const override;
+};
+
 }; // END of namespace lyr_std
 }; // END of namespace modules
 }; // END of namespace synfig

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_std/curvewarp.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_std/curvewarp.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_std/julia.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_std/julia.cpp Changed

@@ -37,12 +37,7 @@
 
 #include <synfig/localization.h>
 
-#include <synfig/string.h>
-#include <synfig/time.h>
 #include <synfig/context.h>
-#include <synfig/paramdesc.h>
-#include <synfig/renddesc.h>
-#include <synfig/value.h>
 
 #endif
 
@@ -60,42 +55,10 @@
 SYNFIG_LAYER_SET_NAME(Julia,"julia");
 SYNFIG_LAYER_SET_LOCAL_NAME(Julia,N_("Julia Set"));
 SYNFIG_LAYER_SET_CATEGORY(Julia,N_("Fractals"));
-SYNFIG_LAYER_SET_VERSION(Julia,"0.1");
+SYNFIG_LAYER_SET_VERSION(Julia,"0.2");
 
 /* === P R O C E D U R E S ================================================= */
 
-inline void
-color_neg_flip(Color &color)
-{
-	if(color.get_a()==0)
-	{
-		color=Color::alpha();
-		return;
-	}
-
-	if(color.get_a()<0)
-		color=-color;
-
-	if(color.get_r()<0)
-	{
-		color.set_g(color.get_g()-color.get_r());
-		color.set_b(color.get_b()-color.get_r());
-		color.set_r(0);
-	}
-	if(color.get_g()<0)
-	{
-		color.set_r(color.get_r()-color.get_g());
-		color.set_b(color.get_b()-color.get_g());
-		color.set_g(0);
-	}
-	if(color.get_b()<0)
-	{
-		color.set_r(color.get_r()-color.get_b());
-		color.set_g(color.get_g()-color.get_b());
-		color.set_b(0);
-	}
-}
-
 /* === M E T H O D S ======================================================= */
 
 Julia::Julia():
@@ -121,8 +84,8 @@
 	param_broken=ValueBase(false);
 	param_seed=ValueBase(Point(0,0));
 
-	param_bailout=ValueBase(Real(4));
-	lp=log(log(param_bailout.get(Real())));
+	param_bailout=ValueBase(Real(2));
+	squared_bailout = 4;
 
 	SET_INTERPOLATION_DEFAULTS();
 	SET_STATIC_DEFAULTS();
@@ -152,28 +115,17 @@
 	IMPORT_VALUE(param_smooth_outside);
 	IMPORT_VALUE(param_broken);
 
-	IMPORT_VALUE_PLUS(param_iterations,
-	{
-		int iterations=param_iterations.get(int());
-		iterations=value.get(iterations);
-		if(iterations<0)
-			iterations=0;
-		if(iterations>500000)
-			iterations=500000;
+	IMPORT_VALUE_PLUS(param_iterations, {
+		int iterations = value.get(int());
+		iterations = synfig::clamp(iterations, 0, 500000);
 		param_iterations.set(iterations);
 		return true;
-	}
-	);
-	IMPORT_VALUE_PLUS(param_bailout,
-	{
+	});
+	IMPORT_VALUE_PLUS(param_bailout, {
 		Real bailout=param_bailout.get(Real());
-		bailout=value.get(bailout);
-		bailout*=bailout;
-		lp=log(log(bailout));
-		param_bailout.set(bailout);
+		squared_bailout = bailout * bailout;
 		return true;
-	}
-	);
+	});
 
 	return false;
 }
@@ -200,14 +152,7 @@
 	EXPORT_VALUE(param_color_cycle);
 	EXPORT_VALUE(param_smooth_outside);
 	EXPORT_VALUE(param_broken);
-
-	if(param=="bailout")
-	{
-		// This line is needed to copy the static and interpolation options
-		ValueBase ret(param_bailout);
-		ret.set(sqrt(param_bailout.get(Real())));
-		return ret;
-	}
+	EXPORT_VALUE(param_bailout);
 
 	EXPORT_NAME();
 	EXPORT_VERSION();
@@ -277,7 +222,7 @@
 		// Calculate Magnitude
 		mag=zr*zr+zi*zi;
 
-		if(mag>4)
+		if(mag>squared_bailout)
 		{
 			if(smooth_outside)
 			{

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_std/julia.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_std/julia.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_std/mandelbrot.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_std/mandelbrot.cpp Changed

@@ -233,65 +233,50 @@
 
 	ret.push_back(ParamDesc("distort_inside")
 		.set_local_name(_("Distort Inside"))
-		.set_group(_("Inside"))
 	);
 	ret.push_back(ParamDesc("shade_inside")
 		.set_local_name(_("Shade Inside"))
-		.set_group(_("Inside"))
 	);
 	ret.push_back(ParamDesc("solid_inside")
 		.set_local_name(_("Solid Inside"))
-		.set_group(_("Inside"))
 	);
 	ret.push_back(ParamDesc("invert_inside")
 		.set_local_name(_("Invert Inside"))
-		.set_group(_("Inside"))
 	);
 	ret.push_back(ParamDesc("gradient_inside")
 		.set_local_name(_("Gradient Inside"))
-		.set_group(_("Inside"))
 	);
 	ret.push_back(ParamDesc("gradient_offset_inside")
 		.set_local_name(_("Offset Inside"))
-		.set_group(_("Inside"))
 	);
 	ret.push_back(ParamDesc("gradient_loop_inside")
 		.set_local_name(_("Loop Inside"))
-		.set_group(_("Inside"))
 	);
 
 	ret.push_back(ParamDesc("distort_outside")
 		.set_local_name(_("Distort Outside"))
-		.set_group(_("Outside"))
 	);
 	ret.push_back(ParamDesc("shade_outside")
 		.set_local_name(_("Shade Outside"))
-		.set_group(_("Outside"))
 	);
 	ret.push_back(ParamDesc("solid_outside")
 		.set_local_name(_("Solid Outside"))
-		.set_group(_("Outside"))
 	);
 	ret.push_back(ParamDesc("invert_outside")
 		.set_local_name(_("Invert Outside"))
-		.set_group(_("Outside"))
 	);
 	ret.push_back(ParamDesc("gradient_outside")
 		.set_local_name(_("Gradient outside"))
-		.set_group(_("Outside"))
 	);
 	ret.push_back(ParamDesc("smooth_outside")
 		.set_local_name(_("Smooth Outside"))
 		.set_description(_("Smooth the coloration outside the set"))
-		.set_group(_("Outside"))
 	);
 	ret.push_back(ParamDesc("gradient_offset_outside")
 		.set_local_name(_("Offset Outside"))
-		.set_group(_("Outside"))
 	);
 	ret.push_back(ParamDesc("gradient_scale_outside")
 		.set_local_name(_("Scale Outside"))
-		.set_group(_("Outside"))
 	);
 
 	return ret;

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_std/perspective.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_std/perspective.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_std/shade.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_std/shade.cpp Changed

@@ -242,12 +242,6 @@
 	if (!sub_task)
 		return sub_task;
 
-	rendering::TaskBlur::Handle task_blur(new rendering::TaskBlur());
-	task_blur->blur.size = size;
-	task_blur->blur.type = type;
-	if (sub_task)
-		task_blur->sub_task() = sub_task->clone_recursive();
-
 	ColorMatrix matrix;
 	matrix *= ColorMatrix().set_replace_color(color);
 	if (invert)
@@ -255,11 +249,20 @@
 
 	rendering::TaskPixelColorMatrix::Handle task_colormatrix(new rendering::TaskPixelColorMatrix());
 	task_colormatrix->matrix = matrix;
-	task_colormatrix->sub_task() = task_blur;
+	task_colormatrix->sub_task() = sub_task->clone_recursive();
 
 	rendering::TaskTransformationAffine::Handle task_transformation(new rendering::TaskTransformationAffine());
 	task_transformation->transformation->matrix.set_translate(origin);
 	task_transformation->sub_task() = task_colormatrix;
 
+	if (size != Vector::zero())
+	{
+		rendering::TaskBlur::Handle task_blur(new rendering::TaskBlur());
+		task_blur->blur.size = size;
+		task_blur->blur.type = type;
+		task_blur->sub_task() = task_transformation;
+		return task_blur;
+	}
+
 	return task_transformation;
 }

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_std/xorpattern.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_std/xorpattern.cpp Changed

@@ -45,6 +45,8 @@
 #include <synfig/renddesc.h>
 #include <synfig/value.h>
 
+#include <synfig/rendering/software/task/taskpaintpixelsw.h>
+
 #endif
 
 using namespace synfig;
@@ -59,12 +61,64 @@
 SYNFIG_LAYER_SET_NAME(XORPattern,"xor_pattern");
 SYNFIG_LAYER_SET_LOCAL_NAME(XORPattern,N_("XOR Pattern"));
 SYNFIG_LAYER_SET_CATEGORY(XORPattern,N_("Other"));
-SYNFIG_LAYER_SET_VERSION(XORPattern,"0.1");
+SYNFIG_LAYER_SET_VERSION(XORPattern,"0.2");
 
 /* === P R O C E D U R E S ================================================= */
 
 /* === M E T H O D S ======================================================= */
 
+class TaskXORPattern: public rendering::Task, public rendering::TaskInterfaceTransformation
+{
+public:
+	typedef etl::handle<TaskXORPattern> Handle;
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
+
+	Vector origin;
+	Vector size;
+
+	rendering::Transformation::Handle get_transformation() const override {
+		return transformation.handle();
+	}
+
+private:
+	rendering::Holder<rendering::TransformationAffine> transformation;
+};
+
+class TaskXORPatternSW: public TaskXORPattern, public rendering::TaskPaintPixelSW
+{
+public:
+	typedef etl::handle<TaskXORPatternSW> Handle;
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
+
+	bool run(RunParams&) const override
+	{
+		return run_task();
+	}
+
+	Color get_color(const Vector& point) const override
+	{
+		const unsigned int a = floor((point0 - origin0) / size0);
+		const unsigned int b = floor((point1 - origin1) / size1);
+		unsigned char rindex = (a^b);
+		unsigned char gindex = (a^(~b)) * 4;
+		unsigned char bindex = ~(a^b) * 2;
+
+		return
+			Color(
+				(Color::value_type)rindex / (Color::value_type)255.0,
+				(Color::value_type)gindex / (Color::value_type)255.0,
+				(Color::value_type)bindex / (Color::value_type)255.0,
+				1.0);
+	}
+};
+
+SYNFIG_EXPORT rendering::Task::Token TaskXORPattern::token(
+	DescAbstract<TaskXORPattern>("TaskXORPattern") );
+SYNFIG_EXPORT rendering::Task::Token TaskXORPatternSW::token(
+	DescReal<TaskXORPatternSW, TaskXORPattern>("TaskXORPatternSW") );
+
 XORPattern::XORPattern():
 	Layer_Composite(1.0,Color::BLEND_COMPOSITE),
 	param_origin(ValueBase(Vector(0.125,0.125))),
@@ -155,3 +209,13 @@
 
 	return const_cast<XORPattern*>(this);
 }
+
+rendering::Task::Handle
+XORPattern::build_composite_task_vfunc(ContextParams /*context_params*/) const
+{
+	TaskXORPattern::Handle task(new TaskXORPattern());
+	task->origin = param_origin.get(Vector());
+	task->size = param_size.get(Vector());
+
+	return task;
+}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/lyr_std/xorpattern.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/lyr_std/xorpattern.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_bmp/trgt_bmp.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_bmp/trgt_bmp.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_bmp/trgt_bmp.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_bmp/trgt_bmp.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_dv/trgt_dv.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_dv/trgt_dv.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_dv/trgt_dv.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_dv/trgt_dv.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.cpp Changed

@@ -98,13 +98,25 @@
 
 	// Remove temporary sound file
 	if (FileSystemNative::instance()->is_file(sound_filename.u8string())) {
-		if(FileSystemNative::instance()->remove_recursive(sound_filename.u8string())) {
+		if (!FileSystemNative::instance()->remove_recursive(sound_filename)) {
 			synfig::warning("Error deleting temporary sound file (%s).", sound_filename.u8_str());
 		}
 	}
 }
 
 bool
+ffmpeg_trgt::is_multiple_files() const
+{
+	return /*multi_image*/false;
+}
+
+filesystem::Path
+ffmpeg_trgt::get_filename() const
+{
+	return filename;
+}
+
+bool
 ffmpeg_trgt::set_rend_desc(RendDesc *given_desc)
 {
 	//given_desc->set_pixel_format(PF_RGB);
@@ -144,7 +156,7 @@
 bool
 ffmpeg_trgt::init(ProgressCallback* cb = nullptr)
 {
-	bool with_sound = false;
+	bool with_sound = true;
 	const std::string extension = filename.extension().u8string();
 	const std::vector<const char*> image_only_extensions{".gif", ".mng"};
 	const bool does_file_format_support_audio = std::find(image_only_extensions.begin(), image_only_extensions.end(), extension) == image_only_extensions.end();

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_ffmpeg/trgt_ffmpeg.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_filter/halftone2.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_filter/halftone2.cpp Changed

@@ -42,9 +42,9 @@
 #include <synfig/string.h>
 #include <synfig/context.h>
 #include <synfig/paramdesc.h>
-#include <synfig/renddesc.h>
-#include <synfig/surface.h>
-#include <synfig/value.h>
+#include <synfig/rendering/common/task/taskpixelprocessor.h>
+#include <synfig/rendering/software/task/taskpaintpixelsw.h>
+#include <synfig/rendering/software/task/tasksw.h>
 
 #endif
 
@@ -58,10 +58,75 @@
 SYNFIG_LAYER_SET_NAME(Halftone2,"halftone2");
 SYNFIG_LAYER_SET_LOCAL_NAME(Halftone2,N_("Halftone 2"));
 SYNFIG_LAYER_SET_CATEGORY(Halftone2,N_("Filters"));
-SYNFIG_LAYER_SET_VERSION(Halftone2,"0.0");
+SYNFIG_LAYER_SET_VERSION(Halftone2,"0.1");
 
 /* === P R O C E D U R E S ================================================= */
 
+class TaskHalfTone2: public rendering::TaskPixelProcessorBase, public rendering::TaskInterfaceTransformationGetAndPass
+{
+public:
+	typedef etl::handle<TaskHalfTone2> Handle;
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
+
+	Halftone halftone;
+	Color color_dark;
+	Color color_light;
+
+	rendering::Holder<rendering::TransformationAffine> transformation;
+
+	rendering::Transformation::Handle get_transformation() const override
+	{
+		return transformation.handle();
+	}
+};
+
+
+class TaskHalfTone2SW: public TaskHalfTone2, public rendering::TaskFilterPixelSW
+{
+public:
+	typedef etl::handle<TaskHalfTone2SW> Handle;
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
+
+	void pre_run(const Matrix3& /*raster_to_world*/) const override
+	{
+		supersample_size = 1/std::fabs(get_pixels_per_unit()0*(halftone.param_size.get(Vector())).mag());
+		inverted_transformation = transformation->create_inverted();
+	}
+
+	Color get_color(const Vector& p, const Color& c) const override
+	{
+		const float amount(halftone(inverted_transformation->transform(p), c.get_y(), supersample_size));
+		Color halfcolor;
+
+		if (amount <= 0.0f)
+			halfcolor = color_dark;
+		else if (amount >= 1.0f)
+			halfcolor = color_light;
+		else
+			halfcolor = Color::blend(color_light, color_dark, amount, Color::BLEND_STRAIGHT);
+
+		halfcolor.set_a(c.get_a());
+
+		return halfcolor;
+	}
+
+	bool run(RunParams&) const override
+	{
+		return run_task();
+	}
+
+protected:
+	mutable float supersample_size = 1.0f;
+	mutable rendering::Transformation::Handle inverted_transformation;
+};
+
+SYNFIG_EXPORT rendering::Task::Token TaskHalfTone2::token(
+	DescAbstract<TaskHalfTone2>("HalfTone2") );
+SYNFIG_EXPORT rendering::Task::Token TaskHalfTone2SW::token(
+	DescReal<TaskHalfTone2SW, TaskHalfTone2>("HalfTone2SW") );
+
 /* === M E T H O D S ======================================================= */
 
 Halftone2::Halftone2():
@@ -99,12 +164,6 @@
 	return halfcolor;
 }
 
-inline float
-Halftone2::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const
-{
-	return std::fabs(pw/(halftone.param_size.get(Vector())).mag());
-}
-
 synfig::Layer::Handle
 Halftone2::hit_check(synfig::Context /*context*/, const synfig::Point &/*point*/)const
 {
@@ -195,69 +254,16 @@
 		return Color::blend(color,undercolor,get_amount(),get_blend_method());
 }
 
-bool
-Halftone2::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
+rendering::Task::Handle
+Halftone2::build_composite_fork_task_vfunc(ContextParams /* context_params */, rendering::Task::Handle sub_task) const
 {
-	RENDER_TRANSFORMED_IF_NEED(__FILE__, __LINE__)
-
-	SuperCallback supercb(cb,0,9500,10000);
-
-	if(!context.accelerated_render(surface,quality,renddesc,&supercb))
-		return false;
-	if(get_amount()==0)
-		return true;
-
-	const Real pw(renddesc.get_pw()),ph(renddesc.get_ph());
-	const Point tl(renddesc.get_tl());
-	const int w(surface->get_w());
-	const int h(surface->get_h());
-	const float supersample_size(std::fabs(pw/(halftone.param_size.get(Vector())).mag()));
-
-	Surface::pen pen(surface->begin());
-	Point pos;
-	int x,y;
-
-	if(is_solid_color())
-	{
-		for(y=0,pos1=tl1;y<h;y++,pen.inc_y(),pen.dec_x(x),pos1+=ph)
-			for(x=0,pos0=tl0;x<w;x++,pen.inc_x(),pos0+=pw)
-				pen.put_value(
-					color_func(
-						pos,
-						supersample_size,
-						pen.get_value()
-					)
-				);
-	}
-	else
-	{
-		for(y=0,pos1=tl1;y<h;y++,pen.inc_y(),pen.dec_x(x),pos1+=ph)
-			for(x=0,pos0=tl0;x<w;x++,pen.inc_x(),pos0+=pw)
-				pen.put_value(
-					Color::blend(
-				 		color_func(
-							pos,
-							supersample_size,
-							pen.get_value()
-						),
-						pen.get_value(),
-						get_amount(),
-						get_blend_method()
-					)
-				);
-	}
-
-	// Mark our progress as finished
-	if(cb && !cb->amount_complete(10000,10000))
-		return false;
-
-	return true;
+	if (!sub_task)
+		return sub_task;
+
+	TaskHalfTone2::Handle task_halftone2(new TaskHalfTone2());
+	task_halftone2->color_dark = param_color_dark.get(Color());
+	task_halftone2->color_light = param_color_light.get(Color());
+	task_halftone2->halftone = halftone;
+	task_halftone2->sub_task() = sub_task;//->clone_recursive();
+	return task_halftone2;
 }
-
-///
-
-rendering::Task::Handle
-Halftone2::build_rendering_task_vfunc(Context context) const
-	{ return Layer::build_rendering_task_vfunc(context); }
-
-///

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_filter/halftone2.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_filter/halftone2.h Changed

@@ -72,23 +72,18 @@
 
 	Color color_func(const Point &x, float supersample,const Color &under_color)const;
 
-	float calc_supersample(const Point &x, float pw,float ph)const;
-
-	//float halftone_func(Point x)const;
-
 public:
 	Halftone2();
 
 	virtual bool set_param(const String &param, const ValueBase &value);
 	virtual ValueBase get_param(const String &param)const;
 	virtual Color get_color(Context context, const Point &pos)const;
-	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	Layer::Handle hit_check(Context context, const Point &point)const;
 	virtual Vocab get_param_vocab()const;
 	virtual bool reads_context()const { return true; }
 
 protected:
-	virtual rendering::Task::Handle build_rendering_task_vfunc(Context context) const;
+	virtual rendering::Task::Handle build_composite_fork_task_vfunc(ContextParams context_params, rendering::Task::Handle sub_task) const;
 }; // END of class Halftone2
 
 /* === E N D =============================================================== */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_filter/halftone3.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_filter/halftone3.cpp Changed

@@ -40,11 +40,9 @@
 #include <synfig/localization.h>
 
 #include <synfig/string.h>
-#include <synfig/time.h>
 #include <synfig/context.h>
 #include <synfig/paramdesc.h>
-#include <synfig/renddesc.h>
-#include <synfig/surface.h>
+#include <synfig/rendering/software/task/taskpaintpixelsw.h>
 #include <synfig/value.h>
 
 #endif
@@ -59,12 +57,96 @@
 SYNFIG_LAYER_SET_NAME(Halftone3,"halftone3");
 SYNFIG_LAYER_SET_LOCAL_NAME(Halftone3,N_("Halftone 3"));
 SYNFIG_LAYER_SET_CATEGORY(Halftone3,N_("Filters"));
-SYNFIG_LAYER_SET_VERSION(Halftone3,"0.0");
+SYNFIG_LAYER_SET_VERSION(Halftone3,"0.1");
 
 /* === P R O C E D U R E S ================================================= */
 
-#define HALFSQRT2	(0.7)
-#define SQRT2	(1.414213562f)
+class TaskHalfTone3: public rendering::TaskPixelProcessorBase, public rendering::TaskInterfaceTransformationGetAndPass
+{
+public:
+	typedef etl::handle<TaskHalfTone3> Handle;
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
+
+	Halftone tone3;
+	Color color3;
+	bool subtractive = false;
+	float inverse_matrix33;
+
+	rendering::Holder<rendering::TransformationAffine> transformation;
+
+	rendering::Transformation::Handle get_transformation() const override
+	{
+		return transformation.handle();
+	}
+};
+
+
+class TaskHalfTone3SW: public TaskHalfTone3, public rendering::TaskFilterPixelSW
+{
+public:
+	typedef etl::handle<TaskHalfTone3> Handle;
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
+
+	void pre_run(const Matrix3& /*raster_to_world*/) const override
+	{
+		supersample = 1/std::fabs(get_pixels_per_unit()0*(tone0.param_size.get(Vector())).mag());
+		inverted_transformation = transformation->create_inverted();
+	}
+
+	Color get_color(const Vector& p, const Color& in_color) const override
+	{
+		Color halfcolor;
+
+		float chan3;
+
+		const Vector point = inverted_transformation->transform(p);
+
+		if(subtractive)
+		{
+			chan0=inverse_matrix00*(1.0f-in_color.get_r())+inverse_matrix01*(1.0f-in_color.get_g())+inverse_matrix02*(1.0f-in_color.get_b());
+			chan1=inverse_matrix10*(1.0f-in_color.get_r())+inverse_matrix11*(1.0f-in_color.get_g())+inverse_matrix12*(1.0f-in_color.get_b());
+			chan2=inverse_matrix20*(1.0f-in_color.get_r())+inverse_matrix21*(1.0f-in_color.get_g())+inverse_matrix22*(1.0f-in_color.get_b());
+
+			halfcolor=Color::white();
+			halfcolor-=(~color0)*tone0(point,chan0,supersample);
+			halfcolor-=(~color1)*tone1(point,chan1,supersample);
+			halfcolor-=(~color2)*tone2(point,chan2,supersample);
+
+			halfcolor.set_a(in_color.get_a());
+		}
+		else
+		{
+			chan0=inverse_matrix00*in_color.get_r()+inverse_matrix01*in_color.get_g()+inverse_matrix02*in_color.get_b();
+			chan1=inverse_matrix10*in_color.get_r()+inverse_matrix11*in_color.get_g()+inverse_matrix12*in_color.get_b();
+			chan2=inverse_matrix20*in_color.get_r()+inverse_matrix21*in_color.get_g()+inverse_matrix22*in_color.get_b();
+
+			halfcolor=Color::black();
+			halfcolor+=color0*tone0(point,chan0,supersample);
+			halfcolor+=color1*tone1(point,chan1,supersample);
+			halfcolor+=color2*tone2(point,chan2,supersample);
+
+			halfcolor.set_a(in_color.get_a());
+		}
+
+		return halfcolor;
+	}
+
+	bool run(RunParams&) const override
+	{
+		return run_task();
+	}
+
+protected:
+	mutable float supersample = 1.0f;
+	mutable rendering::Transformation::Handle inverted_transformation;
+};
+
+SYNFIG_EXPORT rendering::Task::Token TaskHalfTone3::token(
+	DescAbstract<TaskHalfTone3>("HalfTone3") );
+SYNFIG_EXPORT rendering::Task::Token TaskHalfTone3SW::token(
+	DescReal<TaskHalfTone3SW, TaskHalfTone3>("HalfTone3SW") );
 
 /* === M E T H O D S ======================================================= */
 
@@ -124,7 +206,6 @@
 	}
 
 #define matrix inverse_matrix
-	//float matrix33;
 	if(subtractive)
 	{
 		for(int i=0;i<3;i++)
@@ -164,41 +245,6 @@
 		}
 	}
 #undef matrix
-
-
-
-#if 0
-	// Insert guass-jordan elimination code here
-	int k=0,i=0,j=0,z_size=3;
-#define A inverse_matrix
-
-	for (k=0;k<z_size;k++)
- // the pivot element
- { Akk= -1/Akk;
-
- //the pivot column
- for (i=0;i<z_size;i++)
- if (i!=k) Aik*=Akk;
-
- //elements not in a pivot row or column
- for (i=0;i<z_size;i++)
- if (i!=k)
- for (j=0;j<z_size;j++)
- if (j!=k)
- Aij+=Aik*Akj;
-
- //elements in a pivot row
- for (i=0;i<z_size;i++)
- if (i!=k)
- Aki*=Akk;
- }
-
- //change sign
- for (i=0;i<z_size;i++) /*reverse sign*/
- for (j=0;j<z_size;j++)
- Aij=-Aij;
-#undef A
-#endif
 }
 
 inline Color
@@ -244,12 +290,6 @@
 	return halfcolor;
 }
 
-inline float
-Halftone3::calc_supersample(const synfig::Point &/*x*/, float pw,float /*ph*/)const
-{
-	return std::fabs(pw/(tone0.param_size.get(Vector())).mag());
-}
-
 synfig::Layer::Handle
 Halftone3::hit_check(synfig::Context /*context*/, const synfig::Point &/*point*/)const
 {
@@ -374,70 +414,22 @@
 		return Color::blend(color,undercolor,get_amount(),get_blend_method());
 }
 
-bool
-Halftone3::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
+rendering::Task::Handle
+Halftone3::build_composite_fork_task_vfunc(ContextParams /* context_params */, rendering::Task::Handle sub_task) const
 {
-	RENDER_TRANSFORMED_IF_NEED(__FILE__, __LINE__)
-
-	SuperCallback supercb(cb,0,9500,10000);
-
-	if(!context.accelerated_render(surface,quality,renddesc,&supercb))
-		return false;
-	if(get_amount()==0)
-		return true;
-
-	const Real pw(renddesc.get_pw()),ph(renddesc.get_ph());
-	const Point tl(renddesc.get_tl());
-	const int w(surface->get_w());
-	const int h(surface->get_h());
-	const float supersample_size(std::fabs(pw/(tone0.param_size.get(Vector())).mag()));
-
-	Surface::pen pen(surface->begin());
-	Point pos;
-	int x,y;
-
-	if(is_solid_color())
-	{
-		for(y=0,pos1=tl1;y<h;y++,pen.inc_y(),pen.dec_x(x),pos1+=ph)
-			for(x=0,pos0=tl0;x<w;x++,pen.inc_x(),pos0+=pw)
-				pen.put_value(
-					color_func(
-						pos,
-						supersample_size,
-						pen.get_value()
-					)
-				);
-	}
-	else
-	{
-		for(y=0,pos1=tl1;y<h;y++,pen.inc_y(),pen.dec_x(x),pos1+=ph)
-			for(x=0,pos0=tl0;x<w;x++,pen.inc_x(),pos0+=pw)
-				pen.put_value(
-					Color::blend(
-				 		color_func(
-							pos,
-							supersample_size,
-							pen.get_value()
-						),
-						pen.get_value(),
-						get_amount(),
-						get_blend_method()
-					)
-				);
-	}
-
-	// Mark our progress as finished
-	if(cb && !cb->amount_complete(10000,10000))
-		return false;
-
-	return true;
+	if (!sub_task)
+		return sub_task;
+
+	TaskHalfTone3::Handle task_halftone3(new TaskHalfTone3());
+	for (int i=0; i < 3; i++)
+		task_halftone3->colori = param_colori.get(Color());
+	task_halftone3->subtractive = param_subtractive.get(bool());
+	for (int i=0; i < 3; i++)
+		task_halftone3->tonei = tonei;
+	for (int i=0; i < 3; i++)
+		for (int j=0; j < 3; j++)
+			task_halftone3->inverse_matrixij = inverse_matrixij;
+	task_halftone3->sub_task() = sub_task;//->clone_recursive();
+
+	return task_halftone3;
 }
-
-////
-
-
-rendering::Task::Handle
-Halftone3::build_rendering_task_vfunc(Context context) const
-	{ return Layer::build_rendering_task_vfunc(context); }
-
-////

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_filter/halftone3.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_filter/halftone3.h Changed

@@ -40,12 +40,6 @@
 #include "halftone.h"
 
 /* === M A C R O S ========================================================= */
-#define HALFTONE3_IMPORT_VALUE(x)                                             \
-	if (#x=="tonei.param_"+param && x.get_type()==value.get_type())         \
-		{                                                                     \
-			x=value;                                                          \
-			return true;                                                      \
-		}                                                                     \
 
 /* === T Y P E D E F S ===================================================== */
 
@@ -72,10 +66,6 @@
 
 	Color color_func(const Point &x, float supersample,const Color &under_color)const;
 
-	float calc_supersample(const Point &x, float pw,float ph)const;
-
-	//float halftone_func(Point x)const;
-
 	void sync();
 
 public:
@@ -84,13 +74,12 @@
 	virtual bool set_param(const String &param, const ValueBase &value);
 	virtual ValueBase get_param(const String &param)const;
 	virtual Color get_color(Context context, const Point &pos)const;
-	virtual bool accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const;
 	Layer::Handle hit_check(Context context, const Point &point)const;
 	virtual Vocab get_param_vocab()const;
 	virtual bool reads_context()const { return true; }
 
 protected:
-	virtual rendering::Task::Handle build_rendering_task_vfunc(Context context) const;
+	virtual rendering::Task::Handle build_composite_fork_task_vfunc(ContextParams context_params, rendering::Task::Handle sub_task) const;
 }; // END of class Halftone3
 
 /* === E N D =============================================================== */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_geometry/advanced_outline.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_geometry/advanced_outline.cpp Changed

@@ -94,7 +94,7 @@
 	Real calc_position(Real p, const rendering::Bend &bend, bool homogeneous) {
 		return homogeneous
 			 ? p*bend.length1()
-			 : bend.length_by_l( p*bend.l1() );
+			 : bend.length_by_index( p*bend.l1() );
 	}
 	
 	class AdvancedPoint {
@@ -183,13 +183,15 @@
 				}
 				
 				Real ky = kx*s1;
+				// i0: the first vertex, i1: the second one
 				i1 = begin(); i0 = i1++;
 				i0->second.pp10 = i0->first + (i1->first - i0->first)*kx;
 				i0->second.pp11 = i0->second.y1() + (i1->second.y0() - i0->second.y1())*ky;
 
+				// i0: the penultimate vertex, i1: the last one
 				i0 = end(); i1 = (--i0)--;
 				i1->second.pp00 = i1->first - (i1->first - i0->first)*kx;
-				i1->second.pp01 = i1->second.y1() - (i1->second.y0() - i0->second.y1())*ky;
+				i1->second.pp01 = i1->second.y0() - (i1->second.y0() - i0->second.y1())*ky;
 			}
 			
 			i0 = begin(); i1 = end(); --i1;
@@ -201,7 +203,14 @@
 			iterator i1 = lower_bound(p);
 			if (i1 == end())
 				{ clear(); return; }
-				
+
+			if (approximate_equal(i1->first, p)) {
+				i1->second.side0 = side;
+				i1->second.pp0 = Vector(p, 0);
+				erase(begin(), i1);
+				return;
+			}
+
 			Bezier b;
 			if (i1 == begin()) {
 				b = Bezier(
@@ -245,7 +254,14 @@
 			if (i1 == begin())
 				{ clear(); return; }
 			iterator i0 = i1; --i0;
-				
+
+			if (approximate_equal(i0->first, p)) {
+				i0->second.side1 = side;
+				i0->second.pp1 = Vector(p, 0);
+				erase(i1, end());
+				return;
+			}
+
 			Bezier b;
 			if (i1 == end()) {
 				b = Bezier(
@@ -538,8 +554,8 @@
 {
 	clear();
 	
-	const int wire_segments = 16;
-	const int contour_segments = 8;
+	const int wire_segments = 64;
+	const int contour_segments = 32;
 	const BLinePoint bp_blank;
 	const WidthPoint wp_blank;
 	const DashItem di_blank;

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_geometry/checkerboard.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_geometry/checkerboard.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_geometry/outline.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_geometry/outline.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_gif/trgt_gif.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_gif/trgt_gif.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_gif/trgt_gif.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_gif/trgt_gif.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_gradient/conicalgradient.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_gradient/conicalgradient.cpp Changed

@@ -62,17 +62,21 @@
 {
 public:
 	typedef etl::handle<TaskConicalGradient> Handle;
-	static Token token;
+	SYNFIG_EXPORT static Token token;
 	Token::Handle get_token() const override { return token.handle(); }
 
 	Point center;
 	Angle angle;
 	CompiledGradient compiled_gradient;
-	rendering::Holder<rendering::TransformationAffine> transformation;
 
 	TaskConicalGradient() { }
-	virtual rendering::Transformation::Handle get_transformation() const override
-		{ return transformation.handle(); }
+
+	rendering::Transformation::Handle get_transformation() const override {
+		return transformation.handle();
+	}
+
+private:
+	rendering::Holder<rendering::TransformationAffine> transformation;
 };
 
 
@@ -80,8 +84,8 @@
 {
 public:
 	typedef etl::handle<TaskConicalGradientSW> Handle;
-	static Token token;
-	virtual Token::Handle get_token() const override { return token.handle(); }
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
 
 	mutable Real pw = 0;
 	mutable Real ph = 0;
@@ -116,9 +120,9 @@
 	}
 };
 
-rendering::Task::Token TaskConicalGradient::token(
+SYNFIG_EXPORT rendering::Task::Token TaskConicalGradient::token(
 	DescAbstract<TaskConicalGradient>("TaskConicalGradient") );
-rendering::Task::Token TaskConicalGradientSW::token(
+SYNFIG_EXPORT rendering::Task::Token TaskConicalGradientSW::token(
 	DescReal<TaskConicalGradientSW, TaskConicalGradient>("TaskConicalGradientSW") );

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_gradient/curvegradient.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_gradient/curvegradient.cpp Changed

@@ -44,8 +44,7 @@
 #include <synfig/bezier.h>
 #include <synfig/context.h>
 #include <synfig/paramdesc.h>
-#include <synfig/renddesc.h>
-#include <synfig/surface.h>
+#include <synfig/rendering/software/task/taskpaintpixelsw.h>
 #include <synfig/value.h>
 #include <synfig/valuenode.h>
 
@@ -61,7 +60,7 @@
 SYNFIG_LAYER_SET_NAME(CurveGradient,"curve_gradient");
 SYNFIG_LAYER_SET_LOCAL_NAME(CurveGradient,N_("Curve Gradient"));
 SYNFIG_LAYER_SET_CATEGORY(CurveGradient,N_("Gradients"));
-SYNFIG_LAYER_SET_VERSION(CurveGradient,"0.0");
+SYNFIG_LAYER_SET_VERSION(CurveGradient,"0.1");
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -93,7 +92,7 @@
 	for(;next!=end;iter=next++)
 	{
 		// Setup the curve
-		hermite<Vector> curve(
+		synfig::hermite<Vector> curve(
 			iter->get_vertex(),
 			next->get_vertex(),
 			iter->get_tangent2(),
@@ -121,7 +120,7 @@
 	//Real best_bline_len(0);
 	Real total_bline_dist(0);
 	Real best_pos(0);
-	hermite<Vector> best_curve;
+	synfig::hermite<Vector> best_curve;
 
 	if(loop)
 		iter=--bline.end();
@@ -133,7 +132,7 @@
 	for(;next!=end;iter=next++)
 	{
 		// Setup the curve
-		hermite<Vector> curve(
+		synfig::hermite<Vector> curve(
 			iter->get_vertex(),
 			next->get_vertex(),
 			iter->get_tangent2(),
@@ -194,6 +193,218 @@
 	return ret;
 }
 
+class TaskCurveGradient: public rendering::Task, public rendering::TaskInterfaceTransformation
+{
+public:
+	typedef etl::handle<TaskCurveGradient> Handle;
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
+
+	Point origin;
+	Real width;
+	std::vector<synfig::BLinePoint> bline;
+	bool loop;
+	bool perpendicular;
+	bool fast;
+	bool bline_loop;
+	Real curve_length;
+	CompiledGradient compiled_gradient;
+
+	rendering::Transformation::Handle get_transformation() const override {
+		return transformation.handle();
+	}
+
+private:
+	rendering::Holder<rendering::TransformationAffine> transformation;
+};
+
+
+class TaskCurveGradientSW: public TaskCurveGradient, public rendering::TaskPaintPixelSW
+{
+public:
+	typedef etl::handle<TaskCurveGradient> Handle;
+	SYNFIG_EXPORT static Token token;
+
+	Token::Handle get_token() const override { return token.handle(); }
+
+	Color get_color(const Vector& p) const override
+	{
+		Vector tangent;
+		Point p1;
+		Real thickness;
+		Real dist;
+
+		Real perp_dist = 0;
+		bool edge_case = false;
+
+		if(bline.size()==0)
+			return Color::alpha();
+		else if(bline.size()==1)
+		{
+			tangent=bline.front().get_tangent1();
+			p1=bline.front().get_vertex();
+			thickness=bline.front().get_width();
+		}
+		else
+		{
+			Real t;
+			const Point point(p-origin);
+
+			std::vector<synfig::BLinePoint>::const_iterator iter,next;
+
+			// Figure out the BLinePoints we will be using,
+			// Taking into account looping.
+			if(perpendicular)
+			{
+				next=find_closest(fast,bline,point,t,bline_loop,&perp_dist);
+				perp_dist/=curve_length;
+			}
+			else					// not perpendicular
+			{
+				next=find_closest(fast,bline,point,t,bline_loop);
+			}
+
+			iter=next++;
+			if(next==bline.end()) next=bline.begin();
+
+			// Setup the curve
+			synfig::hermite<Vector> curve(
+				iter->get_vertex(),
+				next->get_vertex(),
+				iter->get_tangent2(),
+				next->get_tangent1()
+				);
+
+			// Figure out the closest point on the curve
+			if (fast)
+				t = curve.find_closest(fast, point);
+
+			// Calculate our values
+			p1=curve(t); // the closest point on the curve
+			tangent=curve.derivative(t); // the tangent at that point
+
+			// if the point we're nearest to is at either end of the
+			// bline, our distance from the curve is the distance from the
+			// point on the curve. we need to know which side of the
+			// curve we're on, so find the average of the two tangents at
+			// this point
+			if (t<0.00001 || t>0.99999)
+			{
+				const bool zero_tangent = approximate_zero(tangent0) && approximate_zero(tangent1);
+
+				if (t<0.5)
+				{
+					if (iter->get_split_tangent_angle() || iter->get_split_tangent_radius() || zero_tangent)
+					{
+						// fake the current tangent if we need to
+						if (zero_tangent) tangent = curve(FAKE_TANGENT_STEP) - curve(0);
+
+						// calculate the other tangent
+						Vector other_tangent(iter->get_tangent1());
+						if (approximate_zero(other_tangent0) && approximate_zero(other_tangent1))
+						{
+							// find the previous blinepoint
+							std::vector<synfig::BLinePoint>::const_iterator prev;
+							if (iter != bline.begin()) (prev = iter)--;
+							else if (loop) (prev = bline.end())--;
+							else prev = iter;
+
+							synfig::hermite<Vector> other_curve(prev->get_vertex(), iter->get_vertex(), prev->get_tangent2(), iter->get_tangent1());
+							other_tangent = other_curve(1) - other_curve(1-FAKE_TANGENT_STEP);
+						}
+
+						// normalise and sum the two tangents
+						tangent=(other_tangent.norm()+tangent.norm());
+						edge_case=true;
+					}
+				}
+				else
+				{
+					if (next->get_split_tangent_angle() || next->get_split_tangent_radius() || zero_tangent)
+					{
+						// fake the current tangent if we need to
+						if (zero_tangent) tangent = curve(1) - curve(1-FAKE_TANGENT_STEP);
+
+						// calculate the other tangent
+						Vector other_tangent(next->get_tangent2());
+						if (approximate_zero(other_tangent0) && approximate_zero(other_tangent1))
+						{
+							// find the next blinepoint
+							std::vector<synfig::BLinePoint>::const_iterator next2(next);
+							if (++next2 == bline.end())
+							{
+								if (loop) next2 = bline.begin();
+								else next2 = next;
+							}
+
+							synfig::hermite<Vector> other_curve(next->get_vertex(), next2->get_vertex(), next->get_tangent2(), next2->get_tangent1());
+							other_tangent = other_curve(FAKE_TANGENT_STEP) - other_curve(0);
+						}
+
+						// normalise and sum the two tangents
+						tangent=(other_tangent.norm()+tangent.norm());
+						edge_case=true;
+					}
+				}
+			}
+			tangent = tangent.norm();
+
+			if(perpendicular)
+			{
+				tangent*=curve_length;
+				p1-=tangent*perp_dist;
+				tangent=-tangent.perp();
+			}
+			else					// not perpendicular
+				// the width of the bline at the closest point on the curve
+				thickness=(next->get_width()-iter->get_width())*t+iter->get_width();
+		}
+
+		Vector diff;
+
+		if (perpendicular)
+		{
+			diff=tangent.perp();
+			//p1-=diff*0.5;
+		}
+		else						// not perpendicular
+		{
+			if (edge_case)
+			{
+				diff=(p1-(p-origin));
+				if(diff*tangent.perp()<0) diff=-diff;
+				diff=diff.norm()*thickness*width;
+			}
+			else
+				diff=tangent.perp()*thickness*width;
+
+			p1-=diff*0.5;
+		}
+
+		if (approximate_zero(diff0) && approximate_zero(diff1)) {
+			return compiled_gradient.color(compiled_gradient.get_from_zigzag()? 0.5 : 1.0);
+		}
+
+		const Real mag(diff.inv_mag());
+		diff*=mag*mag;
+		dist=(p-origin - p1)*diff;
+		Real supersample = get_units_per_pixel()0;
+		supersample = synfig::clamp(supersample*mag, 0., 2.);
+		supersample *= 0.5;
+		return compiled_gradient.average(dist - supersample, dist + supersample);
+	}
+
+	bool run(RunParams&) const override {
+		return run_task();
+	}
+};
+
+SYNFIG_EXPORT rendering::Task::Token TaskCurveGradient::token(
+	DescAbstract<TaskCurveGradient>("CurveGradient") );
+SYNFIG_EXPORT rendering::Task::Token TaskCurveGradientSW::token(
+	DescReal<TaskCurveGradientSW, TaskCurveGradient>("CurveGradientSW") );
+
+
 /* === M E T H O D S ======================================================= */
 
 inline void
@@ -247,7 +458,7 @@
 }
 
 inline Color
-CurveGradient::color_func(const Point &point_, int quality, Real supersample)const
+CurveGradient::color_func(const Point& point_, Real supersample) const
 {
 	Point origin=param_origin.get(Point());
 	Real width=param_width.get(Real());
@@ -257,7 +468,6 @@
 	bool fast=param_fast.get(bool());
 
 	Vector tangent;
-	Vector diff;
 	Point p1;
 	Real thickness;
 	Real dist;
@@ -296,31 +506,14 @@
 		if(next==bline.end()) next=bline.begin();
 
 		// Setup the curve
-		hermite<Vector> curve(
+		synfig::hermite<Vector> curve(
 			iter->get_vertex(),
 			next->get_vertex(),
 			iter->get_tangent2(),
 			next->get_tangent1()
 			);
 
-		int search_iterations(7);
-
-		/*if(quality==0)search_iterations=8;
-		 else if(quality<=2)search_iterations=10;
-		 else if(quality<=4)search_iterations=8;
-		*/
-		if(perpendicular)
-		{
-			if(quality>7)
-				search_iterations=4;
-		}
-		else					// not perpendicular
-		{
-			if(quality<=6)search_iterations=7;
-			else if(quality<=7)search_iterations=6;
-			else if(quality<=8)search_iterations=5;
-			else search_iterations=4;
-		}
+		constexpr int search_iterations(7);
 
 		// Figure out the closest point on the curve
 		if (fast)
@@ -337,7 +530,7 @@
 		// this point
 		if (t<0.00001 || t>0.99999)
 		{
-			bool zero_tangent = (tangent0 == 0 && tangent1 == 0);
+			const bool zero_tangent = approximate_zero(tangent0) && approximate_zero(tangent1 == 0);
 
 			if (t<0.5)
 			{
@@ -348,15 +541,14 @@
 
 					// calculate the other tangent
 					Vector other_tangent(iter->get_tangent1());
-					if (other_tangent0 == 0 && other_tangent1 == 0)
-					{
+					if (approximate_zero(other_tangent0) && approximate_zero(other_tangent1 == 0)) {
 						// find the previous blinepoint
 						std::vector<synfig::BLinePoint>::const_iterator prev;
 						if (iter != bline.begin()) (prev = iter)--;
 						else if (loop) (prev = bline.end())--;
 						else prev = iter;
 
-						hermite<Vector> other_curve(prev->get_vertex(), iter->get_vertex(), prev->get_tangent2(), iter->get_tangent1());
+						synfig::hermite<Vector> other_curve(prev->get_vertex(), iter->get_vertex(), prev->get_tangent2(), iter->get_tangent1());
 						other_tangent = other_curve(1) - other_curve(1-FAKE_TANGENT_STEP);
 					}
 
@@ -374,8 +566,7 @@
 
 					// calculate the other tangent
 					Vector other_tangent(next->get_tangent2());
-					if (other_tangent0 == 0 && other_tangent1 == 0)
-					{
+					if (approximate_zero(other_tangent0) && approximate_zero(other_tangent1 == 0)) {
 						// find the next blinepoint
 						std::vector<synfig::BLinePoint>::const_iterator next2(next);
 						if (++next2 == bline.end())
@@ -384,7 +575,7 @@
 							else next2 = next;
 						}
 
-						hermite<Vector> other_curve(next->get_vertex(), next2->get_vertex(), next->get_tangent2(), next2->get_tangent1());
+						synfig::hermite<Vector> other_curve(next->get_vertex(), next2->get_vertex(), next->get_tangent2(), next2->get_tangent1());
 						other_tangent = other_curve(FAKE_TANGENT_STEP) - other_curve(0);
 					}
 
@@ -407,26 +598,11 @@
 			thickness=(next->get_width()-iter->get_width())*t+iter->get_width();
 	}
 
-	if (perpendicular && bline.size() > 1)
+	Vector diff;
+
+	if (perpendicular)
 	{
-		if(quality>7)
-		{
-			dist=perp_dist;
-/*			diff=tangent.perp();
-			const Real mag(diff.inv_mag());
-			supersample=supersample*mag;
-*/
-			supersample=0;
-		}
-		else
-		{
-			diff=tangent.perp();
-			//p1-=diff*0.5;
-			const Real mag(diff.inv_mag());
-			supersample=supersample*mag;
-			diff*=mag*mag;
-			dist=(point_-origin - p1)*diff;
-		}
+		diff=tangent.perp();
 	}
 	else						// not perpendicular
 	{
@@ -440,22 +616,21 @@
 			diff=tangent.perp()*thickness*width;
 
 		p1-=diff*0.5;
-		const Real mag(diff.inv_mag());
-		supersample=supersample*mag;
-		diff*=mag*mag;
-		dist=(point_-origin - p1)*diff;
 	}
 
+	if (approximate_zero(diff0) && approximate_zero(diff1)) {
+		return compiled_gradient.color(compiled_gradient.get_from_zigzag()? 0.5 : 1.0);
+	}
+
+	const Real mag(diff.inv_mag());
+	diff *= mag * mag;
+	dist = (point_ - origin - p1) * diff;
+
+	supersample = supersample * mag;
 	supersample *= 0.5;
 	return compiled_gradient.average(dist - supersample, dist + supersample);
 }
 
-Real
-CurveGradient::calc_supersample(const synfig::Point &/*x*/, Real pw, Real /*ph*/)const
-{
-	return pw;
-}
-
 synfig::Layer::Handle
 CurveGradient::hit_check(synfig::Context context, const synfig::Point &point)const
 {
@@ -563,7 +738,7 @@
 Color
 CurveGradient::get_color(Context context, const Point &point)const
 {
-	const Color color(color_func(point,0));
+	const Color color(color_func(point));
 
 	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
 		return color;
@@ -571,52 +746,23 @@
 		return Color::blend(color,context.get_color(point),get_amount(),get_blend_method());
 }
 
-bool
-CurveGradient::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
+rendering::Task::Handle
+CurveGradient::build_composite_task_vfunc(ContextParams /*context_params*/) const
 {
-	RENDER_TRANSFORMED_IF_NEED(__FILE__, __LINE__)
-
-	SuperCallback supercb(cb,0,9500,10000);
-
-	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
-	{
-		surface->set_wh(renddesc.get_w(),renddesc.get_h());
-	}
-	else
-	{
-		if(!context.accelerated_render(surface,quality,renddesc,&supercb))
-			return false;
-		if(get_amount()==0)
-			return true;
-	}
-
-
-	int x,y;
-
-	Surface::pen pen(surface->begin());
-	const Real pw(renddesc.get_pw()),ph(renddesc.get_ph());
-	Point pos;
-	Point tl(renddesc.get_tl());
-	const int w(surface->get_w());
-	const int h(surface->get_h());
-
-	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
-	{
-		for(y=0,pos1=tl1;y<h;y++,pen.inc_y(),pen.dec_x(x),pos1+=ph)
-			for(x=0,pos0=tl0;x<w;x++,pen.inc_x(),pos0+=pw)
-				pen.put_value(color_func(pos,quality,calc_supersample(pos,pw,ph)));
-	}
-	else
-	{
-		for(y=0,pos1=tl1;y<h;y++,pen.inc_y(),pen.dec_x(x),pos1+=ph)
-			for(x=0,pos0=tl0;x<w;x++,pen.inc_x(),pos0+=pw)
-				pen.put_value(Color::blend(color_func(pos,quality,calc_supersample(pos,pw,ph)),pen.get_value(),get_amount(),get_blend_method()));
-	}
-
-	// Mark our progress as finished
-	if(cb && !cb->amount_complete(10000,10000))
-		return false;
-
-	return true;
+	auto bline = param_bline.get_list_of(BLinePoint());
+	if (bline.empty())
+		return {};
+
+	TaskCurveGradient::Handle task(new TaskCurveGradient());
+	task->origin = param_origin.get(Point());
+	task->width = param_width.get(Real());
+	task->bline = std::move(bline);
+	task->loop = param_loop.get(bool());
+	task->perpendicular = param_perpendicular.get(bool());
+	task->fast = param_fast.get(bool());
+	task->compiled_gradient = compiled_gradient;
+	task->curve_length = curve_length_;
+	task->bline_loop = bline_loop;
+
+	return task;
 }
-

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_gradient/curvegradient.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_gradient/curvegradient.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_gradient/lineargradient.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_gradient/lineargradient.cpp Changed

@@ -60,15 +60,19 @@
 {
 public:
 	typedef etl::handle<TaskLinearGradient> Handle;
-	static Token token;
+	SYNFIG_EXPORT static Token token;
 	Token::Handle get_token() const override { return token.handle(); }
 
 	LinearGradient::Params params;
-	rendering::Holder<rendering::TransformationAffine> transformation;
 
 	TaskLinearGradient() { }
-	virtual rendering::Transformation::Handle get_transformation() const override
-		{ return transformation.handle(); }
+
+	rendering::Transformation::Handle get_transformation() const override {
+		return transformation.handle();
+	}
+
+private:
+	rendering::Holder<rendering::TransformationAffine> transformation;
 };
 
 
@@ -76,12 +80,12 @@
 {
 public:
 	typedef etl::handle<TaskLinearGradientSW> Handle;
-	static Token token;
-	virtual Token::Handle get_token() const override { return token.handle(); }
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
 
 	mutable Real supersample = 0.;
 
-	void pre_run(const Matrix3& /*matrix*/, const Matrix3& /*inverse_matrix*/) const override
+	void pre_run(const Matrix3& /*world_to_raster*/, const Matrix3& /*raster_to_world*/) const override
 	{
 		supersample = get_units_per_pixel()0*.1;
 	}
@@ -99,9 +103,9 @@
 	}
 };
 
-rendering::Task::Token TaskLinearGradient::token(
+SYNFIG_EXPORT rendering::Task::Token TaskLinearGradient::token(
 	DescAbstract<TaskLinearGradient>("TaskLinearGradient") );
-rendering::Task::Token TaskLinearGradientSW::token(
+SYNFIG_EXPORT rendering::Task::Token TaskLinearGradientSW::token(
 	DescReal<TaskLinearGradientSW, TaskLinearGradient>("TaskLinearGradientSW") );
 
 inline void

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_gradient/radialgradient.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_gradient/radialgradient.cpp Changed

@@ -63,17 +63,21 @@
 {
 public:
 	typedef etl::handle<TaskRadialGradient> Handle;
-	static Token token;
+	SYNFIG_EXPORT static Token token;
 	Token::Handle get_token() const override { return token.handle(); }
 
 	Point center;
 	Real radius;
 	CompiledGradient compiled_gradient;
-	rendering::Holder<rendering::TransformationAffine> transformation;
 
 	TaskRadialGradient() { }
-	virtual rendering::Transformation::Handle get_transformation() const override
-		{ return transformation.handle(); }
+
+	rendering::Transformation::Handle get_transformation() const override {
+		return transformation.handle();
+	}
+
+private:
+	rendering::Holder<rendering::TransformationAffine> transformation;
 };
 
 
@@ -81,12 +85,12 @@
 {
 public:
 	typedef etl::handle<TaskRadialGradientSW> Handle;
-	static Token token;
-	virtual Token::Handle get_token() const override { return token.handle(); }
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
 
 	mutable Real supersample = 0.;
 
-	void pre_run(const Matrix3& /*matrix*/, const Matrix3& /*inverse_matrix*/) const override
+	void pre_run(const Matrix3& /*world_to_raster*/, const Matrix3& /*raster_to_world*/) const override
 	{
 		supersample = 1.2*get_units_per_pixel()0/radius;
 		supersample *= 0.5;
@@ -106,9 +110,9 @@
 	}
 };
 
-rendering::Task::Token TaskRadialGradient::token(
+SYNFIG_EXPORT rendering::Task::Token TaskRadialGradient::token(
 	DescAbstract<TaskRadialGradient>("TaskRadialGradient") );
-rendering::Task::Token TaskRadialGradientSW::token(
+SYNFIG_EXPORT rendering::Task::Token TaskRadialGradientSW::token(
 	DescReal<TaskRadialGradientSW, TaskRadialGradient>("TaskRadialGradientSW") );

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_gradient/spiralgradient.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_gradient/spiralgradient.cpp Changed

@@ -62,7 +62,7 @@
 {
 public:
 	typedef etl::handle<TaskSpiralGradient> Handle;
-	static Token token;
+	SYNFIG_EXPORT static Token token;
 	Token::Handle get_token() const override { return token.handle(); }
 
 	Point center;
@@ -70,11 +70,15 @@
 	Angle angle;
 	bool clockwise;
 	CompiledGradient compiled_gradient;
-	rendering::Holder<rendering::TransformationAffine> transformation;
 
 	TaskSpiralGradient() : clockwise(false) { }
-	virtual rendering::Transformation::Handle get_transformation() const override
-		{ return transformation.handle(); }
+
+	rendering::Transformation::Handle get_transformation() const override {
+		return transformation.handle();
+	}
+
+private:
+	rendering::Holder<rendering::TransformationAffine> transformation;
 };
 
 
@@ -82,8 +86,8 @@
 {
 public:
 	typedef etl::handle<TaskSpiralGradientSW> Handle;
-	static Token token;
-	virtual Token::Handle get_token() const override { return token.handle(); }
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
 
 	mutable Real pw = 0;
 
@@ -119,9 +123,9 @@
 	}
 };
 
-rendering::Task::Token TaskSpiralGradient::token(
+SYNFIG_EXPORT rendering::Task::Token TaskSpiralGradient::token(
 	DescAbstract<TaskSpiralGradient>("TaskSpiralGradient") );
-rendering::Task::Token TaskSpiralGradientSW::token(
+SYNFIG_EXPORT rendering::Task::Token TaskSpiralGradientSW::token(
 	DescReal<TaskSpiralGradientSW, TaskSpiralGradient>("TaskSpiralGradientSW") );

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_imagemagick/mptr_imagemagick.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_imagemagick/mptr_imagemagick.cpp Changed

@@ -99,17 +99,35 @@
 		}
 	}
 
-	OS::RunArgs args;
-	args.push_back(filename);
+	bool success = false;
+	// pair (binary name, first argument)
+	std::vector<std::pair<std::string, std::string>> binaries {
+		{"magick", "convert"}, // ImageMagick 7 with legacy syntax
+#ifdef _WIN32
+		{synfig::OS::get_binary_path().parent_path().append("convert.exe").u8string(), ""}, // legacy (version < 7) - Avoid Windows system "convert.exe"
+#else
+		{"convert", ""}, // legacy (version < 7)
+#endif
+	};
+	for (const auto& binary_info : binaries) {
+		OS::RunArgs args;
+		if (!binary_info.second.empty())
+			args.push_back(binary_info.second);
+		args.push_back(filename);
 
-	if (filename_extension == ".psd" || filename_extension == ".xcf")
-		args.push_back("-flatten");
+		if (filename_extension == ".psd" || filename_extension == ".xcf")
+			args.push_back("-flatten");
 
-	args.push_back(strprintf("png32:%s", target_filename.u8_str()));
+		args.push_back(strprintf("png32:%s", target_filename.u8_str()));
 
-	bool success = OS::run_sync({"convert"}, args);
+		success = OS::run_sync({binary_info.first}, args);
+		if (success)
+			break;
+
+		synfig::warning(_("Unable to open %s ImageMagick"), binary_info.first.c_str());
+	}
 	if (!success) {
-		synfig::error(_("Unable to open convert ImageMagick"));
+		synfig::error(_("Unable to open any known ImageMagick utility"));
 		return false;
 	}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_imagemagick/trgt_imagemagick.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_imagemagick/trgt_imagemagick.cpp Changed

@@ -67,6 +67,22 @@
 }
 
 bool
+imagemagick_trgt::is_multiple_files() const
+{
+	return multi_image;
+}
+
+filesystem::Path
+imagemagick_trgt::get_filename() const
+{
+	if (!multi_image)
+		return filename;
+	if (filename.u8string() == "-")
+		return filename;
+	return filesystem::Path(filename).add_suffix(strprintf("%s%04d", sequence_separator.c_str(), desc.get_frame_start()));
+}
+
+bool
 imagemagick_trgt::set_rend_desc(RendDesc *given_desc)
 {
 	if (filename.extension().u8string() == ".xpm")
@@ -103,21 +119,36 @@
 bool
 imagemagick_trgt::start_frame(synfig::ProgressCallback *cb)
 {
-	const char *msg=_("Unable to open pipe to imagemagick's convert utility");
+	const char *msg=_("Unable to open pipe to imagemagick utility");
 
 	synfig::filesystem::Path newfilename = filename;
 
 	if (multi_image)
 		newfilename.add_suffix(sequence_separator + strprintf("%04d", imagecount));
 
-	OS::RunArgs args;
-	args.push_back({"-depth", "8"});
-	args.push_back({"-size", strprintf("%dx%d", desc.get_w(), desc.get_h())});
-	args.push_back(pixel_size(pf) == 4 ? "rgba:-0" : "rgb:-0");
-	args.push_back({"-density", strprintf("%dx%d", round_to_int(desc.get_x_res()/39.3700787402), round_to_int(desc.get_y_res()/39.3700787402))});
-	args.push_back(newfilename);
-
-	pipe = OS::run_async({"convert"}, args, OS::RUN_MODE_WRITE);
+	// pair (binary name, first argument)
+	std::vector<std::pair<std::string, std::string>> binaries {
+		{"magick", "convert"}, // ImageMagick 7 with legacy syntax
+#ifdef _WIN32
+		{synfig::OS::get_binary_path().parent_path().append("convert.exe").u8string(), ""}, // legacy (version < 7) - Avoid Windows system "convert.exe"
+#else
+		{"convert", ""}, // legacy (version < 7)
+#endif
+	};
+	for (const auto& binary_info : binaries) {
+		OS::RunArgs args;
+		if (!binary_info.second.empty())
+			args.push_back(binary_info.second);
+		args.push_back({"-depth", "8"});
+		args.push_back({"-size", strprintf("%dx%d", desc.get_w(), desc.get_h())});
+		args.push_back(pixel_size(pf) == 4 ? "rgba:-0" : "rgb:-0");
+		args.push_back({"-density", strprintf("%dx%d", round_to_int(desc.get_x_res()/39.3700787402), round_to_int(desc.get_y_res()/39.3700787402))});
+		args.push_back(newfilename);
+
+		pipe = OS::run_async({binary_info.first}, args, OS::RUN_MODE_WRITE);
+		if (pipe)
+			break;
+	}
 
 	if (!pipe) {
 		if (cb)

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_imagemagick/trgt_imagemagick.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_imagemagick/trgt_imagemagick.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_jpeg/trgt_jpeg.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_jpeg/trgt_jpeg.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_jpeg/trgt_jpeg.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_jpeg/trgt_jpeg.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_libavcodec/trgt_av.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_libavcodec/trgt_av.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_libavcodec/trgt_av.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_libavcodec/trgt_av.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_magickpp/trgt_magickpp.cpp Changed

@@ -50,6 +50,34 @@
 SYNFIG_TARGET_SET_EXT(magickpp_trgt,"gif");
 SYNFIG_TARGET_SET_VERSION(magickpp_trgt,"0.1");
 
+/* === P R O C E D U R E S ================================================= */
+
+/**
+ * Check if file format of @a filename supports image merging into a single file
+ */
+static bool
+check_can_adjoin(const Magick::Image& reference_image, const filesystem::Path& filename)
+{
+	MagickCore::ExceptionInfo* exceptionInfo = MagickCore::AcquireExceptionInfo();
+
+	bool can_addjoin = false;
+	// check whether this file format supports multiple-image files
+	Magick::Image image(reference_image);
+	image.fileName(filename.u8string());
+	try
+	{
+		SetImageInfo(image.imageInfo(), Magick::MagickTrue, exceptionInfo);
+		can_addjoin = image.adjoin();
+	}
+	catch (Magick::Warning& warning) {
+		synfig::warning("exception '%s'", warning.what());
+	}
+
+	MagickCore::DestroyExceptionInfo(exceptionInfo);
+
+	return can_addjoin;
+}
+
 /* === M E T H O D S ======================================================= */
 
 template <class Container>
@@ -90,23 +118,9 @@
 
 	try
 	{
-		bool multiple_images = images.size() > 1;
-		bool can_adjoin = false;
-
-		if (multiple_images)
-		{
-			// check whether this file format supports multiple-image files
-			Magick::Image image(images.front());
-			image.fileName(filename.u8string());
-			try
-			{
-				SetImageInfo(image.imageInfo(),Magick::MagickTrue,exceptionInfo);
-				can_adjoin = image.adjoin();
-			}
-			catch(Magick::Warning &warning) {
-				synfig::warning("exception '%s'", warning.what());
-			}
-		}
+		const bool multiple_images = images.size() > 1;
+		// check whether this file format supports multiple-image files
+		const bool can_adjoin = multiple_images && check_can_adjoin(images.front(), filename);
 
 		// the file type is now in image.imageInfo()->magick and
 		// image.adjoin() tells us whether we can write to a single file
@@ -202,6 +216,22 @@
 }
 
 bool
+magickpp_trgt::is_multiple_files() const
+{
+	return images.size() > 1 && !check_can_adjoin(images.front(), filename);
+}
+
+filesystem::Path
+magickpp_trgt::get_filename() const
+{
+	if (!is_multiple_files())
+		return filename;
+	if (filename.u8string() == "-")
+		return filename;
+	return filesystem::Path(filename).add_suffix(strprintf("%s%04d", sequence_separator.c_str(), desc.get_frame_start()));
+}
+
+bool
 magickpp_trgt::set_rend_desc(RendDesc *given_desc)
 {
 	desc = *given_desc;

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_magickpp/trgt_magickpp.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_magickpp/trgt_magickpp.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_mng/trgt_mng.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_mng/trgt_mng.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_mng/trgt_mng.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_mng/trgt_mng.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_noise/noise.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_noise/noise.cpp Changed

@@ -42,8 +42,7 @@
 #include <synfig/time.h>
 #include <synfig/context.h>
 #include <synfig/paramdesc.h>
-#include <synfig/renddesc.h>
-#include <synfig/surface.h>
+#include <synfig/rendering/software/task/taskpaintpixelsw.h>
 #include <synfig/value.h>
 #include <ctime>
 
@@ -59,10 +58,149 @@
 SYNFIG_LAYER_SET_NAME(Noise,"noise");
 SYNFIG_LAYER_SET_LOCAL_NAME(Noise,N_("Noise Gradient"));
 SYNFIG_LAYER_SET_CATEGORY(Noise,N_("Gradients"));
-SYNFIG_LAYER_SET_VERSION(Noise,"0.0");
+SYNFIG_LAYER_SET_VERSION(Noise,"0.1");
 
 /* === P R O C E D U R E S ================================================= */
 
+class TaskNoise: public rendering::Task, public rendering::TaskInterfaceTransformation
+{
+public:
+	typedef etl::handle<TaskNoise> Handle;
+	SYNFIG_EXPORT static Token token;
+
+	Token::Handle get_token() const override { return token.handle(); }
+
+	Vector size;
+	RandomNoise random;
+	RandomNoise::SmoothType smooth;
+	int detail;
+	Real speed;
+	bool turbulent;
+	bool do_alpha;
+	bool super_sample;
+	CompiledGradient compiled_gradient;
+	Time time_mark;
+
+	rendering::Transformation::Handle get_transformation() const override {
+		return transformation.handle();
+	}
+
+private:
+	rendering::Holder<rendering::TransformationAffine> transformation;
+};
+
+
+class TaskNoiseSW: public TaskNoise, public rendering::TaskPaintPixelSW
+{
+public:
+	typedef etl::handle<TaskNoise> Handle;
+	SYNFIG_EXPORT static Token token;
+	Token::Handle get_token() const override { return token.handle(); }
+
+	void pre_run(const Matrix3& /*matrix*/, const Matrix3& /*inverse_matrix*/) const override
+	{
+		pixel_size = (std::fabs(get_units_per_pixel()0) + std::fabs(get_units_per_pixel()1)) * 0.5f;
+	}
+
+	Color get_color(const Vector& point) const override
+	{
+		float x(point0 / size0 * (1 << detail));
+		float y(point1 / size1 * (1 << detail));
+		float x2(0), y2(0);
+
+		if (super_sample && pixel_size) {
+			x2 = (point0 + pixel_size) / size0 * (1 << detail);
+			y2 = (point1 + pixel_size) / size1 * (1 << detail);
+		}
+
+		const RandomNoise::SmoothType smooth_type((!speed && smooth == RandomNoise::SMOOTH_SPLINE)
+													? RandomNoise::SMOOTH_FAST_SPLINE
+													: smooth);
+
+		const float ftime(speed * time_mark);
+
+		float amount = 0.0f;
+		float amount2 = 0.0f;
+		float amount3 = 0.0f;
+		float alpha = 0.0f;
+		for (int i = 0; i < detail; i++) {
+			amount = random(smooth_type, 0 + (detail - i) * 5, x, y, ftime) + amount * 0.5;
+			amount = synfig::clamp(amount, -1.f, 1.f);
+
+			if (super_sample && pixel_size) {
+				amount2 = random(smooth_type, 0 + (detail - i) * 5, x2, y, ftime) + amount2 * 0.5;
+				amount2 = synfig::clamp(amount2, -1.f, 1.f);
+
+				amount3 = random(smooth_type, 0 + (detail - i) * 5, x, y2, ftime) + amount3 * 0.5;
+				amount3 = synfig::clamp(amount3, -1.f, 1.f);
+
+				if (turbulent) {
+					amount2 = std::fabs(amount2);
+					amount3 = std::fabs(amount3);
+				}
+
+				x2 *= 0.5f;
+				y2 *= 0.5f;
+			}
+
+			if (do_alpha) {
+				alpha = random(smooth_type, 3 + (detail - i) * 5, x, y, ftime) + alpha * 0.5;
+				alpha = synfig::clamp(alpha, -1.f, 1.f);
+			}
+
+			if (turbulent) {
+				amount = std::fabs(amount);
+				alpha = std::fabs(alpha);
+			}
+
+			x *= 0.5f;
+			y *= 0.5f;
+		}
+
+		if (!turbulent) {
+			amount = amount / 2.0f + 0.5f;
+			alpha = alpha / 2.0f + 0.5f;
+
+			if (super_sample && pixel_size) {
+				amount2 = amount2 / 2.0f + 0.5f;
+				amount3 = amount3 / 2.0f + 0.5f;
+			}
+		}
+
+		Color color;
+
+		if (super_sample && pixel_size) {
+			Real da = std::max(amount3, std::max(amount, amount2)) - std::min(amount3, std::min(amount, amount2));
+			if (da < 0)
+				da = -da;
+			if (approximate_greater(da, 2.))
+				da = 2.;
+			da *= 0.5;
+			color = compiled_gradient.average(amount - da, amount + da);
+		} else {
+			color = compiled_gradient.color(amount);
+		}
+
+		if (do_alpha)
+			color.set_a(color.get_a() * alpha);
+
+		return color;
+	}
+
+	bool run(RunParams&) const override {
+		return run_task();
+	}
+
+protected:
+	mutable float pixel_size = 0.0f;
+};
+
+SYNFIG_EXPORT rendering::Task::Token TaskNoise::token(
+	DescAbstract<TaskNoise>("Noise") );
+SYNFIG_EXPORT rendering::Task::Token TaskNoiseSW::token(
+	DescReal<TaskNoiseSW, TaskNoise>("NoiseSW") );
+
+
 /* === M E T H O D S ======================================================= */
 
 Noise::Noise():
@@ -115,7 +253,6 @@
 		y2=(point1+pixel_size)/size1*(1<<detail);
 	}
 
-	int i;
 	Time time;
 	time=speed*get_time_mark();
 	int smooth((!speed && smooth_ == (int)RandomNoise::SMOOTH_SPLINE) ? (int)RandomNoise::SMOOTH_FAST_SPLINE : smooth_);
@@ -127,8 +264,7 @@
 		float amount2=0.0f;
 		float amount3=0.0f;
 		float alpha=0.0f;
-		for(i=0;i<detail;i++)
-		{
+		for (int i = 0; i < detail; i++) {
 			amount=random(RandomNoise::SmoothType(smooth),0+(detail-i)*5,x,y,ftime)+amount*0.5;
 			if (amount < -1) amount = -1;
 			if (amount > 1) amount = 1;
@@ -196,11 +332,6 @@
 	return ret;
 }
 
-inline float
-Noise::calc_supersample(const synfig::Point &/*x*/, float /*pw*/,float /*ph*/)const
-{
-	return 0.0f;
-}
 
 synfig::Layer::Handle
 Noise::hit_check(synfig::Context context, const synfig::Point &point)const
@@ -323,55 +454,21 @@
 		return Color::blend(color,context.get_color(point),get_amount(),get_blend_method());
 }
 
-
-bool
-Noise::accelerated_render(Context context,Surface *surface,int quality, const RendDesc &renddesc, ProgressCallback *cb)const
+rendering::Task::Handle
+Noise::build_composite_task_vfunc(ContextParams /*context_params*/) const
 {
-	RENDER_TRANSFORMED_IF_NEED(__FILE__, __LINE__)
-
-	SuperCallback supercb(cb,0,9500,10000);
-
-	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
-	{
-		surface->set_wh(renddesc.get_w(),renddesc.get_h());
-	}
-	else
-	{
-		if(!context.accelerated_render(surface,quality,renddesc,&supercb))
-			return false;
-		if(get_amount()==0)
-			return true;
-	}
-
-
-	int x,y;
-
-	Surface::pen pen(surface->begin());
-	const Real pw(renddesc.get_pw()),ph(renddesc.get_ph());
-	Point pos;
-	Point tl(renddesc.get_tl());
-	const int w(surface->get_w());
-	const int h(surface->get_h());
-	float supersampleradius((std::fabs(pw)+std::fabs(ph))*0.5f);
-	if(quality>=8)
-		supersampleradius=0;
-
-	if(get_amount()==1.0 && get_blend_method()==Color::BLEND_STRAIGHT)
-	{
-		for(y=0,pos1=tl1;y<h;y++,pen.inc_y(),pen.dec_x(x),pos1+=ph)
-			for(x=0,pos0=tl0;x<w;x++,pen.inc_x(),pos0+=pw)
-				pen.put_value(color_func(pos,supersampleradius,context));
-	}
-	else
-	{
-		for(y=0,pos1=tl1;y<h;y++,pen.inc_y(),pen.dec_x(x),pos1+=ph)
-			for(x=0,pos0=tl0;x<w;x++,pen.inc_x(),pos0+=pw)
-				pen.put_value(Color::blend(color_func(pos,supersampleradius,context),pen.get_value(),get_amount(),get_blend_method()));
-	}
-
-	// Mark our progress as finished
-	if(cb && !cb->amount_complete(10000,10000))
-		return false;
-
-	return true;
+	TaskNoise::Handle task(new TaskNoise());
+	task->size = param_size.get(Vector());
+	task->random.set_seed(param_random.get(int()));
+	task->smooth = RandomNoise::SmoothType(param_smooth.get(int()));
+	task->detail = param_detail.get(int());
+	task->speed = param_speed.get(Real());
+	task->turbulent = param_turbulent.get(bool());
+	task->do_alpha = param_do_alpha.get(bool());
+	task->super_sample = param_super_sample.get(bool());
+	task->compiled_gradient = compiled_gradient;
+	task->time_mark = get_time_mark();
+
+	return task;
 }
+

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_noise/noise.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_noise/noise.h Changed

@@ -74,7 +74,6 @@
 
 	void compile();
 	synfig::Color color_func(const synfig::Point &x, float supersample,synfig::Context context)const;
-	float calc_supersample(const synfig::Point &x, float pw,float ph)const;
 
 public:
 	Noise();
@@ -82,9 +81,11 @@
 	virtual bool set_param(const synfig::String &param, const synfig::ValueBase &value);
 	virtual synfig::ValueBase get_param(const synfig::String &param)const;
 	virtual synfig::Color get_color(synfig::Context context, const synfig::Point &pos)const;
-	virtual bool accelerated_render(synfig::Context context,synfig::Surface *surface,int quality, const synfig::RendDesc &renddesc, synfig::ProgressCallback *cb)const;
 	synfig::Layer::Handle hit_check(synfig::Context context, const synfig::Point &point)const;
 	virtual Vocab get_param_vocab()const;
+
+protected:
+	synfig::rendering::Task::Handle build_composite_task_vfunc(synfig::ContextParams /*context_params*/) const;
 };
 
 /* === E N D =============================================================== */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_openexr/trgt_openexr.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_openexr/trgt_openexr.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_openexr/trgt_openexr.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_openexr/trgt_openexr.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_particle/plant.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_particle/plant.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_png/mptr_png.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_png/mptr_png.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_png/trgt_png.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_png/trgt_png.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_png/trgt_png.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_png/trgt_png.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_png/trgt_png_spritesheet.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_png/trgt_png_spritesheet.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_png/trgt_png_spritesheet.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_png/trgt_png_spritesheet.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_ppm/trgt_ppm.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_ppm/trgt_ppm.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_ppm/trgt_ppm.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_ppm/trgt_ppm.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_svg/svg_parser.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_svg/svg_parser.cpp Changed

@@ -77,6 +77,7 @@
 static float getRadian(float sexa);
 //string functions
 static std::vector<String> tokenize(const String& str,const String& delimiters);
+static String unquote(const String& str);
 
 static float get_inkscape_version(const xmlpp::Element* svgNodeElement);
 
@@ -268,13 +269,168 @@
 }
 
 void
+Svg_parser::parser_text(const xmlpp::Element* nodeElement, xmlpp::Element* root, const Style& style, const SVGMatrix& mtx)
+{
+	Glib::ustring text_id = nodeElement->get_attribute_value("id");
+	double text_x = style.compute("x", "0");
+	if (auto attr = nodeElement->get_attribute("x")) {
+		text_x = getDimension(attr->get_value());
+	}
+	double text_y = style.compute("y", "0");
+	if (auto attr = nodeElement->get_attribute("y")) {
+		text_y = getDimension(attr->get_value());
+	}
+//	double text_dx = style.compute("dx", "0");
+//	if (auto attr = nodeElement->get_attribute("dx")) {
+//		text_dx = getDimension(attr->get_value());
+//	}
+//	double text_dy = style.compute("dy", "0");
+//	if (auto attr = nodeElement->get_attribute("dy")) {
+//		text_dy = getDimension(attr->get_value());
+//	}
+
+	Glib::ustring fill = style.get("fill", "#000");
+	float fill_opacity = style.compute("fill_opacity", "1");
+	float opacity = style.compute("opacity", "1");
+
+	const bool is_fill_gradient = fill.compare(0,3,"url")==0;
+
+	// TODO: stroke
+
+	Glib::ustring font_family = style.get("font-family", "");
+	{
+		auto font_families = tokenize(font_family, ",");
+		if (font_families.empty())
+			font_family = "";
+		else
+			font_family = unquote(font_families.front());
+	}
+
+	float font_size = atof(style.get("font-size", "16px").c_str()) / kux / 2.; // Instead of 16px, use FontSize::default_size;
+	int font_style = 0;
+	{
+		Glib::ustring font_style_str = style.get("font-style", "normal");
+		if (font_style_str == "italic")
+			font_style = 2;
+		else if (font_style_str == "oblique")
+			font_style = 1;
+	}
+
+	int font_weight = 400;
+	{
+		Glib::ustring font_weight_str = style.get("font-weight", "normal");
+		if (font_weight_str == "normal") {
+			font_weight = 400;
+		} else if (font_weight_str == "bold") {
+			font_weight = 600;
+		} else if (font_weight_str == "380") {
+			font_weight = 380;
+		} else if (!font_weight_str.empty()) {
+			int weight = atoi(font_weight_str.c_str()) / 100;
+
+			if (weight <= 0) {
+				font_weight = 400;
+			} else if (weight > 10) {
+				font_weight = 900;
+			} else {
+				constexpr char conversion = "-0124566789";
+				font_weight = 100 * (conversionweight - '0');
+			}
+		}
+	}
+
+	int direction = 0;
+	{
+		Glib::ustring direction_str = nodeElement->get_attribute_value("direction");
+		if (direction_str.empty())
+			direction_str = style.get("direction", "0");
+		if (direction_str == "rtl") {
+			direction = 2;
+		} else if (direction_str == "ltr") {
+			direction = 1;
+		}
+	}
+
+	Vector text_align(0., 1.);
+	{
+		Glib::ustring text_align_str = style.get("text-align", "start");
+		if (text_align_str == "center") {
+			text_align0 = 0.5;
+		} else if (text_align_str == "left") {
+			text_align0 = 0.0;
+		} else if (text_align_str == "right") {
+			text_align0 = 1.0;
+		} else if (text_align_str == "start") {
+			if (direction == 2)
+				text_align0 = 1.0;
+		} else if (text_align_str == "end") {
+			if (direction != 2)
+				text_align0 = 1.0;
+		}
+	}
+
+	Glib::ustring text;
+	for (const auto& child : nodeElement->get_children()) {
+		if (const xmlpp::Element* childElement = dynamic_cast<const xmlpp::Element*>(child)) {
+			const Glib::ustring childName = child->get_name();
+
+			// Is element known ?
+			const std::vector<const char*> valid_elements = {"tspan", "textPath", "a"};
+			if (valid_elements.end() == std::find(valid_elements.begin(), valid_elements.end(), childName)) {
+				synfig::error("not valid child node to <text>: %s", childName.c_str());
+				continue;
+			}
+			// actually, tspan and textPath can also have a and tspan children... must it be recursive?
+			text += childElement->get_child_text()->get_content();
+		} else if (const xmlpp::ContentNode* childElement = dynamic_cast<const xmlpp::TextNode*>(child)) {
+			text += childElement->get_content();
+		} else if (const xmlpp::ContentNode* childElement = dynamic_cast<const xmlpp::CdataNode*>(child)) {
+			text += childElement->get_content();
+		}
+	}
+
+	xmlpp::Element* text_node = root;
+	if (is_fill_gradient) {
+		root = initializeGroupLayerNode(root, "fill");
+		text_node = root->add_child("layer");
+	}
+
+	text_node->set_attribute("type","text");
+	text_node->set_attribute("active","true");
+	text_node->set_attribute("version","0.5");
+	text_node->set_attribute("desc",text_id);
+
+	build_real(text_node->add_child("param"),"z_depth",0.0);
+	build_real(text_node->add_child("param"),"amount",1.0);
+	build_integer(text_node->add_child("param"),"blend_method",0);
+	build_color(text_node->add_child("param"),getRed(fill),getGreen(fill),getBlue(fill),opacity*fill_opacity);
+
+	float auxx = text_x;
+	float auxy = text_y;
+	mtx.transformPoint2D(auxx, auxy);
+	coor2vect(&auxx, &auxy);
+	build_vector(text_node->add_child("param"), "origin", auxx, auxy);
+	build_vector(text_node->add_child("param"), "size", font_size, font_size);
+	build_vector(text_node->add_child("param"), "orient", text_align0, text_align1);
+	build_string(text_node->add_child("param"), "family", font_family);
+	build_integer(text_node->add_child("param"), "style", font_style);
+	build_integer(text_node->add_child("param"), "weight", font_weight);
+	build_integer(text_node->add_child("param"), "direction", direction);
+	build_string(text_node->add_child("param"), "text", text);
+
+	if (is_fill_gradient) { //gradient in onto mode (stroke)
+		build_fill(root, fill, SVGMatrix::identity);
+	}
+}
+
+void
 Svg_parser::parser_graphics(const xmlpp::Node* node, xmlpp::Element* root, Style style, const SVGMatrix& mtx_parent)
 {
 	if(const xmlpp::Element* nodeElement = dynamic_cast<const xmlpp::Element*>(node)){
 		const Glib::ustring nodename = node->get_name();
 
 		// Is element known ?
-		const std::vector<const char*> valid_elements = {"g", "path", "polygon", "rect", "circle", "ellipse", "line", "polyline"};
+		const std::vector<const char*> valid_elements = {"g", "path", "polygon", "rect", "circle", "ellipse", "line", "polyline", "text"};
 		if (valid_elements.end() == std::find(valid_elements.begin(), valid_elements.end(), nodename))
 			return;
 
@@ -297,6 +453,12 @@
 			return;
 		}
 
+		// Is it a text element?
+		if(nodename.compare("text")==0){
+			parser_text(nodeElement, root->add_child("layer"), style, mtx);
+			return;
+		}
+
 		// Shape elements
 
 		enum FillType {FILL_TYPE_NONE, FILL_TYPE_SIMPLE, FILL_TYPE_GRADIENT};
@@ -809,7 +971,7 @@
 	std::list<BLine> k0;
 	if(polygon_points.empty())
 		return k0;
-	std::list<Vertex> points;
+	std::vector<Vertex> points;
 	std::vector<String> tokens=get_tokens_path (polygon_points);
 
 	for(unsigned int i=0;i<tokens.size();i++){
@@ -831,7 +993,7 @@
 Svg_parser::parser_path_d(const String& path_d, const SVGMatrix& mtx)
 {
 	std::list<BLine> k;
-	std::list<Vertex> k1;
+	std::vector<Vertex> k1;
 
 	std::vector<String> tokens=get_tokens_path(path_d);
 	String command="M"; //the current command
@@ -952,6 +1114,8 @@
 			coor2vect(&tgx,&tgy);
 			//save
 			k1.back().setTg2(tgx2,tgy2);
+			if (k1.size() == 1 || k1.back().angle1 != k1.back().angle2 || k1.back().radius1 != k1.back().radius2)
+				k1.back().setSplit(true);
 
 			k1.push_back(Vertex(ax,ay));
 			k1.back().setTg1(tgx,tgy);
@@ -1260,6 +1424,19 @@
 			break;
 		}
 		case 'z':{
+			if (k1.size() > 1) {
+				Vertex& first = k1.front();
+				const Vertex& last = k1.back();
+				if (approximate_equal(first.x, last.x) && approximate_equal(first.y, last.y)) {
+					// Merge!
+					first.angle1 = last.angle1;
+					first.radius1 = last.radius1;
+					first.split_angle = approximate_not_equal(first.angle1, first.angle2);
+					first.split_radius = approximate_not_equal(first.radius1, first.radius2);
+
+					k1.pop_back();
+				}
+			}
 			k.push_front(BLine(k1, true));
 			k1.clear();
 			current_x=init_x;
@@ -1819,7 +1996,7 @@
 	 stops(stops), transform(transform)
 {}
 
-BLine::BLine(std::list<Vertex> points, bool loop)
+BLine::BLine(std::vector<Vertex> points, bool loop)
 	: points(points), loop(loop),
 	 bline_id(GUID().get_string()),
 	 offset_id(GUID().get_string())
@@ -1896,7 +2073,7 @@
 }
 
 void
-Svg_parser::build_bline(xmlpp::Element* root, const std::list<Vertex>& p, bool loop, const String& blineguid)
+Svg_parser::build_bline(xmlpp::Element* root, const std::vector<Vertex>& p, bool loop, const String& blineguid)
 {
 	root->set_attribute("name","bline");
 	xmlpp::Element *child=root->add_child("bline");
@@ -1996,6 +2173,14 @@
 }
 
 void
+Svg_parser::build_string(xmlpp::Element* root, const String& name, const String& value)
+{
+	if(!name.empty()) root->set_attribute("name",name);
+	xmlpp::Element *child=root->add_child("string");
+	child->set_child_text(value);
+}
+
+void
 Svg_parser::build_vector(xmlpp::Element* root, const String& name, float x, float y)
 {
 	if(!name.empty()) root->set_attribute("name",name);
@@ -2522,6 +2707,19 @@
 	return tokens;
 }
 
+static String
+unquote(const String& str){
+	String trimmed = synfig::trim(str);
+	if (trimmed.size() >= 2) {
+		const char& f = trimmed.front();
+		const char& b = trimmed.back();
+		if ((f == '"' && b == '"') || (f == '\'' && b == '\'')) {
+			return trimmed.substr(1, trimmed.length() - 2);
+		}
+	}
+	return trimmed;
+}
+
 #define COLOR_NAME(color, r, g, b) {color, {r, g, b}},
 
 static int
@@ -2704,6 +2902,112 @@
 	return 0; // not inkscape ;)
 }
 
+/**
+ * A parser for CSS style 'font-size'.
+ * Instantiate with parent font-size (or let the default value) and call parse() with the font-size value string.
+ */
+struct FontSize
+{
+	static constexpr float default_size = 16.; // 16.0 px
+	static constexpr float larger_factor = 1.2;
+
+	static const std::map<String, float> absolute_size_names;
+
+	float font_size = default_size;
+
+	FontSize() = default;
+	explicit FontSize(float size) : font_size(size) { }
+
+	bool parse(const String& value) {
+		if (value.empty())
+			return true;
+
+		auto length = value.length();
+
+		if (value.back() == '%') {
+			const auto factor = atof(value.substr(0, length-1).c_str()) / 100.;
+			if (approximate_less(factor, 0.))
+				return false;
+			font_size *= factor;
+			return true;
+		}
+
+		if (length >= 2) {
+
+			auto size_name_it = absolute_size_names.find(value);
+			if (size_name_it != absolute_size_names.end()) {
+				font_size = size_name_it->second;
+				return true;
+			}
+
+			if (value == "larger") {
+				larger();
+				return true;
+			}
+
+			if (value == "smaller") {
+				smaller();
+				return true;
+			}
+
+			const String unit = value.substr(length - 2, 2);
+
+			if (unit == "em") {
+				const auto factor = atof(value.substr(0, length-2).c_str());
+				if (approximate_less(factor, 0.))
+					return false;
+				font_size *= factor;
+				return true;
+			}
+
+		}
+
+		auto new_value = getDimension(value);
+		if (approximate_less(new_value, 0.))
+			return false;
+
+		font_size = new_value;
+		return true;
+	}
+
+	void larger()
+	{
+		for (auto it = absolute_size_names.begin(); it != absolute_size_names.end(); ++it) {
+			if (font_size < it->second) {
+				font_size = it->second;
+				return;
+			}
+		}
+		font_size *= larger_factor;
+	}
+
+	void smaller()
+	{
+		for (auto it = absolute_size_names.rbegin(); it != absolute_size_names.rend(); ++it) {
+			if (font_size > it->second) {
+				font_size = it->second;
+				return;
+			}
+		}
+		font_size /= larger_factor;
+	}
+
+	String to_string() const
+	{
+		return std::to_string(font_size) + "px";
+	}
+};
+
+const std::map<String, float> FontSize::absolute_size_names = {
+	{"xx-small", default_size * 3./5.},
+	{"x-small", default_size * 3./4.},
+	{"small", default_size * 8./9.},
+	{"medium", default_size * 1.},
+	{"large", default_size * 6./5.},
+	{"x-large", default_size * 3./2.},
+	{"xx-large", default_size * 2.}
+};
+
 void
 Style::merge(const xmlpp::Element *elem)
 {
@@ -2739,7 +3043,29 @@
 	for (const auto& prop : style.data) {
 		if (prop.first == "clip-path" && prop.second == "none")
 			continue;
+
+		// Font size is special: it has relative values whose reference value is unrelated to viewport size,
+		// but parent font-size... So we cannot just store the 'percentual' value here.
+		// Possible solutions:
+		// 1. keep a stack of font-sizes
+		// 2. compute the font-size as soon as it is set (the chosen one)
+		if (prop.first == "font-size" && !prop.second.empty()) {
+			FontSize font_size;
+
+			auto font_size_it = data.find(prop.first);
+			if (font_size_it == data.end()) {
+				auto p = data.insert({"font-size", FontSize().to_string()});
+				font_size_it = p.first;
+			}
+
+			font_size.parse(font_size_it->second);
+			font_size.parse(prop.second);
+			font_size_it->second = font_size.to_string();
+			continue;
+		}
+
 		// TODO: Relative values?
+
 		dataprop.first = prop.second;
 	}
 }

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_svg/svg_parser.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_svg/svg_parser.h Changed

@@ -118,12 +118,12 @@
 };
 
 struct BLine {
-	std::list<Vertex> points;
+	std::vector<Vertex> points;
 	bool loop;
 	String bline_id;
 	String offset_id;
 
-	BLine(std::list<Vertex> points, bool loop);
+	BLine(std::vector<Vertex> points, bool loop);
 };
 
 struct Style {
@@ -193,6 +193,7 @@
 		void parser_layer(const xmlpp::Node* node, xmlpp::Element* root, Style style, const SVGMatrix& mtx);
 		void parser_rect(const xmlpp::Element* nodeElement, xmlpp::Element* root, const Style& style);
 		void parser_circle(const xmlpp::Element* nodeElement, xmlpp::Element* root, const Style& style);
+		void parser_text(const xmlpp::Element* nodeElement, xmlpp::Element* root, const Style& style, const SVGMatrix& mtx_parent);
 		/* === CONVERT TO PATH PARSERS ==================== */
 		std::list<BLine> parser_path_polygon(const Glib::ustring& polygon_points, const SVGMatrix& mtx);
 		std::list<BLine> parser_path_d(const String& path_d, const SVGMatrix& mtx);
@@ -226,7 +227,7 @@
 		void build_translate(xmlpp::Element* root,float dx,float dy);
 		void build_points(xmlpp::Element* root, const std::list<Vertex>& p);
 		void build_vertex(xmlpp::Element* root, const Vertex& p);
-		void build_bline(xmlpp::Element* root, const std::list<Vertex>& p, bool loop, const String& blineguid);
+		void build_bline(xmlpp::Element* root, const std::vector<Vertex>& p, bool loop, const String& blineguid);
 		void build_param (xmlpp::Element* root, const String& name, const String& type, const String& value);
 		void build_param (xmlpp::Element* root, const String& name, const String& type, float value);
 		void build_param (xmlpp::Element* root, const String& name, const String& type, int value);
@@ -236,6 +237,7 @@
 		void build_vector (xmlpp::Element* root, const String& name, float x, float y, const String& guid);
 		void build_dilist(xmlpp::Element* root, const std::vector<float>& p, int linecap);
 		void build_color(xmlpp::Element* root,float r,float g,float b,float a);
+		void build_string(xmlpp::Element* root, const String& name, const String& value);
 		xmlpp::Element* initializeGroupLayerNode(xmlpp::Element* root, const String& name);
 
 		/* === COORDINATES & TRANSFORMATIONS ============== */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_yuv420p/trgt_yuv.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_yuv420p/trgt_yuv.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/modules/mod_yuv420p/trgt_yuv.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/modules/mod_yuv420p/trgt_yuv.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/blur/boxblur.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/blur/boxblur.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/color/color.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/color/color.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/color/color.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/color/color.h Changed

@@ -111,7 +111,7 @@
 	const value_type& get_alpha()const { return get_a(); }
 
 	//! Converts a 2 character hex string \a s (00-ff) into a ColorReal (0.0-1.0)
-	static ColorReal hex2real(String s);
+	static ColorReal hex2real(const String& s);
 
 	//! Converts a ColorReal \a c (0.0-1.0) into a 2 character hex string (00-ff)
 	static const String real2hex(ColorReal c);
@@ -120,7 +120,7 @@
 	inline const String get_hex()const;
 
 	//! Sets the color's R, G, and B from a 3 or 6 character hex string
-	void set_hex(String& hex);
+	void set_hex(const String& hex);
 
 	//! Sets the RED component to \a x
 	Color& set_r(const value_type& x) { r_ = x; return *this; }
@@ -275,8 +275,9 @@
 		BLEND_ALPHA_DARKEN=15,		//!< \deprecated If A is more opaque than B, use B
 		BLEND_ALPHA_OVER=19,		//!< \deprecated multiply alphas and then straight blends using the amount
 		BLEND_ALPHA=23,				//!< multiply alphas
+		BLEND_ALPHA_INTERSECTION=24,//!< Alpha Over where layers overlaps, Composite otherwise
 
-		BLEND_END=24,				//!< \internal
+		BLEND_END=25,				//!< \internal
 		BLEND_BY_LAYER=999			//! Used to let the layer decides what Blend Method use by
 									//! default when the layer is created
 	};
@@ -316,7 +317,8 @@
 			| (1 << BLEND_ALPHA_DARKEN),
 
 		BLEND_METHODS_COMMUTATIVE = 0
-			| (1 << BLEND_ADD_COMPOSITE),
+			| (1 << BLEND_ADD_COMPOSITE)
+			| (1 << BLEND_ALPHA_INTERSECTION),
 
 		BLEND_METHODS_ALL = (1 << BLEND_END) - 1
 	};

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/color/colorblendingfunctions.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/color/colorblendingfunctions.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/filesystem.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/filesystem.cpp Changed

@@ -127,22 +127,24 @@
 		|| (directory_create_recursive(filesystem::Path::dirname(dirname)) && directory_create(dirname));
 }
 
-bool FileSystem::remove_recursive(const String &filename)
+bool FileSystem::remove_recursive(const filesystem::Path& filename)
 {
 	assert(!filename.empty());
 
 	if (filename.empty())
 		return false;
-	if (is_file(filename))
-		return file_remove(filename);
-	if (is_directory(filename))
+	if (is_file(filename.u8string()))
+		return file_remove(filename.u8string());
+	if (is_directory(filename.u8string()))
 	{
 		FileList files;
-		directory_scan(filename, files);
+		directory_scan(filename.u8string(), files);
 		bool success = true;
-		for(FileList::const_iterator i = files.begin(); i != files.end(); ++i)
-			if (!remove_recursive(filename + ETL_DIRECTORY_SEPARATOR + *i))
+		for (const auto& i : files)
+			if (!remove_recursive(filename / i))
 				success = false;
+		if (success)
+			success = file_remove(filename.u8string());
 		return success;
 	}
 	return true;

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/filesystem.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/filesystem.h Changed

@@ -106,13 +106,21 @@
 			virtual size_t internal_write(const void *buffer, size_t size) = 0;
 
 		public:
-			bool write_block(const void *buffer, size_t size)
+			/**
+			 * Write @a size bytes of @a buffer to file.
+			 * @return how many bytes were really written
+			 */
+			size_t write_block(const void *buffer, size_t size)
 			{
 				for(size_t i = 0; i < size; i++)
 					if (!put(((const char*)buffer)i).good())
 						return i;
 				return size;
 			}
+			/**
+			 * Write @a size bytes of @a buffer to file.
+			 * @return true if everything was really written
+			 */
 			bool write_whole_block(const void *buffer, size_t size)
 				{ return size == write_block(buffer, size); }
 			bool write_whole_stream(std::streambuf &streambuf)
@@ -197,7 +205,7 @@
 		Identifier get_identifier(const String &filename) { return Identifier(this, filename); }
 
 		bool directory_create_recursive(const String &dirname);
-		bool remove_recursive(const String &filename);
+		bool remove_recursive(const filesystem::Path& filename);
 
 		static bool copy(Handle from_file_system, const String &from_filename, Handle to_file_system, const String &to_filename);
 		static bool copy_recursive(Handle from_file_system, const String &from_filename, Handle to_file_system, const String &to_filename);

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/filesystem_path.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/filesystem_path.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/filesystem_path.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/filesystem_path.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/gradient.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/gradient.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/gradient.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/gradient.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/layer.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/layer.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/layer.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/layer.h Changed

@@ -608,12 +608,21 @@
 	virtual void set_outline_grow_vfunc(IndependentContext context, Real outline_grow);
 	virtual rendering::Task::Handle build_rendering_task_vfunc(Context context) const;
 
+	//! \see Layer::get_sub_renddesc()
 	virtual RendDesc get_sub_renddesc_vfunc(const RendDesc &renddesc) const;
-	virtual void get_sub_renddesc_vfunc(const RendDesc &renddesc, std::vector<RendDesc> &out_descs) const;
 
 public:
-	void get_sub_renddesc(const RendDesc &renddesc, std::vector<RendDesc> &out_descs) const;
-	RendDesc get_sub_renddesc(const RendDesc &renddesc, int index = 0) const;
+	//! Get the needed renddesc for context layers.
+	/*!
+	 * For the given renddesc argument, returns the computed
+	 * neeed renddesc for the underlying layer.
+	 * It basically sets the vector rectangle coordinates of
+	 * the context/underlying layer.
+	 *
+	 * \param renddesc The required rend_desc for this layer
+	 * \return the needed RendDesc for the underlying layer
+	 */
+	RendDesc get_sub_renddesc(const RendDesc &renddesc) const;
 
 	//! Returns rendering task for context
 	/*!	\param context		Context iterator referring to next Layer.

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/layers/layer_bitmap.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/layers/layer_bitmap.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/layers/layer_meshtransform.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/layers/layer_meshtransform.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/layers/layer_shape.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/layers/layer_shape.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/loadcanvas.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/loadcanvas.cpp Changed

@@ -3541,20 +3541,6 @@
 				if (!canvas) return canvas;
 				register_canvas_in_map(canvas, as);
 
-				const ValueNodeList& value_node_list(canvas->value_node_list());
-
-				again:
-				ValueNodeList::const_iterator iter;
-				for(iter=value_node_list.begin();iter!=value_node_list.end();++iter)
-				{
-					ValueNode::Handle value_node(*iter);
-					if(value_node->is_exported() && value_node->get_id().find("Unnamed")==0)
-					{
-						canvas->remove_value_node(value_node, true);
-						goto again;
-					}
-				}
-
 				return canvas;
 			}
 		} else {
@@ -3597,24 +3583,7 @@
 		total_warnings_=0;
 		if(node)
 		{
-			Canvas::Handle canvas(parse_canvas(node,0,false,FileSystemNative::instance()->get_identifier(std::string()),""));
-			if (!canvas) return canvas;
-
-			const ValueNodeList& value_node_list(canvas->value_node_list());
-
-			again:
-			ValueNodeList::const_iterator iter;
-			for(iter=value_node_list.begin();iter!=value_node_list.end();++iter)
-			{
-				ValueNode::Handle value_node(*iter);
-				if(value_node->is_exported() && value_node->get_id().find("Unnamed")==0)
-				{
-					canvas->remove_value_node(value_node, false); // \todo verify false here
-					goto again;
-				}
-			}
-
-			return canvas;
+			return parse_canvas(node, nullptr, false, FileSystemNative::instance()->get_identifier(""), "");
 		}
 	}
 	catch(Exception::BadLinkName&) { synfig::error("BadLinkName Thrown"); }

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/main.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/main.cpp Changed

@@ -77,6 +77,7 @@
 #include <giomm.h>
 
 #include <synfig/os.h>
+#include <synfig/smartfile.h>
 #include <synfig/synfig_export.h>
 
 #ifdef HAVE_SIGNAL_H
@@ -518,7 +519,7 @@
 filesystem::Path
 synfig::OS::get_binary_path()
 {
-	
+	/* The path in UTF-8 */
 	String result;
 
 #ifdef _WIN32
@@ -549,14 +550,14 @@
 	
 #else
 
-	size_t buf_size = PATH_MAX - 1;
-	std::vector<char> path(buf_size);
+	constexpr ssize_t path_buf_size = PATH_MAX - 1;
+	std::vector<char> path(path_buf_size);
 
 	ssize_t size;
 	struct stat stat_buf;
 
 	/* Read from /proc/self/exe (symlink) */
-	std::vector<char> path2(buf_size);
+	std::vector<char> path2(path_buf_size);
 	const char* procfs_path =
 #if defined(__FreeBSD__) || defined (__DragonFly__) || defined (__OpenBSD__)
 		"/proc/curproc/file";
@@ -566,19 +567,19 @@
 		"/proc/self/exe";
 #endif
 
-	strncpy(path2.data(), procfs_path, buf_size - 1);
+	strncpy(path2.data(), procfs_path, path_buf_size - 1);
 
 	while (1) {
 		int i;
 
-		size = readlink(path2.data(), path.data(), buf_size - 1);
+		size = readlink(path2.data(), path.data(), path_buf_size - 1);
 		if (size == -1) {
 			/* Error. */
 			break;
 		}
 
 		/* readlink() success. */
-		pathsize = '\0';
+		pathstd::min(size, path_buf_size-1) = '\0';
 
 		/* Check whether the symlink's target is also a symlink.
 		 * We want to get the final target. */
@@ -598,7 +599,7 @@
 		}
 
 		/* path is a symlink. Continue loop and resolve this. */
-		strncpy(path.data(), path2.data(), buf_size - 1);
+		strncpy(path.data(), path2.data(), path_buf_size - 1);
 	}
 	
 	path2.clear();
@@ -610,41 +611,41 @@
 		/* readlink() or stat() failed; this can happen when the program is
 		 * running in Valgrind 2.2. Read from /proc/self/maps as fallback. */
 
-		buf_size = PATH_MAX + 128;
-		char* line = (char*)malloc(buf_size);
+		size_t line_buf_size = PATH_MAX + 128;
+		std::vector<char> line(line_buf_size);
 
-		FILE* f = fopen("/proc/self/maps", "r");
+		synfig::SmartFILE f({"/proc/self/maps"}, "r");
 		if (!f) {
 			synfig::error("Cannot open /proc/self/maps.");
+		} else {
+			/* The first entry should be the executable name. */
+			char* r = fgets(line.data(), (int) line_buf_size, f.get());
+			if (!r) {
+				synfig::error("Cannot read /proc/self/maps.");
+			} else {
+				/* Force string end */
+				lineline_buf_size - 1 = 0;
+				/* Get rid of newline character. */
+				line_buf_size = strlen(line.data());
+				if (line_buf_size <= 0) {
+					/* Huh? An empty string? */
+					synfig::error("Invalid /proc/self/maps.");
+				} else {
+					if (lineline_buf_size - 1 == 10) /* = newline \n */
+						lineline_buf_size - 1 = 0;
+
+					/* Extract the filename; it is always an absolute path. */
+					char* path3 = strchr(line.data(), '/');
+
+					/* Sanity check. */
+					if (!path3 || strstr(line.data(), " r-xp ") == nullptr) {
+						synfig::error("Invalid /proc/self/maps.");
+					} else {
+						result = String(path3);
+					}
+				}
+			}
 		}
-
-		/* The first entry should be the executable name. */
-		char *r;
-		r = fgets(line, (int) buf_size, f);
-		if (!r) {
-			synfig::error("Cannot read /proc/self/maps.");
-		}
-
-		/* Get rid of newline character. */
-		buf_size = strlen(line);
-		if (buf_size <= 0) {
-			/* Huh? An empty string? */
-			synfig::error("Invalid /proc/self/maps.");
-		}
-		if (linebuf_size - 1 == 10)
-			linebuf_size - 1 = 0;
-
-		/* Extract the filename; it is always an absolute path. */
-		char* path3 = strchr(line, '/');
-
-		/* Sanity check. */
-		if (strstr(line, " r-xp ") == nullptr || !path3) {
-			synfig::error("Invalid /proc/self/maps.");
-		}
-
-		result = String(path3);
-		free(line);
-		fclose(f);
 	}
 #endif
 
@@ -656,7 +657,7 @@
 	{
 		// In worst case use value specified as fallback 
 		// (usually should come from argv0)
-		return filesystem::absolute(OS::fallback_binary_path).u8string();
+		return filesystem::absolute(OS::fallback_binary_path);
 	}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/os.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/os.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/pen.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/pen.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/common/optimizer/optimizertransformation.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/common/optimizer/optimizertransformation.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/common/task/taskcontour.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/common/task/taskcontour.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/common/task/tasklayer.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/common/task/tasklayer.cpp Changed

@@ -73,10 +73,6 @@
 	return context.get_full_bounding_rect();
 }
 
-bool
-TaskLayer::renddesc_less(const RendDesc &a, const RendDesc &b)
-	{ return fabs(a.get_pw()*a.get_ph()) > fabs(b.get_pw()*b.get_ph()); }
-
 void
 TaskLayer::set_coords_sub_tasks()
 {
@@ -92,43 +88,38 @@
 	desc.set_tl(source_rect.get_min());
 	desc.set_br(source_rect.get_max());
 
-	std::vector<RendDesc> descs;
-	layer->get_sub_renddesc(desc, descs);
-	sort(descs.begin(), descs.end(), renddesc_less);
+	RendDesc sub_desc = layer->get_sub_renddesc(desc);
 
 	Task::Handle task = sub_task();
 	sub_tasks.clear();
 
-	for(std::vector<RendDesc>::const_iterator i = descs.begin(); i != descs.end(); ++i)
-	{
-		if (i->get_w() <= 0 || i->get_h() <= 0)
-			continue;
-
-		Point lt = i->get_tl(), rb = i->get_br();
-		Rect rect(lt, rb);
-		if (!rect.is_valid())
-			continue;
-
-		Matrix matrix;
-		if (approximate_less(rb0, lt0))
-			{ matrix.m00 = -1.0; matrix.m20 = rb0 - lt0; }
-		if (approximate_less(rb1, lt1))
-			{ matrix.m11 = -1.0; matrix.m20 = rb1 - lt1; }
-		matrix = i->get_transformation_matrix() * matrix;
-		if (!matrix.is_invertible())
-			continue;
-
-		Task::Handle t = task->clone();
-		if (!matrix.is_identity()) {
-			TaskTransformationAffine::Handle ta = new TaskTransformationAffine();
-			ta->transformation->matrix = matrix;
-			ta->sub_task() = t;
-			t = ta;
-		}
-
-		sub_tasks.push_back(t);
-		t->set_coords(rect, VectorInt(i->get_w(), i->get_h()));
+	if (sub_desc.get_w() <= 0 || sub_desc.get_h() <= 0)
+		return;
+
+	Point lt = sub_desc.get_tl(), rb = sub_desc.get_br();
+	Rect rect(lt, rb);
+	if (!rect.is_valid())
+		return;
+
+	Matrix matrix;
+	if (approximate_less(rb0, lt0))
+		{ matrix.m00 = -1.0; matrix.m20 = rb0 - lt0; }
+	if (approximate_less(rb1, lt1))
+		{ matrix.m11 = -1.0; matrix.m20 = rb1 - lt1; }
+	matrix = sub_desc.get_transformation_matrix() * matrix;
+	if (!matrix.is_invertible())
+		return;
+
+	Task::Handle t = task->clone();
+	if (!matrix.is_identity()) {
+		TaskTransformationAffine::Handle ta = new TaskTransformationAffine();
+		ta->transformation->matrix = matrix;
+		ta->sub_task() = t;
+		t = ta;
 	}
+
+	sub_tasks.push_back(t);
+	t->set_coords(rect, VectorInt(sub_desc.get_w(), sub_desc.get_h()));
 }
 
 /* === E N T R Y P O I N T ================================================= */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/common/task/tasklayer.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/common/task/tasklayer.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/common/task/taskpixelprocessor.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/common/task/taskpixelprocessor.cpp Changed

@@ -48,8 +48,10 @@
 /* === M E T H O D S ======================================================= */
 
 
+SYNFIG_EXPORT Task::Token TaskPixelProcessorBase::token(
+	DescAbstract<TaskPixelProcessorBase>("PixelProcessorBase") );
 SYNFIG_EXPORT Task::Token TaskPixelProcessor::token(
-	DescAbstract<TaskPixelProcessor>("PixelProcessor") );
+	DescAbstract<TaskPixelProcessor, TaskPixelProcessorBase>("PixelProcessor") );
 Task::Token TaskPixelGamma::token(
 	DescAbstract<TaskPixelGamma, TaskPixelProcessor>("PixelGamma") );
 SYNFIG_EXPORT Task::Token TaskPixelColorMatrix::token(
@@ -57,7 +59,7 @@
 
 
 Rect
-TaskPixelProcessor::calc_bounds() const
+TaskPixelProcessorBase::calc_bounds() const
 {
 	return is_transparent() ? Rect::zero()
 	 : is_affects_transparent() ? Rect::infinite()
@@ -66,7 +68,7 @@
 }
 
 VectorInt
-TaskPixelProcessor::get_offset() const
+TaskPixelProcessorBase::get_offset() const
 {
 	if (!sub_task()) return VectorInt::zero();
 	Vector offset = (sub_task()->source_rect.get_min() - source_rect.get_min()).multiply_coords(get_pixels_per_unit());

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/common/task/taskpixelprocessor.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/common/task/taskpixelprocessor.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/common/task/tasktransformation.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/common/task/tasktransformation.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/primitive/bend.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/primitive/bend.cpp Changed

@@ -173,6 +173,7 @@
 		 && t0.is_equal_to(Vector()) )
 		{
 			// skip zero length segment
+			last.last_index += 1;
 			last.t1 = t1;
 			last.tn1 = t1.norm();
 			last.mode = mode;
@@ -185,18 +186,21 @@
 		
 		point.p = last.p;
 		point.length = last.length;
-		Real l0 = last.l, l = step;
+		const Real l0 = last.last_index;
+		Real l = step;
 		for(int i = 1; i < segments; ++i, l += step) {
 			Vector pp = h.p(l);
-			point.l = l0 + l;
-			point.length = calc_length ? point.length + (pp - point.p).mag() : point.l;
+			point.index = l0 + l;
+			point.last_index = l0 + l;
+			point.length = calc_length ? point.length + (pp - point.p).mag() : point.index;
 			point.p = pp;
 			point.t0 = point.t1 = h.t(l);
 			point.tn0 = point.tn1 = h.d(l);
 			points.push_back(point);
 		}
-		point.l = l0 + 1;
-		point.length = calc_length ? point.length + (p - point.p).mag() : point.l;
+		point.index = l0 + 1;
+		point.last_index = l0 + 1;
+		point.length = calc_length ? point.length + (p - point.p).mag() : point.index;
 		point.tn0 = h.d(1);
 	} else {
 		point.tn0 = t0.norm();
@@ -235,7 +239,7 @@
 
 	{
 		PointList::iterator i1 = points.begin(), i0 = i1++;
-		Real dl = i1->l - i0->l;
+		Real dl = i1->index - i0->last_index;
 		Hermite h(i0->p, i1->p, i0->t1*dl, i1->t0*dl);
 		i0->t0 = i0->tn0 = h.d(0);
 		i0->mode = NONE;
@@ -243,7 +247,7 @@
 
 	{
 		PointList::iterator i0 = points.end(), i1 = (--i0)--;
-		Real dl = i1->l - i0->l;
+		Real dl = i1->index - i0->last_index;
 		Hermite h(i0->p, i1->p, i0->t1*dl, i1->t0*dl);
 		i1->t1 = i1->tn1 = h.d(1);
 		i1->mode = NONE;
@@ -252,16 +256,21 @@
 
 
 Bend::PointList::const_iterator
-Bend::find_by_l(Real l) const
+Bend::find_by_index(Real index) const
 {
 	if (points.empty())
 		return points.end();
 	PointList::const_iterator a = points.begin(), b = points.end() - 1, c;
-	if (!approximate_less(a->l, l)) return a;
-	if (!approximate_less(l, b->l)) return b;
+
+	if (approximate_greater_or_equal(a->last_index, index))
+		return a;
+	if (approximate_greater_or_equal(index, b->index))
+		return b;
+
 	while( (c = a + (b - a)/2) != a ) {
-		if (approximate_equal(l, c->l)) return c;
-		(l < c->l ? b : a) = c;
+		if (approximate_greater_or_equal(index, c->index) && approximate_less_or_equal(index, c->last_index))
+			return c;
+		(index < c->index ? b : a) = c;
 	}
 	return c;
 }
@@ -272,8 +281,12 @@
 	if (points.empty())
 		return points.end();
 	PointList::const_iterator a = points.begin(), b = points.end() - 1, c;
-	if (!approximate_less(a->length, length)) return a;
-	if (!approximate_less(length, b->length)) return b;
+
+	if (approximate_greater_or_equal(a->length, length))
+		return a;
+	if (approximate_greater_or_equal(length, b->length))
+		return b;
+
 	while( (c = a + (b - a)/2) != a ) {
 		if (approximate_equal(length, c->length)) return c;
 		(length < c->length ? b : a) = c;
@@ -281,21 +294,22 @@
 	return c;
 }
 
-Real Bend::length_by_l(Real l) const {
-	PointList::const_iterator i = find_by_l(l);
+Real Bend::length_by_index(Real index) const {
+	PointList::const_iterator i = find_by_index(index);
 	if (i == points.end())
 		return 0;
 	
-	if (approximate_equal(l, i->l)) return i->length;
-	if (l < i->l)
-		return i->length + (l - i->l);
+	if (approximate_greater_or_equal(index, i->index) && approximate_less_or_equal(index, i->last_index))
+		return i->length;
+	if (index < i->index)
+		return i->length + (index - i->index); // TODO: review: shouldn't interpolate?
 	
 	PointList::const_iterator j = i + 1;
 	if (j == points.end())
-		return i->length + (l - i->l);
+		return i->length + (index - i->last_index); // TODO: review: shouldn't interpolate?
 	
-	Real dl = j->l - i->l;
-	return approximate_zero(dl) ? i->length : i->length + (j->length - i->length)*(l - i->l)/dl;
+	Real dl = j->index - i->last_index;
+	return approximate_zero(dl) ? i->length : i->length + (j->length - i->length)*(index - i->last_index)/dl;
 }
 
 Bend::Point
@@ -312,7 +326,8 @@
 		Point s;
 		s.p = i->p + i->tn0*dlen;
 		s.t0 = s.t1 = s.tn0 = s.tn1 = i->tn0;
-		s.l = i->l + dlen;
+		s.index = i->last_index + dlen;
+		s.last_index = s.index;
 		s.length = length;
 		s.e0 = s.e1 = i->e0;
 		return s;
@@ -325,7 +340,8 @@
 		Point s;
 		s.p = i->p + i->tn1*dlen;
 		s.t0 = s.t1 = s.tn0 = s.tn1 = i->t1;
-		s.l = i->l + dlen;
+		s.index = i->last_index + dlen;
+		s.last_index = s.index;
 		s.length = length;
 		s.e0 = s.e1 = i->e1;
 		return s;
@@ -334,14 +350,15 @@
 	// interpolation
 	Real l = j->length - i->length;
 	l = approximate_zero(l) ? 0 : (length - i->length)/l;
-	Real dl = j->l - i->l;
+	Real dl = j->index - i->last_index;
 	Hermite h(i->p, j->p, i->t1*dl, j->t0*dl);
 	
 	Point s;
 	s.p = h.p(l);
 	s.t0 = s.t1 = h.t(l);
 	s.tn0 = s.tn1 = h.d(l);
-	s.l = i->l + l*(j->l - i->l);
+	s.index = i->last_index + l*(j->index - i->last_index);
+	s.last_index = s.index;
 	s.length = length;
 	s.e0 = s.e1 = (i->e1 && j->e0);
 	
@@ -456,7 +473,7 @@
 			const Intersection &next = *bi;
 			if (approximate_equal(prev.l, next.l)) continue;
 
-			bool flip = next.point.l < prev.point.l;
+			bool flip = next.point.index < prev.point.last_index;
 			bool e0 = flip ? prev.point.e0 : prev.point.e1;
 			bool e1 = flip ? next.point.e1 : next.point.e0;
 			if (e0 && e1) {
@@ -469,7 +486,7 @@
 				Vector dst_p0 = prev.point.p + tn0.perp()*src_p0y;
 				Vector dst_p1 = next.point.p + tn1.perp()*src_p1y;
 				
-				bool vertical = approximate_equal(next.point.l, prev.point.l);
+				bool vertical = approximate_greater_or_equal(next.point.index, prev.point.index) && approximate_less_or_equal(next.point.index, prev.point.last_index);
 				
 				half_corner(dst, dst_move_flag, prev.point, src_p0y, flip || vertical, true);
 				touch(dst, dst_move_flag, dst_p0);

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/primitive/bend.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/primitive/bend.h Changed

@@ -72,9 +72,10 @@
 		Vector tn0, tn1;
 		Mode mode;
 		bool e0, e1;
-		Real l;
+		Real index; /**< The point index in the B-line */
+		Real last_index; /**< It is different (greater) of index only if zero-length segments follow this point */
 		Real length;
-		Point(): mode(NONE), e0(), e1(), l(), length() { }
+		Point(): mode(NONE), e0(), e1(), index(), last_index(), length() { }
 	};
 
 	typedef std::vector<Point> PointList;
@@ -86,18 +87,18 @@
 	void tails();
 	
 	Real l0() const
-		{ return points.empty() ? Real() : points.front().l; }
+		{ return points.empty() ? Real() : points.front().index; }
 	Real l1() const
-		{ return points.empty() ? Real() : points.back().l; }
+		{ return points.empty() ? Real() : points.back().last_index; }
 
 	Real length0() const
 		{ return points.empty() ? Real() : points.front().length; }
 	Real length1() const
 		{ return points.empty() ? Real() : points.back().length; }
 	
-	PointList::const_iterator find_by_l(Real l) const;
+	PointList::const_iterator find_by_index(Real index) const;
 	PointList::const_iterator find(Real length) const;
-	Real length_by_l(Real length) const;
+	Real length_by_index(Real index) const;
 	Point interpolate(Real length) const;
 	
 	void bend(Contour &dst, const Contour &src, const Matrix &matrix, int segments) const;

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/primitive/contour.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/primitive/contour.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/primitive/contour.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/primitive/contour.h Changed

@@ -30,15 +30,14 @@
 
 /* === H E A D E R S ======================================================= */
 
+#include <memory>
+#include <mutex>
 #include <vector>
 
-#include <ETL/handle>
-
 #include <synfig/vector.h>
 #include <synfig/rect.h>
 #include <synfig/matrix.h>
 #include <synfig/color.h>
-#include <mutex>
 
 /* === M A C R O S ========================================================= */
 
@@ -53,10 +52,10 @@
 
 class Intersector;
 
-class Contour: public etl::shared_object
+class Contour
 {
 public:
-	typedef etl::handle<Contour> Handle;
+	typedef std::shared_ptr<Contour> Handle;
 
 	enum WindingStyle
 	{
@@ -110,7 +109,7 @@
 	mutable Rect bounds;
 	
 	mutable std::mutex intersector_read_mutex;
-	mutable etl::handle<Intersector> intersector;
+	mutable std::shared_ptr<Intersector> intersector;
 
 	//! call this when 'chunks' or 'first' was changed
 	void touch_chunks();
@@ -176,7 +175,7 @@
 	Rect get_bounds() const;
 	
 	void to_intersector(Intersector &intersector) const;
-	etl::handle<Intersector> crerate_intersector() const;
+	std::shared_ptr<Intersector> create_intersector() const;
 
 	//! actualize internal copy of intersector (if needed) and return it
 	//! method is thread-safe for constant contours - you must not modify a contour while this call

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/primitive/intersector.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/primitive/intersector.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/primitive/intersector.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/primitive/intersector.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/primitive/transformation.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/primitive/transformation.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/software/function/array.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/software/function/array.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/software/task/taskpaintpixelsw.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/software/task/taskpaintpixelsw.cpp Changed

@@ -56,8 +56,8 @@
 
 	Task::Handle &subtask = task->sub_task(0);
 	if ( subtask
-		 && subtask->target_surface == task->target_surface
-		 && !Color::is_straight(blend_method) )
+		&& subtask->target_surface == task->target_surface
+		&& !Color::is_straight(blend_method) )
 	{
 		task->trunc_by_bounds();
 		subtask->source_rect = task->source_rect;
@@ -80,45 +80,114 @@
 	if (!task->is_valid())
 		return true;
 
-	Vector ppu = task->get_pixels_per_unit();
-
 	const synfig::RectInt& target_rect = task->target_rect;
 
-	Matrix bounds_transformation;
-	bounds_transformation.m00 = ppu0;
-	bounds_transformation.m11 = ppu1;
-	bounds_transformation.m20 = target_rect.minx - ppu0*task->source_rect.minx;
-	bounds_transformation.m21 = target_rect.miny - ppu1*task->source_rect.miny;
+	Matrix world_to_raster;
+	{
+		const Vector ppu = task->get_pixels_per_unit();
+		world_to_raster.m00 = ppu0;
+		world_to_raster.m11 = ppu1;
+		world_to_raster.m20 = target_rect.minx - ppu0 * task->source_rect.minx;
+		world_to_raster.m21 = target_rect.miny - ppu1 * task->source_rect.miny;
+	}
 
-	Matrix matrix = bounds_transformation;
 	if (auto interface_transformation = dynamic_cast<const TaskInterfaceTransformation*>(this)) {
 		if (auto affine = TransformationAffine::Handle::cast_dynamic(interface_transformation->get_transformation()))
-			matrix *= affine->matrix;
+			world_to_raster *= affine->matrix;
 		else
 			synfig::error(_("Internal Error: unsupported transformation for %s. It should be TransformationAffine."), task->get_token()->name.c_str());
 	}
-	Matrix inv_matrix = matrix.get_inverted();
 
-	int tw = target_rect.get_width();
-	Vector dx = inv_matrix.axis_x();
-	Vector dy = inv_matrix.axis_y() - dx*(Real)tw;
-	Vector p = inv_matrix.get_transformed( Vector((Real)target_rect.minx, (Real)target_rect.miny) );
+	const Matrix raster_to_world = world_to_raster.get_inverted();
+
+	const int tw = target_rect.get_width();
+	const Vector dx = raster_to_world.axis_x();
+	const Vector dy = raster_to_world.axis_y() - dx * (Real)tw;
+	Vector p = raster_to_world.get_transformed( Vector((Real)target_rect.minx, (Real)target_rect.miny) );
 
-	pre_run(matrix, inv_matrix);
+	pre_run(world_to_raster, raster_to_world);
 
 	LockWrite la(task);
 	if (!la)
 		return false;
 
 	synfig::Surface::alpha_pen apen(la->get_surface().get_pen(target_rect.minx, target_rect.miny));
-	ColorReal amount = blend ? this->amount : ColorReal(1.0);
+	const ColorReal amount = blend ? this->amount : ColorReal(1.0);
 	apen.set_blend_method(blend ? blend_method : Color::BLEND_COMPOSITE);
 
-	for(int iy = target_rect.miny; iy < target_rect.maxy; ++iy, p += dy, apen.inc_y(), apen.dec_x(tw)) {
-		for(int ix = target_rect.minx; ix < target_rect.maxx; ++ix, p += dx, apen.inc_x()) {
+	for (int iy = target_rect.miny; iy < target_rect.maxy; ++iy, p += dy, apen.inc_y(), apen.dec_x(tw)) {
+		for (int ix = target_rect.minx; ix < target_rect.maxx; ++ix, p += dx, apen.inc_x()) {
 			apen.put_value(get_color(p), amount);
 		}
 	}
 
 	return true;
 }
+
+bool
+synfig::rendering::TaskFilterPixelSW::run_task() const
+{
+	const TaskPixelProcessorBase* task = dynamic_cast<const TaskPixelProcessorBase*>(this);
+	if (!task) {
+		const Task* task = dynamic_cast<const Task*>(this);
+		if (task)
+			synfig::error(_("Internal error: Cobra task %s isn't a TaskPixelProcessorBase"), task->get_token()->name.c_str());
+		else
+			synfig::error(_("Internal error: this TaskFilterPixelSW isn't even a Task"));
+		return false;
+	}
+	if (!task->is_valid())
+		return true;
+	if (!task->sub_task())
+		return true;
+
+	const RectInt r = task->target_rect;
+
+	if (r.valid()) {
+		VectorInt offset = task->get_offset();
+
+		RectInt ra = task->sub_task()->target_rect + r.get_min() + offset;
+		if (ra.valid()) {
+			rect_set_intersect(ra, ra, r);
+			if (ra.valid()) {
+				LockWrite ldst(task);
+				if (!ldst) return false;
+
+				synfig::Surface &c = ldst->get_surface();
+
+				const Vector upp = task->get_units_per_pixel();
+				const Rect w = task->source_rect;
+
+				// for raster r to 'world' w conversion: w = upp * r + (w0 * r1 + w1 * r0) / r_size
+				Vector constant;
+				constant0 = (w.get_min()0 * r.get_max()0 + w.get_max()0 * r.get_min()0) / r.get_size()0;
+				constant1 = (w.get_min()1 * r.get_max()1 + w.get_max()1 * r.get_min()1) / r.get_size()1;
+
+				Matrix3 raster_to_world;
+				raster_to_world.m00 = upp0;
+				raster_to_world.m11 = upp1;
+				raster_to_world.m20 = constant0;
+				raster_to_world.m21 = constant1;
+
+				pre_run(raster_to_world);
+
+				LockRead lsrc(task->sub_task());
+				if (!lsrc) return false;
+
+				const synfig::Surface &a = lsrc->get_surface();
+
+				for (int y = ra.miny; y < ra.maxy; ++y) {
+					const Color *ca = &ay - r.miny + offset1ra.minx - r.minx + offset0;
+					Color *cc = &cyra.minx;
+					Real v = upp1 * y + constant1;
+					for (int x = ra.minx; x < ra.maxx; ++x, ++ca, ++cc) {
+						Real u = upp0 * x + constant0;
+						*cc = get_color(Vector(u, v), *ca);
+					}
+				}
+			}
+		}
+	}
+
+	return true;
+}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/software/task/taskpaintpixelsw.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/software/task/taskpaintpixelsw.h Changed

@@ -34,6 +34,7 @@
 #include "tasksw.h"
 #include <synfig/rendering/task.h>
 #include <synfig/rendering/common/task/taskblend.h>
+#include <synfig/rendering/common/task/taskpixelprocessor.h>
 
 /* === M A C R O S ========================================================= */
 
@@ -49,7 +50,7 @@
 /**
 * Paint each pixel depending on its position.
 *
- * The color of each pixel is defined by get_color() or get_color_antialias() calls.
+ * The color of each pixel is defined by get_color() calls.
 *
 * To use this abstract class, call run_task() inside of your implementation of Task::run().
 *
@@ -60,13 +61,12 @@
 		public TaskInterfaceSplit
 {
 public:
-
-	//! Called inside run() right before iterating over each pixel.
+	//! Called inside run() right before start iterating over each pixel.
 	//! Useful for computing some parameters that are constant for all iterations.
 	//!
-	//! \param matrix transformation matrix mixing affine and bound transformations
-	//! \param inverse_matrix the inverse of matrix
-	virtual void pre_run(const Matrix3& /*matrix*/, const Matrix3& /*inverse_matrix*/) const {}
+	//! \param world_to_raster full transformation matrix mixing transformation of vector to raster coords and task affine transformation
+	//! \param raster_to_world the inverse of world_to_raster
+	virtual void pre_run(const Matrix3& /*world_to_raster*/, const Matrix3& /*raster_to_world*/) const {}
 
 	//! Fetch color at position p (in synfig units) when antialias is false
 	virtual Color get_color(const Vector& p) const = 0;
@@ -79,6 +79,31 @@
 	Color::BlendMethodFlags get_supported_blend_methods() const override;
 };
 
+/**
+ * Paint each pixel depending on its position and the context color at that point.
+ *
+ * The color of each pixel is defined by get_color() calls.
+ *
+ * To use this abstract class, call run_task() inside of your implementation of Task::run().
+ *
+ */
+class TaskFilterPixelSW :
+		public TaskSW
+{
+public:
+	//! Called inside run() right before iterating over each pixel.
+	//! Useful for computing some parameters that are constant for all iterations.
+	//!
+	//! \param raster_to_world transformation matrix : raster coordinates to world coordinates
+	virtual void pre_run(const Matrix3& /*raster_to_world*/) const {}
+
+	/** Fetch color at position @a p (in synfig units) given a previous Color @a c at same point */
+	virtual Color get_color(const Vector& /*p*/, const Color& c) const = 0;
+
+	//! Call this method from run() method of the real task implementation
+	virtual bool run_task() const;
+};
+
 
 } /* end namespace rendering */
 } /* end namespace synfig */

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/surface.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/surface.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/surface.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/surface.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/rendering/task.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/rendering/task.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/savecanvas.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/savecanvas.cpp Changed

@@ -985,16 +985,23 @@
 		xmlpp::Element *node=root->add_child("defs");
 		const ValueNodeList &value_node_list(canvas->value_node_list());
 
+		// Save all the constant 'value_node' nodes first.
 		for(ValueNodeList::const_iterator iter=value_node_list.begin();iter!=value_node_list.end();++iter)
 		{
 			// If the value_node is a constant, then use the shorthand
 			if (ValueNode_Const::Handle value_node = ValueNode_Const::Handle::cast_dynamic(*iter))
 			{
 				reinterpret_cast<xmlpp::Element*>(encode_value(node->add_child("value"),value_node->get_value(),canvas))->set_attribute("id",value_node->get_id());
-				continue;
 			}
-			encode_value_node(node->add_child("value_node"),*iter,canvas);
-			// writeme
+		}
+
+		// Save the non-constant ones at the last. This would prevent "Unable to resolve" messages when loading the project.
+		for(ValueNodeList::const_iterator iter=value_node_list.begin();iter!=value_node_list.end();++iter)
+		{
+			if (!ValueNode_Const::Handle::cast_dynamic(*iter))
+			{
+				encode_value_node(node->add_child("value_node"),*iter,canvas);
+			}
 		}
 
 		for(Canvas::Children::const_iterator iter=canvas->children().begin();iter!=canvas->children().end();++iter)

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/soundprocessor.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/soundprocessor.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/synfig_iterations.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/synfig_iterations.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/target.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/target.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/target.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/target.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/valuenodes/Makefile_insert -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/Makefile_insert Changed

@@ -1,6 +1,7 @@
 VALUENODES_HH = \
 	valuenodes/valuenode_add.h \
 	valuenodes/valuenode_and.h \
+	valuenodes/valuenode_angle.h \
 	valuenodes/valuenode_anglestring.h \
 	valuenodes/valuenode_animated.h \
 	valuenodes/valuenode_animatedfile.h \
@@ -28,6 +29,7 @@
 	valuenodes/valuenode_join.h \
 	valuenodes/valuenode_linear.h \
 	valuenodes/valuenode_log.h \
+	valuenodes/valuenode_maprange.h \
 	valuenodes/valuenode_modulo.h \
 	valuenodes/valuenode_not.h \
 	valuenodes/valuenode_or.h \
@@ -70,6 +72,7 @@
 VALUENODES_CC = \
 	valuenodes/valuenode_add.cpp \
 	valuenodes/valuenode_and.cpp \
+	valuenodes/valuenode_angle.cpp \
 	valuenodes/valuenode_anglestring.cpp \
 	valuenodes/valuenode_animated.cpp \
 	valuenodes/valuenode_animatedfile.cpp \
@@ -97,6 +100,7 @@
 	valuenodes/valuenode_join.cpp \
 	valuenodes/valuenode_linear.cpp \
 	valuenodes/valuenode_log.cpp \
+	valuenodes/valuenode_maprange.cpp \
 	valuenodes/valuenode_modulo.cpp \
 	valuenodes/valuenode_not.cpp \
 	valuenodes/valuenode_or.cpp \

_service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_angle.cpp Added

@@ -0,0 +1,159 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_angle.cpp
+**	\brief Implementation of the "Angle" valuenode conversion.
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007, 2008 Chris Moore
+** Copyright (c) 2011 Carlos López
+**
+**	This file is part of Synfig.
+**
+**	Synfig is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 2 of the License, or
+**	(at your option) any later version.
+**
+**	Synfig is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with Synfig. If not, see <https://www.gnu.org/licenses/>.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include "valuenode_angle.h"
+#include "valuenode_const.h"
+#include <synfig/general.h>
+#include <synfig/localization.h>
+#include <synfig/valuenode_registry.h>
+#include <synfig/angle.h>
+#include <synfig/real.h>
+
+#endif
+
+/* === U S I N G =========================================================== */
+
+using namespace synfig;
+
+/* === M A C R O S ========================================================= */
+
+/* === G L O B A L S ======================================================= */
+
+REGISTER_VALUENODE(ValueNode_Angle, RELEASE_VERSION_1_6_0, "fromangle", N_("Angle"))
+
+/* === P R O C E D U R E S ================================================= */
+
+/* === M E T H O D S ======================================================= */
+
+ValueNode_Angle::ValueNode_Angle(Type& x):
+	LinkableValueNode(x)
+{
+	init_children_vocab();
+}
+
+ValueNode_Angle::ValueNode_Angle(const ValueBase &value):
+	LinkableValueNode(value.get_type())
+{
+	init_children_vocab();
+	if (value.get_type() == type_real)
+	{
+		set_link("link", ValueNode_Const::create(Angle::deg(value.get(Real()))));
+	}
+	else
+	if (value.get_type() == type_integer)
+	{
+		set_link("link", ValueNode_Const::create(Angle::deg(value.get(int()))));
+	}
+	else
+	{
+		throw Exception::BadType(value.get_type().description.local_name);
+	}
+}
+
+LinkableValueNode*
+ValueNode_Angle::create_new()const
+{
+	return new ValueNode_Angle(get_type());
+}
+
+ValueNode_Angle*
+ValueNode_Angle::create(const ValueBase& x, etl::loose_handle<Canvas>)
+{
+	return new ValueNode_Angle(x);
+}
+
+ValueNode_Angle::~ValueNode_Angle()
+{
+	unlink_all();
+}
+
+ValueBase
+ValueNode_Angle::operator()(Time t)const
+{
+	DEBUG_LOG("SYNFIG_DEBUG_VALUENODE_OPERATORS",
+		"%s:%d operator()\n", __FILE__, __LINE__);
+
+	const Type& type(get_type());
+	if (type == type_real)
+		return Angle::deg((*angle_)(t).get(Angle())).get();
+	if (type == type_integer)
+		return int(Angle::deg((*angle_)(t).get(Angle())).get());
+
+	assert(0);
+	throw std::runtime_error(get_local_name() + _(":Bad type ") + get_type().description.local_name);
+}
+
+bool
+ValueNode_Angle::check_type(Type &type)
+{
+	return type == type_real || type == type_integer;
+}
+
+bool
+ValueNode_Angle::set_link_vfunc(int i,ValueNode::Handle value)
+{
+	assert(i>=0 && i<link_count());
+
+	switch(i)
+	{
+	case 0: CHECK_TYPE_AND_SET_VALUE(angle_, type_angle);
+	}
+	return false;
+}
+
+ValueNode::LooseHandle
+ValueNode_Angle::get_link_vfunc(int i)const
+{
+	assert(i>=0 && i<link_count());
+
+	if(i==0)
+		return angle_;
+
+	return 0;
+}
+
+LinkableValueNode::Vocab
+ValueNode_Angle::get_children_vocab_vfunc()const
+{
+	LinkableValueNode::Vocab ret;
+
+	ret.push_back(ParamDesc("link")
+		.set_local_name(_("Link"))
+		.set_description(_("Angle value in degrees"))
+	);
+
+	return ret;
+}

_service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_angle.h Added

@@ -0,0 +1,76 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_angle.h
+**	\brief Header file for implementation of the "Real" valuenode conversion.
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2007 Chris Moore
+** Copyright (c) 2011 Carlos López
+**
+**	This file is part of Synfig.
+**
+**	Synfig is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 2 of the License, or
+**	(at your option) any later version.
+**
+**	Synfig is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with Synfig. If not, see <https://www.gnu.org/licenses/>.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef __SYNFIG_VALUENODE_ANGLE_H
+#define __SYNFIG_VALUENODE_ANGLE_H
+
+/* === H E A D E R S ======================================================= */
+
+#include <synfig/valuenode.h>
+
+/* === M A C R O S ========================================================= */
+
+/* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace synfig {
+
+class ValueNode_Angle : public LinkableValueNode
+{
+	ValueNode::RHandle angle_;
+
+	ValueNode_Angle(Type& x);
+	ValueNode_Angle(const ValueBase &value);
+
+public:
+	typedef etl::handle<ValueNode_Angle> Handle;
+	typedef etl::handle<const ValueNode_Angle> ConstHandle;
+
+	static ValueNode_Angle* create(const ValueBase& value=ValueBase(), etl::loose_handle<Canvas> canvas=nullptr);
+	virtual ~ValueNode_Angle();
+
+	virtual String get_name() const override;
+	virtual String get_local_name() const override;
+	static bool check_type(Type &type);
+
+	virtual ValueBase operator()(Time t) const override;
+
+protected:
+	virtual LinkableValueNode* create_new() const override;
+
+	virtual bool set_link_vfunc(int i,ValueNode::Handle x) override;
+	virtual ValueNode::LooseHandle get_link_vfunc(int i) const override;
+
+	virtual Vocab get_children_vocab_vfunc() const override;
+}; // END of class ValueNode_Angle
+
+}; // END of namespace synfig
+
+/* === E N D =============================================================== */
+
+#endif

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/valuenodes/valuenode_bline.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_bline.cpp Changed

@@ -185,8 +185,10 @@
 	synfig::Point best_point;
 
 	const ValueBase::List &list = bline.get_list();
-	int size = (int)list.size();
-	int count = loop ? size : size - 1;
+	const int size = (int)list.size();
+	if (size == 0)
+		return 0;
+	const int count = loop ? size : size - 1;
 	
 	for(int i0 = 0; i0 < count; ++i0) {
 		int i1 = (i0 + 1) % size;
@@ -226,9 +228,8 @@
 Real
 synfig::std_to_hom(const ValueBase &bline, Real pos, bool index_loop, bool bline_loop)
 {
-	Real loops = index_loop ? floor(pos) : 0.0;
+	const Real loops = index_loop ? floor(pos) : 0.0;
 	pos -= loops;
-	assert(approximate_greater_or_equal(pos, 0.0));
 
 	// trivial cases
 	if (approximate_less_or_equal(pos, Real(0)))
@@ -237,29 +238,31 @@
 		return loops + 1;
 
 	const std::vector<BLinePoint> list(bline.get_list_of(BLinePoint()));
-	size_t size = list.size();
-	size_t count = bline_loop? size : size - 1;
+	const size_t size = list.size();
+	if (size == 0)
+		return loops;
+	const size_t count = bline_loop? size : size - 1;
 	if (count < 1)
 		return loops + pos;
 
 	// Calculate the lengths and the total length
 	std::vector<Real> lengths;
-	Real bline_total_length = bline_length(list, bline_loop, &lengths);
+	const Real bline_total_length = bline_length(list, bline_loop, &lengths);
 	// If the total length of the bline is zero return pos
-	if(approximate_equal(bline_total_length, 0.0))
+	if (approximate_equal(bline_total_length, 0.0))
 		return pos;
-	size_t from_vertex = size_t(pos*count);
+	const size_t from_vertex = size_t(pos*count);
 	// Calculate the partial length until the bezier that holds the current
 	Real partial_length = 0;
 	std::vector<Real>::const_iterator length_iter(lengths.begin());
-	for(size_t i=0; i < from_vertex; ++i, ++length_iter)
+	for (size_t i = 0; i < from_vertex; ++i, ++length_iter)
 		partial_length += *length_iter;
 	// Calculate the remaining length of the position over current bezier
 	// Setup the curve of the current bezier.
-	size_t next_vertex = (from_vertex + 1) % size;
-	const BLinePoint &blinepoint0 = listfrom_vertex;
-	const BLinePoint &blinepoint1 = listnext_vertex;
-	hermite<Vector> curve(blinepoint0.get_vertex(), blinepoint1.get_vertex(),
+	const size_t next_vertex = (from_vertex + 1) % size;
+	const BLinePoint& blinepoint0 = listfrom_vertex;
+	const BLinePoint& blinepoint1 = listnext_vertex;
+	const hermite<Vector> curve(blinepoint0.get_vertex(), blinepoint1.get_vertex(),
 							blinepoint0.get_tangent2(), blinepoint1.get_tangent1());
 	// add the distance on the bezier we are on.
 	partial_length += curve.find_distance(0.0, pos*count - from_vertex);
@@ -270,7 +273,7 @@
 Real
 synfig::hom_to_std(const ValueBase &bline, Real pos, bool index_loop, bool bline_loop)
 {
-	Real loops = index_loop ? floor(pos) : 0.0;
+	const Real loops = index_loop ? floor(pos) : 0.0;
 	pos -= loops;
 	assert(approximate_greater_or_equal(pos, 0.0));
 
@@ -281,16 +284,18 @@
 		return loops + 1;
 
 	const std::vector<BLinePoint> list(bline.get_list_of(BLinePoint()));
-	size_t size = list.size();
-	size_t count = bline_loop? size : size - 1;
+	const size_t size = list.size();
+	if (size == 0)
+		return loops;
+	const size_t count = bline_loop? size : size - 1;
 	if (count < 1)
 		return loops + pos;
 
 	// Calculate the lengths and the total length
 	std::vector<Real> lengths;
-	Real bline_total_length=bline_length(bline, bline_loop,&lengths);
+	const Real bline_total_length = bline_length(bline, bline_loop, &lengths);
 	// Calculate the my partial length (the length where pos is)
-	Real target_length = pos * bline_total_length;
+	const Real target_length = pos * bline_total_length;
 	std::vector<Real>::const_iterator length_iter(lengths.begin());
 	// Find the previous bezier where we pos is placed and the sum
 	// of lengths to it (cumulative_length)
@@ -298,40 +303,39 @@
 	Real cumulative_length = 0;
 	size_t from_vertex = 0;
 	Real segment_length = 0;
-	while(target_length > cumulative_length && length_iter != lengths.end())
-	{
+	while (approximate_greater(target_length, cumulative_length) && length_iter != lengths.end()) {
 		segment_length = *length_iter;
 		cumulative_length += segment_length;
 
 		++length_iter;
 		++from_vertex;
 	}
-	// correct the iters and partial length in case we passed over
-	if(cumulative_length > target_length)
-	{
+	if (approximate_equal(target_length, cumulative_length)) {
+		return loops + Real(from_vertex) / count;
+	} else {
+		// correct the iters and partial length in case we passed over
 		--length_iter;
 		cumulative_length -= *length_iter;
 		--from_vertex;
 	}
 	// set up the curve
-	const BLinePoint &blinepoint0 = listfrom_vertex;
-	const BLinePoint &blinepoint1 = list(from_vertex+1) % size;
-	hermite<Vector> curve(blinepoint0.get_vertex(), blinepoint1.get_vertex(),
+	const BLinePoint& blinepoint0 = listfrom_vertex;
+	const BLinePoint& blinepoint1 = list(from_vertex+1) % size;
+	const hermite<Vector> curve(blinepoint0.get_vertex(), blinepoint1.get_vertex(),
 	 blinepoint0.get_tangent2(), blinepoint1.get_tangent1());
 	// Find the solution to which is the standard position which matches the current
 	// homogeneous position
 	// Secant method: http://en.wikipedia.org/wiki/Secant_method
 	Real sn(0.0); // the standard position on current bezier
 	Real sn1(0.0), sn2(1.0);
-	Real t0((target_length-cumulative_length)/segment_length); // the homogeneous position on the current bezier
+	const Real t0((target_length-cumulative_length)/segment_length); // the homogeneous position on the current bezier
 	int iterations=0;
 	const int max_iterations=100;
 	const Real max_error(0.00001);
 	Real error;
 	Real fsn1(t0-curve.find_distance(0.0,sn1)/segment_length);
 	Real fsn2(t0-curve.find_distance(0.0,sn2)/segment_length);
-	do
-	{
+	do {
 		sn=sn1-fsn1*((sn1-sn2)/(fsn1-fsn2));
 		Real fsn=t0-curve.find_distance(0.0, sn)/segment_length;
 		sn2=sn1;
@@ -354,22 +358,22 @@
 	const std::vector<BLinePoint> list(bline.get_list_of(BLinePoint()));
 	if (list.empty())
 		return 0;
-	size_t max_vertex_index(list.size());
-	if(!bline_loop) max_vertex_index--;
-	if(max_vertex_index < 1) return Real();
+	const size_t max_vertex_index = bline_loop ? list.size() : list.size() - 1;
+	if (max_vertex_index < 1)
+		return Real();
 
 	if (lengths)
 		lengths->reserve(max_vertex_index);
 
 	// Calculate the lengths and the total length
 	Real total_length = 0;
-	for(size_t i0 = 0; i0 < max_vertex_index; ++i0) {
-		size_t i1 = (i0 + 1)%list.size();
-		const BLinePoint &blinepoint0 = listi0;
-		const BLinePoint &blinepoint1 = listi1;
-		hermite<Vector> curve(blinepoint0.get_vertex(), blinepoint1.get_vertex(),
+	for (size_t i0 = 0; i0 < max_vertex_index; ++i0) {
+		const size_t i1 = (i0 + 1) % list.size();
+		const BLinePoint& blinepoint0 = listi0;
+		const BLinePoint& blinepoint1 = listi1;
+		const hermite<Vector> curve(blinepoint0.get_vertex(), blinepoint1.get_vertex(),
 							blinepoint0.get_tangent2(), blinepoint1.get_tangent1());
-		Real l=curve.length();
+		const Real l = curve.length();
 		if(lengths) lengths->push_back(l);
 		total_length+=l;
 	}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/valuenodes/valuenode_blinecalctangent.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_blinecalctangent.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/valuenodes/valuenode_blinecalcvertex.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_blinecalcvertex.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/valuenodes/valuenode_blinecalcwidth.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_blinecalcwidth.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/valuenodes/valuenode_bone.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_bone.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/valuenodes/valuenode_composite.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_composite.h Changed

_service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_maprange.cpp Added

@@ -0,0 +1,399 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_maprange.cpp
+**	\brief Implementation of the "Map Range" valuenode conversion.
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2025 Synfig Contributors
+**
+**	This file is part of Synfig.
+**
+**	Synfig is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 2 of the License, or
+**	(at your option) any later version.
+**
+**	Synfig is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with Synfig. If not, see <https://www.gnu.org/licenses/>.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#ifdef USING_PCH
+#	include "pch.h"
+#else
+#ifdef HAVE_CONFIG_H
+#	include <config.h>
+#endif
+
+#include "valuenode_maprange.h"
+
+#include <stdexcept>
+
+#include <synfig/general.h>
+#include <synfig/localization.h>
+#include <synfig/valuenodes/valuenode_const.h>
+#include <synfig/valuenode_registry.h>
+#include <synfig/vector.h>
+
+#endif
+
+/* === U S I N G =========================================================== */
+
+using namespace synfig;
+
+/* === M A C R O S ========================================================= */
+
+/* === G L O B A L S ======================================================= */
+
+REGISTER_VALUENODE(ValueNode_MapRange, RELEASE_VERSION_1_6_0, "map_range", N_("Map Range"))
+
+/* === P R O C E D U R E S ================================================= */
+
+template<class T>
+T
+linear_map_range(const T& value, const T& from_min, const T& from_max, const T& to_min, const T& to_max, bool clamp)
+{
+	if (from_min == from_max) {
+		if (value < from_min)
+			return to_min;
+		return to_max;
+	}
+
+	T ret = to_min + (value - from_min) * Real(to_max - to_min) / Real(from_max - from_min);
+	if (clamp)
+		return synfig::clamp(ret, to_min, to_max);
+	return ret;
+}
+
+template<class T>
+T
+linear_map_range(const ValueBase& value, const ValueBase& from_min, const ValueBase& from_max, const ValueBase& to_min, const ValueBase& to_max, bool clamp)
+{
+	return linear_map_range<T>(value.get(T()), from_min.get(T()), from_max.get(T()), to_min.get(T()), to_max.get(T()), clamp);
+}
+
+template<>
+Angle
+linear_map_range(const Angle& value, const Angle& from_min, const Angle& from_max, const Angle& to_min, const Angle& to_max, bool clamp)
+{
+	if (from_min == from_max) {
+		if (value < from_min)
+			return to_min;
+		return to_max;
+	}
+
+	Angle ret = to_min + (value - from_min) * Angle::deg(to_max - to_min).get() / Angle::deg(from_max - from_min).get();
+	if (clamp)
+		return synfig::clamp(ret, to_min, to_max);
+	return ret;
+}
+
+template<>
+Vector
+linear_map_range(const Vector& value, const Vector& from_min, const Vector& from_max, const Vector& to_min, const Vector& to_max, bool clamp)
+{
+	return Vector(
+		linear_map_range<Real>(value0, from_min0, from_max0, to_min0, to_max0, clamp),
+		linear_map_range<Real>(value1, from_min1, from_max1, to_min1, to_max1, clamp)
+	);
+}
+
+/* === M E T H O D S ======================================================= */
+
+ValueNode_MapRange::ValueNode_MapRange(const ValueBase& value)
+	: LinkableValueNode(value.get_type())
+{
+	init_children_vocab();
+
+	set_link("interpolation", ValueNode_Const::create(int(0)));
+	set_link("clamp", ValueNode_Const::create(bool(true)));
+
+	const Type& type(value.get_type());
+
+	if (type == type_angle) {
+		set_link("link", ValueNode_Const::create(value.get(Angle())));
+		set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+		set_link("from_max", ValueNode_Const::create(Angle::deg(90)));
+		set_link("to_min", ValueNode_Const::create(Angle::deg(-180)));
+		set_link("to_max", ValueNode_Const::create(Angle::deg(180)));
+	} else if (type == type_integer) {
+		set_link("link", ValueNode_Const::create(value.get(int())));
+		set_link("from_min", ValueNode_Const::create(int(0)));
+		set_link("from_max", ValueNode_Const::create(int(10)));
+		set_link("to_min", ValueNode_Const::create(int(-5)));
+		set_link("to_max", ValueNode_Const::create(int(5)));
+	} else if (type == type_real) {
+		set_link("link", ValueNode_Const::create(value.get(Real())));
+		set_link("from_min", ValueNode_Const::create(Real(0)));
+		set_link("from_max", ValueNode_Const::create(Real(1)));
+		set_link("to_min", ValueNode_Const::create(Real(-1)));
+		set_link("to_max", ValueNode_Const::create(Real(1)));
+	} else if (type == type_time) {
+		set_link("link", ValueNode_Const::create(value.get(Time())));
+		set_link("from_min", ValueNode_Const::create(Time(0)));
+		set_link("from_max", ValueNode_Const::create(Time(10)));
+		set_link("to_min", ValueNode_Const::create(Time(0)));
+		set_link("to_max", ValueNode_Const::create(Time(5)));
+	} else if (type == type_vector) {
+		set_link("link", ValueNode_Const::create(value.get(Vector())));
+		set_link("from_min", ValueNode_Const::create(Vector(0, -1)));
+		set_link("from_max", ValueNode_Const::create(Vector(1, 1)));
+		set_link("to_min", ValueNode_Const::create(Vector(-1, 0)));
+		set_link("to_max", ValueNode_Const::create(Vector(1, 1)));
+	} else {
+		assert(0);
+		throw std::runtime_error(get_local_name() + _(":Bad type ") + type.description.local_name);
+	}
+}
+
+LinkableValueNode*
+ValueNode_MapRange::create_new() const
+{
+	return new ValueNode_MapRange(get_type());
+}
+
+ValueNode_MapRange*
+ValueNode_MapRange::create(const ValueBase& value, etl::loose_handle<Canvas>)
+{
+	return new ValueNode_MapRange(value);
+}
+
+ValueNode_MapRange::~ValueNode_MapRange()
+{
+	unlink_all();
+}
+
+bool
+ValueNode_MapRange::check_type(Type& type)
+{
+	return type == type_angle
+		 || type == type_integer
+		 || type == type_real
+		 || type == type_time
+		 || type == type_vector;
+}
+
+ValueBase
+ValueNode_MapRange::operator()(Time t) const
+{
+	DEBUG_LOG("SYNFIG_DEBUG_VALUENODE_OPERATORS",
+			 "%s:%d operator()\n", __FILE__, __LINE__);
+
+	if (!interpolation_ || !clamp_ || !link_ || !from_min_ || !from_max_ || !to_min_ || !to_max_)
+		throw std::runtime_error(strprintf("ValueNode_MapRange: %s",_("One or more of my parameters aren't set!")));
+
+	const Type& type(get_type());
+	const ValueBase from_min = (*from_min_)(t);
+	const ValueBase from_max = (*from_max_)(t);
+	const ValueBase to_min = (*to_min_)(t);
+	const ValueBase to_max = (*to_max_)(t);
+	const bool clamp = (*clamp_)(t).get(bool());
+
+	if (to_min == to_max)
+		return to_min;
+
+	// new_value = to_min + (value - from_min) x (to_max - to_min) / (from_max - from_min)
+	if (type == type_angle) {
+		return linear_map_range<Angle>((*link_)(t), from_min, from_max, to_min, to_max, clamp);
+	} if (type == type_integer)
+		return linear_map_range<int>((*link_)(t), from_min, from_max, to_min, to_max, clamp);
+	if (type == type_real)
+		return linear_map_range<Real>((*link_)(t), from_min, from_max, to_min, to_max, clamp);
+	if (type == type_time)
+		return linear_map_range<Time>((*link_)(t), from_min, from_max, to_min, to_max, clamp);
+	if (type == type_vector) {
+		return linear_map_range<Vector>((*link_)(t), from_min, from_max, to_min, to_max, clamp);
+	}
+
+	assert(0);
+	return ValueBase();
+}
+
+LinkableValueNode::InvertibleStatus
+ValueNode_MapRange::is_invertible(const Time& t, const ValueBase& target_value, int* link_index) const
+{
+	if (!t.is_valid())
+		return INVERSE_ERROR_BAD_TIME;
+
+	const Type& type = target_value.get_type();
+	if (type != get_type())
+		return INVERSE_ERROR_BAD_TYPE;
+
+	if (!interpolation_) {
+		if (link_index)
+			*link_index = get_link_index_from_name("interpolation");
+		return InvertibleStatus::INVERSE_ERROR_BAD_PARAMETER;
+	}
+
+	if (!clamp_) {
+		if (link_index)
+			*link_index = get_link_index_from_name("clamp");
+		return InvertibleStatus::INVERSE_ERROR_BAD_PARAMETER;
+	}
+
+	if (!from_min_) {
+		if (link_index)
+			*link_index = get_link_index_from_name("from_min");
+		return InvertibleStatus::INVERSE_ERROR_BAD_PARAMETER;
+	}
+
+	if (!from_max_) {
+		if (link_index)
+			*link_index = get_link_index_from_name("from_max");
+		return InvertibleStatus::INVERSE_ERROR_BAD_PARAMETER;
+	}
+
+	if (!to_min_) {
+		if (link_index)
+			*link_index = get_link_index_from_name("to_min");
+		return InvertibleStatus::INVERSE_ERROR_BAD_PARAMETER;
+	}
+
+	if (!to_max_) {
+		if (link_index)
+			*link_index = get_link_index_from_name("to_max");
+		return InvertibleStatus::INVERSE_ERROR_BAD_PARAMETER;
+	}
+
+	if (link_index)
+		*link_index = get_link_index_from_name("link");
+	return InvertibleStatus::INVERSE_OK;
+}
+
+ValueBase
+ValueNode_MapRange::get_inverse(const Time& t, const ValueBase& target_value) const
+{
+	/*const*/ Type& type(get_type());
+	if (target_value.get_type() != type) {
+		synfig::error(_("ValueNode_MapRange::get_inverse(): target_value type is different from the value node type (%s vs. %s)"), target_value.get_type().description.local_name.c_str(), type.description.local_name.c_str());
+		return ValueBase(type);
+	}
+	const ValueBase from_min = (*from_min_)(t);
+	const ValueBase from_max = (*from_max_)(t);
+	const ValueBase to_min = (*to_min_)(t);
+	const ValueBase to_max = (*to_max_)(t);
+	const bool clamp = (*clamp_)(t).get(bool());
+
+
+	if (from_min == from_max)
+		return from_min;
+
+	if (to_min == to_max) {
+		if (target_value < to_min)
+			return from_min;
+	}
+
+	ValueBase value;
+	if (!clamp) {
+		value = target_value;
+	} else {
+		if (type != type_vector) {
+			value = synfig::clamp(target_value, to_min, to_max);
+		} else {
+			value = Vector(
+				synfig::clamp(target_value.get(Vector())0, to_min.get(Vector())0, to_max.get(Vector())0),
+				synfig::clamp(target_value.get(Vector())1, to_min.get(Vector())1, to_max.get(Vector())1)
+			);
+		}
+	}
+
+	if (type == type_angle) {
+		return linear_map_range<Angle>(value, to_min, to_max, from_min, from_max, false);
+	} if (type == type_integer)
+		return linear_map_range<int>(value, to_min, to_max, from_min, from_max, false);
+	if (type == type_real)
+		return linear_map_range<Real>(value, to_min, to_max, from_min, from_max, false);
+	if (type == type_time)
+		return linear_map_range<Time>(value, to_min, to_max, from_min, from_max, false);
+	if (type == type_vector) {
+		return linear_map_range<Vector>(value, to_min, to_max, from_min, from_max, false);
+	}
+	return ValueBase();
+}
+
+bool
+ValueNode_MapRange::set_link_vfunc(int i, ValueNode::Handle value)
+{
+	assert(i >= 0 && i < link_count());
+
+	switch (i) {
+		case 0: CHECK_TYPE_AND_SET_VALUE(interpolation_, type_integer);
+		case 1: CHECK_TYPE_AND_SET_VALUE(clamp_, type_bool);
+		case 2: CHECK_TYPE_AND_SET_VALUE(link_, get_type());
+		case 3: CHECK_TYPE_AND_SET_VALUE(from_min_, get_type());
+		case 4: CHECK_TYPE_AND_SET_VALUE(from_max_, get_type());
+		case 5: CHECK_TYPE_AND_SET_VALUE(to_min_, get_type());
+		case 6: CHECK_TYPE_AND_SET_VALUE(to_max_, get_type());
+	}
+	return false;
+}
+
+ValueNode::LooseHandle
+ValueNode_MapRange::get_link_vfunc(int i) const
+{
+	assert(i >= 0 && i < link_count());
+
+	switch (i) {
+		case 0: return interpolation_;
+		case 1: return clamp_;
+		case 2: return link_;
+		case 3: return from_min_;
+		case 4: return from_max_;
+		case 5: return to_min_;
+		case 6: return to_max_;
+		default: return nullptr;
+	}
+}
+
+LinkableValueNode::Vocab
+ValueNode_MapRange::get_children_vocab_vfunc() const
+{
+	LinkableValueNode::Vocab ret;
+
+	ret.push_back(ParamDesc("interpolation")
+		.set_local_name(_("Interpolation"))
+		.set_description(_("The mathematical function to interpolate the value in the target range"))
+		.set_hint("enum")
+		.add_enum_value(Interpolation::LINEAR, "linear", _("Linear"))
+	);
+
+	ret.push_back(ParamDesc("clamp")
+		.set_local_name(_("Clamp"))
+		.set_description(_("If enabled, the output value is clamped to the target range"))
+	);
+
+	ret.push_back(ParamDesc("link")
+		.set_local_name(_("Link"))
+		.set_description(_("The value to be remapped to target range"))
+	);
+
+	ret.push_back(ParamDesc("from_min")
+		.set_local_name(_("From Min"))
+		.set_description(_("The lower bound of the range to remap from"))
+	);
+
+	ret.push_back(ParamDesc("from_max")
+		.set_local_name(_("From Max"))
+		.set_description(_("The upper bound of the range to remap from"))
+	);
+
+	ret.push_back(ParamDesc("to_min")
+		.set_local_name(_("To Min"))
+		.set_description(_("The lower bound of the target range"))
+	);
+
+	ret.push_back(ParamDesc("to_max")
+		.set_local_name(_("To Max"))
+		.set_description(_("The upper bound of the target range"))
+	);
+
+	return ret;
+}

_service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_maprange.h Added

@@ -0,0 +1,92 @@
+/* === S Y N F I G ========================================================= */
+/*!	\file valuenode_maprange.h
+**	\brief Header file for implementation of the "Map Range" valuenode conversion.
+**
+**	\legal
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2025 Synfig Contributors
+**
+**	This file is part of Synfig.
+**
+**	Synfig is free software: you can redistribute it and/or modify
+**	it under the terms of the GNU General Public License as published by
+**	the Free Software Foundation, either version 2 of the License, or
+**	(at your option) any later version.
+**
+**	Synfig is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+**	GNU General Public License for more details.
+**
+**	You should have received a copy of the GNU General Public License
+**	along with Synfig. If not, see <https://www.gnu.org/licenses/>.
+**	\endlegal
+*/
+/* ========================================================================= */
+
+/* === S T A R T =========================================================== */
+
+#ifndef SYNFIG_VALUENODE_MAPRANGE_H
+#define SYNFIG_VALUENODE_MAPRANGE_H
+
+/* === H E A D E R S ======================================================= */
+
+#include <synfig/valuenode.h>
+
+/* === M A C R O S ========================================================= */
+
+/* === C L A S S E S & S T R U C T S ======================================= */
+
+namespace synfig {
+
+class ValueNode_MapRange : public LinkableValueNode
+{
+	enum Interpolation {
+		LINEAR = 0,
+	};
+
+	ValueNode::RHandle interpolation_;
+	ValueNode::RHandle clamp_;
+	ValueNode::RHandle link_;
+	ValueNode::RHandle from_min_;
+	ValueNode::RHandle from_max_;
+	ValueNode::RHandle to_min_;
+	ValueNode::RHandle to_max_;
+
+	ValueNode_MapRange(const ValueBase& value);
+
+public:
+	typedef etl::handle<ValueNode_MapRange> Handle;
+	typedef etl::handle<const ValueNode_MapRange> ConstHandle;
+
+	static ValueNode_MapRange* create(const ValueBase& value = ValueBase(), etl::loose_handle<Canvas> canvas = nullptr);
+	virtual ~ValueNode_MapRange();
+
+	String get_name() const override;
+	String get_local_name() const override;
+	static bool check_type(Type& type);
+
+	ValueBase operator()(Time t) const override;
+
+	/**
+	 * Checks if it is possible to call get_inverse() for target_value at time t.
+	 * If so, return the link_index related to the return value provided by get_inverse()
+	 */
+	InvertibleStatus is_invertible(const Time& t, const ValueBase& target_value, int* link_index = nullptr) const override;
+	/** Returns the modified Link to match the target value at time t */
+	ValueBase get_inverse(const Time& t, const synfig::ValueBase& target_value) const override;
+
+protected:
+	LinkableValueNode* create_new() const override;
+
+	bool set_link_vfunc(int i, ValueNode::Handle value) override;
+	ValueNode::LooseHandle get_link_vfunc(int i) const override;
+
+	Vocab get_children_vocab_vfunc() const override;
+}; // END of class ValueNode_Add
+
+}; // END of namespace synfig
+
+/* === E N D =============================================================== */
+
+#endif // SYNFIG_VALUENODE_MAPRANGE_H

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/synfig/valuenodes/valuenode_radialcomposite.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/synfig/valuenodes/valuenode_radialcomposite.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/src/tool/optionsprocessor.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/src/tool/optionsprocessor.cpp Changed

@@ -162,10 +162,10 @@
 	add_option(og_set, "sequence-separator", ' ', set_sequence_separator, _("Output file sequence separator string (Use double quotes if you want to use spaces)"), "string");
 	add_option(og_set, "canvas", 'c', set_canvas_id, 	_("Render the canvas with the given id instead of the root."), "id");
 	add_option(og_set, "fps", ' ', set_fps, 		_("Set the frame rate"), "NUM");
-	add_option(og_set, "time", ' ', set_time, 		_("Render a single frame at <seconds>"), "seconds");
-	add_option(og_set, "begin-time", ' ', set_begin_time, 	_("Set the starting time"), "seconds");
-	add_option(og_set, "start-time", ' ', set_start_time,	_("Set the starting time"), "seconds");
-	add_option(og_set, "end-time", ' ', set_end_time, 	_("Set the ending time"), "seconds");
+	add_option(og_set, "time", ' ', set_time, 		_("Render a single frame at <time> in synfig format (e.g. \"0s 6f\")"), "time");
+	add_option(og_set, "begin-time", ' ', set_begin_time, 	_("Set the starting time in synfig format (e.g. \"0s 6f\")"), "time");
+	add_option(og_set, "start-time", ' ', set_start_time,	_("Set the starting time in synfig format (e.g. \"0s 6f\")"), "time");
+	add_option(og_set, "end-time", ' ', set_end_time, 	_("Set the ending time in synfig format (e.g. \"1m 10s 12f\")"), "time");
 	add_option(og_set, "dpi", ' ', set_dpi, 		_("Set the physical resolution (Dots-per-inch)"), "NUM");
 	add_option(og_set, "dpi-x", ' ', set_dpi_x, 		_("Set the physical X resolution (Dots-per-inch)"), "NUM");
 	add_option(og_set, "dpi-y", ' ', set_dpi_y, 		_("Set the physical Y resolution (Dots-per-inch)"), "NUM");

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/test/Makefile.am -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/test/Makefile.am Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/test/benchmark.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/test/benchmark.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/test/bline.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/test/bline.cpp Changed

@@ -37,61 +37,149 @@
 
 using namespace synfig;
 
-void fill_list(std::vector<ValueBase> &list) {
-	BLinePoint p;
-	list.push_back(p);
-	p.set_vertex(Point(0.0,1.0));
-	list.push_back(p);
-	p.set_vertex(Point(0.0,2.0));
-	list.push_back(p);
+void
+fill_list_colinear(std::vector<ValueBase> &list)
+{
+	const std::vector<Point> points {{0.0, 0.0}, {0.0, 1.0}, {0.0, 2.0}};
+	for (const auto& point : points) {
+		BLinePoint p;
+		p.set_vertex(point);
+		list.push_back(p);
+	}
 }
 
-void test_bline_length() {
+void
+fill_list_open_rectangle(std::vector<ValueBase> &list)
+{
+	const std::vector<Point> points {{0.0, 0.0}, {0.0, 2.0}, {1.0, 2.0}, {1.0, 0.0}};
+	for (const auto& point : points) {
+		BLinePoint p;
+		p.set_vertex(point);
+		list.push_back(p);
+	}
+}
+
+void
+test_bline_length_single_vertex()
+{
 	std::vector<ValueBase> list;
-	fill_list(list);
-	
+
 	bool loop = false;
 	std::vector<Real> lengths;
+	Real total_length;
 
-	Real l = bline_length(list, loop, &lengths);
+	BLinePoint p1;
+	p1.set_tangent1(Point(-1,0));
+	p1.set_tangent2(Point(1,0));
+	list.push_back(p1);
+
+	loop = false;
+	total_length = bline_length(list, loop, &lengths);
+	ASSERT_EQUAL(0, lengths.size());
+	ASSERT_APPROX_EQUAL(0.0, total_length);
+
+	loop = true;
+	total_length = bline_length(list, loop, &lengths);
+	ASSERT_EQUAL(1, lengths.size());
+	ASSERT_APPROX_EQUAL_MICRO(0.349854, total_length);
+}
+
+void
+test_bline_length_without_loop()
+{
+	std::vector<ValueBase> list;
+	fill_list_colinear(list);
+
+	const bool loop = false;
+	std::vector<Real> lengths;
+
+	Real total_length = bline_length(list, loop, &lengths);
 	ASSERT_EQUAL(2, lengths.size());
 	ASSERT_APPROX_EQUAL(1.0, lengths0);
 	ASSERT_APPROX_EQUAL(1.0, lengths1);
-	ASSERT_APPROX_EQUAL(2.0, l);
+	ASSERT_APPROX_EQUAL(2.0, total_length);
 
-	loop = true;
-	l = bline_length(list, loop, &lengths);
+	list.clear();
+	fill_list_open_rectangle(list);
+
+	total_length = bline_length(list, loop, &lengths);
 	ASSERT_EQUAL(3, lengths.size());
-	ASSERT_APPROX_EQUAL(1.0, lengths0);
+	ASSERT_APPROX_EQUAL(2.0, lengths0);
 	ASSERT_APPROX_EQUAL(1.0, lengths1);
 	ASSERT_APPROX_EQUAL(2.0, lengths2);
-	ASSERT_APPROX_EQUAL(4.0, l);
+	ASSERT_APPROX_EQUAL(5.0, total_length);
+}
 
-	BLinePoint p1;
-	p1.set_tangent1(Point(-1,0));
-	p1.set_tangent2(Point(1,0));
+void
+test_bline_length_with_loop()
+{
+	std::vector<ValueBase> list;
+	fill_list_colinear(list);
+
+	const bool loop = true;
+	std::vector<Real> lengths;
+
+	Real total_length = bline_length(list, loop, &lengths);
+	ASSERT_EQUAL(3, lengths.size());
+	ASSERT_APPROX_EQUAL(1.0, lengths0);
+	ASSERT_APPROX_EQUAL(1.0, lengths1);
+	ASSERT_APPROX_EQUAL(2.0, lengths2);
+	ASSERT_APPROX_EQUAL(4.0, total_length);
 
 	list.clear();
-	list.push_back(p1);
-	lengths.clear();
-	// single point
-	loop = false;
-	l = bline_length(list, loop, &lengths);
-	ASSERT_EQUAL(0, lengths.size());
-	ASSERT_APPROX_EQUAL(0.0, l);
+	fill_list_open_rectangle(list);
 
-	loop = true;
-	l = bline_length(list, loop, &lengths);
-	ASSERT_EQUAL(1, lengths.size());
-	ASSERT_APPROX_EQUAL_MICRO(0.349854, l);
+	total_length = bline_length(list, loop, &lengths);
+	ASSERT_EQUAL(4, lengths.size());
+	ASSERT_APPROX_EQUAL(2.0, lengths0);
+	ASSERT_APPROX_EQUAL(1.0, lengths1);
+	ASSERT_APPROX_EQUAL(2.0, lengths2);
+	ASSERT_APPROX_EQUAL(1.0, lengths3);
+	ASSERT_APPROX_EQUAL(6.0, total_length);
+}
+
+void
+test_bline_std_to_hom_without_bline_loop_without_index_loop_clamps_to_zero_for_negative_position()
+{
+	std::vector<ValueBase> list;
+	fill_list_colinear(list);
+
+	ASSERT_APPROX_EQUAL(0.0, synfig::std_to_hom(list, 0.0, false, false));
+	ASSERT_APPROX_EQUAL(0.0, synfig::std_to_hom(list, -1.0, false, false));
+	ASSERT_APPROX_EQUAL(0.0, synfig::std_to_hom(list, -0.5, false, false));
 }
 
-void test_bline_std_to_hom_without_loop() {
+void
+test_bline_std_to_hom_without_bline_loop_without_index_loop_clamps_to_one_for_position_greater_than_one()
+{
 	std::vector<ValueBase> list;
-	fill_list(list);
+	fill_list_colinear(list);
+
+	ASSERT_APPROX_EQUAL(1.0, synfig::std_to_hom(list, 1.0, false, false));
+	ASSERT_APPROX_EQUAL(1.0, synfig::std_to_hom(list, 2.0, false, false));
+	ASSERT_APPROX_EQUAL(1.0, synfig::std_to_hom(list, 2.5, false, false));
+}
+
+void
+test_bline_std_to_hom_without_bline_loop_with_index_loop_keeps_position_for_both_edges()
+{
+	std::vector<ValueBase> list;
+	fill_list_colinear(list);
+
+	ASSERT_APPROX_EQUAL( 0.0, synfig::std_to_hom(list, 0.0, true, false));
+	ASSERT_APPROX_EQUAL(-1.0, synfig::std_to_hom(list, -1.0, true, false));
+	ASSERT_APPROX_EQUAL(1.0, synfig::std_to_hom(list, 1.0, true, false));
+	ASSERT_APPROX_EQUAL(2.0, synfig::std_to_hom(list, 2.0, true, false));
+}
+
+void
+test_bline_std_to_hom_without_loop()
+{
+	std::vector<ValueBase> list;
+	fill_list_colinear(list);
 
 	const std::vector<Real> positions = {0.0, 0.2, 1/3., 0.5, 2/3., 0.8, 1.0};
-	std::vector<Real> expected = {0.0, 0.176000, 0.370370, 0.5, 0.629630, 0.824000, 1.0};
+	const std::vector<Real> expected = {0.0, 0.176000, 0.370370, 0.5, 0.629630, 0.824000, 1.0};
 	for (size_t i = 0; i < positions.size(); ++i) {
 		Real value = synfig::std_to_hom(list, positionsi, false, false);
 		ASSERT_APPROX_EQUAL_MICRO(expectedi, value);
@@ -113,10 +201,10 @@
 
 void test_bline_std_to_hom_with_loop() {
 	std::vector<ValueBase> list;
-	fill_list(list);
+	fill_list_colinear(list);
 
 	const std::vector<Real> positions = {0.0, 0.2, 1/3., 0.5, 2/3., 0.8, 1.0};
-	std::vector<Real> expected = {0.0, 0.162, 0.25, 0.375, 0.5, 0.676, 1.0};
+	const std::vector<Real> expected = {0.0, 0.162, 0.25, 0.375, 0.5, 0.676, 1.0};
 	for (size_t i = 0; i < positions.size(); ++i) {
 		Real value = synfig::std_to_hom(list, positionsi, false, true);
 		ASSERT_APPROX_EQUAL_MICRO(expectedi, value);
@@ -138,10 +226,10 @@
 
 void test_bline_hom_to_std_without_loop() {
 	std::vector<ValueBase> list;
-	fill_list(list);
+	fill_list_colinear(list);
 
 	const std::vector<Real> positions = {0.0, 0.2, 1/3., 0.5, 2/3., 0.8, 1.0};
-	std::vector<Real> expected = {0.0, 0.216466, 0.306518, 0.5, 0.693482, 0.783534, 1.0};
+	const std::vector<Real> expected = {0.0, 0.216466, 0.306518, 0.5, 0.693482, 0.783534, 1.0};
 	for (size_t i = 0; i < positions.size(); ++i) {
 		Real value = synfig::hom_to_std(list, positionsi, false, false);
 		ASSERT_APPROX_EQUAL_MICRO(expectedi, value);
@@ -163,10 +251,10 @@
 
 void test_bline_hom_to_std_with_loop() {
 	std::vector<ValueBase> list;
-	fill_list(list);
+	fill_list_colinear(list);
 
 	const std::vector<Real> positions = {0.0, 0.2, 1/3., 0.5, 2/3., 0.8, 1.0};
-	std::vector<Real> expected = {0.0, 0.237620, 0.462321, 0.666667, 0.795654, 0.855690, 1.0};
+	const std::vector<Real> expected = {0.0, 0.237620, 0.462321, 0.666667, 0.795654, 0.855690, 1.0};
 	for (size_t i = 0; i < positions.size(); ++i) {
 		Real value = synfig::hom_to_std(list, positionsi, false, true);
 		ASSERT_APPROX_EQUAL_MICRO(expectedi, value);
@@ -186,7 +274,8 @@
 	}
 }
 
-void test_calc_vertex() {
+void
+test_calc_vertex() {
 	std::vector<ValueBase> list;
 	BLinePoint p;
 	p.set_vertex(Point(-2.342526, -1.151789));
@@ -207,7 +296,7 @@
 	p.set_origin(0.500000);
 	list.push_back(p);
 
-	ValueNode_BLine *bline = ValueNode_BLine::create(list);
+	ValueNode_BLine* bline = ValueNode_BLine::create(list);
 	
 	bool homogeneous = true;
 
@@ -233,18 +322,531 @@
 	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(-0.260716, 0.341317), vertex)
 }
 
+void
+test_bline_length_for_bline_with_two_vertices_at_same_spot()
+{
+	std::vector<ValueBase> list;
+	const std::vector<Point> points {{0,0}, {0,1}, {0,1}, {0,2}};
+	for (const auto& point : points) {
+		BLinePoint p;
+		p.set_vertex(point);
+		list.push_back(p);
+	}
+
+	bool loop = false;
+	std::vector<Real> lengths;
+
+	Real l = bline_length(list, loop, &lengths);
+	ASSERT_EQUAL(3, lengths.size());
+	ASSERT_APPROX_EQUAL(1.0, lengths0);
+	ASSERT_APPROX_EQUAL(0.0, lengths1);
+	ASSERT_APPROX_EQUAL(1.0, lengths2);
+	ASSERT_APPROX_EQUAL(2.0, l);
+
+	loop = true;
+	l = bline_length(list, loop, &lengths);
+	ASSERT_EQUAL(4, lengths.size());
+	ASSERT_APPROX_EQUAL(1.0, lengths0);
+	ASSERT_APPROX_EQUAL(0.0, lengths1);
+	ASSERT_APPROX_EQUAL(1.0, lengths2);
+	ASSERT_APPROX_EQUAL(2.0, lengths3);
+	ASSERT_APPROX_EQUAL(4.0, l);
+}
+
+void
+test_bline_std_to_hom_without_loop_with_two_vertices_at_same_spot() {
+	std::vector<ValueBase> list;
+	const std::vector<Point> points {{0,0}, {0,1}, {0,1}, {0,2}, {0,3}};
+	for (const auto& point : points) {
+		BLinePoint p;
+		p.set_vertex(point);
+		list.push_back(p);
+	}
+
+	const std::vector<Real> positions = {0.0, 0.25, 0.5, 0.75, 1.0, /* 0.2, */ 0.4, /*0.8*/};
+	const std::vector<Real> expected = {0.0, 1/3., 1/3., 2/3., 1.0, /* 0.8*1/3., */1/3., /*2/3.+0.2*1/3.*/};
+
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::std_to_hom(list, positionsi, false, false);
+		ASSERT_APPROX_EQUAL(expectedi, value);
+	}
+
+	// check index loop
+	Real index_offset = 2.0;
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::std_to_hom(list, positionsi + index_offset, true, false);
+		ASSERT_APPROX_EQUAL(expectedi + index_offset, value);
+	}
+
+	index_offset = -2.0;
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::std_to_hom(list, positionsi + index_offset, true, false);
+		ASSERT_APPROX_EQUAL(expectedi + index_offset, value);
+	}
+}
+
+void
+test_bline_std_to_hom_with_loop_with_two_vertices_at_same_spot() {
+	std::vector<ValueBase> list;
+	const std::vector<Point> points {{0,0}, {0,1}, {0,1}, {0,2}};
+	for (const auto& point : points) {
+		BLinePoint p;
+		p.set_vertex(point);
+		list.push_back(p);
+	}
+
+	const std::vector<Real> positions = {0.0, 0.25, 0.5, 0.75, 1.0, /* 0.2, */ 0.4, /*0.8*/};
+	const std::vector<Real> expected = {0.0, 0.25, 0.25, 0.50, 1.0, /* 0.8*1/3., */0.25, /*2/3.+0.2*1/3.*/};
+
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::std_to_hom(list, positionsi, false, true);
+		ASSERT_APPROX_EQUAL(expectedi, value);
+	}
+
+	// check index loop
+	Real index_offset = 2.0;
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::std_to_hom(list, positionsi + index_offset, true, true);
+		ASSERT_APPROX_EQUAL(expectedi + index_offset, value);
+	}
+
+	index_offset = -2.0;
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::std_to_hom(list, positionsi + index_offset, true, true);
+		ASSERT_APPROX_EQUAL(expectedi + index_offset, value);
+	}
+}
+
+void
+test_bline_hom_to_std_without_loop_with_two_vertices_at_same_spot() {
+	std::vector<ValueBase> list;
+	const std::vector<Point> points {{0,0}, {0,1}, {0,1}, {0,2}, {0,3}};
+	for (const auto& point : points) {
+		BLinePoint p;
+		p.set_vertex(point);
+		list.push_back(p);
+	}
+
+	const std::vector<Real> positions = {0.0, 1/3., 2/3., 1.0};
+	const std::vector<Real> expected = {0.0, 0.25, 0.75, 1.0};
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::hom_to_std(list, positionsi, false, false);
+		ASSERT_APPROX_EQUAL_MICRO(expectedi, value);
+	}
+
+	// check index loop
+	Real index_offset = 2.0;
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::hom_to_std(list, positionsi + index_offset, true, false);
+		ASSERT_APPROX_EQUAL_MICRO(expectedi + index_offset, value);
+	}
+
+	index_offset = -2.0;
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::hom_to_std(list, positionsi + index_offset, true, false);
+		ASSERT_APPROX_EQUAL_MICRO(expectedi + index_offset, value);
+	}
+}
+
+void
+test_bline_hom_to_std_with_loop_with_two_vertices_at_same_spot() {
+	std::vector<ValueBase> list;
+	const std::vector<Point> points {{0,0}, {0,1}, {0,1}, {0,2}, {0,4}};
+	for (const auto& point : points) {
+		BLinePoint p;
+		p.set_vertex(point);
+		list.push_back(p);
+	}
+
+	const std::vector<Real> positions = {0.0, 1/8., 2/8., 4/8., 1.0};
+	const std::vector<Real> expected = {0.0, 1/5., 3/5., 4/5., 1.0};
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::hom_to_std(list, positionsi, false, true);
+		ASSERT_APPROX_EQUAL_MICRO(expectedi, value);
+	}
+
+	// check index loop
+	Real index_offset = 2.0;
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::hom_to_std(list, positionsi + index_offset, true, true);
+		ASSERT_APPROX_EQUAL_MICRO(expectedi + index_offset, value);
+	}
+
+	index_offset = -2.0;
+	for (size_t i = 0; i < positions.size(); ++i) {
+		Real value = synfig::hom_to_std(list, positionsi + index_offset, true, true);
+		ASSERT_APPROX_EQUAL_MICRO(expectedi + index_offset, value);
+	}
+}
+
+void
+test_calc_vertex_for_single_vertex_without_loop_returns_itself()
+{
+	std::vector<ValueBase> list;
+	{
+		BLinePoint p;
+		p.set_vertex({1.0, 2.0});
+		list.push_back(p);
+	}
+
+	ValueNode_BLine* bline = ValueNode_BLine::create(list);
+	ValueNode_Const* const_false = static_cast<ValueNode_Const*>(ValueNode_Const::create(false));
+	ValueNode_Const* const_true = static_cast<ValueNode_Const*>(ValueNode_Const::create(true));
+	ValueNode_Const* const_amount = static_cast<ValueNode_Const*>(ValueNode_Const::create(0.1));
+
+	ValueNode_BLineCalcVertex::Handle bline_calc_vertex(ValueNode_BLineCalcVertex::create(Vector(0,0)));
+	bline_calc_vertex->set_link("bline", bline);
+	bline_calc_vertex->set_link("loop", const_false);
+	bline_calc_vertex->set_link("homogeneous", const_true);
+	bline_calc_vertex->set_link("amount", const_amount);
+
+	const_amount->set_value(0.0);
+	Vector vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 2.0), vertex)
+
+	const_amount->set_value(0.3);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 2.0), vertex)
+
+	const_amount->set_value(0.8);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 2.0), vertex)
+
+	const_amount->set_value(1.0);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 2.0), vertex)
+}
+
+void
+test_calc_vertex_for_single_vertex_with_loop_returns_itself_on_edges()
+{
+	std::vector<ValueBase> list;
+	{
+		BLinePoint p;
+		p.set_vertex({1.0, 2.0});
+		p.set_tangent({1.0, -2.0});
+		list.push_back(p);
+	}
+
+	ValueNode_BLine* bline = ValueNode_BLine::create(list);
+	ValueNode_Const* const_false = static_cast<ValueNode_Const*>(ValueNode_Const::create(false));
+	ValueNode_Const* const_true = static_cast<ValueNode_Const*>(ValueNode_Const::create(true));
+	ValueNode_Const* const_amount = static_cast<ValueNode_Const*>(ValueNode_Const::create(0.1));
+
+	ValueNode_BLineCalcVertex::Handle bline_calc_vertex(ValueNode_BLineCalcVertex::create(Vector(0,0)));
+	bline_calc_vertex->set_link("bline", bline);
+	bline_calc_vertex->set_link("loop", const_false);
+	bline_calc_vertex->set_link("homogeneous", const_true);
+	bline_calc_vertex->set_link("amount", const_amount);
+
+	const_amount->set_value(0.0);
+	Vector vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 2.0), vertex)
+
+	const_amount->set_value(0.3);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_FALSE(synfig::approximate_not_equal(1.0, vertex0));
+	ASSERT_FALSE(synfig::approximate_not_equal(2.0, vertex1));
+
+	const_amount->set_value(0.8);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_FALSE(synfig::approximate_not_equal(1.0, vertex0));
+	ASSERT_FALSE(synfig::approximate_not_equal(2.0, vertex1));
+
+	const_amount->set_value(1.0);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 2.0), vertex)
+}
+
+void
+test_calc_vertex_for_straight_line_without_loop() {
+	std::vector<ValueBase> list;
+	fill_list_colinear(list);
+
+	ValueNode_BLine* bline = ValueNode_BLine::create(list);
+	ValueNode_Const* const_false = static_cast<ValueNode_Const*>(ValueNode_Const::create(false));
+	ValueNode_Const* const_true = static_cast<ValueNode_Const*>(ValueNode_Const::create(true));
+	ValueNode_Const* const_amount = static_cast<ValueNode_Const*>(ValueNode_Const::create(0.1));
+
+	ValueNode_BLineCalcVertex::Handle bline_calc_vertex(ValueNode_BLineCalcVertex::create(Vector(0,0)));
+	bline_calc_vertex->set_link("bline", bline);
+	bline_calc_vertex->set_link("loop", const_false);
+	bline_calc_vertex->set_link("homogeneous", const_true);
+	bline_calc_vertex->set_link("amount", const_amount);
+
+	const_amount->set_value(0.0);
+	Vector vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.0), vertex)
+
+	const_amount->set_value(0.1);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.20), vertex)
+
+	const_amount->set_value(0.25);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.50), vertex)
+
+	const_amount->set_value(0.35);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.70), vertex)
+
+	const_amount->set_value(0.50);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 1.00), vertex)
+
+	const_amount->set_value(0.80);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 1.60), vertex)
+
+	const_amount->set_value(1.00);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 2.0), vertex)
+}
+
+void
+test_calc_vertex_for_straight_line_with_loop() {
+	std::vector<ValueBase> list;
+	fill_list_colinear(list);
+
+	ValueNode_BLine* bline = ValueNode_BLine::create(list);
+	bline->set_loop(true);
+	ValueNode_Const* const_false = static_cast<ValueNode_Const*>(ValueNode_Const::create(false));
+	ValueNode_Const* const_true = static_cast<ValueNode_Const*>(ValueNode_Const::create(true));
+	ValueNode_Const* const_amount = static_cast<ValueNode_Const*>(ValueNode_Const::create(0.1));
+
+	ValueNode_BLineCalcVertex::Handle bline_calc_vertex(ValueNode_BLineCalcVertex::create(Vector(0,0)));
+	bline_calc_vertex->set_link("bline", bline);
+	bline_calc_vertex->set_link("loop", const_false);
+	bline_calc_vertex->set_link("homogeneous", const_true);
+	bline_calc_vertex->set_link("amount", const_amount);
+
+	const_amount->set_value(0.0);
+	Vector vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.0), vertex)
+
+	const_amount->set_value(0.1);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.40), vertex)
+
+	const_amount->set_value(0.25);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 1.00), vertex)
+
+	const_amount->set_value(0.35);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 1.40), vertex)
+
+	const_amount->set_value(0.50);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 2.00), vertex)
+
+	const_amount->set_value(0.75);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 1.00), vertex)
+
+	const_amount->set_value(0.80);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.80), vertex)
+
+	const_amount->set_value(1.00);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.0), vertex)
+}
+
+void
+test_calc_vertex_for_open_rectangle() {
+	std::vector<ValueBase> list;
+	fill_list_open_rectangle(list);
+
+	ValueNode_BLine* bline = ValueNode_BLine::create(list);
+	ValueNode_Const* const_false = static_cast<ValueNode_Const*>(ValueNode_Const::create(false));
+	ValueNode_Const* const_true = static_cast<ValueNode_Const*>(ValueNode_Const::create(true));
+	ValueNode_Const* const_amount = static_cast<ValueNode_Const*>(ValueNode_Const::create(0.1));
+
+	ValueNode_BLineCalcVertex::Handle bline_calc_vertex(ValueNode_BLineCalcVertex::create(Vector(0,0)));
+	bline_calc_vertex->set_link("bline", bline);
+	bline_calc_vertex->set_link("loop", const_false);
+	bline_calc_vertex->set_link("homogeneous", const_true);
+	bline_calc_vertex->set_link("amount", const_amount);
+
+	const_amount->set_value(0.0);
+	Vector vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.0), vertex)
+
+	const_amount->set_value(0.10);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.50), vertex)
+
+	const_amount->set_value(0.40);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 2.00), vertex)
+
+	const_amount->set_value(0.50);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.5, 2.00), vertex)
+
+	const_amount->set_value(0.60);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 2.00), vertex)
+
+	const_amount->set_value(0.80);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 1.00), vertex)
+
+	const_amount->set_value(1.00);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 0.0), vertex)
+}
+
+void
+test_calc_vertex_for_closed_rectangle() {
+	std::vector<ValueBase> list;
+	fill_list_open_rectangle(list);
+
+	ValueNode_BLine* bline = ValueNode_BLine::create(list);
+	bline->set_loop(true);
+	ValueNode_Const* const_false = static_cast<ValueNode_Const*>(ValueNode_Const::create(false));
+	ValueNode_Const* const_true = static_cast<ValueNode_Const*>(ValueNode_Const::create(true));
+	ValueNode_Const* const_amount = static_cast<ValueNode_Const*>(ValueNode_Const::create(0.1));
+
+	ValueNode_BLineCalcVertex::Handle bline_calc_vertex(ValueNode_BLineCalcVertex::create(Vector(0,0)));
+	bline_calc_vertex->set_link("bline", bline);
+	bline_calc_vertex->set_link("loop", const_false);
+	bline_calc_vertex->set_link("homogeneous", const_true);
+	bline_calc_vertex->set_link("amount", const_amount);
+
+	const_amount->set_value(0.0);
+	Vector vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.0), vertex)
+
+	const_amount->set_value(0.1);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.60), vertex)
+
+	const_amount->set_value(0.25);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 1.50), vertex)
+
+	const_amount->set_value(1/3.);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 2.00), vertex)
+
+	const_amount->set_value(0.40);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.4, 2.00), vertex)
+
+	const_amount->set_value(0.50);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 2.00), vertex)
+
+	const_amount->set_value(0.75);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 0.50), vertex)
+
+	const_amount->set_value(5/6.);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(1.0, 0.00), vertex)
+
+	const_amount->set_value(0.90);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.6, 0.0), vertex)
+
+	const_amount->set_value(1.00);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(Vector(0.0, 0.0), vertex)
+}
+
+void
+test_calc_vertex_on_vertex_exact_positions_for_looped_curve_with_two_vertices_on_same_coords() {
+	std::vector<ValueBase> list;
+	struct SimpleBPoint {
+		Point vertex;
+		Vector tangent1;
+		Vector tangent2;
+	};
+
+	const std::vector<SimpleBPoint> bpoints {
+		{{18.1919, 43.7512}, {0., 0.}, {0., 0.}},
+		{{20.1668, 43.8746}, {0., 0.}, {0., 0.}},
+		{{18.8027, 46.8822}, {-0.098746, -0.006174}, {0., 0.}},
+		{{18.8027, 46.8822}, {0., 0.}, {0., 0.}}
+	};
+	for (const auto& item : bpoints) {
+		BLinePoint p;
+		p.set_vertex(item.vertex);
+		p.set_tangent1(item.tangent1);
+		p.set_tangent2(item.tangent2);
+		p.set_origin(0.500000);
+		list.push_back(p);
+	}
+
+	ValueNode_BLine* bline = ValueNode_BLine::create(list);
+	bline->set_loop(true);
+	ValueNode_Const* const_false = static_cast<ValueNode_Const*>(ValueNode_Const::create(false));
+	// ValueNode_Const* const_true = static_cast<ValueNode_Const*>(ValueNode_Const::create(true));
+	ValueNode_Const* const_amount = static_cast<ValueNode_Const*>(ValueNode_Const::create(0.1));
+
+	ValueNode_BLineCalcVertex::Handle bline_calc_vertex(ValueNode_BLineCalcVertex::create(Vector(0,0)));
+	bline_calc_vertex->set_link("bline", bline);
+	bline_calc_vertex->set_link("loop", const_false);
+	bline_calc_vertex->set_link("homogeneous", const_false);
+	bline_calc_vertex->set_link("amount", const_amount);
+
+	const_amount->set_value(0.0);
+	Vector vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(bpoints0.vertex, vertex)
+
+	const_amount->set_value(0.25);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(bpoints1.vertex, vertex)
+
+	const_amount->set_value(0.5);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(bpoints2.vertex, vertex)
+
+	const_amount->set_value(0.75);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(bpoints3.vertex, vertex)
+
+	const_amount->set_value(1.0);
+	vertex = (*bline_calc_vertex)(Time()).get(Vector());
+	ASSERT_VECTOR_APPROX_EQUAL_MICRO(bpoints0.vertex, vertex)
+}
 
 int main() {
 	Type::subsys_init();
 
-	TEST_SUITE_BEGIN()
-		TEST_FUNCTION(test_bline_length)
-		TEST_FUNCTION(test_bline_std_to_hom_without_loop)
-		TEST_FUNCTION(test_bline_std_to_hom_with_loop)
-		TEST_FUNCTION(test_bline_hom_to_std_without_loop)
-		TEST_FUNCTION(test_bline_hom_to_std_with_loop)
-		TEST_FUNCTION(test_calc_vertex)
-	TEST_SUITE_END()
+	TEST_SUITE_BEGIN();
+
+	TEST_FUNCTION(test_bline_length_single_vertex);
+	TEST_FUNCTION(test_bline_length_without_loop);
+	TEST_FUNCTION(test_bline_length_with_loop);
+
+	TEST_FUNCTION(test_bline_std_to_hom_without_bline_loop_without_index_loop_clamps_to_zero_for_negative_position);
+	TEST_FUNCTION(test_bline_std_to_hom_without_bline_loop_without_index_loop_clamps_to_one_for_position_greater_than_one);
+	TEST_FUNCTION(test_bline_std_to_hom_without_bline_loop_with_index_loop_keeps_position_for_both_edges);
+
+	TEST_FUNCTION(test_bline_std_to_hom_without_loop);
+	TEST_FUNCTION(test_bline_std_to_hom_with_loop);
+	TEST_FUNCTION(test_bline_hom_to_std_without_loop);
+	TEST_FUNCTION(test_bline_hom_to_std_with_loop);
+	TEST_FUNCTION(test_calc_vertex);
+
+	TEST_FUNCTION(test_bline_length_for_bline_with_two_vertices_at_same_spot);
+	TEST_FUNCTION(test_bline_std_to_hom_without_loop_with_two_vertices_at_same_spot);
+	TEST_FUNCTION(test_bline_std_to_hom_with_loop_with_two_vertices_at_same_spot);
+	TEST_FUNCTION(test_bline_hom_to_std_without_loop_with_two_vertices_at_same_spot);
+	TEST_FUNCTION(test_bline_hom_to_std_with_loop_with_two_vertices_at_same_spot);
+
+	TEST_FUNCTION(test_calc_vertex_for_single_vertex_without_loop_returns_itself);
+	TEST_FUNCTION(test_calc_vertex_for_single_vertex_with_loop_returns_itself_on_edges);
+	TEST_FUNCTION(test_calc_vertex_for_straight_line_without_loop);
+	TEST_FUNCTION(test_calc_vertex_for_straight_line_with_loop);
+	TEST_FUNCTION(test_calc_vertex_for_open_rectangle);
+	TEST_FUNCTION(test_calc_vertex_for_closed_rectangle);
+	TEST_FUNCTION(test_calc_vertex_on_vertex_exact_positions_for_looped_curve_with_two_vertices_on_same_coords);
+
+	TEST_SUITE_END();
 
 	Type::subsys_stop();

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/test/filesystem_path.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/test/filesystem_path.cpp Changed

@@ -1414,6 +1414,20 @@
 	ASSERT_EQUAL("\\\\host.example.com/path/to/file", Path::from_uri("file://///host.example.com/path/to/file").u8string());
 }
 
+void
+test_from_uri_with_escapes()
+{
+	ASSERT_EQUAL("/path/to/file with spaces", Path::from_uri("file:///path/to/file%20with%20spaces").u8string());
+
+	ASSERT_EQUAL("/path/to/file.a", Path::from_uri("file:///path/to/file%2ea").u8string());
+	ASSERT_EQUAL("/path/to/file.b", Path::from_uri("file:///path/to/file%2Eb").u8string());
+	ASSERT_EQUAL("/path/to/.file", Path::from_uri("file:///path/to/%2Efile").u8string());
+
+	ASSERT_EQUAL("/path/to/.file", Path::from_uri("file:///path/to/%2Efile").u8string());
+
+	ASSERT_EQUAL("/path/to/file\xc3\xb3", Path::from_uri("file:///path/to/file%c3%B3").u8string());
+}
+
 /* === E N T R Y P O I N T ================================================= */
 
 int main() {
@@ -1542,6 +1556,7 @@
 	TEST_FUNCTION(test_proximate_between_different_root_paths)
 
 	TEST_FUNCTION(test_from_uri)
+	TEST_FUNCTION(test_from_uri_with_escapes)
 
 	TEST_SUITE_END()

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/test/handle.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/test/handle.cpp Changed

@@ -596,6 +596,210 @@
 	ASSERT_EQUAL(1, real_obj2->use_count());
 }
 
+void
+handle_move_constructor_stores_the_same_object()
+{
+	BasicSharedObject* real_obj = new BasicSharedObject();
+
+	BasicSharedObject::Handle obj((BasicSharedObject::Handle(real_obj)));
+
+	ASSERT(obj.get() == real_obj);
+}
+
+void
+handle_move_constructor_does_not_increase_refcount()
+{
+	BasicSharedObject* real_obj = new BasicSharedObject();
+
+	BasicSharedObject::Handle obj((BasicSharedObject::Handle(real_obj)));
+
+	ASSERT_EQUAL(1, real_obj->use_count());
+	ASSERT_EQUAL(1, obj->use_count());
+}
+
+void
+handle_move_constructor_removes_from_source_handle()
+{
+	BasicSharedObject* real_obj = new BasicSharedObject();
+
+	BasicSharedObject::Handle obj1(real_obj);
+	BasicSharedObject::Handle obj2(std::move(obj1));
+
+	ASSERT_FALSE(obj1);
+	ASSERT(obj1.get() == nullptr);
+	ASSERT(obj2.get() == real_obj);
+}
+
+void
+handle_move_assignment_stores_the_same_object()
+{
+	BasicSharedObject* real_obj = new BasicSharedObject();
+
+	BasicSharedObject::Handle obj1(real_obj);
+	BasicSharedObject::Handle obj2 = std::move(obj1);
+
+	ASSERT(obj2.get() == real_obj);
+}
+
+void
+handle_move_assignment_does_not_increase_refcount()
+{
+	BasicSharedObject* real_obj = new BasicSharedObject();
+
+	BasicSharedObject::Handle obj1(real_obj);
+	BasicSharedObject::Handle obj2 = std::move(obj1);
+
+	ASSERT_EQUAL(1, real_obj->use_count());
+}
+
+void
+handle_move_assignment_safely_moves_to_itself()
+{
+	BasicSharedObject* real_obj = new BasicSharedObject();
+
+	BasicSharedObject::Handle obj1(real_obj);
+	obj1 = std::move(obj1);
+
+	ASSERT_EQUAL(1, real_obj->use_count());
+	ASSERT(obj1.get() == real_obj);
+}
+
+void
+handle_move_assignment_from_empty_handle_discards_previous_object()
+{
+	BasicSharedObject* real_obj = new BasicSharedObject();
+	DeleteGuard<BasicSharedObject> guard(real_obj);
+
+	real_obj->ref();
+
+	BasicSharedObject::Handle obj1(real_obj);
+
+	obj1 = std::move(BasicSharedObject::Handle());
+	ASSERT(obj1.empty());
+	ASSERT_EQUAL(0, obj1.use_count());
+}
+
+void
+handle_move_assignment_from_empty_handle_decreases_previous_object_refcount()
+{
+	BasicSharedObject* real_obj1 = new BasicSharedObject();
+	DeleteGuard<BasicSharedObject> guard(real_obj1);
+
+	real_obj1->ref();
+
+	BasicSharedObject::Handle obj1(real_obj1);
+
+	BasicSharedObject::Handle obj2(new BasicSharedObject());
+
+	ASSERT_EQUAL(2, real_obj1->use_count());
+
+	obj1 = std::move(obj2);
+
+	ASSERT_EQUAL(1, real_obj1->use_count());
+}
+
+void
+handle_move_assignment_from_empty_deletes_previous_object_if_it_is_time()
+{
+	int delete_counter = 0;
+
+	RIPSharedObject* real_obj = new RIPSharedObject(delete_counter);
+
+	RIPSharedObject::Handle obj1(real_obj);
+
+	ASSERT_EQUAL(1, real_obj->use_count());
+
+	obj1 = std::move(RIPSharedObject::Handle());
+	ASSERT_EQUAL(1, delete_counter);
+}
+
+void
+handle_move_assignment_removes_from_source_handle()
+{
+	BasicSharedObject* real_obj = new BasicSharedObject();
+
+	BasicSharedObject::Handle obj1(real_obj);
+	BasicSharedObject::Handle obj2 = std::move(obj1);
+
+	ASSERT_FALSE(obj1);
+	ASSERT(obj1.get() == nullptr);
+}
+
+void
+handle_move_assignment_from_other_handle_discards_previous_object()
+{
+	BasicSharedObject* real_obj1 = new BasicSharedObject();
+	BasicSharedObject* real_obj2 = new BasicSharedObject();
+	DeleteGuard<BasicSharedObject> guard(real_obj1);
+
+	real_obj1->ref();
+
+	BasicSharedObject::Handle obj1(real_obj1);
+
+	BasicSharedObject::Handle obj2(real_obj2);
+
+	obj1 = std::move(obj2);
+
+	ASSERT_FALSE(obj1.get() == real_obj1);
+	ASSERT(obj1.get() == real_obj2);
+}
+
+void
+handle_move_assignment_from_other_handle_decreases_previous_object_refcount()
+{
+	BasicSharedObject* real_obj1 = new BasicSharedObject();
+	DeleteGuard<BasicSharedObject> guard(real_obj1);
+
+	real_obj1->ref();
+
+	BasicSharedObject::Handle obj1(real_obj1);
+
+	BasicSharedObject::Handle obj2(new BasicSharedObject());
+
+	obj1 = std::move(obj2);
+
+	ASSERT_EQUAL(1, real_obj1->use_count());
+}
+
+void
+handle_move_assignment_from_other_handle_with_same_object_does_not_decrease_object_refcount()
+{
+	BasicSharedObject* real_obj1 = new BasicSharedObject();
+	DeleteGuard<BasicSharedObject> guard(real_obj1);
+
+	real_obj1->ref();
+
+	BasicSharedObject::Handle obj1(real_obj1);
+
+	BasicSharedObject::Handle obj2(real_obj1);
+
+	ASSERT_EQUAL(3, obj1->use_count());
+	ASSERT_EQUAL(3, obj2->use_count());
+
+	obj1 = std::move(obj2);
+
+	ASSERT_EQUAL(3, real_obj1->use_count());
+}
+
+void
+handle_move_assignment_from_other_handle_deletes_previous_object_if_it_is_time()
+{
+	int delete_counter1 = 0;
+	int delete_counter2 = 0;
+	RIPSharedObject* real_obj1 = new RIPSharedObject(delete_counter1);
+
+	RIPSharedObject::Handle obj1(real_obj1);
+
+	RIPSharedObject::Handle obj2(new RIPSharedObject(delete_counter2));
+
+	ASSERT_EQUAL(1, obj1->use_count());
+	ASSERT_EQUAL(1, obj2->use_count());
+
+	obj1 = std::move(obj2);
+
+	ASSERT_EQUAL(1, delete_counter1);
+	ASSERT_EQUAL(0, delete_counter2);
+}
 
 void
 loose_handle_default_constructor_means_empty()
@@ -1190,6 +1394,469 @@
 }
 
 void
+rhandle_copy_constructor()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1(new MyTestObj(1001));
+	RObjHandle obj2(obj1);
+
+	ASSERT(obj1.get() == obj2.get());
+	ASSERT_EQUAL(1001, obj1->my_id);
+	ASSERT_EQUAL(1001, obj2->my_id);
+	ASSERT_EQUAL(2, obj1.use_count());
+	ASSERT_EQUAL(2, obj2.use_count());
+	ASSERT_EQUAL(2, obj1.rcount());
+	ASSERT_EQUAL(2, obj2.rcount());
+
+	RObjHandle obj3(new MyTestObj(2002));
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	ASSERT(obj1.replace(obj3));
+	ASSERT(obj1.get() == obj2.get());
+	ASSERT(obj1.get() == obj3.get());
+	ASSERT_EQUAL(2002, obj1->my_id);
+	ASSERT_EQUAL(2002, obj3->my_id);
+	ASSERT_EQUAL(3, obj1.use_count());
+	ASSERT_EQUAL(3, obj2.use_count());
+	ASSERT_EQUAL(3, obj1.rcount());
+	ASSERT_EQUAL(3, obj2.rcount());
+
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+}
+
+void
+rhandle_copy_assignment()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1 = new MyTestObj(1001);
+	RObjHandle obj2 = obj1;
+
+	ASSERT(obj1.get() == obj2.get());
+	ASSERT_EQUAL(1001, obj1->my_id);
+	ASSERT_EQUAL(1001, obj2->my_id);
+	ASSERT_EQUAL(2, obj1.use_count());
+	ASSERT_EQUAL(2, obj2.use_count());
+	ASSERT_EQUAL(2, obj1.rcount());
+	ASSERT_EQUAL(2, obj2.rcount());
+
+	RObjHandle obj3 = new MyTestObj(2002);
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	ASSERT(obj1.replace(obj3));
+	ASSERT(obj1.get() == obj2.get());
+	ASSERT(obj1.get() == obj3.get());
+	ASSERT_EQUAL(2002, obj1->my_id);
+	ASSERT_EQUAL(2002, obj3->my_id);
+	ASSERT_EQUAL(3, obj1.use_count());
+	ASSERT_EQUAL(3, obj2.use_count());
+	ASSERT_EQUAL(3, obj1.rcount());
+	ASSERT_EQUAL(3, obj2.rcount());
+
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+}
+
+void
+rhandle_copy_assignment_to_nonnull()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1 = new MyTestObj(1001);
+	const RObjHandle obj2 = new MyTestObj(2002);
+
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	ASSERT(obj1.get() != obj2.get());
+	ASSERT_EQUAL(1001, obj1->my_id);
+	ASSERT_EQUAL(2002, obj2->my_id);
+	ASSERT_EQUAL(1, obj1.use_count());
+	ASSERT_EQUAL(1, obj2.use_count());
+	ASSERT_EQUAL(1, obj1.rcount());
+	ASSERT_EQUAL(1, obj2.rcount());
+
+	obj1 = obj2;
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+
+	ASSERT(obj1.get() == obj2.get());
+	ASSERT_EQUAL(2002, obj1->my_id);
+	ASSERT_EQUAL(2002, obj2->my_id);
+	ASSERT_EQUAL(2, obj1.use_count());
+	ASSERT_EQUAL(2, obj2.use_count());
+	ASSERT_EQUAL(2, obj1.rcount());
+	ASSERT_EQUAL(2, obj2.rcount());
+}
+
+void
+rhandle_move_constructor()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1(std::move(new MyTestObj(1001)));
+	RObjHandle obj2(std::move(new MyTestObj(2002)));
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	ASSERT(obj1.get() != obj2.get());
+	ASSERT_EQUAL(1001, obj1->my_id);
+	ASSERT_EQUAL(2002, obj2->my_id);
+	ASSERT_EQUAL(1, obj1.use_count());
+	ASSERT_EQUAL(1, obj2.use_count());
+	ASSERT_EQUAL(1, obj1.rcount());
+	ASSERT_EQUAL(1, obj2.rcount());
+
+	RObjHandle obj4(std::move(obj1));
+
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	ASSERT(obj1.get() != obj2.get());
+	ASSERT_FALSE(obj1);
+	ASSERT_EQUAL(1001, obj4->my_id);
+	ASSERT_EQUAL(0, obj1.use_count());
+	ASSERT_EQUAL(1, obj2.use_count());
+	ASSERT_EQUAL(1, obj4.use_count());
+	ASSERT_EQUAL(0, obj1.rcount());
+	ASSERT_EQUAL(1, obj2.rcount());
+	ASSERT_EQUAL(1, obj4.rcount());
+
+	RObjHandle obj3(std::move(new MyTestObj(3003)));
+	ASSERT_EQUAL(3, MyTestObj::instance_count);
+
+	ASSERT(obj2.replace(std::move(obj3)));
+	ASSERT_EQUAL(3003, obj2->my_id);
+}
+
+void
+rhandle_move_assignment_to_null()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1 = std::move(new MyTestObj(1001));
+	RObjHandle obj2;
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+
+	ASSERT(obj1.get() != obj2.get());
+	ASSERT_EQUAL(1001, obj1->my_id);
+	ASSERT_FALSE(obj2);
+	ASSERT_EQUAL(1, obj1.use_count());
+	ASSERT_EQUAL(0, obj2.use_count());
+	ASSERT_EQUAL(1, obj1.rcount());
+	ASSERT_EQUAL(0, obj2.rcount());
+
+	obj2 = std::move(obj1);
+
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+
+	ASSERT(obj1.get() != obj2.get());
+	ASSERT_FALSE(obj1);
+	ASSERT_EQUAL(1001, obj2->my_id);
+	ASSERT_EQUAL(0, obj1.use_count());
+	ASSERT_EQUAL(1, obj2.use_count());
+	ASSERT_EQUAL(0, obj1.rcount());
+	ASSERT_EQUAL(1, obj2.rcount());
+}
+
+void
+rhandle_move_assignment_to_nonnull()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1 = std::move(new MyTestObj(1001));
+	RObjHandle obj2 = std::move(new MyTestObj(2002));
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	ASSERT(obj1.get() != obj2.get());
+	ASSERT_EQUAL(1001, obj1->my_id);
+	ASSERT_EQUAL(2002, obj2->my_id);
+	ASSERT_EQUAL(1, obj1.use_count());
+	ASSERT_EQUAL(1, obj2.use_count());
+	ASSERT_EQUAL(1, obj1.rcount());
+	ASSERT_EQUAL(1, obj2.rcount());
+
+	obj2 = std::move(obj1);
+
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+
+	ASSERT_FALSE(obj1);
+	ASSERT(obj1.get() != obj2.get());
+	ASSERT_EQUAL(1001, obj2->my_id);
+	ASSERT_EQUAL(0, obj1.use_count());
+	ASSERT_EQUAL(1, obj2.use_count());
+	ASSERT_EQUAL(0, obj1.rcount());
+	ASSERT_EQUAL(1, obj2.rcount());
+}
+
+void
+rhandle_replace_simple_case()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1 = new MyTestObj(1001);
+	RObjHandle obj2 = obj1;
+	RObjHandle obj3 = obj1;
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+
+	ASSERT_EQUAL(1001, obj1->my_id);
+	ASSERT_EQUAL(1001, obj2->my_id);
+	ASSERT_EQUAL(1001, obj3->my_id);
+	ASSERT_EQUAL(3, obj1.use_count());
+	ASSERT_EQUAL(3, obj2.use_count());
+	ASSERT_EQUAL(3, obj3.use_count());
+	ASSERT_EQUAL(3, obj1.rcount());
+	ASSERT_EQUAL(3, obj2.rcount());
+	ASSERT_EQUAL(3, obj3.rcount());
+
+	RObjHandle obj4 = new MyTestObj(44);
+
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	obj1.replace(obj4);
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+	ASSERT_EQUAL(44, obj1->my_id);
+	ASSERT_EQUAL(44, obj2->my_id);
+	ASSERT_EQUAL(44, obj3->my_id);
+	ASSERT_EQUAL(44, obj4->my_id);
+	ASSERT_EQUAL(4, obj1.use_count());
+	ASSERT_EQUAL(4, obj2.use_count());
+	ASSERT_EQUAL(4, obj3.use_count());
+	ASSERT_EQUAL(4, obj4.use_count());
+	ASSERT_EQUAL(4, obj1.rcount());
+	ASSERT_EQUAL(4, obj2.rcount());
+	ASSERT_EQUAL(4, obj3.rcount());
+	ASSERT_EQUAL(4, obj4.rcount());
+
+	obj2.replace(new MyTestObj(555));
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+	ASSERT_EQUAL(555, obj1->my_id);
+	ASSERT_EQUAL(555, obj2->my_id);
+	ASSERT_EQUAL(555, obj3->my_id);
+	ASSERT_EQUAL(555, obj4->my_id);
+	ASSERT_EQUAL(4, obj1.use_count());
+	ASSERT_EQUAL(4, obj2.use_count());
+	ASSERT_EQUAL(4, obj3.use_count());
+	ASSERT_EQUAL(4, obj4.use_count());
+	ASSERT_EQUAL(4, obj1.rcount());
+	ASSERT_EQUAL(4, obj2.rcount());
+	ASSERT_EQUAL(4, obj3.rcount());
+	ASSERT_EQUAL(4, obj4.rcount());
+
+	obj4.replace(new MyTestObj(66));
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+	ASSERT_EQUAL(66, obj1->my_id);
+	ASSERT_EQUAL(66, obj2->my_id);
+	ASSERT_EQUAL(66, obj3->my_id);
+	ASSERT_EQUAL(66, obj4->my_id);
+	ASSERT_EQUAL(4, obj1.use_count());
+	ASSERT_EQUAL(4, obj2.use_count());
+	ASSERT_EQUAL(4, obj3.use_count());
+	ASSERT_EQUAL(4, obj4.use_count());
+	ASSERT_EQUAL(4, obj1.rcount());
+	ASSERT_EQUAL(4, obj2.rcount());
+	ASSERT_EQUAL(4, obj3.rcount());
+	ASSERT_EQUAL(4, obj4.rcount());
+
+	obj3.replace(new MyTestObj(7));
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+	ASSERT_EQUAL(7, obj1->my_id);
+	ASSERT_EQUAL(7, obj2->my_id);
+	ASSERT_EQUAL(7, obj3->my_id);
+	ASSERT_EQUAL(7, obj4->my_id);
+	ASSERT_EQUAL(4, obj1.use_count());
+	ASSERT_EQUAL(4, obj2.use_count());
+	ASSERT_EQUAL(4, obj3.use_count());
+	ASSERT_EQUAL(4, obj4.use_count());
+	ASSERT_EQUAL(4, obj1.rcount());
+	ASSERT_EQUAL(4, obj2.rcount());
+	ASSERT_EQUAL(4, obj3.rcount());
+	ASSERT_EQUAL(4, obj4.rcount());
+}
+
+void
+rhandle_replace_merging_two_lists()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1a = new MyTestObj(1001);
+	RObjHandle obj1b = obj1a;
+	RObjHandle obj1c = obj1a;
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+
+	ASSERT_EQUAL(1001, obj1a->my_id);
+	ASSERT_EQUAL(1001, obj1b->my_id);
+	ASSERT_EQUAL(1001, obj1c->my_id);
+	ASSERT_EQUAL(3, obj1a.use_count());
+	ASSERT_EQUAL(3, obj1b.use_count());
+	ASSERT_EQUAL(3, obj1c.use_count());
+	ASSERT_EQUAL(3, obj1a.rcount());
+	ASSERT_EQUAL(3, obj1b.rcount());
+	ASSERT_EQUAL(3, obj1c.rcount());
+
+	RObjHandle obj2a = new MyTestObj(222);
+	RObjHandle obj2b = obj2a;
+	RObjHandle obj2c = obj2a;
+
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	obj1a.replace(obj2b);
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+	ASSERT_EQUAL(222, obj1a->my_id);
+	ASSERT_EQUAL(222, obj1b->my_id);
+	ASSERT_EQUAL(222, obj1c->my_id);
+	ASSERT_EQUAL(222, obj2a->my_id);
+	ASSERT_EQUAL(222, obj2b->my_id);
+	ASSERT_EQUAL(222, obj2c->my_id);
+	ASSERT_EQUAL(6, obj1a.use_count());
+	ASSERT_EQUAL(6, obj1b.use_count());
+	ASSERT_EQUAL(6, obj1c.use_count());
+	ASSERT_EQUAL(6, obj2a.use_count());
+	ASSERT_EQUAL(6, obj2b.use_count());
+	ASSERT_EQUAL(6, obj2c.use_count());
+	ASSERT_EQUAL(6, obj1a.rcount());
+	ASSERT_EQUAL(6, obj1b.rcount());
+	ASSERT_EQUAL(6, obj1c.rcount());
+	ASSERT_EQUAL(6, obj2a.rcount());
+	ASSERT_EQUAL(6, obj2b.rcount());
+	ASSERT_EQUAL(6, obj2c.rcount());
+}
+
+void
+rhandle_move_to_a_rhandle_list()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1a = new MyTestObj(1001);
+	RObjHandle obj1b = obj1a;
+	RObjHandle obj1c = obj1a;
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+
+	ASSERT_EQUAL(1001, obj1a->my_id);
+	ASSERT_EQUAL(1001, obj1b->my_id);
+	ASSERT_EQUAL(1001, obj1c->my_id);
+	ASSERT_EQUAL(3, obj1a.use_count());
+	ASSERT_EQUAL(3, obj1b.use_count());
+	ASSERT_EQUAL(3, obj1c.use_count());
+	ASSERT_EQUAL(3, obj1a.rcount());
+	ASSERT_EQUAL(3, obj1b.rcount());
+	ASSERT_EQUAL(3, obj1c.rcount());
+
+	RObjHandle obj2a = new MyTestObj(222);
+	RObjHandle obj2b = obj2a;
+	RObjHandle obj2c = obj2a;
+
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	obj1b = std::move(obj2b);
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+	ASSERT_FALSE(obj2b);
+	ASSERT_EQUAL(1001, obj1a->my_id);
+	ASSERT_EQUAL(222, obj1b->my_id);
+	ASSERT_EQUAL(1001, obj1c->my_id);
+	ASSERT_EQUAL(222, obj2a->my_id);
+	ASSERT_EQUAL(222, obj2c->my_id);
+	ASSERT_EQUAL(2, obj1a.use_count());
+	ASSERT_EQUAL(3, obj1b.use_count());
+	ASSERT_EQUAL(2, obj1c.use_count());
+	ASSERT_EQUAL(3, obj2a.use_count());
+	ASSERT_EQUAL(0, obj2b.use_count());
+	ASSERT_EQUAL(3, obj2c.use_count());
+	ASSERT_EQUAL(2, obj1a.rcount());
+	ASSERT_EQUAL(3, obj1b.rcount());
+	ASSERT_EQUAL(2, obj1c.rcount());
+	ASSERT_EQUAL(3, obj2a.rcount());
+	ASSERT_EQUAL(0, obj2b.rcount());
+	ASSERT_EQUAL(3, obj2c.rcount());
+
+	obj1b.replace(new MyTestObj(55));
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+	ASSERT_FALSE(obj2b);
+	ASSERT_EQUAL(1001, obj1a->my_id);
+	ASSERT_EQUAL(55, obj1b->my_id);
+	ASSERT_EQUAL(1001, obj1c->my_id);
+	ASSERT_EQUAL(55, obj2a->my_id);
+	ASSERT_EQUAL(55, obj2c->my_id);
+
+	obj2a.replace(new MyTestObj(6));
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+	ASSERT_FALSE(obj2b);
+	ASSERT_EQUAL(1001, obj1a->my_id);
+	ASSERT_EQUAL(6, obj1b->my_id);
+	ASSERT_EQUAL(1001, obj1c->my_id);
+	ASSERT_EQUAL(6, obj2a->my_id);
+	ASSERT_EQUAL(6, obj2c->my_id);
+
+	obj2c.replace(new MyTestObj(707));
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+	ASSERT_FALSE(obj2b);
+	ASSERT_EQUAL(1001, obj1a->my_id);
+	ASSERT_EQUAL(707, obj1b->my_id);
+	ASSERT_EQUAL(1001, obj1c->my_id);
+	ASSERT_EQUAL(707, obj2a->my_id);
+	ASSERT_EQUAL(707, obj2c->my_id);
+
+	obj1c.replace(new MyTestObj(88));
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+	ASSERT_FALSE(obj2b);
+	ASSERT_EQUAL(88, obj1a->my_id);
+	ASSERT_EQUAL(707, obj1b->my_id);
+	ASSERT_EQUAL(88, obj1c->my_id);
+	ASSERT_EQUAL(707, obj2a->my_id);
+	ASSERT_EQUAL(707, obj2c->my_id);
+}
+
+void
+rhandle_move_to_a_rhandle_list_start()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1a = new MyTestObj(1001);
+	RObjHandle obj1b = obj1a;
+	RObjHandle obj1c = obj1a;
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+
+	RObjHandle obj2a = new MyTestObj(222);
+	RObjHandle obj2b = obj2a;
+
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	obj1a = std::move(obj2a);
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+	ASSERT_FALSE(obj2a);
+
+	ASSERT_EQUAL(2, obj1b.replace(new MyTestObj(55)));
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+	ASSERT_EQUAL(222, obj1a->my_id);
+	ASSERT_EQUAL(55, obj1b->my_id);
+	ASSERT_EQUAL(55, obj1c->my_id);
+	ASSERT_EQUAL(222, obj2b->my_id);
+}
+
+void
+rhandle_move_to_a_rhandle_list_start_2()
+{
+	MyTestObj::instance_count = 0;
+
+	RObjHandle obj1a = new MyTestObj(1001);
+	RObjHandle obj1b = obj1a;
+	RObjHandle obj1c = obj1a;
+	ASSERT_EQUAL(1, MyTestObj::instance_count);
+
+	RObjHandle obj2a = new MyTestObj(222);
+	RObjHandle obj2b = obj2a;
+
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+
+	obj1a = std::move(obj2a);
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+	ASSERT_FALSE(obj2a);
+
+	ASSERT_EQUAL(2, obj2b.replace(new MyTestObj(55)));
+	ASSERT_EQUAL(2, MyTestObj::instance_count);
+	ASSERT_EQUAL(55, obj1a->my_id);
+	ASSERT_EQUAL(1001, obj1b->my_id);
+	ASSERT_EQUAL(1001, obj1c->my_id);
+	ASSERT_EQUAL(55, obj2b->my_id);
+}
+
+void
 handle_inheritance_test()
 {
 	MyTestObj::instance_count = 0;
@@ -1340,6 +2007,20 @@
 	TEST_FUNCTION(handle_comparing_to_a_different_object_means_always_false);
 	TEST_FUNCTION(handle_swap_does_its_job);
 	TEST_FUNCTION(handle_swap_does_not_change_refcounts);
+	TEST_FUNCTION(handle_move_constructor_stores_the_same_object);
+	TEST_FUNCTION(handle_move_constructor_does_not_increase_refcount);
+	TEST_FUNCTION(handle_move_constructor_removes_from_source_handle);
+	TEST_FUNCTION(handle_move_assignment_stores_the_same_object);
+	TEST_FUNCTION(handle_move_assignment_does_not_increase_refcount);
+	TEST_FUNCTION(handle_move_assignment_safely_moves_to_itself);
+	TEST_FUNCTION(handle_move_assignment_from_empty_handle_discards_previous_object);
+	TEST_FUNCTION(handle_move_assignment_from_empty_handle_decreases_previous_object_refcount);
+	TEST_FUNCTION(handle_move_assignment_from_empty_deletes_previous_object_if_it_is_time);
+	TEST_FUNCTION(handle_move_assignment_removes_from_source_handle);
+	TEST_FUNCTION(handle_move_assignment_from_other_handle_discards_previous_object);
+	TEST_FUNCTION(handle_move_assignment_from_other_handle_decreases_previous_object_refcount);
+	TEST_FUNCTION(handle_move_assignment_from_other_handle_with_same_object_does_not_decrease_object_refcount);
+	TEST_FUNCTION(handle_move_assignment_from_other_handle_deletes_previous_object_if_it_is_time);
 
 	TEST_FUNCTION(loose_handle_default_constructor_means_empty);
 	TEST_FUNCTION(loose_handle_constructor_does_not_increase_refcount);
@@ -1375,6 +2056,19 @@
 	TEST_FUNCTION(handle_assignment_from_loose_handle_stores_the_same_object);
 	TEST_FUNCTION(handle_assignment_from_loose_handle_increases_refcount);
 
+	TEST_FUNCTION(rhandle_replace_simple_case);
+	TEST_FUNCTION(rhandle_replace_merging_two_lists);
+
+	TEST_FUNCTION(rhandle_copy_constructor);
+	TEST_FUNCTION(rhandle_copy_assignment);
+	TEST_FUNCTION(rhandle_copy_assignment_to_nonnull);
+	TEST_FUNCTION(rhandle_move_constructor);
+	TEST_FUNCTION(rhandle_move_assignment_to_null);
+	TEST_FUNCTION(rhandle_move_assignment_to_nonnull);
+	TEST_FUNCTION(rhandle_move_to_a_rhandle_list);
+	TEST_FUNCTION(rhandle_move_to_a_rhandle_list_start);
+	TEST_FUNCTION(rhandle_move_to_a_rhandle_list_start_2);
+
 	// Original tests from older ETL/test folder
 
 	TEST_FUNCTION(handle_basic_test);

_service:obs_scm:synfig-1.5.3.obscpio/synfig-core/test/test_base.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-core/test/test_base.h Changed

@@ -25,6 +25,7 @@
 #ifndef SYNFIG_TESTBASE_H
 #define SYNFIG_TESTBASE_H
 
+#include <cmath> // std::isnan
 #include <cstdlib> // std::abs
 #include <iostream> // std::cerr
 #include <sstream>
@@ -52,9 +53,31 @@
 	return os;
 }
 
-// remove this operator after switch to c++17 (it is already implemented in c++17)
-#if !defined(__APPLE__) && !defined(__clang__) || __clang_major__ == 6
-// macOS Clang toolchain has already defined this operator for all c++ versions
+std::ostream& operator<<(std::ostream& os, const synfig::Angle& a)
+{
+	os << '(' << synfig::Angle::deg(a).get() << "°)'";
+	return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const synfig::Angle::deg& a)
+{
+	os << '(' << a.get() << "°)";
+	return os;
+}
+
+/*
+In Clang, the `operator<<(nullptr_t)` was added in version 9 without the corresponding C++ version guard.
+This behavior was fixed in version 15 (commit: https://github.com/llvm/llvm-project/commit/50cfb76)
+
+todo: After switching to C++17, this workaround should be removed.
+
+P.S. As an alternative solution that does not depend on the compiler, the following code can be used:
+```
+#define NULLPTR_HELPER(out, val) (std::is_same<decltype(val), nullptr_t>::value ? (out << "null") : (out << val))
+oss << "\t - expected "; NULLPTR_HELPER(oss, a) << ", but got "; NULLPTR_HELPER(oss, b) << std::endl;
+```
+*/
+#if !defined(__clang__) || (__clang_major__ < 9 || __clang_major__ > 14)
 std::ostream& operator<<(std::ostream& os, std::nullptr_t)
 {
 	os << "null";
@@ -106,14 +129,15 @@
 }
 
 #define ASSERT_APPROX_EQUAL_MICRO(expected, value) {\
-	if (std::abs(expected - value) > 1e-6) { \
+	if (std::isnan(value) != std::isnan(expected) || std::abs(expected - value) > 1e-6) { \
 		ERROR_MESSAGE_TWO_VALUES(expected, value) \
 	} \
 }
 
 #define ASSERT_VECTOR_APPROX_EQUAL_MICRO(expected, value) {\
-	if (std::abs(expected0 - value0) > 2e-6 || std::abs(expected1 - value1) > 2e-6) { \
-		ERROR_MESSAGE_TWO_VALUES(expected, value) \
+	if (std::isnan(value0) != std::isnan(expected0) || std::isnan(value1) != std::isnan(expected1) \
+		|| std::abs(expected0 - value0) > 2e-6 || std::abs(expected1 - value1) > 2e-6) { \
+			ERROR_MESSAGE_TWO_VALUES(expected, value) \
 	} \
 }

_service:obs_scm:synfig-1.5.4.obscpio/synfig-core/test/valuenode_maprange.cpp Added

@@ -0,0 +1,1972 @@
+/* === S Y N F I G ========================================================= */
+/*! \file valuenode_maprange.cpp
+** \brief Test synfig::ValueNode_MapRange methods
+**
+** \legal
+** Copyright (c) 2025 Synfig contributors
+**
+** This file is part of Synfig.
+**
+** Synfig is free software: you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation, either version 2 of the License, or
+** (at your option) any later version.
+**
+** Synfig is distributed in the hope that it will be useful,
+** but WITHOUT ANY WARRANTY; without even the implied warranty of
+** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+** GNU General Public License for more details.
+**
+** You should have received a copy of the GNU General Public License
+** along with Synfig. If not, see <https://www.gnu.org/licenses/>.
+** \endlegal
+*/
+/* ========================================================================= */
+
+/* === H E A D E R S ======================================================= */
+
+#include <synfig/valuenodes/valuenode_maprange.h>
+
+#include "test_base.h"
+
+#include <synfig/valuenodes/valuenode_const.h>
+
+using namespace synfig;
+
+/* === P R O C E D U R E S ================================================= */
+
+static void
+test_int_map_range_clamp_if_below_lower_bound()
+{
+	auto map_range = ValueNode_MapRange::create(int(-1));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_map_range_does_not_clamp_to_lower_bound_if_clamp_is_off()
+{
+	auto map_range = ValueNode_MapRange::create(int(-1));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(-14, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_map_range_clamp_if_above_upper_bound()
+{
+	auto map_range = ValueNode_MapRange::create(int(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(10, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_map_range_does_not_clamp_to_upper_bound_if_clamp_is_off()
+{
+	auto map_range = ValueNode_MapRange::create(int(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(14, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_map_range_matches_from_to_lower_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(int(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(2));
+	map_range->set_link("to_max", ValueNode_Const::create(13));
+	ASSERT_EQUAL(2, (*map_range)(0).get(int()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(2, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_map_range_matches_from_to_upper_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(int(5));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(2));
+	map_range->set_link("to_max", ValueNode_Const::create(13));
+	ASSERT_EQUAL(13, (*map_range)(0).get(int()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(13, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_map_range_inside_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(int(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(-2, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_map_range_does_not_crash_if_source_range_is_null()
+{
+	auto map_range = ValueNode_MapRange::create(int(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(5));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_map_range_to_target_lower_bound_if_source_range_is_null_and_value_is_lower_than_corrupted_source_range()
+{
+	auto map_range = ValueNode_MapRange::create(int(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(5));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_map_range_to_target_upper_bound_if_source_range_is_null_and_value_is_equals_to_or_greater_than_corrupted_source_range()
+{
+	auto map_range = ValueNode_MapRange::create(int(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(5));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(10, (*map_range)(0).get(int()));
+
+	map_range->set_link("link", ValueNode_Const::create(5));
+	ASSERT_EQUAL(10, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_map_range_to_single_value_if_target_range_is_null_no_matter_the_source_value()
+{
+	auto map_range = ValueNode_MapRange::create(int(-2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(-10));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(int()));
+
+	map_range->set_link("link", ValueNode_Const::create(0));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(int()));
+
+	map_range->set_link("link", ValueNode_Const::create(2));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(int()));
+
+	map_range->set_link("link", ValueNode_Const::create(5));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(int()));
+
+	map_range->set_link("link", ValueNode_Const::create(7));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(int()));
+}
+
+static void
+test_int_invert_map_range_works_when_below_target_lower_bound()
+{
+	auto map_range = ValueNode_MapRange::create(int(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(-1, map_range->get_inverse(0, -14).get(int()));
+}
+
+static void
+test_int_invert_map_range_works_when_below_target_lower_bound_even_if_clamped()
+{
+	auto map_range = ValueNode_MapRange::create(int(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(0, map_range->get_inverse(0, -14).get(int()));
+}
+
+static void
+test_int_invert_map_range_works_when_above_target_upper_bound()
+{
+	auto map_range = ValueNode_MapRange::create(int(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(6, map_range->get_inverse(0, 14).get(int()));
+}
+
+static void
+test_int_invert_map_range_works_when_above_target_upper_bound_even_if_clamped()
+{
+	auto map_range = ValueNode_MapRange::create(int(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, 14).get(int()));
+}
+
+static void
+test_int_invert_map_range_matches_lower_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(int(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(0, map_range->get_inverse(0, -10).get(int()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(0, map_range->get_inverse(0, -10).get(int()));
+}
+
+static void
+test_int_invert_map_range_matches_upper_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(int(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, 10).get(int()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, 10).get(int()));
+}
+
+static void
+test_int_invert_map_range_inside_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(int(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(0));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(4, map_range->get_inverse(0, 6).get(int()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(4, map_range->get_inverse(0, 6).get(int()));
+}
+
+static void
+test_int_invert_map_range_does_not_crash_if_source_range_is_null()
+{
+	auto map_range = ValueNode_MapRange::create(int(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(5));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT(map_range->get_inverse(0, 6).is_valid());
+}
+
+static void
+test_int_invert_map_range_the_single_value_if_source_range_is_null_no_matter_the_target_value()
+{
+	auto map_range = ValueNode_MapRange::create(int(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(5));
+	map_range->set_link("from_max", ValueNode_Const::create(5));
+	map_range->set_link("to_min", ValueNode_Const::create(-10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, -10).get(int()));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, 10).get(int()));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, 3).get(int()));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, -15).get(int()));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, +15).get(int()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, -15).get(int()));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, +15).get(int()));
+}
+
+static void
+test_int_invert_map_range_return_source_lower_bound_if_target_range_is_null_if_target_value_is_lower_than_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(int(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(-5));
+	map_range->set_link("from_max", ValueNode_Const::create(+5));
+	map_range->set_link("to_min", ValueNode_Const::create(+10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(-5, map_range->get_inverse(0, -15).get(int()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(-5, map_range->get_inverse(0, -15).get(int()));
+}
+
+static void
+test_int_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_greater_than_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(int(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(-5));
+	map_range->set_link("from_max", ValueNode_Const::create(+5));
+	map_range->set_link("to_min", ValueNode_Const::create(+10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(+5, map_range->get_inverse(0, +15).get(int()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(+5, map_range->get_inverse(0, +15).get(int()));
+}
+
+static void
+test_int_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_equals_to_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(int(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(-5));
+	map_range->set_link("from_max", ValueNode_Const::create(+5));
+	map_range->set_link("to_min", ValueNode_Const::create(+10));
+	map_range->set_link("to_max", ValueNode_Const::create(+10));
+	ASSERT_EQUAL(+5, map_range->get_inverse(0, +10).get(int()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(+5, map_range->get_inverse(0, +10).get(int()));
+}
+
+
+
+
+
+
+static void
+test_angle_map_range_clamp_if_below_lower_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(-1));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(-10), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_map_range_does_not_clamp_to_lower_bound_if_clamp_is_off()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(-1));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(-14), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_map_range_clamp_if_above_upper_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(10), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_map_range_does_not_clamp_to_upper_bound_if_clamp_is_off()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(14), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_map_range_matches_from_to_lower_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(2)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(13)));
+	ASSERT_EQUAL(Angle::deg(2), (*map_range)(0).get(Angle()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Angle::deg(2), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_map_range_matches_from_to_upper_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(5));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(2)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(13)));
+	ASSERT_EQUAL(Angle::deg(13), (*map_range)(0).get(Angle()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Angle::deg(13), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_map_range_inside_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(-2), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_map_range_does_not_crash_if_source_range_is_null()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(-10), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_map_range_to_target_lower_bound_if_source_range_is_null_and_value_is_lower_than_corrupted_source_range()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(-10), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_map_range_to_target_upper_bound_if_source_range_is_null_and_value_is_equals_to_or_greater_than_corrupted_source_range()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(10), (*map_range)(0).get(Angle()));
+
+	map_range->set_link("link", ValueNode_Const::create(Angle::deg(5)));
+	ASSERT_EQUAL(Angle::deg(10), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_map_range_to_single_value_if_target_range_is_null_no_matter_the_source_value()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(-2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(-10)));
+	ASSERT_EQUAL(Angle::deg(-10), (*map_range)(0).get(Angle()));
+
+	map_range->set_link("link", ValueNode_Const::create(Angle::deg(0)));
+	ASSERT_EQUAL(Angle::deg(-10), (*map_range)(0).get(Angle()));
+
+	map_range->set_link("link", ValueNode_Const::create(Angle::deg(2)));
+	ASSERT_EQUAL(Angle::deg(-10), (*map_range)(0).get(Angle()));
+
+	map_range->set_link("link", ValueNode_Const::create(Angle::deg(5)));
+	ASSERT_EQUAL(Angle::deg(-10), (*map_range)(0).get(Angle()));
+
+	map_range->set_link("link", ValueNode_Const::create(Angle::deg(7)));
+	ASSERT_EQUAL(Angle::deg(-10), (*map_range)(0).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_works_when_below_target_lower_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(-1), map_range->get_inverse(0, Angle::deg(-14)).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_works_when_below_target_lower_bound_even_if_clamped()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(0), map_range->get_inverse(0, Angle::deg(-14)).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_works_when_above_target_upper_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(6), map_range->get_inverse(0, Angle::deg(14)).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_works_when_above_target_upper_bound_even_if_clamped()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(5), map_range->get_inverse(0, Angle::deg(14)).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_matches_lower_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(0), map_range->get_inverse(0, Angle::deg(-10)).get(Angle()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(Angle::deg(0), map_range->get_inverse(0, Angle::deg(-10)).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_matches_upper_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(5), map_range->get_inverse(0, Angle::deg(10)).get(Angle()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(Angle::deg(5), map_range->get_inverse(0, Angle::deg(10)).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_inside_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(4), map_range->get_inverse(0, Angle::deg(6)).get(Angle()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(Angle::deg(4), map_range->get_inverse(0, Angle::deg(6)).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_does_not_crash_if_source_range_is_null()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT(map_range->get_inverse(0, Angle::deg(6)).is_valid());
+}
+
+static void
+test_angle_invert_map_range_the_single_value_if_source_range_is_null_no_matter_the_target_value()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(5), map_range->get_inverse(0, Angle::deg(-10)).get(Angle()));
+	ASSERT_EQUAL(Angle::deg(5), map_range->get_inverse(0, Angle::deg(10)).get(Angle()));
+	ASSERT_EQUAL(Angle::deg(5), map_range->get_inverse(0, Angle::deg(3)).get(Angle()));
+	ASSERT_EQUAL(Angle::deg(5), map_range->get_inverse(0, Angle::deg(-15)).get(Angle()));
+	ASSERT_EQUAL(Angle::deg(5), map_range->get_inverse(0, Angle::deg(+15)).get(Angle()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Angle::deg(5), map_range->get_inverse(0, Angle::deg(-15)).get(Angle()));
+	ASSERT_EQUAL(Angle::deg(5), map_range->get_inverse(0, Angle::deg(+15)).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_return_source_lower_bound_if_target_range_is_null_if_target_value_is_lower_than_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(-5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(+5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(+10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(-5), map_range->get_inverse(0, Angle::deg(-15)).get(Angle()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Angle::deg(-5), map_range->get_inverse(0, Angle::deg(-15)).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_greater_than_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(-5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(+5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(+10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(+5), map_range->get_inverse(0, Angle::deg(+15)).get(Angle()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Angle::deg(+5), map_range->get_inverse(0, Angle::deg(+15)).get(Angle()));
+}
+
+static void
+test_angle_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_equals_to_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Angle::deg(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Angle::deg(-5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Angle::deg(+5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Angle::deg(+10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Angle::deg(+10)));
+	ASSERT_EQUAL(Angle::deg(+5), map_range->get_inverse(0, Angle::deg(+10)).get(Angle()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Angle::deg(+5), map_range->get_inverse(0, Angle::deg(+10)).get(Angle()));
+}
+
+
+
+
+
+
+
+static void
+test_real_map_range_clamp_if_below_lower_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Real(-1));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_map_range_does_not_clamp_to_lower_bound_if_clamp_is_off()
+{
+	auto map_range = ValueNode_MapRange::create(Real(-1));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(-14, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_map_range_clamp_if_above_upper_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Real(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(10, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_map_range_does_not_clamp_to_upper_bound_if_clamp_is_off()
+{
+	auto map_range = ValueNode_MapRange::create(Real(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(14, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_map_range_matches_from_to_lower_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Real(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(2)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(13)));
+	ASSERT_EQUAL(2, (*map_range)(0).get(Real()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(2, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_map_range_matches_from_to_upper_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Real(5));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(2)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(13)));
+	ASSERT_EQUAL(13, (*map_range)(0).get(Real()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(13, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_map_range_inside_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Real(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(-2, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_map_range_does_not_crash_if_source_range_is_null()
+{
+	auto map_range = ValueNode_MapRange::create(Real(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_map_range_to_target_lower_bound_if_source_range_is_null_and_value_is_lower_than_corrupted_source_range()
+{
+	auto map_range = ValueNode_MapRange::create(Real(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_map_range_to_target_upper_bound_if_source_range_is_null_and_value_is_equals_to_or_greater_than_corrupted_source_range()
+{
+	auto map_range = ValueNode_MapRange::create(Real(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(10, (*map_range)(0).get(Real()));
+
+	map_range->set_link("link", ValueNode_Const::create(Real(5)));
+	ASSERT_EQUAL(10, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_map_range_to_single_value_if_target_range_is_null_no_matter_the_source_value()
+{
+	auto map_range = ValueNode_MapRange::create(Real(-2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(-10)));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(Real()));
+
+	map_range->set_link("link", ValueNode_Const::create(Real(0)));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(Real()));
+
+	map_range->set_link("link", ValueNode_Const::create(Real(2)));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(Real()));
+
+	map_range->set_link("link", ValueNode_Const::create(Real(5)));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(Real()));
+
+	map_range->set_link("link", ValueNode_Const::create(Real(7)));
+	ASSERT_EQUAL(-10, (*map_range)(0).get(Real()));
+}
+
+static void
+test_real_invert_map_range_works_when_below_target_lower_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Real(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(-1, map_range->get_inverse(0, -14.).get(Real()));
+}
+
+static void
+test_real_invert_map_range_works_when_below_target_lower_bound_even_if_clamped()
+{
+	auto map_range = ValueNode_MapRange::create(Real(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(0, map_range->get_inverse(0, -14.).get(Real()));
+}
+
+static void
+test_real_invert_map_range_works_when_above_target_upper_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Real(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(6, map_range->get_inverse(0, 14.).get(Real()));
+}
+
+static void
+test_real_invert_map_range_works_when_above_target_upper_bound_even_if_clamped()
+{
+	auto map_range = ValueNode_MapRange::create(Real(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, 14.).get(Real()));
+}
+
+static void
+test_real_invert_map_range_matches_lower_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Real(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(0, map_range->get_inverse(0, -10.).get(Real()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(0, map_range->get_inverse(0, -10.).get(Real()));
+}
+
+static void
+test_real_invert_map_range_matches_upper_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Real(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, 10.).get(Real()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, 10.).get(Real()));
+}
+
+static void
+test_real_invert_map_range_inside_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Real(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(4, map_range->get_inverse(0, 6.).get(Real()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(4, map_range->get_inverse(0, 6.).get(Real()));
+}
+
+static void
+test_real_invert_map_range_does_not_crash_if_source_range_is_null()
+{
+	auto map_range = ValueNode_MapRange::create(Real(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT(map_range->get_inverse(0, 6.).is_valid());
+}
+
+static void
+test_real_invert_map_range_the_single_value_if_source_range_is_null_no_matter_the_target_value()
+{
+	auto map_range = ValueNode_MapRange::create(Real(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, -10.).get(Real()));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, 10.).get(Real()));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, 3.).get(Real()));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, -15.).get(Real()));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, +15.).get(Real()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, -15.).get(Real()));
+	ASSERT_EQUAL(5, map_range->get_inverse(0, +15.).get(Real()));
+}
+
+static void
+test_real_invert_map_range_return_source_lower_bound_if_target_range_is_null_if_target_value_is_lower_than_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Real(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(-5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(+5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(+10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(-5, map_range->get_inverse(0, -15.).get(Real()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(-5, map_range->get_inverse(0, -15.).get(Real()));
+}
+
+static void
+test_real_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_greater_than_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Real(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(-5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(+5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(+10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(+5, map_range->get_inverse(0, +15.).get(Real()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(+5, map_range->get_inverse(0, +15.).get(Real()));
+}
+
+static void
+test_real_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_equals_to_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Real(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Real(-5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Real(+5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Real(+10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Real(+10)));
+	ASSERT_EQUAL(+5, map_range->get_inverse(0, +10.).get(Real()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(+5, map_range->get_inverse(0, +10.).get(Real()));
+}
+
+
+
+
+
+
+
+static void
+test_time_map_range_clamp_if_below_lower_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Time(-1));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(-10), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_map_range_does_not_clamp_to_lower_bound_if_clamp_is_off()
+{
+	auto map_range = ValueNode_MapRange::create(Time(-1));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(-14), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_map_range_clamp_if_above_upper_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Time(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(10), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_map_range_does_not_clamp_to_upper_bound_if_clamp_is_off()
+{
+	auto map_range = ValueNode_MapRange::create(Time(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(14), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_map_range_matches_from_to_lower_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Time(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(2)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(13)));
+	ASSERT_EQUAL(Time(2), (*map_range)(0).get(Time()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Time(2), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_map_range_matches_from_to_upper_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Time(5));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(2)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(13)));
+	ASSERT_EQUAL(Time(13), (*map_range)(0).get(Time()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Time(13), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_map_range_inside_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Time(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(-2), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_map_range_does_not_crash_if_source_range_is_null()
+{
+	auto map_range = ValueNode_MapRange::create(Time(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(-10), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_map_range_to_target_lower_bound_if_source_range_is_null_and_value_is_lower_than_corrupted_source_range()
+{
+	auto map_range = ValueNode_MapRange::create(Time(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(-10), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_map_range_to_target_upper_bound_if_source_range_is_null_and_value_is_equals_to_or_greater_than_corrupted_source_range()
+{
+	auto map_range = ValueNode_MapRange::create(Time(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(10), (*map_range)(0).get(Time()));
+
+	map_range->set_link("link", ValueNode_Const::create(Time(5)));
+	ASSERT_EQUAL(Time(10), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_map_range_to_single_value_if_target_range_is_null_no_matter_the_source_value()
+{
+	auto map_range = ValueNode_MapRange::create(Time(-2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(-10)));
+	ASSERT_EQUAL(Time(-10), (*map_range)(0).get(Time()));
+
+	map_range->set_link("link", ValueNode_Const::create(Time(0)));
+	ASSERT_EQUAL(Time(-10), (*map_range)(0).get(Time()));
+
+	map_range->set_link("link", ValueNode_Const::create(Time(2)));
+	ASSERT_EQUAL(Time(-10), (*map_range)(0).get(Time()));
+
+	map_range->set_link("link", ValueNode_Const::create(Time(5)));
+	ASSERT_EQUAL(Time(-10), (*map_range)(0).get(Time()));
+
+	map_range->set_link("link", ValueNode_Const::create(Time(7)));
+	ASSERT_EQUAL(Time(-10), (*map_range)(0).get(Time()));
+}
+
+static void
+test_time_invert_map_range_works_when_below_target_lower_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Time(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(-1), map_range->get_inverse(0, Time(-14)).get(Time()));
+}
+
+static void
+test_time_invert_map_range_works_when_below_target_lower_bound_even_if_clamped()
+{
+	auto map_range = ValueNode_MapRange::create(Time(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(0), map_range->get_inverse(0, Time(-14)).get(Time()));
+}
+
+static void
+test_time_invert_map_range_works_when_above_target_upper_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Time(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(6), map_range->get_inverse(0, Time(14)).get(Time()));
+}
+
+static void
+test_time_invert_map_range_works_when_above_target_upper_bound_even_if_clamped()
+{
+	auto map_range = ValueNode_MapRange::create(Time(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(5), map_range->get_inverse(0, Time(14)).get(Time()));
+}
+
+static void
+test_time_invert_map_range_matches_lower_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Time(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(0), map_range->get_inverse(0, Time(-10)).get(Time()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(Time(0), map_range->get_inverse(0, Time(-10)).get(Time()));
+}
+
+static void
+test_time_invert_map_range_matches_upper_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Time(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(5), map_range->get_inverse(0, Time(10)).get(Time()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(Time(5), map_range->get_inverse(0, Time(10)).get(Time()));
+}
+
+static void
+test_time_invert_map_range_inside_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Time(0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(0)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(4), map_range->get_inverse(0, Time(6)).get(Time()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(Time(4), map_range->get_inverse(0, Time(6)).get(Time()));
+}
+
+static void
+test_time_invert_map_range_does_not_crash_if_source_range_is_null()
+{
+	auto map_range = ValueNode_MapRange::create(Time(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT(map_range->get_inverse(0, Time(6)).is_valid());
+}
+
+static void
+test_time_invert_map_range_the_single_value_if_source_range_is_null_no_matter_the_target_value()
+{
+	auto map_range = ValueNode_MapRange::create(Time(2));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(-10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(5), map_range->get_inverse(0, Time(-10)).get(Time()));
+	ASSERT_EQUAL(Time(5), map_range->get_inverse(0, Time(10)).get(Time()));
+	ASSERT_EQUAL(Time(5), map_range->get_inverse(0, Time(3)).get(Time()));
+	ASSERT_EQUAL(Time(5), map_range->get_inverse(0, Time(-15)).get(Time()));
+	ASSERT_EQUAL(Time(5), map_range->get_inverse(0, Time(+15)).get(Time()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Time(5), map_range->get_inverse(0, Time(-15)).get(Time()));
+	ASSERT_EQUAL(Time(5), map_range->get_inverse(0, Time(+15)).get(Time()));
+}
+
+static void
+test_time_invert_map_range_return_source_lower_bound_if_target_range_is_null_if_target_value_is_lower_than_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Time(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(-5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(+5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(+10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(-5), map_range->get_inverse(0, Time(-15)).get(Time()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Time(-5), map_range->get_inverse(0, Time(-15)).get(Time()));
+}
+
+static void
+test_time_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_greater_than_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Time(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(-5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(+5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(+10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(+5), map_range->get_inverse(0, Time(+15)).get(Time()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Time(+5), map_range->get_inverse(0, Time(+15)).get(Time()));
+}
+
+static void
+test_time_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_equals_to_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Time(6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Time(-5)));
+	map_range->set_link("from_max", ValueNode_Const::create(Time(+5)));
+	map_range->set_link("to_min", ValueNode_Const::create(Time(+10)));
+	map_range->set_link("to_max", ValueNode_Const::create(Time(+10)));
+	ASSERT_EQUAL(Time(+5), map_range->get_inverse(0, Time(+10)).get(Time()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Time(+5), map_range->get_inverse(0, Time(+10)).get(Time()));
+}
+
+
+
+
+
+
+
+static void
+test_vector_map_range_clamp_if_below_lower_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(-1, 0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(-10, -9), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_map_range_does_not_clamp_to_lower_bound_if_clamp_is_off()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(-1, 0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(-14, -13), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_map_range_clamp_if_above_upper_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(6, 7));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(10, 11), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_map_range_does_not_clamp_to_upper_bound_if_clamp_is_off()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(6, 7));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(14, 15), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_map_range_matches_from_to_lower_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(0, 1));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(2, 3)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(13, 14)));
+	ASSERT_EQUAL(Vector(2, 3), (*map_range)(0).get(Vector()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Vector(2, 3), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_map_range_matches_from_to_upper_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(5, 6));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(2, 3)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(13, 14)));
+	ASSERT_EQUAL(Vector(13, 14), (*map_range)(0).get(Vector()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Vector(13, 14), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_map_range_inside_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(2, 3));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(-2, -1), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_map_range_does_not_crash_if_source_range_is_null()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(2, 3));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(-10, -9), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_map_range_to_target_lower_bound_if_source_range_is_null_and_value_is_lower_than_corrupted_source_range()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(2, 3));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(-10, -9), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_map_range_to_target_upper_bound_if_source_range_is_null_and_value_is_equals_to_or_greater_than_corrupted_source_range()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(6, 7));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(10, 11), (*map_range)(0).get(Vector()));
+
+	map_range->set_link("link", ValueNode_Const::create(Vector(5, 6)));
+	ASSERT_EQUAL(Vector(10, 11), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_map_range_to_single_value_if_target_range_is_null_no_matter_the_source_value()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(-2, -1));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(-10, -9)));
+	ASSERT_EQUAL(Vector(-10, -9), (*map_range)(0).get(Vector()));
+
+	map_range->set_link("link", ValueNode_Const::create(Vector(0, 1)));
+	ASSERT_EQUAL(Vector(-10, -9), (*map_range)(0).get(Vector()));
+
+	map_range->set_link("link", ValueNode_Const::create(Vector(2, 3)));
+	ASSERT_EQUAL(Vector(-10, -9), (*map_range)(0).get(Vector()));
+
+	map_range->set_link("link", ValueNode_Const::create(Vector(5, 6)));
+	ASSERT_EQUAL(Vector(-10, -9), (*map_range)(0).get(Vector()));
+
+	map_range->set_link("link", ValueNode_Const::create(Vector(7, 8)));
+	ASSERT_EQUAL(Vector(-10, -9), (*map_range)(0).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_works_when_below_target_lower_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(0, 0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(-1, 0), map_range->get_inverse(0, Vector(-14, -13)).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_works_when_below_target_lower_bound_even_if_clamped()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(0, 0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(0, 1), map_range->get_inverse(0, Vector(-14, -13)).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_works_when_above_target_upper_bound()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(0, 0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(6, 7), map_range->get_inverse(0, Vector(14, 15)).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_works_when_above_target_upper_bound_even_if_clamped()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(0, 0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(5, 6), map_range->get_inverse(0, Vector(14, 15)).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_matches_lower_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(0, 0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(0, 1), map_range->get_inverse(0, Vector(-10, -9)).get(Vector()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(Vector(0, 1), map_range->get_inverse(0, Vector(-10, -9)).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_matches_upper_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(0, 0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(5, 6), map_range->get_inverse(0, Vector(10, 11)).get(Vector()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(Vector(5, 6), map_range->get_inverse(0, Vector(10, 11)).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_inside_bounds()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(0, 0));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(0, 1)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(4, 5), map_range->get_inverse(0, Vector(6, 7)).get(Vector()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	ASSERT_EQUAL(Vector(4, 5), map_range->get_inverse(0, Vector(6, 7)).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_does_not_crash_if_source_range_is_null()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(2, 3));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT(map_range->get_inverse(0, Vector(6, 7)).is_valid());
+}
+
+static void
+test_vector_invert_map_range_the_single_value_if_source_range_is_null_no_matter_the_target_value()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(2, 3));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(5, 6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(-10, -9)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(5, 6), map_range->get_inverse(0, Vector(-10, -9)).get(Vector()));
+	ASSERT_EQUAL(Vector(5, 6), map_range->get_inverse(0, Vector(10, 11)).get(Vector()));
+	ASSERT_EQUAL(Vector(5, 6), map_range->get_inverse(0, Vector(3, 4)).get(Vector()));
+	ASSERT_EQUAL(Vector(5, 6), map_range->get_inverse(0, Vector(-15, -14)).get(Vector()));
+	ASSERT_EQUAL(Vector(5, 6), map_range->get_inverse(0, Vector(+15, +16)).get(Vector()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Vector(5, 6), map_range->get_inverse(0, Vector(-15, -14)).get(Vector()));
+	ASSERT_EQUAL(Vector(5, 6), map_range->get_inverse(0, Vector(+15, +16)).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_return_source_lower_bound_if_target_range_is_null_if_target_value_is_lower_than_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(6, 7));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(-5, -4)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(+5, +6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(+10, +11)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(-5, -4), map_range->get_inverse(0, Vector(-15, -14)).get(Vector()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Vector(-5, -4), map_range->get_inverse(0, Vector(-15, -14)).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_greater_than_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(6, 7));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(-5, -4)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(+5, +6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(+10, +11)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(+5, +6), map_range->get_inverse(0, Vector(+15, +16)).get(Vector()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Vector(+5, +6), map_range->get_inverse(0, Vector(+15, +16)).get(Vector()));
+}
+
+static void
+test_vector_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_equals_to_this_single_value()
+{
+	auto map_range = ValueNode_MapRange::create(Vector(6, 7));
+	map_range->set_link("interpolation", ValueNode_Const::create(0));
+	map_range->set_link("clamp", ValueNode_Const::create(false));
+	map_range->set_link("from_min", ValueNode_Const::create(Vector(-5, -4)));
+	map_range->set_link("from_max", ValueNode_Const::create(Vector(+5, +6)));
+	map_range->set_link("to_min", ValueNode_Const::create(Vector(+10, +11)));
+	map_range->set_link("to_max", ValueNode_Const::create(Vector(+10, +11)));
+	ASSERT_EQUAL(Vector(+5, +6), map_range->get_inverse(0, Vector(+10, +11)).get(Vector()));
+
+	map_range->set_link("clamp", ValueNode_Const::create(true));
+	ASSERT_EQUAL(Vector(+5, +6), map_range->get_inverse(0, Vector(+10, +11)).get(Vector()));
+}
+
+/* === E N T R Y P O I N T ================================================= */
+
+int main() {
+
+	Type::subsys_init();
+
+	TEST_SUITE_BEGIN()
+
+	TEST_FUNCTION(test_int_map_range_clamp_if_below_lower_bound);
+	TEST_FUNCTION(test_int_map_range_does_not_clamp_to_lower_bound_if_clamp_is_off);
+	TEST_FUNCTION(test_int_map_range_clamp_if_above_upper_bound);
+	TEST_FUNCTION(test_int_map_range_does_not_clamp_to_upper_bound_if_clamp_is_off);
+
+	TEST_FUNCTION(test_int_map_range_matches_from_to_lower_bounds);
+	TEST_FUNCTION(test_int_map_range_matches_from_to_upper_bounds);
+
+	TEST_FUNCTION(test_int_map_range_inside_bounds);
+
+	TEST_FUNCTION(test_int_map_range_does_not_crash_if_source_range_is_null);
+	TEST_FUNCTION(test_int_map_range_to_target_lower_bound_if_source_range_is_null_and_value_is_lower_than_corrupted_source_range);
+	TEST_FUNCTION(test_int_map_range_to_target_upper_bound_if_source_range_is_null_and_value_is_equals_to_or_greater_than_corrupted_source_range);
+
+	TEST_FUNCTION(test_int_map_range_to_single_value_if_target_range_is_null_no_matter_the_source_value);
+
+	TEST_FUNCTION(test_int_invert_map_range_works_when_below_target_lower_bound);
+	TEST_FUNCTION(test_int_invert_map_range_works_when_below_target_lower_bound_even_if_clamped);
+	TEST_FUNCTION(test_int_invert_map_range_works_when_above_target_upper_bound);
+	TEST_FUNCTION(test_int_invert_map_range_works_when_above_target_upper_bound_even_if_clamped);
+
+	TEST_FUNCTION(test_int_invert_map_range_matches_lower_bounds);
+	TEST_FUNCTION(test_int_invert_map_range_matches_upper_bounds);
+
+	TEST_FUNCTION(test_int_invert_map_range_inside_bounds);
+
+	TEST_FUNCTION(test_int_invert_map_range_does_not_crash_if_source_range_is_null);
+	TEST_FUNCTION(test_int_invert_map_range_the_single_value_if_source_range_is_null_no_matter_the_target_value);
+	TEST_FUNCTION(test_int_invert_map_range_return_source_lower_bound_if_target_range_is_null_if_target_value_is_lower_than_this_single_value);
+	TEST_FUNCTION(test_int_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_greater_than_this_single_value);
+	TEST_FUNCTION(test_int_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_equals_to_this_single_value);
+
+
+
+	TEST_FUNCTION(test_angle_map_range_clamp_if_below_lower_bound);
+	TEST_FUNCTION(test_angle_map_range_does_not_clamp_to_lower_bound_if_clamp_is_off);
+	TEST_FUNCTION(test_angle_map_range_clamp_if_above_upper_bound);
+	TEST_FUNCTION(test_angle_map_range_does_not_clamp_to_upper_bound_if_clamp_is_off);
+
+	TEST_FUNCTION(test_angle_map_range_matches_from_to_lower_bounds);
+	TEST_FUNCTION(test_angle_map_range_matches_from_to_upper_bounds);
+
+	TEST_FUNCTION(test_angle_map_range_inside_bounds);
+
+	TEST_FUNCTION(test_angle_map_range_does_not_crash_if_source_range_is_null);
+	TEST_FUNCTION(test_angle_map_range_to_target_lower_bound_if_source_range_is_null_and_value_is_lower_than_corrupted_source_range);
+	TEST_FUNCTION(test_angle_map_range_to_target_upper_bound_if_source_range_is_null_and_value_is_equals_to_or_greater_than_corrupted_source_range);
+
+	TEST_FUNCTION(test_angle_map_range_to_single_value_if_target_range_is_null_no_matter_the_source_value);
+
+	TEST_FUNCTION(test_angle_invert_map_range_works_when_below_target_lower_bound);
+	TEST_FUNCTION(test_angle_invert_map_range_works_when_below_target_lower_bound_even_if_clamped);
+	TEST_FUNCTION(test_angle_invert_map_range_works_when_above_target_upper_bound);
+	TEST_FUNCTION(test_angle_invert_map_range_works_when_above_target_upper_bound_even_if_clamped);
+
+	TEST_FUNCTION(test_angle_invert_map_range_matches_lower_bounds);
+	TEST_FUNCTION(test_angle_invert_map_range_matches_upper_bounds);
+
+	TEST_FUNCTION(test_angle_invert_map_range_inside_bounds);
+
+	TEST_FUNCTION(test_angle_invert_map_range_does_not_crash_if_source_range_is_null);
+	TEST_FUNCTION(test_angle_invert_map_range_the_single_value_if_source_range_is_null_no_matter_the_target_value);
+	TEST_FUNCTION(test_angle_invert_map_range_return_source_lower_bound_if_target_range_is_null_if_target_value_is_lower_than_this_single_value);
+	TEST_FUNCTION(test_angle_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_greater_than_this_single_value);
+	TEST_FUNCTION(test_angle_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_equals_to_this_single_value);
+
+
+
+	TEST_FUNCTION(test_real_map_range_clamp_if_below_lower_bound);
+	TEST_FUNCTION(test_real_map_range_does_not_clamp_to_lower_bound_if_clamp_is_off);
+	TEST_FUNCTION(test_real_map_range_clamp_if_above_upper_bound);
+	TEST_FUNCTION(test_real_map_range_does_not_clamp_to_upper_bound_if_clamp_is_off);
+
+	TEST_FUNCTION(test_real_map_range_matches_from_to_lower_bounds);
+	TEST_FUNCTION(test_real_map_range_matches_from_to_upper_bounds);
+
+	TEST_FUNCTION(test_real_map_range_inside_bounds);
+
+	TEST_FUNCTION(test_real_map_range_does_not_crash_if_source_range_is_null);
+	TEST_FUNCTION(test_real_map_range_to_target_lower_bound_if_source_range_is_null_and_value_is_lower_than_corrupted_source_range);
+	TEST_FUNCTION(test_real_map_range_to_target_upper_bound_if_source_range_is_null_and_value_is_equals_to_or_greater_than_corrupted_source_range);
+
+	TEST_FUNCTION(test_real_map_range_to_single_value_if_target_range_is_null_no_matter_the_source_value);
+
+	TEST_FUNCTION(test_real_invert_map_range_works_when_below_target_lower_bound);
+	TEST_FUNCTION(test_real_invert_map_range_works_when_below_target_lower_bound_even_if_clamped);
+	TEST_FUNCTION(test_real_invert_map_range_works_when_above_target_upper_bound);
+	TEST_FUNCTION(test_real_invert_map_range_works_when_above_target_upper_bound_even_if_clamped);
+
+	TEST_FUNCTION(test_real_invert_map_range_matches_lower_bounds);
+	TEST_FUNCTION(test_real_invert_map_range_matches_upper_bounds);
+
+	TEST_FUNCTION(test_real_invert_map_range_inside_bounds);
+
+	TEST_FUNCTION(test_real_invert_map_range_does_not_crash_if_source_range_is_null);
+	TEST_FUNCTION(test_real_invert_map_range_the_single_value_if_source_range_is_null_no_matter_the_target_value);
+	TEST_FUNCTION(test_real_invert_map_range_return_source_lower_bound_if_target_range_is_null_if_target_value_is_lower_than_this_single_value);
+	TEST_FUNCTION(test_real_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_greater_than_this_single_value);
+	TEST_FUNCTION(test_real_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_equals_to_this_single_value);
+
+
+
+	TEST_FUNCTION(test_time_map_range_clamp_if_below_lower_bound);
+	TEST_FUNCTION(test_time_map_range_does_not_clamp_to_lower_bound_if_clamp_is_off);
+	TEST_FUNCTION(test_time_map_range_clamp_if_above_upper_bound);
+	TEST_FUNCTION(test_time_map_range_does_not_clamp_to_upper_bound_if_clamp_is_off);
+
+	TEST_FUNCTION(test_time_map_range_matches_from_to_lower_bounds);
+	TEST_FUNCTION(test_time_map_range_matches_from_to_upper_bounds);
+
+	TEST_FUNCTION(test_time_map_range_inside_bounds);
+
+	TEST_FUNCTION(test_time_map_range_does_not_crash_if_source_range_is_null);
+	TEST_FUNCTION(test_time_map_range_to_target_lower_bound_if_source_range_is_null_and_value_is_lower_than_corrupted_source_range);
+	TEST_FUNCTION(test_time_map_range_to_target_upper_bound_if_source_range_is_null_and_value_is_equals_to_or_greater_than_corrupted_source_range);
+
+	TEST_FUNCTION(test_time_map_range_to_single_value_if_target_range_is_null_no_matter_the_source_value);
+
+	TEST_FUNCTION(test_time_invert_map_range_works_when_below_target_lower_bound);
+	TEST_FUNCTION(test_time_invert_map_range_works_when_below_target_lower_bound_even_if_clamped);
+	TEST_FUNCTION(test_time_invert_map_range_works_when_above_target_upper_bound);
+	TEST_FUNCTION(test_time_invert_map_range_works_when_above_target_upper_bound_even_if_clamped);
+
+	TEST_FUNCTION(test_time_invert_map_range_matches_lower_bounds);
+	TEST_FUNCTION(test_time_invert_map_range_matches_upper_bounds);
+
+	TEST_FUNCTION(test_time_invert_map_range_inside_bounds);
+
+	TEST_FUNCTION(test_time_invert_map_range_does_not_crash_if_source_range_is_null);
+	TEST_FUNCTION(test_time_invert_map_range_the_single_value_if_source_range_is_null_no_matter_the_target_value);
+	TEST_FUNCTION(test_time_invert_map_range_return_source_lower_bound_if_target_range_is_null_if_target_value_is_lower_than_this_single_value);
+	TEST_FUNCTION(test_time_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_greater_than_this_single_value);
+	TEST_FUNCTION(test_time_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_equals_to_this_single_value);
+
+
+
+	TEST_FUNCTION(test_vector_map_range_clamp_if_below_lower_bound);
+	TEST_FUNCTION(test_vector_map_range_does_not_clamp_to_lower_bound_if_clamp_is_off);
+	TEST_FUNCTION(test_vector_map_range_clamp_if_above_upper_bound);
+	TEST_FUNCTION(test_vector_map_range_does_not_clamp_to_upper_bound_if_clamp_is_off);
+
+	TEST_FUNCTION(test_vector_map_range_matches_from_to_lower_bounds);
+	TEST_FUNCTION(test_vector_map_range_matches_from_to_upper_bounds);
+
+	TEST_FUNCTION(test_vector_map_range_inside_bounds);
+
+	TEST_FUNCTION(test_vector_map_range_does_not_crash_if_source_range_is_null);
+	TEST_FUNCTION(test_vector_map_range_to_target_lower_bound_if_source_range_is_null_and_value_is_lower_than_corrupted_source_range);
+	TEST_FUNCTION(test_vector_map_range_to_target_upper_bound_if_source_range_is_null_and_value_is_equals_to_or_greater_than_corrupted_source_range);
+
+	TEST_FUNCTION(test_vector_map_range_to_single_value_if_target_range_is_null_no_matter_the_source_value);
+
+	TEST_FUNCTION(test_vector_invert_map_range_works_when_below_target_lower_bound);
+	TEST_FUNCTION(test_vector_invert_map_range_works_when_below_target_lower_bound_even_if_clamped);
+	TEST_FUNCTION(test_vector_invert_map_range_works_when_above_target_upper_bound);
+	TEST_FUNCTION(test_vector_invert_map_range_works_when_above_target_upper_bound_even_if_clamped);
+
+	TEST_FUNCTION(test_vector_invert_map_range_matches_lower_bounds);
+	TEST_FUNCTION(test_vector_invert_map_range_matches_upper_bounds);
+
+	TEST_FUNCTION(test_vector_invert_map_range_inside_bounds);
+
+	TEST_FUNCTION(test_vector_invert_map_range_does_not_crash_if_source_range_is_null);
+	TEST_FUNCTION(test_vector_invert_map_range_the_single_value_if_source_range_is_null_no_matter_the_target_value);
+	TEST_FUNCTION(test_vector_invert_map_range_return_source_lower_bound_if_target_range_is_null_if_target_value_is_lower_than_this_single_value);
+	TEST_FUNCTION(test_vector_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_greater_than_this_single_value);
+	TEST_FUNCTION(test_vector_invert_map_range_return_source_upper_bound_if_target_range_is_null_if_target_value_is_equals_to_this_single_value);
+
+
+
+	TEST_SUITE_END()
+
+	return tst_exit_status;
+}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/bootstrap.sh -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/bootstrap.sh Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/images/Makefile.am -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/images/Makefile.am Changed

@@ -55,6 +55,7 @@
 	rename_icon.sif \
 	set_fill_color_icon.sif \
 	set_outline_color_icon.sif \
+	hex_icon.sif \
 	duck_position_icon.sif \
 	duck_vertex_icon.sif \
 	duck_tangent_icon.sif \
@@ -64,6 +65,8 @@
 	show_grid_icon.sif \
 	snap_grid_icon.sif \
 	show_guideline_icon.sif \
+	lower_bound_handle_icon.sif \
+	upper_bound_handle_icon.sif \
 	snap_guideline_icon.sif \
 	onion_skin_icon.sif \
 	incr_resolution_icon.sif \
@@ -191,7 +194,11 @@
 	type_segment_icon.sif \
 	type_string_icon.sif \
 	type_time_icon.sif \
+	type_transformation_icon.sif \
 	type_vector_icon.sif \
+	type_pair_bone_object_bone_object_icon.sif \
+	type_bone_object_icon.sif \
+	type_bone_valuenode_icon.sif \
 	\
 	library_icon.sif \
 	graphs_icon.sif \
@@ -253,6 +260,7 @@
 	rename_icon.$(EXT) \
 	set_fill_color_icon.$(EXT) \
 	set_outline_color_icon.$(EXT) \
+	hex_icon.$(EXT) \
 	duck_position_icon.$(EXT) \
 	duck_vertex_icon.$(EXT) \
 	duck_tangent_icon.$(EXT) \
@@ -262,6 +270,8 @@
 	show_grid_icon.$(EXT) \
 	snap_grid_icon.$(EXT) \
 	show_guideline_icon.$(EXT) \
+	lower_bound_handle_icon.$(EXT) \
+	upper_bound_handle_icon.$(EXT) \
 	snap_guideline_icon.$(EXT) \
 	onion_skin_icon.$(EXT) \
 	incr_resolution_icon.$(EXT) \
@@ -402,7 +412,11 @@
 	type_segment_icon.$(EXT) \
 	type_string_icon.$(EXT) \
 	type_time_icon.$(EXT) \
+	type_transformation_icon.$(EXT) \
 	type_vector_icon.$(EXT) \
+	type_pair_bone_object_bone_object_icon.$(EXT) \
+	type_bone_object_icon.$(EXT) \
+	type_bone_valuenode_icon.$(EXT) \
 	\
 	canvas_icon.$(EXT) \
 	library_icon.$(EXT) \

_service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/images/hex_icon.sif Added

@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<canvas version="1.2" width="128" height="128" xres="2834.645691" yres="2834.645691" gamma-r="2.200000" gamma-g="2.200000" gamma-b="2.200000" view-box="-1.000000 1.000000 1.000000 -1.000000" antialias="1" fps="30.000" begin-time="0f" end-time="0f" bgcolor="0.500000 0.500000 0.500000 1.000000">
+ <name>hex_icon.sif</name>
+ <meta name="background_first_color" content="0.880000 0.880000 0.880000"/>
+ <meta name="background_rendering" content="0"/>
+ <meta name="background_second_color" content="0.650000 0.650000 0.650000"/>
+ <meta name="background_size" content="15.000000 15.000000"/>
+ <meta name="grid_color" content="0.623529 0.623529 0.623529"/>
+ <meta name="grid_show" content="0"/>
+ <meta name="grid_size" content="0.250000 0.250000"/>
+ <meta name="grid_snap" content="0"/>
+ <meta name="guide_color" content="0.435294 0.435294 1.000000"/>
+ <meta name="guide_show" content="1"/>
+ <meta name="guide_snap" content="0"/>
+ <meta name="jack_offset" content="0.000000"/>
+ <meta name="onion_skin" content="0"/>
+ <meta name="onion_skin_future" content="0"/>
+ <meta name="onion_skin_keyframes" content="1"/>
+ <meta name="onion_skin_past" content="1"/>
+ <layer type="SolidColor" active="true" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.000000</r>
+ <g>0.000000</g>
+ 0.000000
+ <a>1.000000</a>
+ </color>
+ </param>
+ </layer>
+ <layer type="text" active="true" exclude_from_rendering="false" version="0.5" desc="Top">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="text">
+ <string>#</string>
+ </param>
+ <param name="color">
+ <color>
+ <r>1.000000</r>
+ <g>1.000000</g>
+ 1.000000
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="family">
+ <string>Sans Serif</string>
+ </param>
+ <param name="style">
+ <integer value="2" static="true"/>
+ </param>
+ <param name="weight">
+ <integer value="1000" static="true"/>
+ </param>
+ <param name="direction">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="compress">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="vcompress">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="size">
+ <vector>
+ <x>1.2500000000</x>
+ <y>1.2500000000</y>
+ </vector>
+ </param>
+ <param name="orient">
+ <vector>
+ <x>0.5000000000</x>
+ <y>0.5000000000</y>
+ </vector>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>-0.0495993346</x>
+ <y>-0.0006954593</y>
+ </vector>
+ </param>
+ <param name="use_kerning">
+ <bool value="false"/>
+ </param>
+ <param name="grid_fit">
+ <bool value="false"/>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ </layer>
+</canvas>

_service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/images/lower_bound_handle_icon.sif Added

@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<canvas version="1.2" width="85" height="200" xres="2834.645669" yres="2834.645669" gamma-r="1.000000" gamma-g="1.000000" gamma-b="1.000000" view-box="-1.769158 4.234687 1.769158 -4.234687" antialias="1" fps="24.000" begin-time="0f" end-time="5s" bgcolor="0.500000 0.500000 0.500000 1.000000">
+ <name>lower_bound_handle_icon.sif</name>
+ <meta name="background_first_color" content="0.880000 0.880000 0.880000"/>
+ <meta name="background_rendering" content="0"/>
+ <meta name="background_second_color" content="0.650000 0.650000 0.650000"/>
+ <meta name="background_size" content="15.000000 15.000000"/>
+ <meta name="grid_color" content="0.623529 0.623529 0.623529"/>
+ <meta name="grid_show" content="0"/>
+ <meta name="grid_size" content="0.250000 0.250000"/>
+ <meta name="grid_snap" content="0"/>
+ <meta name="guide_color" content="0.435294 0.435294 1.000000"/>
+ <meta name="guide_show" content="1"/>
+ <meta name="guide_snap" content="0"/>
+ <meta name="guide_x" content="-5.854461"/>
+ <meta name="jack_offset" content="0.000000"/>
+ <meta name="onion_skin" content="0"/>
+ <meta name="onion_skin_future" content="0"/>
+ <meta name="onion_skin_keyframes" content="1"/>
+ <meta name="onion_skin_past" content="1"/>
+ <keyframe time="0f" active="true"/>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.2" desc="Circle233">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.011765</r>
+ <g>0.505882</g>
+ 0.988235
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="radius">
+ <real value="1.4569538979"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>-0.3162264824</x>
+ <y>-2.8289101124</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ </layer>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.2" desc="Circle233">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.011765</r>
+ <g>0.505882</g>
+ 0.988235
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="radius">
+ <real value="1.4569538979"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>-0.3162262440</x>
+ <y>2.8289101124</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ </layer>
+ <layer type="rectangle" active="true" exclude_from_rendering="false" version="0.2" desc="test072">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.011765</r>
+ <g>0.505882</g>
+ 0.988235
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="point1">
+ <vector>
+ <x>-1.7691581249</x>
+ <y>2.9503970146</y>
+ </vector>
+ </param>
+ <param name="point2">
+ <vector>
+ <x>-0.4358797073</x>
+ <y>-2.8462653160</y>
+ </vector>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="feather_x">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="feather_y">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="bevel">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="bevCircle">
+ <bool value="true"/>
+ </param>
+ </layer>
+ <layer type="rectangle" active="true" exclude_from_rendering="false" version="0.2" desc="test074">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.011765</r>
+ <g>0.505882</g>
+ 0.988235
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="point1">
+ <vector>
+ <x>-0.6068125963</x>
+ <y>4.2346873283</y>
+ </vector>
+ </param>
+ <param name="point2">
+ <vector>
+ <x>1.8375315666</x>
+ <y>-4.2867531776</y>
+ </vector>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="feather_x">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="feather_y">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="bevel">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="bevCircle">
+ <bool value="true"/>
+ </param>
+ </layer>
+</canvas>

_service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/images/type_bone_object_icon.sif Added

@@ -0,0 +1,1683 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<canvas version="1.0" width="128" height="128" xres="2834.645669" yres="2834.645669" view-box="-1.000000 1.000000 1.000000 -1.000000" antialias="1" fps="24.000" begin-time="0f" end-time="5s" bgcolor="0.500000 0.500000 0.500000 1.000000">
+ <name>Synfig Studio: Type: Bone objec</name>
+ <desc>Placed in the Public Domain in 2025 by Svarov</desc>
+ <meta name="background_first_color" content="0.880000 0.880000 0.880000"/>
+ <meta name="background_rendering" content="0"/>
+ <meta name="background_second_color" content="0.650000 0.650000 0.650000"/>
+ <meta name="background_size" content="15.000000 15.000000"/>
+ <meta name="grid_color" content="0.623529 0.623529 0.623529"/>
+ <meta name="grid_show" content="0"/>
+ <meta name="grid_size" content="0.100000 0.100000"/>
+ <meta name="grid_snap" content="1"/>
+ <meta name="guide" content=""/>
+ <meta name="guide_color" content="0.435294 0.435294 1.000000"/>
+ <meta name="guide_show" content="1"/>
+ <meta name="guide_snap" content="0"/>
+ <meta name="jack_offset" content="0.000000"/>
+ <meta name="onion_skin" content="0"/>
+ <meta name="onion_skin_future" content="0"/>
+ <meta name="onion_skin_keyframes" content="1"/>
+ <meta name="onion_skin_past" content="1"/>
+ <meta name="status_ruler" content="1"/>
+ <keyframe time="0f" active="true"/>
+ <defs>
+ <color id="COLOR1">
+ <r>0.023104</r>
+ <g>0.030257</g>
+ 0.032876
+ <a>1.000000</a>
+ </color>
+ <color id="COLOR2">
+ <r>0.612066</r>
+ <g>0.612066</g>
+ 0.612066
+ <a>1.000000</a>
+ </color>
+ </defs>
+ <layer type="SolidColor" active="false" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.346774</r>
+ <g>0.346774</g>
+ 0.346774
+ <a>1.000000</a>
+ </color>
+ </param>
+ </layer>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.2" desc="BONE-1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>0.0500000007</x>
+ <y>0.0700000003</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="-45.000000"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>1.3500000238</x>
+ <y>1.3500000238</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="region" active="true" exclude_from_rendering="false" version="0.1" desc="BONE-F">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR2"/>
+ <param name="origin">
+ <vector guid="04DC830B4DE35BB0E3F05BE4517D7E2E">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="DA5928C9221290C9AC45F4CA1E877839" type="bline_point" loop="true">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000089</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.4118228555"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.9189054427"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000015</x>
+ <y>0.1553682983</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.7961767316"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4000000000"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.8999999911"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2400000095</x>
+ <y>0.6179683208</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="56.207397"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="-303.792603"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0499999896</x>
+ <y>0.6653683186</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2700000107</x>
+ <y>0.5179682970</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.1755367219"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5717634886"/>
+ </radius>
+ <theta>
+ <angle value="-85.225426"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6431420365"/>
+ </radius>
+ <theta>
+ <angle value="-9.272489"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.1000000015</x>
+ <y>0.1901679039</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.2161518931"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6193186199"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0999999940</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.6684747338"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.0694081018"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2599999905</x>
+ <y>-0.5752041936</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.8383740187"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3244112520"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1262981853"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2499999851</x>
+ <y>-0.5778041482</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1058053390"/>
+ </radius>
+ <theta>
+ <angle value="-278.785095"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2877134970"/>
+ </radius>
+ <theta>
+ <angle value="42.478153"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ </layer>
+ <layer type="shade" active="true" exclude_from_rendering="false" version="0.2">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="13" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.325037</r>
+ <g>0.325037</g>
+ 0.325037
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0799999982</x>
+ <y>-0.0799999982</y>
+ </vector>
+ </param>
+ <param name="size">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="invert">
+ <bool value="true"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="BONE-O">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector guid="04DC830B4DE35BB0E3F05BE4517D7E2E">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="DA5928C9221290C9AC45F4CA1E877839" type="bline_point" loop="true">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000089</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.4118228555"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.9189054427"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000015</x>
+ <y>0.1553682983</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.7961767316"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4000000000"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.8999999911"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2400000095</x>
+ <y>0.6179683208</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="56.207397"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="-303.792603"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0499999896</x>
+ <y>0.6653683186</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2700000107</x>
+ <y>0.5179682970</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.1755367219"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5717634886"/>
+ </radius>
+ <theta>
+ <angle value="-85.225426"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6431420365"/>
+ </radius>
+ <theta>
+ <angle value="-9.272489"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.1000000015</x>
+ <y>0.1901679039</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.2161518931"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6193186199"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0999999940</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.6684747338"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.0694081018"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2599999905</x>
+ <y>-0.5752041936</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.8383740187"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3244112520"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1262981853"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2499999851</x>
+ <y>-0.5778041482</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1058053390"/>
+ </radius>
+ <theta>
+ <angle value="-278.785095"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2877134970"/>
+ </radius>
+ <theta>
+ <angle value="42.478153"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.8973339966"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.1254334320"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="C-D">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="FAE1A13CE91FD1A648194E6A59AC2AC5" type="bline_point" loop="false">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1038874487"/>
+ </radius>
+ <theta>
+ <angle value="46.338520"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1038874487"/>
+ </radius>
+ <theta>
+ <angle value="46.338520"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0409854762</x>
+ <y>-0.6472402811</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1177529376"/>
+ </radius>
+ <theta>
+ <angle value="-651.115112"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2877134970"/>
+ </radius>
+ <theta>
+ <angle value="42.478153"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.0000000000"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.9999985134"/>
+ </position>
+ <width>
+ <real value="0.1000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="C-U">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="29FCA9BE03F980B2A24B66A26EB4C917" type="bline_point" loop="false">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0704637170</x>
+ <y>0.5553683043</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1739873818"/>
+ </radius>
+ <theta>
+ <angle value="69.685860"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1739873818"/>
+ </radius>
+ <theta>
+ <angle value="-290.314148"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0131630599</x>
+ <y>0.6740797758</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0657161566"/>
+ </radius>
+ <theta>
+ <angle value="152.837982"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3089307841"/>
+ </radius>
+ <theta>
+ <angle value="-14.261456"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.9999994358"/>
+ </position>
+ <width>
+ <real value="0.3500000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.0000000000"/>
+ </position>
+ <width>
+ <real value="0.1000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+</canvas>

_service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/images/type_bone_valuenode_icon.sif Added

@@ -0,0 +1,2566 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<canvas version="1.0" width="128" height="128" xres="2834.645669" yres="2834.645669" view-box="-1.000000 1.000000 1.000000 -1.000000" antialias="1" fps="24.000" begin-time="0f" end-time="5s" bgcolor="0.500000 0.500000 0.500000 1.000000">
+ <name>Synfig Studio: Type: Bone_valuenode</name>
+ <desc>Placed in the Public Domain in 2025 by Svarov</desc>
+ <meta name="background_first_color" content="0.880000 0.880000 0.880000"/>
+ <meta name="background_rendering" content="0"/>
+ <meta name="background_second_color" content="0.650000 0.650000 0.650000"/>
+ <meta name="background_size" content="15.000000 15.000000"/>
+ <meta name="grid_color" content="0.623529 0.623529 0.623529"/>
+ <meta name="grid_show" content="0"/>
+ <meta name="grid_size" content="0.100000 0.100000"/>
+ <meta name="grid_snap" content="1"/>
+ <meta name="guide" content=""/>
+ <meta name="guide_color" content="0.435294 0.435294 1.000000"/>
+ <meta name="guide_show" content="1"/>
+ <meta name="guide_snap" content="0"/>
+ <meta name="jack_offset" content="0.000000"/>
+ <meta name="onion_skin" content="0"/>
+ <meta name="onion_skin_future" content="0"/>
+ <meta name="onion_skin_keyframes" content="1"/>
+ <meta name="onion_skin_past" content="1"/>
+ <meta name="status_ruler" content="1"/>
+ <keyframe time="0f" active="true"/>
+ <defs>
+ <color id="COLOR1">
+ <r>0.023104</r>
+ <g>0.030257</g>
+ 0.032876
+ <a>1.000000</a>
+ </color>
+ <color id="COLOR2">
+ <r>0.612066</r>
+ <g>0.612066</g>
+ 0.612066
+ <a>1.000000</a>
+ </color>
+ </defs>
+ <layer type="SolidColor" active="false" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.346774</r>
+ <g>0.346774</g>
+ 0.346774
+ <a>1.000000</a>
+ </color>
+ </param>
+ </layer>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.2" desc="ICON">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>-0.6999999881</x>
+ <y>-0.5350000262</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="0.000000"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>1.0000000000</x>
+ <y>1.0000000000</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.2" desc="JOINT">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>0.0153846098</x>
+ <y>-0.1325641125</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="-45.000000"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>0.8999999762</x>
+ <y>0.8999999762</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="region" active="true" exclude_from_rendering="false" version="0.1" desc="BONE-F">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR2"/>
+ <param name="origin">
+ <vector guid="B4FD56B7C7B496B3061AD3718D767718">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="6A78FD75A8455DCA49AF7C5FC28C710F" type="bline_point" loop="true">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.0485877730</x>
+ <y>-0.2823882997</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5113946795"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2461133847"/>
+ </radius>
+ <theta>
+ <angle value="172.313904"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2351457634"/>
+ </radius>
+ <theta>
+ <angle value="172.313904"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2016923726</x>
+ <y>-0.2165780067</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.7961767316"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3112766805"/>
+ </radius>
+ <theta>
+ <angle value="132.697510"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5680892670"/>
+ </radius>
+ <theta>
+ <angle value="127.153122"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2400000244</x>
+ <y>0.1763715446</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4801217104"/>
+ </radius>
+ <theta>
+ <angle value="32.916527"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4801217104"/>
+ </radius>
+ <theta>
+ <angle value="-327.083466"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0499999784</x>
+ <y>0.3174483478</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130846479"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130846479"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2699999809</x>
+ <y>0.0763715208</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.1755367219"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6104321075"/>
+ </radius>
+ <theta>
+ <angle value="-64.742867"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6669433394"/>
+ </radius>
+ <theta>
+ <angle value="-75.518295"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.1445985585</x>
+ <y>-0.2321908176</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.2161518931"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5229670833"/>
+ </radius>
+ <theta>
+ <angle value="-125.517281"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4180671920"/>
+ </radius>
+ <theta>
+ <angle value="-132.238129"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ </layer>
+ <layer type="shade" active="true" exclude_from_rendering="false" version="0.2">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="13" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.325037</r>
+ <g>0.325037</g>
+ 0.325037
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0799999982</x>
+ <y>0.0799999982</y>
+ </vector>
+ </param>
+ <param name="size">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="invert">
+ <bool value="true"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="BONE-O">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector guid="B4FD56B7C7B496B3061AD3718D767718">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="6A78FD75A8455DCA49AF7C5FC28C710F" type="bline_point" loop="true">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.0485877730</x>
+ <y>-0.2823882997</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5113946795"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2461133847"/>
+ </radius>
+ <theta>
+ <angle value="172.313904"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2351457634"/>
+ </radius>
+ <theta>
+ <angle value="172.313904"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2016923726</x>
+ <y>-0.2165780067</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.7961767316"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3112766805"/>
+ </radius>
+ <theta>
+ <angle value="132.697510"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5680892670"/>
+ </radius>
+ <theta>
+ <angle value="127.153122"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2400000244</x>
+ <y>0.1763715446</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4801217104"/>
+ </radius>
+ <theta>
+ <angle value="32.916527"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4801217104"/>
+ </radius>
+ <theta>
+ <angle value="-327.083466"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0499999784</x>
+ <y>0.3174483478</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130846479"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130846479"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2699999809</x>
+ <y>0.0763715208</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.1755367219"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6104321075"/>
+ </radius>
+ <theta>
+ <angle value="-64.742867"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6669433394"/>
+ </radius>
+ <theta>
+ <angle value="-75.518295"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.1445985585</x>
+ <y>-0.2321908176</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.2161518931"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5229670833"/>
+ </radius>
+ <theta>
+ <angle value="-125.517281"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4180671920"/>
+ </radius>
+ <theta>
+ <angle value="-132.238129"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.8973339966"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.1254334320"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.2" desc="BONE-1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>1.0000000000</x>
+ <y>0.8500000238</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="-45.000000"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>1.0499999523</x>
+ <y>1.0499999523</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="region" active="true" exclude_from_rendering="false" version="0.1" desc="BONE-F">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR2"/>
+ <param name="origin">
+ <vector guid="3BEA9C271A8FEEDB8A9F55DD5940EEAC">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="E56F37E5757E25A2C52AFAF316BAE8BB" type="bline_point" loop="true">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000089</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.4118228555"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.9189054427"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000015</x>
+ <y>0.1553682983</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.7961767316"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4000000000"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.8999999911"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2400000095</x>
+ <y>0.6179683208</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="56.207397"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="-303.792603"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0499999896</x>
+ <y>0.6653683186</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2700000107</x>
+ <y>0.5179682970</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.1755367219"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5717634886"/>
+ </radius>
+ <theta>
+ <angle value="-85.225426"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6431420365"/>
+ </radius>
+ <theta>
+ <angle value="-9.272489"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.1000000015</x>
+ <y>0.1901679039</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.2161518931"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6193186199"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0999999940</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.6684747338"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.9581257193"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2961176932</x>
+ <y>-0.5766777396</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.8383740187"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3244112520"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1262981853"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2871758640</x>
+ <y>-0.5627790093</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1058052901"/>
+ </radius>
+ <theta>
+ <angle value="-261.160309"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4566918986"/>
+ </radius>
+ <theta>
+ <angle value="98.839676"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ </layer>
+ <layer type="shade" active="true" exclude_from_rendering="false" version="0.2">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="13" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.325037</r>
+ <g>0.325037</g>
+ 0.325037
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0799999982</x>
+ <y>-0.0799999982</y>
+ </vector>
+ </param>
+ <param name="size">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="invert">
+ <bool value="true"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="BONE-O">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector guid="3BEA9C271A8FEEDB8A9F55DD5940EEAC">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="E56F37E5757E25A2C52AFAF316BAE8BB" type="bline_point" loop="true">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000089</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.4118228555"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.9189054427"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000015</x>
+ <y>0.1553682983</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.7961767316"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4000000000"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.8999999911"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2400000095</x>
+ <y>0.6179683208</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="56.207397"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="-303.792603"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0499999896</x>
+ <y>0.6653683186</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2700000107</x>
+ <y>0.5179682970</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.1755367219"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5717634886"/>
+ </radius>
+ <theta>
+ <angle value="-85.225426"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6431420365"/>
+ </radius>
+ <theta>
+ <angle value="-9.272489"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.1000000015</x>
+ <y>0.1901679039</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.2161518931"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6193186199"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0999999940</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.6684747338"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.9581257193"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2961176932</x>
+ <y>-0.5766777396</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.8383740187"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3244112520"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1262981853"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2871758640</x>
+ <y>-0.5627790093</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1058052901"/>
+ </radius>
+ <theta>
+ <angle value="-261.160309"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4566918986"/>
+ </radius>
+ <theta>
+ <angle value="98.839676"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.8973339966"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.1254334320"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="C-D">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="C5D7BE10BE7364CD217640535191BA47" type="bline_point" loop="false">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1038874487"/>
+ </radius>
+ <theta>
+ <angle value="46.338520"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1038874487"/>
+ </radius>
+ <theta>
+ <angle value="46.338520"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0409854762</x>
+ <y>-0.6472402811</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1177529376"/>
+ </radius>
+ <theta>
+ <angle value="-651.115112"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2877134970"/>
+ </radius>
+ <theta>
+ <angle value="42.478153"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.0000000000"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.9999985134"/>
+ </position>
+ <width>
+ <real value="0.1000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="C-U">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="16CAB692549535D9CB24689B66895995" type="bline_point" loop="false">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0704637170</x>
+ <y>0.5553683043</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1739873818"/>
+ </radius>
+ <theta>
+ <angle value="69.685860"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1739873818"/>
+ </radius>
+ <theta>
+ <angle value="-290.314148"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0131630599</x>
+ <y>0.6740797758</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0657161566"/>
+ </radius>
+ <theta>
+ <angle value="152.837982"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3089307841"/>
+ </radius>
+ <theta>
+ <angle value="-14.261456"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.9999994358"/>
+ </position>
+ <width>
+ <real value="0.3500000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.0000000000"/>
+ </position>
+ <width>
+ <real value="0.1000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+</canvas>

_service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/images/type_pair_bone_object_bone_object_icon.sif Added

@@ -0,0 +1,3309 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<canvas version="1.0" width="128" height="128" xres="2834.645669" yres="2834.645669" view-box="-1.000000 1.000000 1.000000 -1.000000" antialias="1" fps="24.000" begin-time="0f" end-time="5s" bgcolor="0.500000 0.500000 0.500000 1.000000">
+ <name>Synfig Studio: Type: Pair (bone object, bone object)</name>
+ <desc>Placed in the Public Domain in 2025 by Svarov</desc>
+ <meta name="background_first_color" content="0.880000 0.880000 0.880000"/>
+ <meta name="background_rendering" content="0"/>
+ <meta name="background_second_color" content="0.650000 0.650000 0.650000"/>
+ <meta name="background_size" content="15.000000 15.000000"/>
+ <meta name="grid_color" content="0.623529 0.623529 0.623529"/>
+ <meta name="grid_show" content="0"/>
+ <meta name="grid_size" content="0.100000 0.100000"/>
+ <meta name="grid_snap" content="1"/>
+ <meta name="guide" content=""/>
+ <meta name="guide_color" content="0.435294 0.435294 1.000000"/>
+ <meta name="guide_show" content="1"/>
+ <meta name="guide_snap" content="0"/>
+ <meta name="jack_offset" content="0.000000"/>
+ <meta name="onion_skin" content="0"/>
+ <meta name="onion_skin_future" content="0"/>
+ <meta name="onion_skin_keyframes" content="1"/>
+ <meta name="onion_skin_past" content="1"/>
+ <meta name="status_ruler" content="1"/>
+ <keyframe time="0f" active="true"/>
+ <defs>
+ <color id="COLOR1">
+ <r>0.023104</r>
+ <g>0.030257</g>
+ 0.032876
+ <a>1.000000</a>
+ </color>
+ <color id="COLOR2">
+ <r>0.612066</r>
+ <g>0.612066</g>
+ 0.612066
+ <a>1.000000</a>
+ </color>
+ </defs>
+ <layer type="SolidColor" active="false" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.346774</r>
+ <g>0.346774</g>
+ 0.346774
+ <a>1.000000</a>
+ </color>
+ </param>
+ </layer>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.2" desc="BONE-2">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>0.5500000119</x>
+ <y>-0.0750000030</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="180.000000"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>1.2500000000</x>
+ <y>1.2500000000</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="region" active="true" exclude_from_rendering="false" version="0.1" desc="BONE-F">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR2"/>
+ <param name="origin">
+ <vector guid="04DC830B4DE35BB0E3F05BE4517D7E2E">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="DA5928C9221290C9AC45F4CA1E877839" type="bline_point" loop="true">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000089</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.4118228555"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.9189054427"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000015</x>
+ <y>0.1553682983</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.7961767316"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4000000000"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.8999999911"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2400000095</x>
+ <y>0.6179683208</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="56.207397"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="-303.792603"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0499999896</x>
+ <y>0.6653683186</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2700000107</x>
+ <y>0.5179682970</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.1755367219"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5717634886"/>
+ </radius>
+ <theta>
+ <angle value="-85.225426"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6431420365"/>
+ </radius>
+ <theta>
+ <angle value="-9.272489"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.1000000015</x>
+ <y>0.1901679039</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.2161518931"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6193186199"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0999999940</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.6684747338"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.0694081018"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2599999905</x>
+ <y>-0.5752041936</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.8383740187"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3244112520"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1262981853"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2499999851</x>
+ <y>-0.5778041482</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1058053390"/>
+ </radius>
+ <theta>
+ <angle value="-278.785095"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2877134970"/>
+ </radius>
+ <theta>
+ <angle value="42.478153"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ </layer>
+ <layer type="shade" active="true" exclude_from_rendering="false" version="0.2">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="13" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.325037</r>
+ <g>0.325037</g>
+ 0.325037
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>-0.0799999982</x>
+ <y>0.0799999982</y>
+ </vector>
+ </param>
+ <param name="size">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="invert">
+ <bool value="true"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="BONE-O">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector guid="04DC830B4DE35BB0E3F05BE4517D7E2E">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="DA5928C9221290C9AC45F4CA1E877839" type="bline_point" loop="true">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000089</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.4118228555"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.9189054427"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000015</x>
+ <y>0.1553682983</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.7961767316"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4000000000"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.8999999911"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2400000095</x>
+ <y>0.6179683208</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="56.207397"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="-303.792603"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0499999896</x>
+ <y>0.6653683186</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2700000107</x>
+ <y>0.5179682970</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.1755367219"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5717634886"/>
+ </radius>
+ <theta>
+ <angle value="-85.225426"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6431420365"/>
+ </radius>
+ <theta>
+ <angle value="-9.272489"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.1000000015</x>
+ <y>0.1901679039</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.2161518931"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6193186199"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0999999940</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.6684747338"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.0694081018"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2599999905</x>
+ <y>-0.5752041936</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.8383740187"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3244112520"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1262981853"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2499999851</x>
+ <y>-0.5778041482</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1058053390"/>
+ </radius>
+ <theta>
+ <angle value="-278.785095"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2877134970"/>
+ </radius>
+ <theta>
+ <angle value="42.478153"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.8973339966"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.1254334320"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="C-D">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="FAE1A13CE91FD1A648194E6A59AC2AC5" type="bline_point" loop="false">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1038874487"/>
+ </radius>
+ <theta>
+ <angle value="46.338520"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1038874487"/>
+ </radius>
+ <theta>
+ <angle value="46.338520"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0409854762</x>
+ <y>-0.6472402811</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1177529376"/>
+ </radius>
+ <theta>
+ <angle value="-651.115112"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2877134970"/>
+ </radius>
+ <theta>
+ <angle value="42.478153"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.0000000000"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.9999985134"/>
+ </position>
+ <width>
+ <real value="0.1000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="C-U">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="29FCA9BE03F980B2A24B66A26EB4C917" type="bline_point" loop="false">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0704637170</x>
+ <y>0.5553683043</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1739873818"/>
+ </radius>
+ <theta>
+ <angle value="69.685860"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1739873818"/>
+ </radius>
+ <theta>
+ <angle value="-290.314148"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0131630599</x>
+ <y>0.6740797758</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0657161566"/>
+ </radius>
+ <theta>
+ <angle value="152.837982"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3089307841"/>
+ </radius>
+ <theta>
+ <angle value="-14.261456"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.9999994358"/>
+ </position>
+ <width>
+ <real value="0.3500000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.0000000000"/>
+ </position>
+ <width>
+ <real value="0.1000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.2" desc="BONE-1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>-0.5500000119</x>
+ <y>0.0599999987</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="0.000000"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>1.2500000000</x>
+ <y>1.2500000000</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="region" active="true" exclude_from_rendering="false" version="0.1" desc="BONE-F">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR2"/>
+ <param name="origin">
+ <vector guid="B137F9A0EBF96CBB9F6AA3F28A261FA1">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="6FB252628408A7C2D0DF0CDCC5DC19B6" type="bline_point" loop="true">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000089</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.4118228555"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.9189054427"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000015</x>
+ <y>0.1553682983</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.7961767316"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4000000000"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.8999999911"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2400000095</x>
+ <y>0.6179683208</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="56.207397"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="-303.792603"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0499999896</x>
+ <y>0.6653683186</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2700000107</x>
+ <y>0.5179682970</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.1755367219"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5717634886"/>
+ </radius>
+ <theta>
+ <angle value="-85.225426"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6431420365"/>
+ </radius>
+ <theta>
+ <angle value="-9.272489"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.1000000015</x>
+ <y>0.1901679039</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.2161518931"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6193186199"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0999999940</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.6684747338"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.0694081018"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2599999905</x>
+ <y>-0.5752041936</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.8383740187"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3244112520"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1262981853"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2499999851</x>
+ <y>-0.5778041482</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1058053390"/>
+ </radius>
+ <theta>
+ <angle value="-278.785095"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2877134970"/>
+ </radius>
+ <theta>
+ <angle value="42.478153"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ </layer>
+ <layer type="shade" active="true" exclude_from_rendering="false" version="0.2">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="13" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.325037</r>
+ <g>0.325037</g>
+ 0.325037
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0799999982</x>
+ <y>-0.0799999982</y>
+ </vector>
+ </param>
+ <param name="size">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="invert">
+ <bool value="true"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="BONE-O">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector guid="B137F9A0EBF96CBB9F6AA3F28A261FA1">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="6FB252628408A7C2D0DF0CDCC5DC19B6" type="bline_point" loop="true">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000089</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.4118228555"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.9189054427"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.1000000015</x>
+ <y>0.1553682983</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.7961767316"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.4000000000"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.8999999911"/>
+ </radius>
+ <theta>
+ <angle value="89.999992"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2400000095</x>
+ <y>0.6179683208</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="56.207397"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5393856914"/>
+ </radius>
+ <theta>
+ <angle value="-303.792603"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0499999896</x>
+ <y>0.6653683186</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3130847051"/>
+ </radius>
+ <theta>
+ <angle value="-13.178632"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2700000107</x>
+ <y>0.5179682970</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.1755367219"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5717634886"/>
+ </radius>
+ <theta>
+ <angle value="-85.225426"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6431420365"/>
+ </radius>
+ <theta>
+ <angle value="-9.272489"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.1000000015</x>
+ <y>0.1901679039</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.2161518931"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.6193186199"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0999999940</x>
+ <y>-0.2102041692</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.6684747338"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.5000000000"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.0694081018"/>
+ </radius>
+ <theta>
+ <angle value="-90.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="true"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.2599999905</x>
+ <y>-0.5752041936</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.8383740187"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3244112520"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1262981853"/>
+ </radius>
+ <theta>
+ <angle value="-76.317650"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0000000000"/>
+ </radius>
+ <theta>
+ <angle value="0.000000"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>-0.2499999851</x>
+ <y>-0.5778041482</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="1.1058053390"/>
+ </radius>
+ <theta>
+ <angle value="-278.785095"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2877134970"/>
+ </radius>
+ <theta>
+ <angle value="42.478153"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.8973339966"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.1254334320"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="C-D">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="4F0ADB974F05E6AD3483B67C82F74B4A" type="bline_point" loop="false">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0000000079</x>
+ <y>-0.7602041960</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5300998688"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1038874487"/>
+ </radius>
+ <theta>
+ <angle value="46.338520"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1038874487"/>
+ </radius>
+ <theta>
+ <angle value="46.338520"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0409854762</x>
+ <y>-0.6472402811</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1177529376"/>
+ </radius>
+ <theta>
+ <angle value="-651.115112"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.2877134970"/>
+ </radius>
+ <theta>
+ <angle value="42.478153"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="true"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.0000000000"/>
+ </position>
+ <width>
+ <real value="0.5000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.9999985134"/>
+ </position>
+ <width>
+ <real value="0.1000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="advanced_outline" active="true" exclude_from_rendering="false" version="0.2" desc="C-U">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="antialias">
+ <bool value="true"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="blurtype">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="winding_style">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="bline">
+ <bline guid="9C17D315A5E3B7B9DED19EB4B5EFA898" type="bline_point" loop="false">
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0704637170</x>
+ <y>0.5553683043</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.0000000000"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1739873818"/>
+ </radius>
+ <theta>
+ <angle value="69.685860"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.1739873818"/>
+ </radius>
+ <theta>
+ <angle value="-290.314148"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="bline_point">
+ <point>
+ <vector>
+ <x>0.0131630599</x>
+ <y>0.6740797758</y>
+ </vector>
+ </point>
+ <width>
+ <real value="1.0000000000"/>
+ </width>
+ <origin>
+ <real value="0.5250284076"/>
+ </origin>
+ <split>
+ <bool value="false"/>
+ </split>
+ <t1>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.0657161566"/>
+ </radius>
+ <theta>
+ <angle value="152.837982"/>
+ </theta>
+ </radial_composite>
+ </t1>
+ <t2>
+ <radial_composite type="vector">
+ <radius>
+ <real value="0.3089307841"/>
+ </radius>
+ <theta>
+ <angle value="-14.261456"/>
+ </theta>
+ </radial_composite>
+ </t2>
+ <split_radius>
+ <bool value="false"/>
+ </split_radius>
+ <split_angle>
+ <bool value="false"/>
+ </split_angle>
+ </composite>
+ </entry>
+ </bline>
+ </param>
+ <param name="width">
+ <real value="0.1000000015"/>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="start_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="end_tip">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="cusp_type">
+ <integer value="1" static="true"/>
+ </param>
+ <param name="smoothness">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="homogeneous">
+ <bool value="true" static="true"/>
+ </param>
+ <param name="wplist">
+ <wplist type="width_point" loop="false">
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.9999994358"/>
+ </position>
+ <width>
+ <real value="0.3500000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ <entry>
+ <composite type="width_point">
+ <position>
+ <real value="0.0000000000"/>
+ </position>
+ <width>
+ <real value="0.1000000000"/>
+ </width>
+ <side_before>
+ <integer value="0" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="0" static="true"/>
+ </side_after>
+ <lower_bound>
+ <real value="0.0000000000" static="true"/>
+ </lower_bound>
+ <upper_bound>
+ <real value="1.0000000000" static="true"/>
+ </upper_bound>
+ </composite>
+ </entry>
+ </wplist>
+ </param>
+ <param name="fast">
+ <bool value="false"/>
+ </param>
+ <param name="dash_enabled">
+ <bool value="false"/>
+ </param>
+ <param name="dilist">
+ <dilist type="dash_item" loop="false">
+ <entry>
+ <composite type="dash_item">
+ <offset>
+ <real value="0.1000000000"/>
+ </offset>
+ <length>
+ <real value="0.1000000000"/>
+ </length>
+ <side_before>
+ <integer value="4" static="true"/>
+ </side_before>
+ <side_after>
+ <integer value="4" static="true"/>
+ </side_after>
+ </composite>
+ </entry>
+ </dilist>
+ </param>
+ <param name="dash_offset">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+</canvas>

_service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/images/type_transformation_icon.sif Added

@@ -0,0 +1,598 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<canvas version="1.0" width="128" height="128" xres="2834.645669" yres="2834.645669" view-box="-1.000000 1.000000 1.000000 -1.000000" antialias="1" fps="24.000" begin-time="0f" end-time="5s" bgcolor="0.500000 0.500000 0.500000 1.000000">
+ <name>Synfig Studio: Type: Transformation Icon</name>
+ <desc>Placed in the Public Domain in 2025 by Svarov</desc>
+ <meta name="background_first_color" content="0.880000 0.880000 0.880000"/>
+ <meta name="background_rendering" content="0"/>
+ <meta name="background_second_color" content="0.650000 0.650000 0.650000"/>
+ <meta name="background_size" content="15.000000 15.000000"/>
+ <meta name="grid_color" content="0.623529 0.623529 0.623529"/>
+ <meta name="grid_show" content="0"/>
+ <meta name="grid_size" content="0.100000 0.100000"/>
+ <meta name="grid_snap" content="1"/>
+ <meta name="guide" content=""/>
+ <meta name="guide_color" content="0.435294 0.435294 1.000000"/>
+ <meta name="guide_show" content="1"/>
+ <meta name="guide_snap" content="0"/>
+ <meta name="jack_offset" content="0.000000"/>
+ <meta name="onion_skin" content="0"/>
+ <meta name="onion_skin_future" content="0"/>
+ <meta name="onion_skin_keyframes" content="1"/>
+ <meta name="onion_skin_past" content="1"/>
+ <meta name="status_ruler" content="1"/>
+ <keyframe time="0f" active="true"/>
+ <defs>
+ <color id="COLOR1">
+ <r>0.023104</r>
+ <g>0.030257</g>
+ 0.032876
+ <a>1.000000</a>
+ </color>
+ </defs>
+ <layer type="SolidColor" active="false" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.346774</r>
+ <g>0.346774</g>
+ 0.346774
+ <a>1.000000</a>
+ </color>
+ </param>
+ </layer>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.2" desc="HANDLE-SCALE">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>0.4000000358</x>
+ <y>0.4000000060</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="0.000000"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>3.5000000000</x>
+ <y>3.5000000000</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="radius">
+ <real value="0.0949999988"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector guid="550B2D8D5987FD507829A1512921844A">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="falloff">
+ <integer value="1"/>
+ </param>
+ </layer>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.611765</r>
+ <g>0.215686</g>
+ 0.078431
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="radius">
+ <real value="0.0750000030"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector guid="550B2D8D5987FD507829A1512921844A">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="falloff">
+ <integer value="1"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.2" desc="HANDLE-ORIGIN">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>-0.4000000358</x>
+ <y>-0.4000000060</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="0.000000"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>3.5000000000</x>
+ <y>3.5000000000</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="radius">
+ <real value="0.0949999988"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="falloff">
+ <integer value="1"/>
+ </param>
+ </layer>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.420508</r>
+ <g>0.625345</g>
+ 0.325037
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="radius">
+ <real value="0.0750000030"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="falloff">
+ <integer value="1"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.2" desc="HANDLE-ANGLE">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>0.4000000060</x>
+ <y>-0.4000000060</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="0.000000"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>3.0000000000</x>
+ <y>3.0000000000</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.168627</r>
+ <g>0.352941</g>
+ 0.631373
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="radius">
+ <real value="0.0750000030"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector guid="5BFA91E27EC115E1CC3F3410B55AB167">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="falloff">
+ <integer value="1"/>
+ </param>
+ </layer>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="12" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="radius">
+ <real value="0.0949999988"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector guid="5BFA91E27EC115E1CC3F3410B55AB167">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="falloff">
+ <integer value="1"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.2" desc="HANDLE-SKEW">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>-0.4000000060</x>
+ <y>0.4000000060</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="0.000000"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>3.0000000000</x>
+ <y>3.0000000000</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color" use=":COLOR1"/>
+ <param name="radius">
+ <real value="0.0949999988"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector guid="B8279D15C6303A0836BB2EB3D78474AE">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="falloff">
+ <integer value="1"/>
+ </param>
+ </layer>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.1">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.612066</r>
+ <g>0.086084</g>
+ 0.082353
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="radius">
+ <real value="0.0750000030"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector guid="B8279D15C6303A0836BB2EB3D78474AE">
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="falloff">
+ <integer value="1"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+ <layer type="zoom" active="true" exclude_from_rendering="false" version="0.1">
+ <param name="amount">
+ <real value="0.2950000000"/>
+ </param>
+ <param name="center">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ </layer>
+</canvas>

_service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/images/upper_bound_handle_icon.sif Added

@@ -0,0 +1,255 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<canvas version="1.2" width="85" height="200" xres="2834.645669" yres="2834.645669" gamma-r="1.000000" gamma-g="1.000000" gamma-b="1.000000" view-box="-1.769158 4.234687 1.769158 -4.234687" antialias="1" fps="24.000" begin-time="0f" end-time="5s" bgcolor="0.500000 0.500000 0.500000 1.000000">
+ <name>upper_bound_handle_icon.sif</name>
+ <meta name="background_first_color" content="0.880000 0.880000 0.880000"/>
+ <meta name="background_rendering" content="0"/>
+ <meta name="background_second_color" content="0.650000 0.650000 0.650000"/>
+ <meta name="background_size" content="15.000000 15.000000"/>
+ <meta name="grid_color" content="0.623529 0.623529 0.623529"/>
+ <meta name="grid_show" content="0"/>
+ <meta name="grid_size" content="0.250000 0.250000"/>
+ <meta name="grid_snap" content="0"/>
+ <meta name="guide_color" content="0.435294 0.435294 1.000000"/>
+ <meta name="guide_show" content="1"/>
+ <meta name="guide_snap" content="0"/>
+ <meta name="guide_x" content="-5.854461"/>
+ <meta name="jack_offset" content="0.000000"/>
+ <meta name="onion_skin" content="0"/>
+ <meta name="onion_skin_future" content="0"/>
+ <meta name="onion_skin_keyframes" content="1"/>
+ <meta name="onion_skin_past" content="1"/>
+ <keyframe time="0f" active="true"/>
+ <layer type="group" active="true" exclude_from_rendering="false" version="0.3">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </param>
+ <param name="transformation">
+ <composite type="transformation">
+ <offset>
+ <vector>
+ <x>0.0000000000</x>
+ <y>0.0000000000</y>
+ </vector>
+ </offset>
+ <angle>
+ <angle value="180.000107"/>
+ </angle>
+ <skew_angle>
+ <angle value="0.000000"/>
+ </skew_angle>
+ <scale>
+ <vector>
+ <x>1.0000000000</x>
+ <y>1.0000000000</y>
+ </vector>
+ </scale>
+ </composite>
+ </param>
+ <param name="canvas">
+ <canvas>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.2" desc="Circle233">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.011765</r>
+ <g>0.505882</g>
+ 0.988235
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="radius">
+ <real value="1.4569538979"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>-0.3162264824</x>
+ <y>-2.8289101124</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ </layer>
+ <layer type="circle" active="true" exclude_from_rendering="false" version="0.2" desc="Circle233">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.011765</r>
+ <g>0.505882</g>
+ 0.988235
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="radius">
+ <real value="1.4569538979"/>
+ </param>
+ <param name="feather">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="origin">
+ <vector>
+ <x>-0.3162262440</x>
+ <y>2.8289101124</y>
+ </vector>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ </layer>
+ <layer type="rectangle" active="true" exclude_from_rendering="false" version="0.2" desc="test072">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.011765</r>
+ <g>0.505882</g>
+ 0.988235
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="point1">
+ <vector>
+ <x>-1.7691581249</x>
+ <y>2.9503970146</y>
+ </vector>
+ </param>
+ <param name="point2">
+ <vector>
+ <x>-0.4358797073</x>
+ <y>-2.8462653160</y>
+ </vector>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="feather_x">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="feather_y">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="bevel">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="bevCircle">
+ <bool value="true"/>
+ </param>
+ </layer>
+ <layer type="rectangle" active="true" exclude_from_rendering="false" version="0.2" desc="test074">
+ <param name="z_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="amount">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="blend_method">
+ <integer value="0" static="true"/>
+ </param>
+ <param name="color">
+ <color>
+ <r>0.011765</r>
+ <g>0.505882</g>
+ 0.988235
+ <a>1.000000</a>
+ </color>
+ </param>
+ <param name="point1">
+ <vector>
+ <x>-0.6068125963</x>
+ <y>4.2346873283</y>
+ </vector>
+ </param>
+ <param name="point2">
+ <vector>
+ <x>1.8375315666</x>
+ <y>-4.2867531776</y>
+ </vector>
+ </param>
+ <param name="expand">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="invert">
+ <bool value="false"/>
+ </param>
+ <param name="feather_x">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="feather_y">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="bevel">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="bevCircle">
+ <bool value="true"/>
+ </param>
+ </layer>
+ </canvas>
+ </param>
+ <param name="time_dilation">
+ <real value="1.0000000000"/>
+ </param>
+ <param name="time_offset">
+ <time value="0s"/>
+ </param>
+ <param name="children_lock">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="outline_grow">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range">
+ <bool value="false" static="true"/>
+ </param>
+ <param name="z_range_position">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_depth">
+ <real value="0.0000000000"/>
+ </param>
+ <param name="z_range_blur">
+ <real value="0.0000000000"/>
+ </param>
+ </layer>
+</canvas>

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/m4/ETL.m4 -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/m4/ETL.m4 Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/org.synfig.SynfigStudio.appdata.xml.in -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/org.synfig.SynfigStudio.appdata.xml.in Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/plugins/lottie-exporter/canvas.py -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/canvas.py Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/plugins/lottie-exporter/common/misc.py -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/common/misc.py Changed

@@ -124,6 +124,14 @@
         pos = float(animatedi0.attrib"value") * settings.OPACITY_CONSTANT,
                get_frame(animatedi)
 
+    elif animated.attrib"type" == "separation":
+        if float(animatedi0.attrib"value") == 1:
+            pos = (float(animatedi0.attrib"value") - 0.45) * settings.SEPARATION_CONSTANT,
+                   get_frame(animatedi)
+        else:
+            pos = float(animatedi0.attrib"value") * settings.SEPARATION_CONSTANT,
+                   get_frame(animatedi)
+
     elif animated.attrib"type" == "effects_opacity":
         pos = float(animatedi0.attrib"value"),
                get_frame(animatedi)
@@ -195,10 +203,13 @@
         green = green ** (1/settings.GAMMA1)
         blue = blue ** (1/settings.GAMMA2)
         return Color(red, green, blue, alpha)
-    
+
     elif animated.attrib"type" == "gradient":
         return Gradient(animatedi0)
 
+    elif animated.attrib"type" == "text":
+        pos = animatedi0.text, get_frame(animatedi)
+
     return Vector(pos0, pos1, animated.attrib"type")

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/plugins/lottie-exporter/export_without_variable_width.py -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/export_without_variable_width.py Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/plugins/lottie-exporter/layers/Makefile.am -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/layers/Makefile.am Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/plugins/lottie-exporter/layers/driver.py -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/layers/driver.py Changed

@@ -13,7 +13,7 @@
 from layers.preComp import gen_layer_precomp
 from layers.group import gen_layer_group
 from layers.blur import gen_layer_blur
-
+from layers.text import gen_layer_text
 sys.path.append("..")
 
 def blur_test(lottie):
@@ -98,7 +98,8 @@
 	group = settings.GROUP_LAYER
 	skeleton = settings.SKELETON_LAYER
 	blur = settings.BLUR_LAYER
-	supported_layers = set.union(shape, solid, shape_solid, image, pre_comp, group, skeleton,blur)
+	text = settings.TEXT_LAYER
+	supported_layers = set.union(shape, solid, shape_solid, image, pre_comp, group, skeleton, blur, text)
 	if settings.WITHOUT_VARIABLE_WIDTH:
 		shape.add("outline")
 		settings.WITHOUT_VARIABLE_WIDTH = False
@@ -138,8 +139,8 @@
 
 		elif layer.get_type() in shape_solid:   # Goto shape_solid layer
 			gen_layer_shape_solid(lottie-1,
-								  layer,
-								  itr)
+							layer,
+							itr)
 			calculate_blurs_needed(settings.LEVEL)
 			append_blur_dict(layer,settings.LEVEL,settings.INSIDE_PRECOMP)
 
@@ -155,14 +156,20 @@
 
 		elif layer.get_type() in pre_comp:      # Goto precomp layer
 			gen_layer_precomp(lottie-1,
-							  layer,
-							  itr)
+							layer,
+							itr)
 			return  # other layers will be generated inside the precomp
 		elif layer.get_type() in group:       # Goto group layer
 			gen_layer_group(lottie-1,
 							layer,
 							itr)
 			# No return statement here
+
+		elif layer.get_type() in text:
+			gen_layer_text(lottie-1,
+							layer,
+							itr)
+
 		elif layer.get_type() in skeleton:
 			pass
 			# skeletons are just for linking purposes which is served by bones

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/plugins/lottie-exporter/layers/group.py -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/layers/group.py Changed

_service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/layers/text.py Added

@@ -0,0 +1,272 @@
+"""
+Will store all the functions corresponding to text layer in lottie
+"""
+
+import sys
+import settings
+from common.Count import Count
+from helpers.transform import gen_helpers_transform
+from helpers.blendMode import get_blend
+from common.misc import is_animated
+from properties.value import gen_properties_value
+from properties.valueKeyframed import gen_value_Keyframed
+from common.misc import get_frame, parse_position
+sys.path.append("..")
+
+def calc_font_data(lottie,layer):
+    """
+    Calculates the font data used in the outermost canvas
+
+    Args:
+        lottie (dict)       : Outermost dictionary used in Lottie file
+        layer  (common.Layer.Layer) : Synfig format text layer
+
+    Returns:
+        (None)
+    """
+    default_list = {
+        "origin": 0,
+        "fPath": "",
+        "fClass": "",
+        "fFamily": "",
+        "fWeight": "",
+        "fName": "",
+        "ascent": 75.9994506835938
+      }
+    #Ascent is not documentated in the Lottie documentation and it's purpose is not known yet.
+
+    style_dict = {0:'Regular', 1:'Regular', 2:'Italic'}
+    #Lottie does not support oblique style of Synfig, so defaulting to Regular Style for it
+
+
+    default_list.update({'fStyle'  : style_dictint(layer.get_param("style").get()0.attrib"value")})
+    default_list.update({'fWeight' : layer.get_param("weight").get()0.attrib"value"})
+    font = layer.get_param("family").get()0.text
+    if font in settings.FONT_STYLES:
+	    if "Comic" in font:
+	    	default_list"fFamily" = "Comic Sans MS"
+	    	default_list"fName"   = "ComicSansMS"
+	    else:
+	    	default_list"fFamily" = font
+	    	default_list"fName"   = "".join(font.split())
+
+    lottie"fonts""list".append(default_list)
+
+def calc_default_text_properties(layer):
+    """
+    Generated the lottie dictionary corresponding to properties which won't change in text-animation
+
+    Args:
+        layer  (common.Layer.Layer) : Synfig format text layer
+
+    Returns:
+        Lottie format default dictionary for text animation properties
+    """
+    default_dict = {
+      "nm": "",
+      "s": {
+        "t" : 0,
+        "xe": {},
+        "ne": {},
+        "a" : {},
+        "b" : 1,
+        "rn": 0,
+        "sh": 1,
+        "r" : 1
+      }
+    }
+    gen_properties_value(default_dict"s""xe",
+                             0,
+                             7,
+                             settings.DEFAULT_ANIMATED,
+                             settings.NO_INFO)
+    gen_properties_value(default_dict"s""ne",
+                             0,
+                             8,
+                             settings.DEFAULT_ANIMATED,
+                             settings.NO_INFO)
+    gen_properties_value(default_dict"s""a",
+                             100,
+                             4,
+                             settings.DEFAULT_ANIMATED,
+                             settings.NO_INFO)
+
+    default_dict"nm" = layer.get_description()
+
+    return default_dict
+
+def calc_anchor_alignment(lottie):
+    """
+    Generates the dictionary corresponding to the anchor alignment properties
+
+    Args:
+        lottie (dict) : Lottie generated text layer stored here
+    """
+    lottie"t""m" = {
+                          "g": 1,
+                          "a": {}
+                       } #Has no corresponding synfig property, so using default values
+    gen_properties_value(lottie"t""m""a",
+                             0,0,
+                             2,
+                             settings.DEFAULT_ANIMATED,
+                             settings.NO_INFO)
+
+def calculate_text_animation(lottie,animated):
+    """
+    Generates the dictionary corresponding to text properties
+
+    Args:
+        lottie  (dict)                 : Lottie generated text properties dictionary
+        animated (lxml.etree._Element) : Synfig format animation
+    """
+
+    waypoints = len(animated)
+    #Adding text to each waypoint
+    for waypoint in range(waypoints):
+        temp  = {
+              "s": {
+                "s": 50,
+                "f": "",
+                "t": "",
+                "j": 2,
+                "tr": 0,
+                "lh": 50,
+                "ls": 1,
+                "fc": 1,1,1,1
+              },
+              "t": 0
+            }
+        cur_pos = parse_position(animated, waypoint)
+        text_val = cur_pos.get_val()
+        time = get_frame(animatedwaypoint)
+        ax = text_val0.split("\n")
+        final_text = "\r".join(ax)
+        temp"s""t" = final_text
+        temp"t" = time
+        lottie.append(temp)
+
+def gen_layer_text(lottie, layer, idx):
+    """
+    Generates the dictionary corresponding to layers/text.json
+
+    Args:
+        lottie (dict)       : Lottie generated text layer stored here
+        layer  (common.Layer.Layer) : Synfig format text layer
+        idx    (int)        : Stores the index(number of) of text layer
+
+    Returns:
+        (None)
+    """
+    index = Count()
+    lottie"ddd" = settings.DEFAULT_3D
+    lottie"ind" = idx+1
+    lottie"ty" = settings.LAYER_TEXT_TYPE
+    lottie"nm" = layer.get_description()
+    lottie"sr" = settings.LAYER_DEFAULT_STRETCH
+    lottie"ks" = {}   # Transform properties to be filled
+
+    calc_font_data(settings.lottie_format,layer)
+
+    lottie"ao" = settings.LAYER_DEFAULT_AUTO_ORIENT
+    lottie"ip" = settings.lottie_format"ip"
+    lottie"op" = settings.lottie_format"op"
+    lottie"st" = 0            # Don't know yet
+    lottie"t" = {}
+    calc_anchor_alignment(lottie)
+    lottie"t""a" = 
+
+    origin = layer.get_param("origin")
+    origin.animate("vector")
+
+    anchor = layer.get_param("orient")
+    anchor.animate("vector",True)
+
+    scale = layer.get_param("size")
+    scale.animate("stretch_layer_scale")
+    pos = origin
+    pos.animate("vector",True)
+
+    gen_helpers_transform(lottie"ks", pos, anchor, scale)
+
+    lottie"t""a".append(calc_default_text_properties(layer))
+    lottie"t""a"0"a" = {"fc":{},"o":{},"t":{}}
+
+    color = layer.get_param("color")
+    color.animate("color")
+    color.fill_path(lottie"t""a"0"a","fc")
+
+    opacity = layer.get_param("amount").get()
+    is_animate = is_animated(opacity0)
+    if is_animate == settings.ANIMATED:
+        # Telling the function that this is for opacity
+        opacity0.attrib'type' = 'opacity'
+        gen_value_Keyframed(lottie"t""a"0"a""o", opacity0, index.inc())
+
+    else:
+        if is_animate == settings.NOT_ANIMATED:
+            val = float(opacity0.attrib"value")
+        else:
+            val = float(opacity000.attrib"value")
+        val = val * settings.OPACITY_CONSTANT
+        gen_properties_value(lottie"t""a"0"a""o",
+                             val,
+                             index.inc(),
+                             settings.DEFAULT_ANIMATED,
+                             settings.NO_INFO)
+
+    tracking = layer.get_param("compress").get()
+    is_animate = is_animated(tracking0)
+    if is_animate == settings.ANIMATED:
+        # Telling the function that this is for separation
+        tracking0.attrib'type' = 'separation'
+        gen_value_Keyframed(lottie"t""a"0"a""t", tracking0, index.inc())
+
+    else:
+        if is_animate == settings.NOT_ANIMATED:
+            val = float(tracking0.attrib"value")
+        else:
+            val = float(tracking000.attrib"value")
+        if val == 1.0:
+            val = (val - 0.45) * settings.SEPARATION_CONSTANT
+        else:
+            val = val * settings.SEPARATION_CONSTANT
+        gen_properties_value(lottie"t""a"0"a""t",
+                             val,
+                             index.inc(),
+                             settings.DEFAULT_ANIMATED,
+                             settings.NO_INFO)
+
+    lottie"t""d" = {}
+    lottie"t""p" = {}
+    lottie"t""d""k" = 
+    default = {
+              "s": {
+                "s": 50,
+                "f": "",
+                "t": "",
+                "j": 2,
+                "tr": 0,
+                "lh": 50,
+                "ls": 1,
+                "fc": 1,1,1,1
+              },
+              "t": 0
+            }
+
+    texts = layer.get_param("text").get()
+    is_animate = is_animated(texts0)
+    if is_animate == settings.ANIMATED:
+        texts0.attrib'type' = 'text'
+        calculate_text_animation(lottie"t""d""k",texts0)
+    else:
+        ax = layer.get_param("text").get()0.text.split("\n")
+        #Line separation is not supported so adding separation only for integer values
+        line_separation = layer.get_param("vcompress").get()0.attrib"value"
+        breaks = "\r"*round(float(line_separation))
+        text = breaks.join(ax)
+        default"s""t" = text
+        lottie"t""d""k".append(default)
+
+    get_blend(lottie, layer)
+

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/plugins/lottie-exporter/lottie-exporter.py -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/lottie-exporter.py Changed

@@ -23,6 +23,55 @@
 import settings
 import argparse
 
+def calc_font_data(lottie,layer):
+    """
+    Calculates the font data used in the outermost canvas
+
+    Args:
+        lottie (dict)       : Outermost dictionary used in Lottie file
+        layer  (common.Layer.Layer) : Synfig format text layer
+
+    Returns:
+        (None)
+    """
+    default_list = {
+        "origin": 0,
+        "fPath": "",
+        "fClass": "",
+        "fFamily": "",
+        "fWeight": "",
+        "fName": "",
+        "ascent": 75.9994506835938
+      }
+    #Ascent is not documentated in the Lottie documentation and it's purpose is not known yet.
+
+    style_dict = {0:'Regular', 1:'Regular', 2:'Italic'}
+    #Lottie does not support oblique style of Synfig, so defaulting to Regular Style for it
+
+    for child in layer:
+        if child.tag == 'layer' and child.attrib"type" == 'text':
+            for children in child:
+                if children.attrib"name" == 'family':
+                    name = ''.join(children0.itertext())
+                    if name in settings.FONT_STYLES:
+                    	if "Comic" in name:
+                    		default_list"fFamily" = "Comic Sans MS"
+                    		default_list"fName"   = "ComicSansMS"
+                    	else:
+                    		default_list"fFamily" = name
+                    		default_list"fName"   = "".join(name.split())
+
+
+                if children.attrib"name" == 'style':
+                    value = style_dictint(children.getchildren()0.attrib"value")
+                    default_list.update({'fStyle': value})
+
+                if children.attrib"name" == 'weight':
+                    value = int(children.getchildren()0.attrib"value")
+                    default_list.update({'fWeight': value})
+                
+
+            lottie"fonts""list".append(default_list)
 
 def parse(file_name):
     """
@@ -38,6 +87,7 @@
     root = tree.getroot()  # canvas
     gen_canvas(settings.lottie_format, root)
 
+    calc_font_data(settings.lottie_format,root)
     # Storing the file name
     settings.file_name"fn" = file_name
 
@@ -71,7 +121,7 @@
     else:
         bodymovin_path = os.path.join(os.path.dirname(sys.argv0), "bodymovin.js")
 
-    with open(bodymovin_path, "r") as f:
+    with open(bodymovin_path, "r", encoding="utf-8") as f:
         bodymovin_script = f.read()
 
     html_text = \
@@ -146,5 +196,5 @@
 if ns.outfile.endswith(".html"):
     out = gen_html(out)
 
-with open(ns.outfile, "w") as fil:
+with open(ns.outfile, "w", encoding="utf-8") as fil:
     fil.write(out)

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/plugins/lottie-exporter/properties/shapePropKeyframe/advanced_outline.py -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/properties/shapePropKeyframe/advanced_outline.py Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/plugins/lottie-exporter/settings.py -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/settings.py Changed

@@ -15,6 +15,8 @@
 DEFAULT_NAME = "Synfig Animation"
 DEFAULT_3D = 0
 DEFAULT_BLEND = 0
+LAYER_TEXT_TYPE = 5
+LAYER_TEXT_NAME = "Text Layer"
 LAYER_SHAPE_TYPE = 4
 LAYER_SHAPE_NAME = "Shape Layer "
 LAYER_SOLID_TYPE = 1
@@ -38,6 +40,7 @@
 DEFAULT_SKEW = 0
 GAMMA = 2.2, 2.2, 2.2     # Default RGB gamma correction values
 PIX_PER_UNIT = 0
+SEPARATION_CONSTANT = 42    # Separation constant value used in the animation of horizontal separation
 TANGENT_FACTOR = 3.0
 IN_TANGENT_X = 0.58
 IN_TANGENT_Y = 1
@@ -63,18 +66,20 @@
 EXCLUDE_FROM_RENDERING = "Layer '%s' is excluded from rendering"
 SHAPE_LAYER = {"simple_circle", "linear_gradient", "radial_gradient"}
 BLUR_LAYER = {"blur"}
-SOLID_LAYER = {"solid_color"}
-SHAPE_SOLID_LAYER = {"region", "polygon", "advanced_outline", "outline", "circle", "rectangle", "filled_rectangle", "star"} 
+SOLID_LAYER = {"solid_color", "SolidColor"}
+SHAPE_SOLID_LAYER = {"region", "polygon", "advanced_outline", "outline", "circle", "rectangle", "filled_rectangle", "star"}
 IMAGE_LAYER = {"import"}
 PRE_COMP_LAYER = {"rotate", "zoom", "translate", "stretch"}
 GROUP_LAYER = {"group", "switch"}
 SKELETON_LAYER = {"skeleton"}
+TEXT_LAYER = {"text"}
 UNKNOWN_LAYER = "unknown_layer"
 CONVERT_METHODS = {"add", "atan2","average", "bone", "bone_link", "bone_root", "composite", "cos", "dotproduct", "exp", "fromint", "linear", "logarithm", "power", "radial_composite", "range", "reciprocal", "scale", "sine", "subtract", "switch", "vectorangle", "vectorlength", "vectorx", "vectory", "weighted_average"}
 BONES = {"bone", "bone_root"}
 DOT_FLAG = 0 #Used for the two types of dot product -> angle and real
 BLUR_TYPE = 29
 RANGE_FLAG = 0 #Used for if-else expressions
+FONT_STYLES = "Sans Serif","Times New Roman","Calibria","Arial","Courier","Comic Sans"
 # Some waypoint animated definitions
 ANIMATED = 2
 SINGLE_WAYPOINT = 1

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/plugins/lottie-exporter/sources/image.py -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/plugins/lottie-exporter/sources/image.py Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/app.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/app.cpp Changed

@@ -946,7 +946,7 @@
 DEFINE_ACTION("unselect-all-layers", _("Unselect All Layers"))
 DEFINE_ACTION("select-parent-layer", _("Select Parent Layer"))
 DEFINE_ACTION("input-devices", _("Input Devices..."))
-DEFINE_ACTION("setup", _("Preferences..."))
+DEFINE_ACTION("preferences", _("Preferences..."))
 
 // actions in View menu
 DEFINE_ACTION("toggle-mainwin-menubar", _("Menubar"))
@@ -979,6 +979,8 @@
 DEFINE_ACTION("toggle-background-rendering", _("Toggle Background Rendering"))
 DEFINE_ACTION("toggle-onion-skin", _("Toggle Onion Skin"))
 DEFINE_ACTION("toggle-onion-skin-keyframes", _("Toggle Onion Skin on Keyframes"))
+DEFINE_ACTION("toggle-keyframe-lock-past", _("Toggle Keyframe Lock Past"))
+DEFINE_ACTION("toggle-keyframe-lock-future", _("Toggle Keyframe Lock Future"))
 DEFINE_ACTION("canvas-zoom-in", Gtk::StockID("gtk-zoom-in"))
 DEFINE_ACTION("canvas-zoom-out", Gtk::StockID("gtk-zoom-out"))
 DEFINE_ACTION("canvas-zoom-fit", Gtk::StockID("gtk-zoom-fit"))
@@ -1046,7 +1048,7 @@
 DEFINE_ACTION("help-reference", Gtk::Stock::HELP)
 DEFINE_ACTION("help-faq", Gtk::Stock::HELP)
 DEFINE_ACTION("help-support", Gtk::Stock::HELP)
-DEFINE_ACTION("help-about", Gtk::StockID("synfig-about"))
+DEFINE_ACTION("about", Gtk::StockID("synfig-about"))
 
 // actions: Keyframe
 DEFINE_ACTION("keyframe-properties", _("Properties"))
@@ -1097,7 +1099,7 @@
 "		<menuitem action='select-parent-layer'/>"
 "		<separator name='sep-edit3'/>"
 "		<menuitem action='input-devices' />"
-"		<menuitem action='setup' />"
+"		<menuitem action='preferences' />"
 "	</menu>"
 "	<menu action='menu-view'>"
 "		<menuitem action='toggle-mainwin-menubar' />"
@@ -1137,6 +1139,8 @@
 "		<menuitem action='toggle-background-rendering'/>"
 "		<menuitem action='toggle-onion-skin'/>"
 "		<menuitem action='toggle-onion-skin-keyframes'/>"
+"		<menuitem action='toggle-keyframe-lock-past'/>"
+"		<menuitem action='toggle-keyframe-lock-future'/>"
 "		<separator name='sep-view2'/>"
 "		<menuitem action='canvas-zoom-in'/>"
 "		<menuitem action='canvas-zoom-out'/>"
@@ -1212,7 +1216,7 @@
 "		<separator name='sep-help2'/>"
 "		<menuitem action='help-support'/>"
 "		<separator name='sep-help3'/>"
-"		<menuitem action='help-about'/>"
+"		<menuitem action='about'/>"
 "	</menu>";
 
 	Glib::ustring ui_info_main_tool =
@@ -1400,6 +1404,8 @@
 		{"space", "<Actions>/canvasview/play"},
 		{"<Shift>space", "<Actions>/canvasview/pause"},
 		{"<Control>space", "<Actions>/canvasview/animate"},
+		{"<Control>Left", "<Actions>/canvasview/toggle-keyframe-lock-past"},
+		{"<Control>Right", "<Actions>/canvasview/toggle-keyframe-lock-future"},
 	};
 
 	return default_accel_map;
@@ -2345,7 +2351,7 @@
 	filter_supported->add_pattern("*.tsv");
 	filter_supported->add_pattern("*.xml");
 
-	// Sub fileters
+	// Sub filters
 	// 1 Synfig documents. sfg is not supported to import
 	Glib::RefPtr<Gtk::FileFilter> filter_synfig = Gtk::FileFilter::create();
 	filter_synfig->set_name(_("Synfig files (*.sif, *.sifz)"));
@@ -3453,7 +3459,7 @@
 	dialog.add_button(button2, Gtk::RESPONSE_OK);
 
 	dialog.set_default_response(Gtk::RESPONSE_OK);
-	//entry->signal_activate().connect(sigc::bind(sigc::mem_fun(dialog,&Gtk::Dialog::response),Gtk::RESPONSE_OK));
+	combo_entry->get_entry()->signal_activate().connect(sigc::bind(sigc::mem_fun(dialog, &Gtk::Dialog::response), Gtk::RESPONSE_OK));
 	dialog.show();
 
 	if(dialog.run()!=Gtk::RESPONSE_OK)
@@ -3899,7 +3905,7 @@
 			dialog_message_1b("ERROR", errors, "details", _("Close"));
 	}
 
-	FileSystemNative::instance()->remove_recursive(tmp_filename.u8string());
+	FileSystemNative::instance()->remove_recursive(tmp_filename);
 	// lock file (temp_lock.second) is auto-deleted
 }

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/asyncrenderer.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/asyncrenderer.cpp Changed

@@ -162,6 +162,16 @@
 		return r;
 	}
 
+	bool is_multiple_files() const override
+	{
+		return warm_target->is_multiple_files();
+	}
+
+	filesystem::Path get_filename() const override
+	{
+		return warm_target->get_filename();
+	}
+
 	virtual bool wait_render_tiles(ProgressCallback* cb = nullptr)
 	{
 		if(!alive_flag)
@@ -346,6 +356,16 @@
 		alive_flag=false;
 	}
 
+	bool is_multiple_files() const override
+	{
+		return warm_target->is_multiple_files();
+	}
+
+	filesystem::Path get_filename() const override
+	{
+		return warm_target->get_filename();
+	}
+
 	virtual bool start_frame(synfig::ProgressCallback *cb)
 	{
 		this->cb = cb;
@@ -489,26 +509,20 @@
 			if(interaction == INTERACTION_UNDEFINED)
 			{
 				if(status == RENDERING_SUCCESS)
-					signal_success_();
+					signal_success_(target->get_filename());
 				else
 					error_message = _("Animation couldn't be rendered");
 
-				target=0;
-				render_thread=0;
-				lock.release();
-
 				if(status == RENDERING_ERROR)
 				{
 					if(ProgressLogger *logger = dynamic_cast<ProgressLogger*>(cb))
 						error_message += "\n" + logger->get_error_message();
 				}
 			}
-			else
-			{
-				target=0;
-				render_thread=0;
-				lock.release();
-			}
+
+			target = nullptr;
+			render_thread = nullptr;
+			lock.release();
 
 			signal_finished_(error_message);
 		}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/asyncrenderer.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/asyncrenderer.h Changed

@@ -66,8 +66,11 @@
 	//! An error message is passed as argument in case of error;
 	//! it's empty otherwise
 	sigc::signal<void, std::string> signal_finished_;
-	//! Signal emitted when target has succeeded
-	sigc::signal<void> signal_success_;
+	/**
+	 * Signal emitted when target has succeeded.
+	 * The filepath of rendered document is passed as argument
+	 */
+	sigc::signal<void, synfig::filesystem::Path> signal_success_;
 
 	//! Seems to be unused
 	std::list<sigc::connection> activity_connection_list;
@@ -110,8 +113,14 @@
 	synfig::Real get_execution_time() const { return (finish_time - start_time).as_double(); }
 	synfig::Real get_execution_clock() const { return (synfig::Real)(finish_clock - start_clock)/(synfig::Real)CLOCKS_PER_SEC; }
 
+	etl::handle<const synfig::Target> get_target() const { return target; };
+
 	sigc::signal<void, std::string>& signal_finished() { return signal_finished_; }
-	sigc::signal<void>& signal_success() { return signal_success_; }
+	/**
+	 * Signal emitted when target has succeeded.
+	 * The filepath of rendered document is passed as argument
+	 */
+	sigc::signal<void, synfig::filesystem::Path>& signal_success() { return signal_success_; }
 
 private:

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/canvasview.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/canvasview.cpp Changed

@@ -1478,6 +1478,8 @@
 		{"toggle-background-rendering", "background_rendering_icon", N_("Enable rendering in background"), "", &WorkArea::get_background_rendering, &CanvasView::toggle_background_rendering },
 		{"toggle-onion-skin", "onion_skin_icon", N_("Show Onion Skin"), "", &WorkArea::get_onion_skin, &CanvasView::toggle_onion_skin },
 		{"toggle-onion-skin-keyframes", "keyframe_icon", N_("Onion Skin on Keyframes"), "", &WorkArea::get_onion_skin_keyframes, &CanvasView::toggle_onion_skin_keyframes },
+		{"toggle-keyframe-lock-past", "keyframe_lock_past_on_icon", N_("Lock Past Keyframes"), "", &WorkArea::get_keyframe_lock_past, &CanvasView::toggle_past_keyframe_button },
+		{"toggle-keyframe-lock-future", "keyframe_lock_future_on_icon", N_("Lock Future Keyframes"), "", &WorkArea::get_keyframe_lock_future, &CanvasView::toggle_future_keyframe_button },
 	};
 
 	for (const auto& item : bool_action_list) {
@@ -1501,6 +1503,8 @@
 	background_rendering_toggle = Glib::RefPtr<Gtk::ToggleAction>::cast_static(action_group->get_action("toggle-background-rendering"));
 	onion_skin_toggle = Glib::RefPtr<Gtk::ToggleAction>::cast_static(action_group->get_action("toggle-onion-skin"));
 	onion_skin_keyframes_toggle = Glib::RefPtr<Gtk::ToggleAction>::cast_static(action_group->get_action("toggle-onion-skin-keyframes"));
+	past_keyframes_toggle = Glib::RefPtr<Gtk::ToggleAction>::cast_static(action_group->get_action("toggle-keyframe-lock-past"));
+	future_keyframes_toggle = Glib::RefPtr<Gtk::ToggleAction>::cast_static(action_group->get_action("toggle-keyframe-lock-future"));
 
 	{
 		Glib::RefPtr<Gtk::ToggleAction> action;
@@ -2152,10 +2156,8 @@
 	if(toggling_animate_mode_)
 		return;
 	CanvasInterface::Mode mode(get_mode());
-	if((mode&MODE_ANIMATE_PAST) )
-		set_mode(get_mode()-MODE_ANIMATE_PAST);
-	else
-		set_mode((get_mode()|MODE_ANIMATE_PAST));
+	bool enable = !synfigapp::has_flag(mode, MODE_ANIMATE_PAST);
+	work_area->set_keyframe_lock_past(enable);
 }
 
 
@@ -2164,11 +2166,9 @@
 {
 	if(toggling_animate_mode_)
 		return;
- 	CanvasInterface::Mode mode(get_mode());
-	if((mode&MODE_ANIMATE_FUTURE) )
-		set_mode(get_mode()-MODE_ANIMATE_FUTURE);
-	else
-		set_mode(get_mode()|MODE_ANIMATE_FUTURE);
+	CanvasInterface::Mode mode(get_mode());
+	bool enable = !synfigapp::has_flag(mode, MODE_ANIMATE_FUTURE);
+	work_area->set_keyframe_lock_future(enable);
 }
 
 bool
@@ -3644,4 +3644,5 @@
 {
 	top_toolbar->set_visible(show);
 	right_toolbar->set_visible(show);
+	stopbutton->set_visible(show);
 };

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/canvasview.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/canvasview.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/cellrenderer/cellrenderer_value.cpp Changed

@@ -252,6 +252,15 @@
 	return App::dialog_paragraph(_("Text Paragraph"), _("Enter text here:"), text);
 }
 
+static bool
+is_layer_deleted(const synfig::Layer::ConstHandle& layer)
+{
+	if (Canvas::LooseHandle layer_canvas = layer->get_canvas())
+		return std::find(layer_canvas->begin(), layer_canvas->end(), layer) == layer_canvas->end();
+
+	return true;
+}
+
 /* === M E T H O D S ======================================================= */
 
 CellRenderer_ValueBase::CellRenderer_ValueBase():
@@ -287,6 +296,12 @@
 }
 
 void
+CellRenderer_ValueBase::set_canvas_interface(const etl::loose_handle<synfigapp::CanvasInterface>& x)
+{
+	canvas_interface = x;
+}
+
+void
 CellRenderer_ValueBase::string_edited_(const Glib::ustring& path, const Glib::ustring& str)
 {
 	ValueBase old_value = property_value_.get_value();
@@ -558,19 +573,96 @@
 void
 CellRenderer_ValueBase::gradient_edited(synfig::Gradient gradient, Glib::ustring path)
 {
-	ValueBase old_value(property_value_.get_value());
-	ValueBase value(gradient);
-	if (old_value != value)
-		signal_edited_(path, value);
+	synfigapp::ValueDesc vd = App::dialog_gradient->get_value_desc();
+	if (!vd.is_valid()) {
+		ValueBase old_value(property_value_.get_value());
+		ValueBase value(gradient);
+		if (old_value != value)
+			signal_edited_(path, value);
+
+		return;
+	}
+
+	if (!vd.parent_is_layer()) {
+		canvas_interface->change_value(vd, gradient);
+		return;
+	}
+
+	if (is_layer_deleted(vd.get_layer()))
+		return;
+
+	// do not emit signal_edited_ : gradient dialog may be opened by other cell
+	// and would try to update the parameter related to current one
+	// as it just remembered its parameter tree path
+	// Example:
+	// 1. Create a region layer
+	// 2. Create a gradient layer
+	// 3. Click on gradient parameter to edit it
+	// 4. Without closing gradient dialog, select the region layer instead
+	// 5. Try to edit the gradient
+	// 6. Error Message appears
+	synfigapp::SelectionManager::LayerList selected_layers = canvas_interface->get_selection_manager()->get_selected_layers();
+	const Layer::Handle& trigger_layer = vd.get_layer();
+	bool is_trigger_layer_still_selected = std::find(selected_layers.begin(), selected_layers.end(), trigger_layer) != selected_layers.end();
+	if (!is_trigger_layer_still_selected)
+		return;
+
+	if (selected_layers.size() <= 1) {
+		canvas_interface->change_value(vd, gradient);
+	} else {
+		synfigapp::Action::PassiveGrouper set_multiple_color_action(canvas_interface->get_instance().get(), strprintf(_("Set Layer Gradients (%d)"), selected_layers.size()));
+		for (const auto& layer : selected_layers) {
+			canvas_interface->change_value(synfigapp::ValueDesc(layer, vd.get_param_name()), gradient);
+		}
+	}
 }
 
 void
 CellRenderer_ValueBase::color_edited(synfig::Color color, Glib::ustring path)
 {
-	ValueBase old_value(property_value_.get_value());
-	ValueBase value(color);
-	if (old_value != value)
-		signal_edited_(path, value);
+	synfigapp::ValueDesc vd = App::dialog_color->get_value_desc();
+	if (!vd.is_valid()) {
+		ValueBase old_value(property_value_.get_value());
+		ValueBase value(color);
+		if (old_value != value)
+			signal_edited_(path, value);
+
+		return;
+	}
+
+	if (!vd.parent_is_layer()) {
+		canvas_interface->change_value(vd, color);
+		return;
+	}
+
+	if (is_layer_deleted(vd.get_layer()))
+		return;
+
+	// do not emit signal_edited_ : color dialog may be opened by other cell
+	// and would try to update the parameter related to current one
+	// as it just remembered its parameter tree path
+	// Example:
+	// 1. Create a region layer
+	// 2. Create an outline layer
+	// 3. Click on color parameter to edit it
+	// 4. Without closing color dialog, select the region layer instead
+	// 5. Try to edit the color
+	// 6. Error Message appears
+
+	synfigapp::SelectionManager::LayerList selected_layers = canvas_interface->get_selection_manager()->get_selected_layers();
+	const Layer::Handle& trigger_layer = vd.get_layer();
+	bool is_trigger_layer_still_selected = std::find(selected_layers.begin(), selected_layers.end(), trigger_layer) != selected_layers.end();
+	if (!is_trigger_layer_still_selected)
+		return;
+
+	if (selected_layers.size() <= 1) {
+		canvas_interface->change_value(vd, color);
+	} else {
+		synfigapp::Action::PassiveGrouper set_multiple_color_action(canvas_interface->get_instance().get(), strprintf(_("Set Layer Colors (%d)"), selected_layers.size()));
+		for (const auto& layer : selected_layers) {
+			canvas_interface->change_value(synfigapp::ValueDesc(layer, vd.get_param_name()), color);
+		}
+	}
 }
 
 Gtk::CellEditable*
@@ -608,6 +700,7 @@
 	{
 		App::dialog_gradient->reset();
 		App::dialog_gradient->set_gradient( data.get(Gradient()) );
+		App::dialog_gradient->set_value_desc(get_value_desc());
 		App::dialog_gradient->signal_edited().connect(
 			sigc::bind(
 				sigc::mem_fun(*this, &studio::CellRenderer_ValueBase::gradient_edited),
@@ -623,6 +716,7 @@
 	{
 		App::dialog_color->reset();
 		App::dialog_color->set_color( data.get(Color()) );
+		App::dialog_color->set_value_desc(get_value_desc());
 		App::dialog_color->signal_edited().connect(
 			sigc::bind(
 				sigc::mem_fun(*this, &studio::CellRenderer_ValueBase::color_edited),

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/cellrenderer/cellrenderer_value.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/cellrenderer/cellrenderer_value.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/devicetracker.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/devicetracker.cpp Changed

@@ -64,10 +64,14 @@
 /* === M E T H O D S ======================================================= */
 
 void
-DeviceTracker::list_devices(DeviceList &out_devices)
+DeviceTracker::list_devices(DeviceList& out_devices)
 {
 	out_devices.clear();
 
+	const auto check_if_device_is_null = (const Glib::RefPtr<Gdk::Device>& device) -> bool {
+		return bool(device);
+	};
+
 #ifdef OLD_GDKMM_DEVICE_FUNCTIONALITY
 	Gdk::DeviceType types = {
 		Gdk::DEVICE_TYPE_MASTER,
@@ -80,7 +84,7 @@
 				get_default_display()->
 					get_device_manager()->
 						list_devices(typesi);
-		out_devices.insert(out_devices.end(), list.begin(), list.end());
+		std::copy_if(list.begin(), list.end(), std::back_inserter(out_devices), check_if_device_is_null);
 	}
 #else
 	Glib::RefPtr<Gdk::Seat> seat = Gdk::DisplayManager::get()->get_default_display()->get_default_seat();
@@ -90,7 +94,7 @@
 		out_devices.push_back(seat->get_pointer());
 	DeviceList slaves = seat->get_slaves(Gdk::SEAT_CAPABILITY_ALL);
 	out_devices.reserve(out_devices.size() + slaves.size());
-	out_devices.insert(out_devices.end(), slaves.begin(), slaves.end());
+	std::copy_if(slaves.begin(), slaves.end(), std::back_inserter(out_devices), check_if_device_is_null);
 #endif
 }

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/dialogs/about.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/dialogs/about.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/dialogs/dialog_color.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/dialogs/dialog_color.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/dialogs/dialog_color.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/dialogs/dialog_color.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/dialogs/dialog_gradient.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/dialogs/dialog_gradient.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/dialogs/dialog_gradient.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/dialogs/dialog_gradient.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/dialogs/dialog_pasteoptions.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/dialogs/dialog_pasteoptions.cpp Changed

@@ -27,6 +27,7 @@
 #include <gtkmm/icontheme.h>
 #include <gtkmm/label.h>
 #include <gtkmm/liststore.h>
+#include <gtkmm/treeviewcolumn.h>
 
 #include <gui/iconcontroller.h>
 #include <gui/localization.h>
@@ -77,6 +78,20 @@
 	pixbuf_conflict = theme->load_icon("dialog-error", Gtk::ICON_SIZE_SMALL_TOOLBAR, window_scale_factor, Gtk::ICON_LOOKUP_USE_BUILTIN);
 	pixbuf_empty = Gdk::Pixbuf::create(Gdk::COLORSPACE_RGB, true, pixbuf_link->get_bits_per_sample(), pixbuf_link->get_width(), pixbuf_link->get_height());
 	pixbuf_empty->fill(0);
+
+	Gtk::Widget* widget_copy_column_header = nullptr;
+	builder->get_widget("copy_column_header", widget_copy_column_header);
+	if (widget_copy_column_header) {
+		Gtk::manage(widget_copy_column_header);
+		auto copy_column_obj = refGlade->get_object("copy_column");
+		if (auto copy_column = Glib::RefPtr<Gtk::TreeViewColumn>::cast_dynamic(copy_column_obj)) {
+			copy_column->set_widget(*widget_copy_column_header);
+			if ((copy_all_checkbutton = dynamic_cast<Gtk::CheckButton*>(widget_copy_column_header))) {
+				copy_all_checkbutton->signal_toggled().connect(sigc::mem_fun(*this, &Dialog_PasteOptions::on_copy_all_toggled));
+				copy_column->signal_clicked().connect(sigc::hide_return(sigc::mem_fun(*copy_all_checkbutton, &Gtk::CheckButton::activate)));
+			}
+		}
+	}
 }
 
 std::shared_ptr<Dialog_PasteOptions> Dialog_PasteOptions::create(Gtk::Window& parent)
@@ -190,6 +205,7 @@
 	}
 
 	update_ok_button_sensitivity();
+	update_copy_all_button_status();
 }
 
 void Dialog_PasteOptions::on_valuenode_name_edited(const Glib::ustring& path, const Glib::ustring& new_text)
@@ -235,6 +251,19 @@
 	update_ok_button_sensitivity();
 }
 
+void Dialog_PasteOptions::on_copy_all_toggled()
+{
+	if (copy_all_checkbutton) {
+		bool is_copy_all = copy_all_checkbutton->get_active();
+		copy_all_checkbutton->set_inconsistent(false);
+		valuenodes_model->foreach_iter(is_copy_all(const Gtk::TreeModel::iterator& iter) -> bool {
+			iter->set_value(COLUMN_COPY_OR_NOT, is_copy_all);
+			return false;
+		});
+		copy_all_checkbutton->set_active(is_copy_all);
+	}
+}
+
 void Dialog_PasteOptions::update_ok_button_sensitivity()
 {
 	bool enable_button = true;
@@ -257,11 +286,39 @@
 	set_response_sensitive(Gtk::RESPONSE_OK, enable_button);
 }
 
+void Dialog_PasteOptions::update_copy_all_button_status()
+{
+	if (!copy_all_checkbutton)
+		return;
+
+	bool is_something_being_copied = false;
+	bool is_something_being_linked = false;
+
+	valuenodes_model->foreach_iter(=, &is_something_being_copied, &is_something_being_linked(const Gtk::TreeModel::iterator& iter) -> bool {
+		bool is_copy;
+		iter->get_value(COLUMN_COPY_OR_NOT, is_copy);
+		if (is_copy)
+			is_something_being_copied = true;
+		else
+			is_something_being_linked = true;
+
+		if (is_something_being_copied && is_something_being_linked)
+			return true;
+		return false;
+	});
+
+	if (is_something_being_copied && is_something_being_linked)
+		copy_all_checkbutton->set_inconsistent(true);
+	else
+		copy_all_checkbutton->set_active(is_something_being_copied);
+}
+
 void Dialog_PasteOptions::clear()
 {
 	if (valuenodes_model)
 		valuenodes_model->clear();
 	update_ok_button_sensitivity();
+	update_copy_all_button_status();
 }
 
 void Dialog_PasteOptions::rebuild_model()
@@ -293,6 +350,7 @@
 
 	refresh_status();
 	update_ok_button_sensitivity();
+	update_copy_all_button_status();
 }
 
 void Dialog_PasteOptions::refresh_status()

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/dialogs/dialog_pasteoptions.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/dialogs/dialog_pasteoptions.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/dialogs/dialog_spritesheetparam.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/dialogs/dialog_spritesheetparam.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/docks/dock_history.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/docks/dock_history.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/docks/dock_info.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/docks/dock_info.cpp Changed

@@ -35,11 +35,15 @@
 
 #include "docks/dock_info.h"
 
+#include <glibmm/fileutils.h>
+
 #include <gui/app.h>
 #include <gui/canvasview.h>
 #include <gui/localization.h>
 #include <gui/workarea.h>
 
+#include <synfig/os.h>
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -157,6 +161,8 @@
 
 	Gtk::Label *separator2 = manage(new Gtk::Label(" "));
 	grid->attach(*separator2, 0, 4, 8, 1);
+	Gtk::Label *separator3 = manage(new Gtk::Label(" "));
+	grid->attach(*separator3, 0, 8, 8, 1);
 
 	// Render Progress Bar
 	Gtk::Box *render_box = manage(new Gtk::Box());
@@ -182,10 +188,25 @@
 	stop_button.set_valign(Gtk::ALIGN_CENTER);
 	stop_button.signal_clicked().connect(sigc::mem_fun(*this, &studio::Dock_Info::on_stop_button_clicked));
 
+	open_file_button.set_label(_("Open Rendered File"));
+	open_file_button.set_halign(Gtk::ALIGN_START);
+	open_file_button.signal_clicked().connect(sigc::mem_fun(*this, &studio::Dock_Info::on_open_file_button_clicked));
+
+	open_folder_button.set_image_from_icon_name("folder-open");
+	open_folder_button.set_tooltip_text(_("Open Destination Folder"));
+	open_folder_button.set_halign(Gtk::ALIGN_START);
+	open_folder_button.signal_clicked().connect(sigc::mem_fun(*this, &studio::Dock_Info::on_open_folder_button_clicked));
+
+	Gtk::Box* open_box = Gtk::manage(new Gtk::Box(Gtk::ORIENTATION_HORIZONTAL));
+	open_box->set_spacing(6);
+	open_box->pack_start(open_file_button, false, false, 0);
+	open_box->pack_start(open_folder_button, false, false, 0);
+
 	render_box->pack_start(*overlay, true, true, 0);
 	render_box->pack_start(stop_button, false, false, 0);
 	grid->attach_next_to(*render_progress_label, *separator2, Gtk::POS_BOTTOM, 8, 1);
 	grid->attach_next_to(*render_box, *render_progress_label, Gtk::POS_BOTTOM, 7, 1);
+	grid->attach_next_to(*open_box, *separator3, Gtk::POS_BOTTOM, 8, 1);
 
 	grid->set_margin_start(5);
 	grid->set_margin_end(5);
@@ -193,6 +214,8 @@
 	grid->set_margin_bottom(5);
 	grid->show_all();
 
+	hide_open_buttons();
+
 	add(*grid);
 
 	// Render progress
@@ -207,6 +230,17 @@
 {
 }
 
+void studio::Dock_Info::on_open_file_button_clicked()
+{
+	synfig::OS::launch_file_async(output_target);
+}
+
+void studio::Dock_Info::on_open_folder_button_clicked()
+{
+	const bool is_directory = Glib::file_test(output_target.u8string(), Glib::FILE_TEST_IS_DIR);
+	synfig::OS::launch_file_async(is_directory ? output_target : output_target.parent_path());
+}
+
 void studio::Dock_Info::on_stop_button_clicked()
 {
 	if(!async_renderer)
@@ -263,3 +297,18 @@
 	else
 		stop_button.set_sensitive(false);
 }
+
+void studio::Dock_Info::hide_open_buttons()
+{
+	open_file_button.hide();
+	open_folder_button.hide();
+}
+
+void studio::Dock_Info::set_rendered_file_path(const synfig::filesystem::Path& target_filepath)
+{
+	output_target = target_filepath;
+	const bool is_directory = Glib::file_test(target_filepath.u8string(), Glib::FILE_TEST_IS_DIR);
+
+	open_file_button.set_visible(!is_directory);
+	open_folder_button.show();
+}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/docks/dock_info.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/docks/dock_info.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/docks/dock_navigator.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/docks/dock_navigator.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/docks/dock_params.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/docks/dock_params.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/docks/dock_params.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/docks/dock_params.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/iconcontroller.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/iconcontroller.cpp Changed

@@ -47,6 +47,10 @@
 #include <synfig/valuenodes/valuenode_const.h>
 #include <synfigapp/action.h>
 
+// Needed for various bone icons
+#include <synfig/pair.h>
+#include <synfig/valuenodes/valuenode_bone.h>
+
 #include <gtkmm/icontheme.h>
 
 #endif
@@ -74,6 +78,7 @@
 	{"type_integer", {"type_integer_icon", N_("Integer")}},
 	{"type_angle", {"type_angle_icon", N_("Angle")}},
 	{"type_time", {"type_time_icon", N_("Time")}},
+	{"type_transformation", {"type_transformation_icon", N_("Transformation")}},
 	{"type_real", {"type_real_icon", N_("Real")}},
 	{"type_vector", {"type_vector_icon", N_("Vector")}},
 	{"type_color", {"type_color_icon", N_("Color")}},
@@ -163,6 +168,7 @@
 
 	{"set_outline_color", {"set_outline_color_icon", N_("Set as Outline")}},
 	{"set_fill_color", {"set_fill_color_icon", N_("Set as Fill")}},
+	{"hex", {"hex_icon", N_("Copy Hex")}},
 
 	{"animate_seek_begin", {"animate_seek_begin_icon", N_("Seek to Begin")}},
 	{"animate_seek_prev_keyframe", {"animate_seek_prev_keyframe_icon", N_("Seek to Previous Keyframe")}},
@@ -363,6 +369,8 @@
 		return "type_angle_icon";
 	if (type == type_time)
 		return "type_time_icon";
+	if (type == type_transformation)
+		return "type_transformation_icon";
 	if (type == type_real)
 		return "type_real_icon";
 	if (type == type_vector)
@@ -381,6 +389,12 @@
 		return "type_string_icon";
 	if (type == type_gradient)
 		return "type_gradient_icon";
+	if (type == types_namespace::TypePair<Bone, Bone>::instance)
+		return "type_pair_bone_object_bone_object_icon";
+	if (type == type_bone_object)
+		return "type_bone_object_icon";
+	if (type == type_bone_valuenode)
+		return "type_bone_valuenode_icon";
 	if (!type.description.name.empty())
 		synfig::warning(_("no icon for value type: \"%s\""), type.description.name.c_str());
 	return "image-missing";

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/main.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/main.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/mainwindow.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/mainwindow.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/modules/mod_palette/dock_paledit.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/modules/mod_palette/dock_paledit.cpp Changed

@@ -141,6 +141,17 @@
 		)
 	);
 	action_group->add(Gtk::Action::create_with_icon_name(
+		"palette-add-from-clipboard",
+		"hex_icon",
+		_("Add clipboard color"),
+		_("Add hex color from clipboard")
+	),
+		sigc::mem_fun(
+			*this,
+			&Dock_PalEdit::add_from_clipboard
+		)
+	);
+	action_group->add(Gtk::Action::create_with_icon_name(
 		"palette-save",
 		"document-save",
 		_("Save palette"),
@@ -181,6 +192,7 @@
 	"<ui>"
 	"	<toolbar action='toolbar-palette'>"
 	"	<toolitem action='palette-add-color' />"
+	"	<toolitem action='palette-add-from-clipboard' />"
 	"	<toolitem action='palette-save' />"
 	"	<toolitem action='palette-load' />"
 	"	<toolitem action='palette-set-default' />"
@@ -343,6 +355,14 @@
 			i ));
 	menu->append(*item);
 
+	item = image_menu_item("hex_icon", _("Add clipboard color"));
+	item->signal_activate().connect(
+		sigc::bind(
+			sigc::mem_fun(*this,&studio::Dock_PalEdit::copy_color),
+			i ));
+	item->show_all();
+	menu->append(*item);
+
 	item = image_menu_item("edit-delete", _("_Delete"), true);
 	item->signal_activate().connect(
 		sigc::bind(
@@ -362,6 +382,61 @@
 	return size()-1;
 }
 
+bool
+Dock_PalEdit::check_hex_format(const std::string& hexcolor)
+{
+	const int strsize = hexcolor.size();
+
+	// Check size is correct for the format: #ffffff or #fff or #f
+	// these are the sizes supported by Color::set_hex()
+	if (strsize != 7 && strsize != 4 && strsize != 2)
+		return false;
+
+	// Check if first character is a # for the correct format
+	if (hexcolor0 != '#')
+		return false;
+
+	// Checking if all characters are between 0-F uppercase or lowercase in ascii
+	for (int i=1; i < strsize; ++i)
+		if (!std::isxdigit(hexcolori))
+			return false;
+
+	return true;
+}
+
+void
+Dock_PalEdit::add_from_clipboard()
+{
+	Glib::RefPtr<Gtk::Clipboard> refClipboard = Gtk::Clipboard::get();
+	std::string hexcolor = refClipboard->wait_for_text();
+
+	// Clipboard is in hexformat. Add the color.
+	if (check_hex_format(hexcolor)) {
+		hexcolor = hexcolor.substr(1, 6);
+		
+		synfig::Color col;
+		col.set_hex(hexcolor);
+		col.set_a(1.0f);
+
+		palette_.push_back(col);
+
+		signal_changed()();
+		refresh();
+	}
+}
+
+void
+Dock_PalEdit::copy_color(int i)
+{
+	if (i < 0 || i >= palette_.size()) {
+		synfig::error(_("Trying to get hex code from an invalid index for the palette: %i"), i);
+		return;
+	}
+	// Taking first 7 characters of the color string as they contain the formated #hexadecimal color
+	Glib::RefPtr<Gtk::Clipboard> refClipboard = Gtk::Clipboard::get();
+	refClipboard->set_text(palette_i.color.get_string().substr(0, 7));
+}
+
 void
 Dock_PalEdit::set_color(synfig::Color x, int i)
 {

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/modules/mod_palette/dock_paledit.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/modules/mod_palette/dock_paledit.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/render.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/render.cpp Changed

@@ -364,6 +364,7 @@
 	App::dock_info_->set_n_passes_requested(render_passes.size());
 	App::dock_info_->set_n_passes_pending(render_passes.size());
 	App::dock_info_->set_render_progress(0.0);
+	App::dock_info_->hide_open_buttons();
 	App::dock_manager->find_dockable("info").present(); //Bring Dock_Info to front
 
 	progress_logger->clear();
@@ -549,6 +550,7 @@
 
 		async_renderer=new AsyncRenderer(target, progress_logger.get());
 		async_renderer->signal_finished().connect( sigc::mem_fun(*this,&RenderSettings::on_finished));
+		async_renderer->signal_success().connect(sigc::mem_fun(*this, &RenderSettings::on_success));
 		async_renderer->start();
 		App::dock_info_->set_async_render(async_renderer);
 	}
@@ -576,6 +578,11 @@
 			App::sound_render_done->set_position(Time());
 			App::sound_render_done->set_playing(true);
 		}
+
+		if (!success) {
+			App::dock_info_->hide_open_buttons();
+		}
+
 		App::dock_info_->set_render_progress(1.0);
 	}
 
@@ -585,6 +592,21 @@
 }
 
 void
+RenderSettings::on_success(filesystem::Path filepath)
+{
+	const bool really_finished = (render_passes.size() == 0); // May have another files/tiles to render yet
+
+	if (really_finished) { // Because of multi-pass render
+		if (!async_renderer || !async_renderer->get_target()) {
+			App::dock_info_->hide_open_buttons();
+		} else {
+			const filesystem::Path target_filepath(async_renderer->get_target()->get_filename());
+			App::dock_info_->set_rendered_file_path(target_filepath);
+		}
+	}
+}
+
+void
 RenderSettings::on_cancel_pressed()
 {
 	hide();

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/render.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/render.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/resources/ui/dialog_pasteoptions.glade -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/resources/ui/dialog_pasteoptions.glade Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/resources/ui/studio_menubar.xml -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/resources/ui/studio_menubar.xml Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/states/state_bline.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/states/state_bline.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/states/state_circle.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/states/state_circle.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/states/state_draw.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/states/state_draw.cpp Changed

@@ -981,7 +981,7 @@
 		for (std::list<synfig::WidthPoint>::iterator iter = wplist.begin(); iter != wplist.end(); ++iter)
 			iter->set_position(hom_to_std(ValueBase::List(bline.begin(), bline.end()), iter->get_position(), false, false));
 	}
-	// print out resutls
+	// print out results
 	//synfig::info("-----------widths");
 	//for (std::list<synfig::WidthPoint>::iterator iter = wplist.begin(); iter != wplist.end(); ++iter) {
 		//if(!iter->get_dash())
@@ -1170,7 +1170,6 @@
 				{
 					shift_origin = true;
 					shift_origin_vector = start_duck->get_origin();
-					get_canvas_interface()->auto_export(start_duck_value_desc);
 					if (extend_finish)
 						if(start_duck_value_node_bline&&start_duck_value_node_bline==finish_duck_value_node_bline)
 							extend_finish_join_same=true;
@@ -1194,7 +1193,6 @@
 				{
 					shift_origin = true;
 					shift_origin_vector = finish_duck->get_origin();
-					get_canvas_interface()->auto_export(finish_duck_value_desc);
 					if(extend_start)
 						if(finish_duck_value_node_bline&&start_duck_value_node_bline==finish_duck_value_node_bline)
 							extend_start_join_same=true;
@@ -2132,7 +2130,6 @@
 								value_node->set_link("t2",value_node_next->get_link("t2"));
 								value_node->set_link("split",ValueNode_Const::create(true));
 
-								// get_canvas_interface()->auto_export(value_node);
 								printf("exporting\n");
 								get_canvas_interface()->add_value_node(value_node,value_node->get_id() + strprintf("foo %d", rand()));
 
@@ -2213,18 +2210,12 @@
 		std::list<synfigapp::ValueDesc>::iterator iter;
 		for(iter=vertex_list.begin();iter!=vertex_list.end();++iter)
 		{
-			// Ensure that the vertex is exported.
-			get_canvas_interface()->auto_export(*iter);
-
 			value_node_bline->add(iter->get_value_node());
-			//value_node_bline->add(ValueNode_BLine::ListEntry(iter->get_value_node()));
 		}
 
 		value_node_bline->set_loop(true);
 	}
 
-	get_canvas_interface()->auto_export(value_node_bline);
-
 	// Now we create the region layer
 	// Create the layer
 	{
@@ -2728,8 +2719,6 @@
 
 	Layer::Handle layer;
 
-	get_canvas_interface()->auto_export(last_stroke);
-
 	synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
 
 	Canvas::Handle canvas(get_canvas_view()->get_canvas());

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/states/state_lasso.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/states/state_lasso.cpp Changed

@@ -908,7 +908,7 @@
 		for (std::list<synfig::WidthPoint>::iterator iter = wplist.begin(); iter != wplist.end(); ++iter)
 			iter->set_position(hom_to_std(ValueBase::List(bline.begin(), bline.end()), iter->get_position(), false, false));
 	}
-	// print out resutls
+	// print out results
 	//synfig::info("-----------widths");
 	//for (std::list<synfig::WidthPoint>::iterator iter = wplist.begin(); iter != wplist.end(); ++iter) {
 		//if(!iter->get_dash())
@@ -1086,7 +1086,6 @@
 				{
 					shift_origin = true;
 					shift_origin_vector = start_duck->get_origin();
-					get_canvas_interface()->auto_export(start_duck_value_desc);
 					if (extend_finish)
 						if(start_duck_value_node_bline&&start_duck_value_node_bline==finish_duck_value_node_bline)
 							extend_finish_join_same=true;
@@ -1110,7 +1109,6 @@
 				{
 					shift_origin = true;
 					shift_origin_vector = finish_duck->get_origin();
-					get_canvas_interface()->auto_export(finish_duck_value_desc);
 					if(extend_start)
 						if(finish_duck_value_node_bline&&start_duck_value_node_bline==finish_duck_value_node_bline)
 							extend_start_join_same=true;
@@ -2055,7 +2053,6 @@
 								value_node->set_link("t2",value_node_next->get_link("t2"));
 								value_node->set_link("split",ValueNode_Const::create(true));
 
-								// get_canvas_interface()->auto_export(value_node);
 								printf("exporting\n");
 								get_canvas_interface()->add_value_node(value_node,value_node->get_id() + strprintf("foo %d", rand()));
 
@@ -2135,18 +2132,12 @@
 
 		std::list<synfigapp::ValueDesc>::iterator iter;
 		for (iter = vertex_list.begin(); iter != vertex_list.end(); ++iter) {
-			// Ensure that the vertex is exported.
-			get_canvas_interface()->auto_export(*iter);
-
 			value_node_bline->add(iter->get_value_node());
-			//value_node_bline->add(ValueNode_BLine::ListEntry(iter->get_value_node()));
 		}
 
 		value_node_bline->set_loop(true);
 	}
 
-	get_canvas_interface()->auto_export(value_node_bline);
-
 	// Now we create the region layer
 	// Create the layer
 	{
@@ -2617,8 +2608,6 @@
 
 	Layer::Handle layer;
 
-	get_canvas_interface()->auto_export(last_stroke);
-
 	synfigapp::PushMode push_mode(get_canvas_interface(),synfigapp::MODE_NORMAL);
 
 	Canvas::Handle canvas(get_canvas_view()->get_canvas());

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/states/state_rectangle.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/states/state_rectangle.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/trees/childrentreestore.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/trees/childrentreestore.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/trees/historytreestore.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/trees/historytreestore.cpp Changed

@@ -111,7 +111,7 @@
 }
 
 void
-HistoryTreeStore::insert_action(Gtk::TreeRow row,etl::handle<synfigapp::Action::Undoable> action, bool is_undo, bool is_redo)
+HistoryTreeStore::insert_action(Gtk::TreeRow row, synfigapp::Action::Undoable::Handle action, bool is_undo, bool is_redo)
 {
 	assert(action);
 
@@ -129,10 +129,7 @@
 		rowmodel.canvas_id = specific_action->get_canvas()->get_id();
 	}
 
-	etl::handle<synfigapp::Action::Group> group;
-	group=etl::handle<synfigapp::Action::Group>::cast_dynamic(action);
-	if(group)
-	{
+	if (auto group = synfigapp::Action::Group::Handle::cast_dynamic(action)) {
 		synfigapp::Action::ActionList::const_iterator iter;
 		for(iter=group->action_list().begin();iter!=group->action_list().end();++iter)
 		{
@@ -207,7 +204,7 @@
 }
 
 void
-HistoryTreeStore::on_new_action(etl::handle<synfigapp::Action::Undoable> action)
+HistoryTreeStore::on_new_action(synfigapp::Action::Undoable::Handle action)
 {
 	Gtk::TreeRow row;
 
@@ -222,7 +219,7 @@
 }
 
 void
-HistoryTreeStore::on_action_status_changed(etl::handle<synfigapp::Action::Undoable> action)
+HistoryTreeStore::on_action_status_changed(synfigapp::Action::Undoable::Handle action)
 {
 	Gtk::TreeModel::Children::iterator iter;
 	Gtk::TreeModel::Children children_(children());

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/trees/historytreestore.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/trees/historytreestore.h Changed

@@ -56,7 +56,7 @@
 	class Model : public Gtk::TreeModel::ColumnRecord
 	{
 	public:
-		Gtk::TreeModelColumn<etl::handle<synfigapp::Action::Undoable> > action;
+		Gtk::TreeModelColumn<synfigapp::Action::Undoable::Handle> action;
 		Gtk::TreeModelColumn<Glib::ustring> name;
 		Gtk::TreeModelColumn<Glib::RefPtr<Gdk::Pixbuf> > icon;
 		Gtk::TreeModelColumn<bool> is_active;
@@ -103,7 +103,7 @@
 
 private:
 
-	void insert_action(Gtk::TreeRow row, etl::handle<synfigapp::Action::Undoable> action, bool is_undo=true, bool is_redo=false);
+	void insert_action(Gtk::TreeRow row, synfigapp::Action::Undoable::Handle action, bool is_undo=true, bool is_redo=false);
 
 	/*
 -- ** -- P R I V A T E D A T A ---------------------------------------------
@@ -135,9 +135,9 @@
 
 	void on_redo_stack_cleared();
 
-	void on_new_action(etl::handle<synfigapp::Action::Undoable> action);
+	void on_new_action(synfigapp::Action::Undoable::Handle action);
 
-	void on_action_status_changed(etl::handle<synfigapp::Action::Undoable> action);
+	void on_action_status_changed(synfigapp::Action::Undoable::Handle action);
 
 	/*
 -- ** -- P U B L I C M E T H O D S -----------------------------------------

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/trees/layertree.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/trees/layertree.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/widgets/widget_canvastimeslider.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/widgets/widget_canvastimeslider.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/widgets/widget_curves.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/widgets/widget_curves.cpp Changed

@@ -77,6 +77,47 @@
 
 /* === P R O C E D U R E S ================================================= */
 
+static bool
+is_a_kind_of_composite_value_node(const ValueNode::Handle& value_node)
+{
+	return value_node && (value_node->get_name() == "composite" || value_node->get_name() == "radial_composite");
+}
+
+/**
+ * List all value paths with their value descs.
+ *
+ * Composite and RadialComposite value nodes can't be handled directly, as they
+ * are not converted into Animated value nodes in Synfig Studio GUI, but their
+ * components are. So, we use their components instead of them directly.
+ *
+ * @paramin value_path
+ * @paramin value_desc
+ * @paramout curve_descs
+ */
+static void
+gather_curve_descs(const std::string& value_path, const ValueDesc& value_desc, std::vector<std::pair<std::string, ValueDesc>>& curve_descs)
+{
+	ValueNode::Handle value_node = value_desc.get_value_node();
+	if (!is_a_kind_of_composite_value_node(value_node)) {
+		curve_descs.push_back({value_path, value_desc});
+	} else {
+		auto lvn = LinkableValueNode::Handle::cast_dynamic(value_node);
+		const auto& vocab = lvn->get_children_vocab();
+		int i = 0;
+		for (const auto& vocab_item : vocab) {
+			auto sub_value_desc = synfigapp::ValueDesc(lvn, i, value_desc);
+			auto sub_value_path = value_path + ":" + vocab_item.get_local_name();
+			auto sub_lvn = LinkableValueNode::Handle::cast_dynamic(lvn->get_link(i));
+			if (is_a_kind_of_composite_value_node(sub_lvn)) {
+				gather_curve_descs(sub_value_path, sub_value_desc, curve_descs);
+			} else {
+				curve_descs.push_back({sub_value_path, sub_value_desc});
+			}
+			++i;
+		}
+	}
+}
+
 /* === C L A S S E S ======================================================= */
 
 struct Widget_Curves::Channel
@@ -568,27 +609,34 @@
 	clear();
 	CurveStruct curve_struct;
 	for(const auto& item : data) {
-		const ValueDesc* i = &item.second;
 
-		curve_struct.name = item.first;
-		curve_struct.init(*i);
-		if (curve_struct.channels.empty())
-			continue;
+		std::vector<std::pair<std::string, ValueDesc>> curve_descs;
 
-		curve_list.push_back(curve_struct);
+		gather_curve_descs(item.first, item.second, curve_descs);
+		for (const auto& curve_desc : curve_descs) {
+			// add curves to be drawn
+			curve_struct.name = curve_desc.first;
+			curve_struct.init(curve_desc.second);
+			if (curve_struct.channels.empty())
+				continue;
 
-		if (i->is_value_node())
-			value_desc_changed.push_back(
-				i->get_value_node()->signal_changed().connect(
+			curve_list.push_back(curve_struct);
+
+			// connect signals on-value-desc-change to refresh this widget
+			const ValueDesc* i = &curve_desc.second;
+			if (i->is_value_node())
+				value_desc_changed.push_back(
+					i->get_value_node()->signal_changed().connect(
+							sigc::mem_fun(*this, &Widget_Curves::refresh )));
+			if (i->parent_is_value_node())
+				value_desc_changed.push_back(
+					i->get_parent_value_node()->signal_changed().connect(
+						sigc::mem_fun(*this, &Widget_Curves::refresh )));
+			if (i->parent_is_layer())
+				value_desc_changed.push_back(
+					i->get_layer()->signal_changed().connect(
 						sigc::mem_fun(*this, &Widget_Curves::refresh )));
-		if (i->parent_is_value_node())
-			value_desc_changed.push_back(
-				i->get_parent_value_node()->signal_changed().connect(
-					sigc::mem_fun(*this, &Widget_Curves::refresh )));
-		if (i->parent_is_layer())
-			value_desc_changed.push_back(
-				i->get_layer()->signal_changed().connect(
-					sigc::mem_fun(*this, &Widget_Curves::refresh )));
+		}
 	}
 	queue_draw();
 }

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/widgets/widget_soundwave.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/widgets/widget_soundwave.cpp Changed

@@ -189,15 +189,16 @@
 
 	std::lock_guard<std::mutex> lock(mutex);
 
-	const int bytes_per_sample = 1;
 
 	Gdk::RGBA color = get_style_context()->get_color();
 	cr->set_source_rgb(color.get_red(), color.get_green(), color.get_blue());
 
-	const int middle_y = 127;
-	cr->move_to(0, middle_y);
-
+	constexpr int bytes_per_sample = 1;
 	const int stride = frequency * bytes_per_sample * n_channels;
+	const unsigned long max_index = buffer.size() - bytes_per_sample;
+
+	const int middle_y = 127; // std::pow(2, bytes_per_sample) - 1;
+	cr->move_to(0, middle_y);
 
 	for (double x = 0; x < get_width(); x+=.1) {
 		synfig::Time t = time_plot_data->get_t_from_pixel_coord(x);
@@ -205,8 +206,9 @@
 		if (t >= sound_delay) {
 			synfig::Time dt = t - sound_delay;
 			unsigned long index = int(dt * stride) + channel_idx;
-			if (index < buffer.size())
-				std::copy(buffer.begin() + index, buffer.begin() + index + bytes_per_sample, &value);
+			if (index >= max_index)
+				break;
+			std::copy(buffer.begin() + index, buffer.begin() + index + bytes_per_sample, &value);
 		}
 		int y = time_plot_data->get_pixel_y_coord(value);
 		cr->line_to(x, y);
@@ -278,10 +280,15 @@
 	std::string real_filename = Glib::filename_from_utf8(filename.u8string());
 	Mlt::Profile profile;
 	Mlt::Producer *track = new Mlt::Producer(profile, (std::string("avformat:") + real_filename).c_str());
-	if (!track->get_producer() || track->get_length() <= 0) {
+
+	// That value is INT_MAX, which is our special value that means unknown or possibly a live source.
+	// https://github.com/mltframework/mlt/issues/1073#issuecomment-2730111264
+	constexpr int mlt_error_length = INT_MAX;
+
+	if (!track->get_producer() || track->get_length() <= 0 || track->get_length() == mlt_error_length) {
 		delete track;
 		track = new Mlt::Producer(profile, (std::string("vorbis:") + real_filename).c_str());
-		if (!track->get_producer() || track->get_length() <= 0) {
+		if (!track->get_producer() || track->get_length() <= 0 || track->get_length() == mlt_error_length) {
 			delete track;
 			return false;
 		}
@@ -306,7 +313,7 @@
 	n_channels = 0;
 
 	for (int i = start_frame; i < end_frame; ++i) {
-		Mlt::Frame *frame = track->get_frame(0);
+		std::unique_ptr<Mlt::Frame> frame(track->get_frame(0));
 		if (!frame)
 			break;
 
@@ -323,22 +330,27 @@
 		void * _buffer = frame->get_audio(format, _frequency, _channels, _n_samples);
 		if (_buffer == nullptr) {
 			synfig::warning("couldn't get sound frame #%i", i);
-			delete frame;
 			break;
 		}
 		if (buffer.empty()) {
 			synfig::warning("sound frame #%i got empty buffer", i);
-			int buffer_length = (end_frame - start_frame + 1) * _channels * bytes_per_sample * std::round(_frequency/fps);
+			int buffer_length = (end_frame - start_frame) * _channels * bytes_per_sample * std::round(_frequency/fps);
 			buffer.resize(buffer_length);
 		}
 		int _n_bytes = _n_samples * _channels * bytes_per_sample;
-		std::copy(static_cast<unsigned char*>(_buffer), static_cast<unsigned char*>(_buffer) + _n_bytes, buffer.begin()+bytes_written);
+		if (bytes_written + _n_bytes > buffer.size()) {
+			if (buffer.size() <= bytes_written) {
+				synfig::error(_("Internal error: Widget_SoundWave: trying to read more bytes than buffer size: %i x %zu"), _n_bytes + bytes_written, buffer.size());
+				break;
+			}
+			_n_bytes = buffer.size() - bytes_written;
+		}
+		std::copy(static_cast<unsigned char*>(_buffer), static_cast<unsigned char*>(_buffer) + _n_bytes, buffer.begin() + bytes_written);
 		bytes_written += _n_bytes;
 		outbuffer += _n_bytes;
 		frequency = _frequency;
 		n_channels = _channels;
 		n_samples += _n_samples;
-		delete frame;
 	}
 	if (channel_idx > n_channels)
 		channel_idx = 0;

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/widgets/widget_timeslider.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/widgets/widget_timeslider.cpp Changed

@@ -40,6 +40,7 @@
 #include <cmath>
 
 #include <gdkmm/general.h>
+#include <gtkmm/icontheme.h>
 
 #include <gui/app.h>
 #include <gui/exception_guard.h>
@@ -59,6 +60,7 @@
 const double zoominfactor = 1.25;
 const double zoomoutfactor = 1/zoominfactor;
 const int fullheight = 20;
+const double handle_dimension = 8;
 
 /* === P R O C E D U R E S ================================================= */
 
@@ -174,6 +176,13 @@
 			 | Gdk::BUTTON_RELEASE_MASK
 			 | Gdk::BUTTON_MOTION_MASK
 			 | Gdk::SCROLL_MASK );
+
+	auto icon_theme = Gtk::IconTheme::get_default();
+	lower_bound_pixbuf = icon_theme->load_icon("lower_bound_handle_icon", 1);
+	upper_bound_pixbuf = icon_theme->load_icon("upper_bound_handle_icon", 1);
+
+	bounds_cursor = Gdk::Cursor::create(get_display(), "ew-resize");
+	default_cursor = Gdk::Cursor::create(get_display(), "default");
 }
 
 Widget_Timeslider::~Widget_Timeslider()
@@ -305,23 +314,54 @@
 				double x1 = time_plot_data->get_double_pixel_t_coord(boundsi1);
 				double w = x1 - x0;
 
+				double boundary_adjust = handle_dimension;
+				double background_adjust = (i == 0) ? 0 : handle_dimension;
+
 				cr->save();
-				cr->rectangle(x0, 0.0, w, (double)get_height());
+				cr->rectangle(x0 + background_adjust, 0.0, w - handle_dimension, (double)get_height());
 				cr->clip();
 				cr->translate(offset, 0.0);
 				cr->set_source(play_bounds_pattern);
 				cr->paint();
 				cr->restore();
 
+				boundary_adjust = (i == 0) ? 0 : handle_dimension;
+
 				cr->save();
 				cr->set_line_width(1.0);
-				cr->set_source_rgba(0.0, 0.0, 0.0, 0.25);
-				cr->rectangle(x0 + 1.0, 1.0, w - 2.0, (double)get_height() - 2.0);
+				cr->set_source_rgba(0.0, 0.0, 0.0, 0.25);//inner border
+				cr->rectangle(x0 + 1.0 + boundary_adjust, 1.0, w - 2.0 - handle_dimension, (double)get_height() - 2.0);
 				cr->stroke();
-				cr->set_source_rgba(0.0, 0.0, 0.0, 0.3);
-				cr->rectangle(x0 + 0.5, 0.5, w - 1.0, (double)get_height() - 1.0);
+				cr->set_source_rgba(0.0, 0.0, 0.0, 0.3);//outer border
+				cr->rectangle(x0 + 0.5 + boundary_adjust, 0.5, w - 1.0 - handle_dimension, (double)get_height() - 1.0);
 				cr->stroke();
 				cr->restore();
+
+				Glib::RefPtr<Gdk::Pixbuf> icon;
+				if (i == 0) {
+					boundary_adjust = -handle_dimension;
+					icon = lower_bound_pixbuf;
+				} else {
+					boundary_adjust = -w;
+					icon = upper_bound_pixbuf;
+				}
+
+				cr->save();
+				Gdk::Cairo::set_source_pixbuf(cr, icon, x0 + w + boundary_adjust, 0);
+				cr->rectangle(x0 + w + boundary_adjust, 0.0, handle_dimension, (double)get_height());
+				cr->fill();
+				if ((moving_lower_bound_handle && i==0) || (moving_upper_bound_handle && i==1)) { //highlight/lighten bound on move
+					cairo_set_operator(cr->cobj(), CAIRO_OPERATOR_LIGHTEN);
+					cr->set_source_rgba(1.0, 1.0, 1.0, 0.4);
+					cr->rectangle(x0 + w + boundary_adjust, 0.0, handle_dimension, (double)get_height());
+					cr->fill();
+				} else if ((hovering_on_lower_bound_handle && i==0) ||	(hovering_on_upper_bound_handle && i==1)) { //highlight/lighten bound on hover
+					cairo_set_operator(cr->cobj(), CAIRO_OPERATOR_LIGHTEN);
+					cr->set_source_rgba(1.0, 1.0, 1.0, 0.2);
+					cr->rectangle(x0 + w + boundary_adjust, 0.0, handle_dimension, (double)get_height());
+					cr->fill();
+				}
+				cr->restore();
 			}
 		}
 	}
@@ -342,7 +382,19 @@
 		Time time = time_plot_data->get_t_from_pixel_coord(event->x);
 		time_plot_data->time_model->set_time(time);
 	}
-
+	//if moving timeslider along with handle isnt wanted move these above prev if and add cond.
+	bool bounds_enabled = time_plot_data->time_model->get_play_bounds_enabled();
+	if (bounds_enabled) {
+		synfig::Rect lower_bound = get_bounds_rectangle(true);
+		synfig::Rect upper_bound = get_bounds_rectangle(false);
+		synfig::Point cursor_pos(event->x, 0.0);
+
+		if (lower_bound.is_inside(cursor_pos))
+			moving_lower_bound_handle = true;
+		else if (upper_bound.is_inside(cursor_pos))
+			moving_upper_bound_handle = true;
+	}
+	queue_draw();
 	return event->button == 1 || event->button == 2;
 	SYNFIG_EXCEPTION_GUARD_END_BOOL(true)
 }
@@ -351,14 +403,59 @@
 Widget_Timeslider::on_button_release_event(GdkEventButton *event){
 	SYNFIG_EXCEPTION_GUARD_BEGIN()
 	lastx = (double)event->x;
+	moving_lower_bound_handle = false;
+	moving_upper_bound_handle = false;
+	queue_draw();
 	return event->button == 1 || event->button == 2;
 	SYNFIG_EXCEPTION_GUARD_END_BOOL(true)
 }
 
 bool
+Widget_Timeslider::on_leave_notify_event(GdkEventCrossing*)
+{
+	SYNFIG_EXCEPTION_GUARD_BEGIN()
+	hovering_on_lower_bound_handle = false;
+	hovering_on_upper_bound_handle = false;
+	queue_draw();
+	return true;
+	SYNFIG_EXCEPTION_GUARD_END_BOOL(true)
+}
+
+const synfig::Rect
+Widget_Timeslider::get_bounds_rectangle(bool lower) const
+{
+	if (lower) {
+		double x1 = time_plot_data->get_double_pixel_t_coord(time_plot_data->time_model->get_play_bounds_lower());
+		synfig::Rect lower_bound(synfig::Point(x1 - handle_dimension, 0.0), synfig::Point(x1, 0.0));
+		return lower_bound;
+	} else {
+		double x0 = time_plot_data->get_double_pixel_t_coord(time_plot_data->time_model->get_play_bounds_upper());
+		synfig::Rect upper_bound(synfig::Point(x0, 0.0), synfig::Point(x0 + handle_dimension, 0.0));
+		return upper_bound;
+	}
+}
+
+bool
 Widget_Timeslider::on_motion_notify_event(GdkEventMotion* event) //for dragging
 {
 	SYNFIG_EXCEPTION_GUARD_BEGIN()
+
+	synfig::Rect lower_bound = get_bounds_rectangle(true);
+	synfig::Rect upper_bound = get_bounds_rectangle(false);
+	synfig::Point cursor_pos(event->x, 0.0);
+	bool moving_handle = moving_lower_bound_handle || moving_upper_bound_handle;
+	bool bounds_enabled = time_plot_data->time_model->get_play_bounds_enabled();
+	hovering_on_lower_bound_handle = lower_bound.is_inside(cursor_pos);
+	hovering_on_upper_bound_handle = upper_bound.is_inside(cursor_pos);
+	bool hovering_on_handle = hovering_on_lower_bound_handle || hovering_on_upper_bound_handle;
+
+	if ((moving_handle || hovering_on_handle) && (bounds_enabled))
+		get_window()->set_cursor(bounds_cursor);
+	else
+		get_window()->set_cursor(default_cursor);
+
+	queue_draw();
+
 	double dx = (double)event->x - lastx;
 	lastx = (double)event->x;
 
@@ -366,7 +463,13 @@
 		return false;
 
 	Gdk::ModifierType mod = Gdk::ModifierType(event->state);
-	if (mod & Gdk::BUTTON1_MASK) {
+
+	if (moving_lower_bound_handle)
+		time_plot_data->time_model->set_play_bounds_lower(time_plot_data->get_t_from_pixel_coord(event->x));
+	else if (moving_upper_bound_handle)
+		time_plot_data->time_model->set_play_bounds_upper(time_plot_data->get_t_from_pixel_coord(event->x));
+
+	if ((mod & Gdk::BUTTON1_MASK) /*&& (!moving_lower_bound_handle) && (!moving_upper_bound_handle)*/) {//commented code is for disabling moving timeslider while moving bound
 		// scrubbing
 		Time time = time_plot_data->get_t_from_pixel_coord(event->x);
 		time_plot_data->time_model->set_time(time);

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/widgets/widget_timeslider.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/widgets/widget_timeslider.h Changed

@@ -34,6 +34,8 @@
 #include <gtkmm/drawingarea.h>
 #include <gui/timemodel.h>
 
+#include <synfig/rect.h>
+
 /* === M A C R O S ========================================================= */
 
 /* === T Y P E D E F S ===================================================== */
@@ -56,9 +58,20 @@
 
 	Cairo::RefPtr<Cairo::SurfacePattern> play_bounds_pattern;
 
+	Glib::RefPtr<Gdk::Cursor> bounds_cursor;
+	Glib::RefPtr<Gdk::Cursor> default_cursor;
+
+	Glib::RefPtr<Gdk::Pixbuf> lower_bound_pixbuf;
+	Glib::RefPtr<Gdk::Pixbuf> upper_bound_pixbuf;
+
 	// last mouse position for dragging
 	double lastx;
 
+	bool moving_lower_bound_handle = false;
+	bool moving_upper_bound_handle = false;
+	bool hovering_on_lower_bound_handle = false;
+	bool hovering_on_upper_bound_handle = false;
+
 	// distance between two small marks, also uses for left/right scroll
 	synfig::Time step;
 
@@ -71,10 +84,12 @@
 	virtual bool on_button_release_event(GdkEventButton *event); //for clicking
 	virtual bool on_motion_notify_event(GdkEventMotion* event); //for dragging
 	virtual bool on_scroll_event(GdkEventScroll* event); //for zooming
+	virtual bool on_leave_notify_event(GdkEventCrossing* event);
 	virtual bool on_draw(const Cairo::RefPtr<Cairo::Context> &cr);
 
 	virtual void draw_background(const Cairo::RefPtr<Cairo::Context> &cr);
 
+	const synfig::Rect get_bounds_rectangle(bool lower) const;
 public:
 	Widget_Timeslider();
 	~Widget_Timeslider();

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/widgets/widget_timetrack.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/widgets/widget_timetrack.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/workarea.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/workarea.cpp Changed

@@ -2280,3 +2280,48 @@
 	renderer_set_.swap(tmp);
 	queue_draw();
 }
+
+bool 
+WorkArea::get_keyframe_lock_past() const
+{
+	if (!canvas_view)
+		return false;
+	return (canvas_view->get_mode() & synfigapp::MODE_ANIMATE_PAST);
+}
+
+bool 
+WorkArea::get_keyframe_lock_future() const
+{
+	if (!canvas_view)
+		return false;
+	return (canvas_view->get_mode() & synfigapp::MODE_ANIMATE_FUTURE);
+}
+
+void 
+WorkArea::set_keyframe_lock_past(bool enabled)
+{
+	if (!canvas_view)
+		return;
+	auto mode = canvas_view->get_mode();
+	if (enabled)
+		mode = synfigapp::set_flag(mode, synfigapp::MODE_ANIMATE_PAST);
+	else
+		mode = synfigapp::clear_flag(mode, synfigapp::MODE_ANIMATE_PAST);
+
+	canvas_view->set_mode(mode);
+}
+
+void 
+WorkArea::set_keyframe_lock_future(bool enabled)
+{
+	if (!canvas_view)
+		return;
+	auto mode = canvas_view->get_mode();
+	if (enabled)
+		mode = synfigapp::set_flag(mode, synfigapp::MODE_ANIMATE_FUTURE);
+	else
+		mode = synfigapp::clear_flag(mode, synfigapp::MODE_ANIMATE_FUTURE);
+
+	canvas_view->set_mode(mode);
+	
+}

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/workarea.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/workarea.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/gui/workarearenderer/renderer_bonesetup.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/gui/workarearenderer/renderer_bonesetup.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/action.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/action.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/action.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/action.h Changed

@@ -224,6 +224,7 @@
 	void set_active(bool x) { active_=x; }
 
 public:
+	typedef etl::handle<Undoable> Handle;
 
 	//! This function will throw an Action::Error() on failure
 	virtual void undo()=0;
@@ -275,7 +276,7 @@
 
 }; // END of class Action::CanvasSpecific
 
-typedef std::list< etl::handle<Action::Undoable> > ActionList;
+typedef std::list< Action::Undoable::Handle > ActionList;
 
 /*!	\class synfigapp::Action::Super
 **	\brief Super-Action base class for actions composed of several other actions.
@@ -288,6 +289,7 @@
 	ActionList action_list_;
 
 public:
+	typedef etl::handle<Super> Handle;
 
 	ActionList &action_list() { return action_list_; }
 	const ActionList &action_list()const { return action_list_; }
@@ -298,19 +300,19 @@
 
 	bool first_time()const { return action_list_.empty(); }
 
-	void add_action(etl::handle<Undoable> action);
-	void add_action_front(etl::handle<Undoable> action);
+	void add_action(Undoable::Handle action);
+	void add_action_front(Undoable::Handle action);
 
-	void add_action(etl::handle<Base> action)
+	void add_action(Action::Handle action)
 	{
-		etl::handle<Undoable> undoable = etl::handle<Undoable>::cast_dynamic(action);
+		Undoable::Handle undoable = Undoable::Handle::cast_dynamic(action);
 		assert(undoable);
 		add_action(undoable);
 	}
 
-	void add_action_front(etl::handle<Base> action)
+	void add_action_front(Action::Handle action)
 	{
-		etl::handle<Undoable> undoable = etl::handle<Undoable>::cast_dynamic(action);
+		Undoable::Handle undoable = Undoable::Handle::cast_dynamic(action);
 		assert(undoable);
 		add_action_front(undoable);
 	}
@@ -329,6 +331,8 @@
 protected:
 	bool ready_;
 public:
+	typedef etl::handle<Group> Handle;
+
 	Group(const synfig::String &str="Group");
 	virtual ~Group();

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/action_system.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/action_system.cpp Changed

@@ -86,7 +86,7 @@
 }
 
 bool
-Action::System::perform_action(etl::handle<Action::Base> action)
+Action::System::perform_action(Action::Handle action)
 {
 	assert(action);
 	DEBUG_LOG("SYNFIG_DEBUG_ACTIONS",
@@ -113,7 +113,7 @@
 
 	// If we cannot undo this action, make sure
 	// that the user knows this.
-	etl::handle<Action::Undoable> undoable_action = etl::handle<Action::Undoable>::cast_dynamic(action);
+	Action::Undoable::Handle undoable_action = Action::Undoable::Handle::cast_dynamic(action);
 	assert(!undoable_action || undoable_action->is_active());
 	if (!undoable_action) {
 		String message = synfig::strprintf(_("Do you want to do action \"%s\"?"), action->get_local_name().c_str());
@@ -187,7 +187,7 @@
 bool
 synfigapp::Action::System::undo_(etl::handle<UIInterface> uim)
 {
-	etl::handle<Action::Undoable> action = undo_action_stack().front();
+	Action::Undoable::Handle action = undo_action_stack().front();
 	most_recent_action_name_ = action->get_name();
 
 	try { if (action->is_active()) action->undo(); }
@@ -234,7 +234,7 @@
 	if (undo_action_stack().empty())
 		return false;
 
-	etl::handle<Action::Undoable> action = undo_action_stack().front();
+	Action::Undoable::Handle action = undo_action_stack().front();
 	Action::CanvasSpecific *canvas_specific = dynamic_cast<Action::CanvasSpecific*>(action.get());
 
 	DirtySignalBlocker dirtyBlocker(canvas_specific);
@@ -254,7 +254,7 @@
 bool
 Action::System::redo_(etl::handle<UIInterface> uim)
 {
-	etl::handle<Action::Undoable> action = redo_action_stack().front();
+	Action::Undoable::Handle action = redo_action_stack().front();
 	most_recent_action_name_ = action->get_name();
 
 	try { if(action->is_active()) action->perform(); }
@@ -301,7 +301,7 @@
 	if (redo_action_stack_.empty())
 		return false;
 
-	etl::handle<Action::Undoable> action = redo_action_stack().front();
+	Action::Undoable::Handle action = redo_action_stack().front();
 	Action::CanvasSpecific *canvas_specific = dynamic_cast<Action::CanvasSpecific*>(action.get());
 
 	DirtySignalBlocker dirtyBlocker(canvas_specific);
@@ -366,12 +366,12 @@
 }
 
 bool
-Action::System::set_action_status(etl::handle<Action::Undoable> action, bool x)
+Action::System::set_action_status(Action::Undoable::Handle action, bool x)
 {
 	if (action->is_active() == x)
 		return true;
 
-	etl::handle<Action::Undoable> cur_pos = undo_action_stack_.front();
+	Action::Undoable::Handle cur_pos = undo_action_stack_.front();
 	Action::CanvasSpecific *canvas_specific = dynamic_cast<Action::CanvasSpecific*>(action.get());
 
 	etl::handle<UIInterface> uim = new ConfidentUIInterface();
@@ -431,21 +431,21 @@
 Action::PassiveGrouper::~PassiveGrouper()
 	{ if (!finished_) finish(); }
 
-etl::handle<Action::Group>
+Action::Group::Handle
 Action::PassiveGrouper::finish()
 {
 	assert(!finished_);
-	if (finished_) return etl::handle<Action::Group>();
+	if (finished_) return Action::Group::Handle();
 	finished_ = true;
 
 	// Remove this group from the group stack
 	assert(instance_->group_stack_.front() == this);
 	instance_->group_stack_.pop_front();
 
-	etl::handle<Action::Group> group;
+	Action::Group::Handle group;
 	if (depth_ == 1) {
-		etl::handle<Action::Undoable> action = instance_->undo_action_stack_.front();
-		group = etl::handle<Action::Group>::cast_dynamic(action);
+		Action::Undoable::Handle action = instance_->undo_action_stack_.front();
+		group = Action::Group::Handle::cast_dynamic(action);
 		if (group) {
 			// If the only action inside of us is a group,
 			// then we should rename the group to our name.
@@ -466,7 +466,7 @@
 		group = new Action::Group(name_);
 
 		for(int i=0; i < depth_; i++) {
-			etl::handle<Action::Undoable> action = instance_->undo_action_stack_.front();
+			Action::Undoable::Handle action = instance_->undo_action_stack_.front();
 
 			if (Action::CanvasSpecific* canvas_specific = dynamic_cast<Action::CanvasSpecific*>(action.get()))
 				if (canvas_specific->is_dirty()) {

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/action_system.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/action_system.h Changed

@@ -83,7 +83,7 @@
 
 	void request_redraw(etl::handle<CanvasInterface>);
 
-	etl::handle<Action::Group> finish();
+	Action::Group::Handle finish();
 
 	void cancel();
 
@@ -94,7 +94,7 @@
 	const int &get_depth()const { return depth_; }
 }; // END of class Action::PassiveGrouper
 
-typedef std::list< etl::handle<Action::Undoable> > Stack;
+typedef std::list<Action::Undoable::Handle> Stack;
 
 class System : public etl::shared_object, public sigc::trackable
 {
@@ -136,12 +136,12 @@
 
 	sigc::signal<void,bool> signal_undo_status_;
 	sigc::signal<void,bool> signal_redo_status_;
-	sigc::signal<void,etl::handle<Action::Undoable> > signal_new_action_;
+	sigc::signal<void,Action::Undoable::Handle> signal_new_action_;
 	sigc::signal<void> signal_undo_stack_cleared_;
 	sigc::signal<void> signal_redo_stack_cleared_;
 	sigc::signal<void> signal_undo_;
 	sigc::signal<void> signal_redo_;
-	sigc::signal<void,etl::handle<Action::Undoable> > signal_action_status_changed_;
+	sigc::signal<void,Action::Undoable::Handle> signal_action_status_changed_;
 
 	mutable sigc::signal<void,bool> signal_unsaved_status_changed_;
 
@@ -180,7 +180,7 @@
 	template <typename T> bool
 	perform_action(T x)
 	{
-		etl::handle<Action::Base> action((Action::Base*)new T(x));
+		Action::Handle action((Action::Base*)new T(x));
 		return perform_action(action);
 	}
 	*/
@@ -193,9 +193,9 @@
 
 	void request_redraw(etl::handle<CanvasInterface>);
 
-	bool perform_action(etl::handle<Action::Base> action);
+	bool perform_action(Action::Handle action);
 
-	bool set_action_status(etl::handle<Action::Undoable> action, bool x);
+	bool set_action_status(Action::Undoable::Handle action, bool x);
 
 	const Stack &undo_action_stack()const { return undo_action_stack_; }
 
@@ -257,9 +257,9 @@
 	sigc::signal<void>& signal_redo() { return signal_redo_; }
 
 	//!	Called whenever an undoable action is processed and added to the stack.
-	sigc::signal<void,etl::handle<Action::Undoable> >& signal_new_action() { return signal_new_action_; }
+	sigc::signal<void,Action::Undoable::Handle>& signal_new_action() { return signal_new_action_; }
 
-	sigc::signal<void,etl::handle<Action::Undoable> >& signal_action_status_changed() { return signal_action_status_changed_; }
+	sigc::signal<void,Action::Undoable::Handle>& signal_action_status_changed() { return signal_action_status_changed_; }
 
 }; // END of class Action::System

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/actions/layerencapsulateswitch.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/actions/layerencapsulateswitch.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/actions/valuedescblinelink.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/actions/valuedescblinelink.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/actions/valuedescconvert.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/actions/valuedescconvert.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/actions/valuedescdisconnect.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/actions/valuedescdisconnect.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/actions/waypointsetsmart.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/actions/waypointsetsmart.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/blineconvert.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/blineconvert.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/canvasinterface.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/canvasinterface.cpp Changed

@@ -953,11 +953,12 @@
 {
 	Action::PassiveGrouper group(get_instance().get(),_("Import sequence"));
 
-	float fps = get_canvas()->rend_desc().get_frame_rate();
-	
+	const float fps = get_canvas()->rend_desc().get_frame_rate();
+
 	synfig::info("Attempting to import sequence");
 	Layer::Handle layer_switch;
 	ValueNode_Animated::Handle layer_name_animated = ValueNode_Animated::create(type_string);
+
 	try {
 		// add imported layers into switch
 		Action::Handle action(Action::create("LayerEncapsulateSwitch"));
@@ -970,16 +971,10 @@
 		d_action->set_param("canvas_interface",etl::loose_handle<CanvasInterface>(this));
 
 		// create layers and assign them with LayerEncapsulateSwitch action
-		Layer::Handle layer;
-		Layer_Bitmap::Handle curr_layer;
-		rendering::Surface::Handle cur_surface,prev_surface= rendering::Surface::Handle();
-		bool first_time=true;
+		Layer::Handle first_imported_layer;
+		rendering::Surface::Handle prev_surface;
 		int layers_count = 0;
-		std::set<filesystem::Path>::const_iterator c1 = filenames.begin();
-		std::set<filesystem::Path>::const_iterator c2 = filenames.begin();
-
-		while (c2 != filenames.end()) {
-			const filesystem::Path& filename = *c2;
+		for (const auto& filename : filenames) {
 			synfig::info("Attempting to import '%s' into sequence", filename.u8_str());
 			
 			String ext(filename.extension().u8string());
@@ -1001,72 +996,75 @@
 			String short_filename = CanvasFileNaming::make_short_filename(get_canvas()->get_file_name(), filename.u8string());
 			
 			try {
-				layer = add_layer_to("Import",get_canvas());
+				Layer::Handle layer = add_layer_to("Import", get_canvas());
 				if (!layer)
 					throw int();
 				if (!layer->set_param("filename", ValueBase(short_filename)))
 					throw int();
 
-				if(remove_dups){
-					curr_layer= Layer_Bitmap::Handle::cast_dynamic(layer);
-					if(!curr_layer){
+				bool is_layer_equal_previous_one = false;
+
+				if (remove_dups) {
+					// Gets the surface of current imported image
+					auto curr_layer = Layer_Bitmap::Handle::cast_dynamic(layer);
+					if (!curr_layer)
 						throw int();
-					}
 					rendering::SurfaceResource::LockRead<rendering::SurfaceSW> cur_lock(curr_layer->rendering_surface);
-					if(!cur_lock) {
+					if (!cur_lock)
 						throw int();
-					}
-					cur_surface=cur_lock.get_handle();
-
-					if(c2!=std::next(filenames.end(), -1) && !first_time && cur_surface->compare_with(prev_surface)){
-						d_action->set_param("layer",layer);
-						advance(c2,1);
-						++layers_count;
-						continue;
-					}
-					if(first_time) {
-						first_time = false;
+					rendering::Surface::Handle cur_surface = cur_lock.get_handle();
+
+					// Finally checks if it is equal to previous imported frame
+					if (prev_surface && cur_surface && cur_surface->equals_to(prev_surface)) {
+						is_layer_equal_previous_one = true;
+						d_action->set_param("layer", layer);
+						synfig::info("\tEquals to previous sequence item");
+					} else {
+						prev_surface = cur_surface;
 					}
 				}
-				update_layer_size(get_canvas()->rend_desc(), layer, resize_image);
-				layer->monitor(filename);
-				String desc = filename.filename().u8string();
-				layer->set_description(desc);
-				signal_layer_new_description()(layer, desc);
-
-				action->set_param("layer", layer);
-				if (!layers_count)
-					action->set_param("description", desc);
-
-				Waypoint &wp = *layer_name_animated->new_waypoint(Time(layers_count/fps), ValueBase(desc));
-				wp.set_before(INTERPOLATION_CONSTANT);
-				wp.set_after(INTERPOLATION_CONSTANT);
+				// Do add the new layer and the waypoint to it
+				if (!is_layer_equal_previous_one) {
+					if (!first_imported_layer)
+						first_imported_layer = layer;
+					update_layer_size(get_canvas()->rend_desc(), layer, resize_image);
+					layer->monitor(filename);
+					String desc = filename.filename().u8string();
+					layer->set_description(desc);
+					signal_layer_new_description()(layer, desc);
+
+					action->set_param("layer", layer);
+					if (layers_count == 0)
+						action->set_param("description", desc);
+
+					Waypoint& wp = *layer_name_animated->new_waypoint(Time(layers_count/fps), ValueBase(desc));
+					wp.set_before(INTERPOLATION_CONSTANT);
+					wp.set_after(INTERPOLATION_CONSTANT);
+				}
 
 				++layers_count;
-				c1=c2;
-				prev_surface=cur_surface;
-				advance(c2,1);
 			} catch(...) {
 				errors += synfig::strprintf(_("Unable to import file: %s"), filename.u8_str());
 				group.cancel();
 				return false;
 			}
 		}
+
 		if (!layers_count)
 			{ get_ui_interface()->error(_("Nothing imported")); throw int(); }
 		if(!action->is_ready())
 			{ get_ui_interface()->error(_("Action Not Ready")); throw int(); }
 		if(!get_instance()->perform_action(action))
 			{ get_ui_interface()->error(_("Action Failed.")); throw int(); }
-		if(remove_dups){
-			if(!get_instance()->perform_action(d_action))
-				{ get_ui_interface()->error(_("Delete Action Failed.")); throw int(); }
+		if (remove_dups) {
+			if (d_action->is_ready())
+				if (!get_instance()->perform_action(d_action))
+					{ get_ui_interface()->error(_("Delete Action Failed.")); throw int(); }
 		}
 
-		if (layer) {
+		if (first_imported_layer) {
 			// get parent layer, because image is encapsulated into action switch
-			Layer::Handle layer_switch = layer->get_parent_paste_canvas_layer();
-
+			layer_switch = first_imported_layer->get_parent_paste_canvas_layer();
 			// connect animated layer_name param
 			action = Action::create("LayerParamConnect");
 			if(!action)
@@ -1189,60 +1187,6 @@
 		get_ui_interface()->error(_("Action Failed."));
 }
 
-
-void
-CanvasInterface::auto_export(synfig::ValueNode::Handle /*value_node*/)
-{
-/*
-	// Check to see if we are already exported.
-	if(value_node->is_exported())
-		return;
-
-	Action::Handle 	action(Action::create("ValueNodeAdd"));
-
-	assert(action);
-	if(!action)
-		return;
-
-	String name(strprintf(_("Unnamed%08d"),synfig::UniqueID().get_uid()));
-
-	action->set_param("canvas",get_canvas());
-	action->set_param("canvas_interface",etl::loose_handle<CanvasInterface>(this));
-	action->set_param("new",value_node);
-	action->set_param("name",name);
-
-	if(!get_instance()->perform_action(action))
-		get_ui_interface()->error(_("Action Failed."));
-*/
-}
-
-void
-CanvasInterface::auto_export(const ValueDesc& /*value_desc*/)
-{
-	// THIS FUNCTION IS DEPRECATED, AND IS NOW A STUB.
-#if 0
-	// Check to see if we are already exported.
-	if(value_desc.is_exported())
-		return;
-
-	Action::Handle 	action(Action::create("ValueDescExport"));
-
-	assert(action);
-	if(!action)
-		return;
-
-	String name(strprintf(_("Unnamed%08d"),synfig::UniqueID().get_uid()));
-
-	action->set_param("canvas",get_canvas());
-	action->set_param("canvas_interface",etl::loose_handle<CanvasInterface>(this));
-	action->set_param("value_desc",value_desc);
-	action->set_param("name",name);
-
-	if(!get_instance()->perform_action(action))
-		get_ui_interface()->error(_("Action Failed."));
-#endif
-}
-
 bool
 CanvasInterface::change_value(synfigapp::ValueDesc value_desc,synfig::ValueBase new_value,bool lock_animation)
 {

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/canvasinterface.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/canvasinterface.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/editmode.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/editmode.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/inputdevice.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/inputdevice.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/inputdevice.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/inputdevice.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/instance.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/instance.cpp Changed

@@ -58,6 +58,7 @@
 #include <synfig/valuenodes/valuenode_blinecalcvertex.h>
 #include <synfig/valuenodes/valuenode_blinecalcwidth.h>
 #include <synfig/valuenodes/valuenode_wplist.h>
+#include <synfig/valuenodes/valuenode_maprange.h>
 #include <synfig/valuenodes/valuenode_scale.h>
 #include <synfig/valuenodes/valuenode_range.h>
 #include <synfig/valuenodes/valuenode_integer.h>
@@ -106,6 +107,7 @@
 		|| ValueNode_BLineCalcVertex::Handle::cast_dynamic(value_node)
 		|| ValueNode_BLineCalcTangent::Handle::cast_dynamic(value_node)
 		|| ValueNode_BLineCalcWidth::Handle::cast_dynamic(value_node)
+		|| ValueNode_MapRange::Handle::cast_dynamic(value_node)
 		|| ValueNode_Scale::Handle::cast_dynamic(value_node)
 		|| ValueNode_Range::Handle::cast_dynamic(value_node)
 		|| ValueNode_Integer::Handle::cast_dynamic(value_node)
@@ -279,7 +281,7 @@
 	return false;
 }
 
-etl::handle<Action::Group>
+Action::Group::Handle
 Instance::import_external_canvases()
 {
 	synfigapp::Action::PassiveGrouper group(this, _("Import external canvases"));
@@ -616,7 +618,7 @@
 		new_canvas_filesystem = CanvasFileNaming::make_filesystem(new_container);
 		if (!new_canvas_filesystem)
 		{
-			warning("Cannot create canvas filesysem for: %s", new_canvas_filename.c_str());
+			warning("Cannot create canvas filesystem for: %s", new_canvas_filename.c_str());
 			return false;
 		}
 
@@ -667,7 +669,7 @@
 	bool embed_files = (bool)new_container_zip;
 	bool save_files = true;
 
-	etl::handle<Action::Group> import_external_canvases_action;
+	Action::Group::Handle import_external_canvases_action;
 	if (embed_files)
 		import_external_canvases_action = import_external_canvases();

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/instance.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/instance.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/main.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/main.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/main.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/main.h Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/value_desc.h -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/value_desc.h Changed

@@ -136,6 +136,34 @@
 		return *this;
 	}
 
+	ValueDesc& operator=(ValueDesc&& other) noexcept
+	{
+		if (this == &other)
+			return *this;
+
+		if (parent_desc && 0 >= --parent_desc->links_count)
+			delete parent_desc;
+
+		if (id_changed_connection.connected())
+			id_changed_connection.disconnect();
+
+		layer = std::move(other.layer);
+		name = std::move(other.name);
+		parent_value_node = std::move(other.parent_value_node);
+		index = other.index;
+		waypoint_time = std::move(other.waypoint_time);
+		canvas = std::move(other.canvas);
+		id_changed_connection = std::move(other.id_changed_connection);
+		sub_names = std::move(other.sub_names);
+		parent_desc = std::move(other.parent_desc);
+		links_count = other.links_count;
+
+		other.parent_desc = nullptr;
+		other.links_count = 0;
+
+		return *this;
+	}
+
 	ValueDesc(synfig::Layer::Handle layer,const synfig::String& param_name,const ValueDesc &parent = blank):
 		layer(layer),
 		name(param_name),
@@ -217,6 +245,15 @@
 		if (parent_desc) parent_desc->links_count++;
 	}
 
+	// move
+	ValueDesc(ValueDesc&& other) noexcept
+		: index(IS_CONST),
+		  parent_desc(nullptr),
+		  links_count(0)
+	{
+		*this = std::move(other);
+	}
+
 	ValueDesc():
 		index(IS_CONST), parent_desc(nullptr), links_count(0) { }

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/vectorizer/centerlineskeletonizer.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/vectorizer/centerlineskeletonizer.cpp Changed

_service:obs_scm:synfig-1.5.3.obscpio/synfig-studio/src/synfigapp/vectorizer/centerlinetostrokes.cpp -> _service:obs_scm:synfig-1.5.4.obscpio/synfig-studio/src/synfigapp/vectorizer/centerlinetostrokes.cpp Changed

_service:obs_scm:synfig.obsinfo Changed

Changes of Revision 52